CVS commit: pkgsrc/emulators/hercules4sdl

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/hercules4sdl
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Sun, 19 Dec 2021 19:08:20 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Dec 19 19:08:20 UTC 2021

Modified Files:
        pkgsrc/emulators/hercules4sdl: Makefile PLIST distinfo
        pkgsrc/emulators/hercules4sdl/patches: patch-Makefile.am
            patch-configure.ac
Removed Files:
        pkgsrc/emulators/hercules4sdl/patches: patch-hifr.h patch-msgenu.h
            patch-tuntap.c

Log Message:
emulators/hercules4sdl: update to 4.4

Now installs hercifc suid root so that you don't have to run hercules
itself as root (for networking purposes).

Summary of Changes:
-------------------

  . Fix many SIE arch-dep violation bugs
  . Fix to SIE handling of STFL/STFLE instructions
  . Internal and SIE SKA Storage Key handling fixes
  . Fix VM/ESA OPERATOR userid looping bug
  . Preliminary SIE ESSA/STHYI instructions support
  . Fixes to MVS assist support
  . ECPS:VM 1.88 fixes

  . ISK/ISKE, IVSK, RRB/RRBE, SSK/SSKE, RRBM, PFMF instruction fixes
  . Fixes to CSP/CSPG/IDTE/IPTE instructions
  . Minor LAA/LAAG (et al.) instructions fix
  . RRBM instruction fix
  . PTFF instruction support for function codes 04, 05, 69
  . Fix DAT bug in MVCOS instruction

  . Local-TLB-Clearing Facility
  . Nonquiescing Key-Setting Facility
  . Insert Reference Bits Multiple Facility
  . Miscellaneous-Instruction-Extensions Facilities 2 and 3
  . PPA-in-order facility
  . Allow modifying "IBM" and undefined facility bits

  . LCS device fixes and improvements
  . LCS device SNA support
  . 3270 device connection improvements
  . CTCE device fixes and improvements
  . CTCI device fix for VSE
  . Minor QETH (OSA) device fixes/improvements

  . CCKDMAP utility CFBA/CFBA64 device support
  . Fix to DASDLS utility shadow file logic
  . CCKDLOAD utility fix
  . Fix dasd utilities r/o access to r/w images
  . Minor "faketape" emulated tape format fix
  . Fix possible CRASH during compressed dasd attach/detach

  . PANOPT statement "MSGCOLOR" option
  . PANRATE/PANTITLE replaced by PANOPT
  . Minor MODEL/PLANT/MANUFACTURER statement fixes
  . New -o/--output/--logfile command-line options

  . Hardware loader fix
  . Minor Rexx support fixes and improvements
  . Minor External Packages updates
  . Fixes to herclin.exe
  . Translation Specification PIC 12 fix
  . Improved TXF reliability and completeness
  . Predefined CPUMODEL $(symbol) values

  . Improvements to building Hercules on non-Windows platforms
  . Improvements to building Hercules on Windows platforms
  . Many other minor internal/external fixes and improvements


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/hercules4sdl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/hercules4sdl/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/hercules4sdl/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/hercules4sdl/patches/patch-Makefile.am \
    pkgsrc/emulators/hercules4sdl/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/hercules4sdl/patches/patch-hifr.h \
    pkgsrc/emulators/hercules4sdl/patches/patch-msgenu.h \
    pkgsrc/emulators/hercules4sdl/patches/patch-tuntap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/hercules4sdl/Makefile
diff -u pkgsrc/emulators/hercules4sdl/Makefile:1.4 pkgsrc/emulators/hercules4sdl/Makefile:1.5
--- pkgsrc/emulators/hercules4sdl/Makefile:1.4  Wed Dec  1 03:51:57 2021
+++ pkgsrc/emulators/hercules4sdl/Makefile      Sun Dec 19 19:08:19 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2021/12/01 03:51:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/19 19:08:19 rhialto Exp $
 
-PKGNAME=       hercules4sdl-4.3
+PKGNAME=       hercules4sdl-4.4
 DISTNAME=      hyperion-Release_${PKGVERSION_NOREV}
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
@@ -32,15 +32,11 @@ SUBST_FILES.prefix= hercules.cnf
 SUBST_SED.prefix=      -e 's,/usr/local,${PREFIX},g'
 
 CONFIGURE_ARGS+=       --enable-extpkgs=${PREFIX}/lib/hercules4sdl
-# There is a configure check that uses C++ to check if the compiler is
-# GNU, and on Darwin it thinks GNU C++ is needed to create shared
-# libraries, even though no actual C++ is used. Or something.
-CONFIGURE_ENV.Darwin+= ac_cv_cxx_compiler_gnu=yes
 
 INSTALLATION_DIRS+=    share/examples/hercules
+SPECIAL_PERMS+=                ${PREFIX}/bin/hercifc ${SETUID_ROOT_PERMS}
 
 pre-configure:
-       ${RM} -f ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c
        cd ${WRKSRC} && ./autogen.sh
 
 post-install:

Index: pkgsrc/emulators/hercules4sdl/PLIST
diff -u pkgsrc/emulators/hercules4sdl/PLIST:1.1 pkgsrc/emulators/hercules4sdl/PLIST:1.2
--- pkgsrc/emulators/hercules4sdl/PLIST:1.1     Sat Nov  6 16:43:23 2021
+++ pkgsrc/emulators/hercules4sdl/PLIST Sun Dec 19 19:08:19 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/11/06 16:43:23 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/12/19 19:08:19 rhialto Exp $
 bin/cckd2ckd
 bin/cckd642ckd
 bin/cckdcdsk
@@ -45,7 +45,6 @@ bin/tapecopy
 bin/tapemap
 bin/tapesplt
 bin/vmfplc2
-bin/voldsext.cmd
 lib/hercules/dyncrypt.la
 lib/hercules/dyngui.la
 lib/hercules/hdt1052c.la
@@ -79,9 +78,7 @@ share/hercules/TMOUNT.txt
 share/hercules/awssl-v19g
 share/hercules/awswrite.jcl
 share/hercules/cckddasd.html
-share/hercules/cckddu64.hla
-share/hercules/cckddump.hla
-share/hercules/cckdload.hla
+share/hercules/cckddump-cckdload.zip
 share/hercules/fishgui.html
 share/hercules/hercconf.html
 share/hercules/hercfaq.html

Index: pkgsrc/emulators/hercules4sdl/distinfo
diff -u pkgsrc/emulators/hercules4sdl/distinfo:1.2 pkgsrc/emulators/hercules4sdl/distinfo:1.3
--- pkgsrc/emulators/hercules4sdl/distinfo:1.2  Wed Dec  1 03:51:57 2021
+++ pkgsrc/emulators/hercules4sdl/distinfo      Sun Dec 19 19:08:19 2021
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.2 2021/12/01 03:51:57 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2021/12/19 19:08:19 rhialto Exp $
 
-BLAKE2s (hyperion-Release_4.3.tar.gz) = 5931c6762e5e6585c44052732628a1aec6d156422dd7aaf8b3b1a335aa8218a0
-SHA512 (hyperion-Release_4.3.tar.gz) = e2591b16ecc08f952f16c013764a1d6bfd88aafe9620130dca9619a8af47f2cc04af7d7552c08f75ff6000854fe8e698350b344dbb573551701a610df68fd00a
-Size (hyperion-Release_4.3.tar.gz) = 11609664 bytes
-SHA1 (patch-Makefile.am) = 85b65386cfde0d7c180abaeaab67e05ad7d07385
-SHA1 (patch-configure.ac) = b7f79b0a12cfe20eab389b59ace08bea427d2b63
-SHA1 (patch-hifr.h) = 6b878b957d1847296882316067281b05872a760c
-SHA1 (patch-msgenu.h) = 947d7ddf4395c6c91d2f6640c9d06e8880c8fdf9
-SHA1 (patch-tuntap.c) = 6067b1be32d2cd3aa4ad57e63a7483aa823fbcf1
+BLAKE2s (hyperion-Release_4.4.tar.gz) = 972aa31de8e0baf01be112a65b2627ca1a1187bc75b4cc1eb4fcd22a41a35d37
+SHA512 (hyperion-Release_4.4.tar.gz) = 42de95dc26c1a7ae17499c44964189e051f5b57caac8b04a62e2a4a5b1c30ea8f800a238589420e5cdd1a9bfea75bb7cce3b6941bf56516092cc7ee4add4f4e6
+Size (hyperion-Release_4.4.tar.gz) = 13680714 bytes
+SHA1 (patch-Makefile.am) = 6ae600095ffb29aab2a5e1e467f79a40e814f26d
+SHA1 (patch-configure.ac) = 734f64da8f4ce0f790d4eac0f352649d1b6d08f2

Index: pkgsrc/emulators/hercules4sdl/patches/patch-Makefile.am
diff -u pkgsrc/emulators/hercules4sdl/patches/patch-Makefile.am:1.1 pkgsrc/emulators/hercules4sdl/patches/patch-Makefile.am:1.2
--- pkgsrc/emulators/hercules4sdl/patches/patch-Makefile.am:1.1 Sat Nov  6 16:43:23 2021
+++ pkgsrc/emulators/hercules4sdl/patches/patch-Makefile.am     Sun Dec 19 19:08:20 2021
@@ -1,44 +1,15 @@
-$NetBSD: patch-Makefile.am,v 1.1 2021/11/06 16:43:23 rhialto Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2021/12/19 19:08:20 rhialto Exp $
 
-* Fix build. Use devel/libltdl instead of internal libltdl.
 - Build dynamic modules only dynamic (-shared), not also static.
 
---- Makefile.am.orig   2020-11-27 18:45:12.000000000 +0000
+--- Makefile.am.orig   2021-12-18 14:28:12.000000000 +0000
 +++ Makefile.am
-@@ -11,7 +11,7 @@ extpkg_headers = @EXTPKG_HEADERS@
- extpkg_ldadd   = @EXTPKG_LDADD@
- hqa_inc        = @HQA_INC@
- lns            = @LN_S@
--ldadd          = @LIBS@
-+ldadd          = @LIBS@ -lltdl
- 
- #------------------------------------------------------------------------------
- 
-@@ -142,9 +142,9 @@ dyndev_SRC =  \
+@@ -144,7 +144,7 @@ dyndev_SRC =  \
  #                    to Windows DLLs
  #-----------------------------------------------------------------
  
 -XSTATIC =
 +XSTATIC = -shared
  DYNSRC  =
--LTDL    =  ltdl.c
-+LTDL    =
  
  DYNMOD_LD_FLAGS =   \
-   -module           \
-@@ -512,7 +512,6 @@ libherc_la_SOURCES = \
-   $(DYNSRC)
- 
- EXTRA_libherc_la_SOURCES = \
--  ltdl.c             \
-   memrchr.c          \
-   $(dynamic_SRC)     \
-   $(dyndev_SRC)      \
-@@ -956,7 +955,6 @@ noinst_HEADERS =          \
-   instfmts.h              \
-   linklist.h              \
-   logger.h                \
--  ltdl.h                  \
-   machdep.h               \
-   memrchr.h               \
-   mpc.h                   \
Index: pkgsrc/emulators/hercules4sdl/patches/patch-configure.ac
diff -u pkgsrc/emulators/hercules4sdl/patches/patch-configure.ac:1.1 pkgsrc/emulators/hercules4sdl/patches/patch-configure.ac:1.2
--- pkgsrc/emulators/hercules4sdl/patches/patch-configure.ac:1.1        Sat Nov  6 16:43:23 2021
+++ pkgsrc/emulators/hercules4sdl/patches/patch-configure.ac    Sun Dec 19 19:08:20 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.1 2021/11/06 16:43:23 rhialto Exp $
+$NetBSD: patch-configure.ac,v 1.2 2021/12/19 19:08:20 rhialto Exp $
 
 - Avoid -march=xxx because it makes binaries nonportable.
 - Fix suffix of helper libraries.
 
---- configure.ac.orig  2020-11-27 18:45:12.000000000 +0000
+--- configure.ac.orig  2021-12-18 14:28:12.000000000 +0000
 +++ configure.ac
-@@ -2826,7 +2826,8 @@ if test "$hc_cv_auto_optimize" = "yes"; 
+@@ -2853,7 +2853,8 @@ if test "$hc_cv_auto_optimize" = "yes"; 
      if test "$hc_cv_is_intel_x86_arch" = "yes"; then
  
          # Set CPU type
@@ -15,7 +15,7 @@ $NetBSD: patch-configure.ac,v 1.1 2021/1
  
          # Dynamically inline small block string operations
          # (subroutine calls still made for large area calls)
-@@ -3031,9 +3032,9 @@ test  "$hc_cv_is_mingw"    =  "yes"  && 
+@@ -3074,9 +3075,9 @@ test  "$hc_cv_is_mingw"    =  "yes"  && 
  #------------------------------------------------------#
  
  if test "$hc_cv_opt_debug" = "yes"; then
@@ -27,19 +27,3 @@ $NetBSD: patch-configure.ac,v 1.1 2021/1
  fi
  
  AC_CACHE_SAVE()
-@@ -3229,10 +3230,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
- ##----------------------------------------------------------------
- ##                         DEBUGGING
- ##----------------------------------------------------------------
--## AC_MSG_NOTICE( [Using crypto_libdir    = ${crypto_libdir}]    )
--## AC_MSG_NOTICE( [Using decnumber_libdir = ${decnumber_libdir}] )
--## AC_MSG_NOTICE( [Using softfloat_libdir = ${softfloat_libdir}] )
--## AC_MSG_NOTICE( [Using telnet_libdir    = ${telnet_libdir}]    )
-+AC_MSG_NOTICE( [Using crypto_libdir    = ${crypto_libdir}]    )
-+AC_MSG_NOTICE( [Using decnumber_libdir = ${decnumber_libdir}] )
-+AC_MSG_NOTICE( [Using softfloat_libdir = ${softfloat_libdir}] )
-+AC_MSG_NOTICE( [Using telnet_libdir    = ${telnet_libdir}]    )
-+AC_MSG_NOTICE( [Using extpkg_ldadd     = ${extpkg_ldadd}]    )
- 
- EXTPKG_INCDIRS="${extpkg_incdirs}"
- AC_SUBST(EXTPKG_INCDIRS)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index