pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/hercules4sdl emulators/hercules4sdl: update ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e778491bdb9b
branches: trunk
changeset: 771611:e778491bdb9b
user: rhialto <rhialto%pkgsrc.org@localhost>
date: Sun Dec 19 19:08:19 2021 +0000
description:
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
diffstat:
emulators/hercules4sdl/Makefile | 10 +--
emulators/hercules4sdl/PLIST | 7 +-
emulators/hercules4sdl/distinfo | 15 ++---
emulators/hercules4sdl/patches/patch-Makefile.am | 35 +------------
emulators/hercules4sdl/patches/patch-configure.ac | 24 +-------
emulators/hercules4sdl/patches/patch-hifr.h | 15 -----
emulators/hercules4sdl/patches/patch-msgenu.h | 17 ------
emulators/hercules4sdl/patches/patch-tuntap.c | 61 -----------------------
8 files changed, 18 insertions(+), 166 deletions(-)
diffs (280 lines):
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/Makefile
--- a/emulators/hercules4sdl/Makefile Sun Dec 19 18:34:11 2021 +0000
+++ b/emulators/hercules4sdl/Makefile Sun Dec 19 19:08:19 2021 +0000
@@ -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_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:
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/PLIST
--- a/emulators/hercules4sdl/PLIST Sun Dec 19 18:34:11 2021 +0000
+++ b/emulators/hercules4sdl/PLIST Sun Dec 19 19:08:19 2021 +0000
@@ -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/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/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
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/distinfo
--- a/emulators/hercules4sdl/distinfo Sun Dec 19 18:34:11 2021 +0000
+++ b/emulators/hercules4sdl/distinfo Sun Dec 19 19:08:19 2021 +0000
@@ -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
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/patches/patch-Makefile.am
--- a/emulators/hercules4sdl/patches/patch-Makefile.am Sun Dec 19 18:34:11 2021 +0000
+++ b/emulators/hercules4sdl/patches/patch-Makefile.am Sun Dec 19 19:08:19 2021 +0000
@@ -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 \
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/patches/patch-configure.ac
--- a/emulators/hercules4sdl/patches/patch-configure.ac Sun Dec 19 18:34:11 2021 +0000
+++ b/emulators/hercules4sdl/patches/patch-configure.ac Sun Dec 19 19:08:19 2021 +0000
@@ -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 @@
# 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 @@
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)
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/patches/patch-hifr.h
--- a/emulators/hercules4sdl/patches/patch-hifr.h Sun Dec 19 18:34:11 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-hifr.h,v 1.1 2021/11/06 16:43:23 rhialto Exp $
-
-Correct back over-done "or NetBSD" condition.
-
---- hifr.h.orig 2020-11-30 19:36:38.734299287 +0000
-+++ hifr.h
-@@ -119,7 +119,7 @@ typedef struct hifr hifr;
- #define hifr_netmask ifreq.ifr_ifru.ifru_netmask
- #define hifr_broadaddr ifreq.ifr_ifru.ifru_broadaddr
- #define hifr_hwaddr ifreq.ifr_ifru.ifru_hwaddr
--#if defined( FREEBSD_OR_NETBSD )
-+#if defined( __FreeBSD__ )
- /* short ifru_flags[2]; */
- #define hifr_flags ifreq.ifr_ifru.ifru_flags[0]
- #else
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/patches/patch-msgenu.h
--- a/emulators/hercules4sdl/patches/patch-msgenu.h Sun Dec 19 18:34:11 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-msgenu.h,v 1.1 2021/11/06 16:43:23 rhialto Exp $
-
-Introduce 2 message texts as added to tuntap.c.
-
---- msgenu.h.orig 2019-09-10 18:06:20.000000000 +0000
-+++ msgenu.h
-@@ -322,8 +322,8 @@ LOGM_DLL_IMPORT int panel_command_captu
- #define HHC00153 "Net device %s: Invalid prefix length %s"
- #define HHC00154 "Preconfigured interface %s does not exist or is not accessible by Hercules (EPERM)"
- #define HHC00155 "Net device %s: Invalid broadcast address %s"
--//efine HHC00156 (available)
--//efine HHC00157 (available)
-+#define HHC00156 "IFF_TUN requested but not a tun device: %s"
-+#define HHC00157 "IFF_TAP requested but not a tap device: %s"
- //efine HHC00158 (available)
- //efine HHC00159 (available)
- #define HHC00160 "SCP %scommand: %s"
diff -r 920437216905 -r e778491bdb9b emulators/hercules4sdl/patches/patch-tuntap.c
--- a/emulators/hercules4sdl/patches/patch-tuntap.c Sun Dec 19 18:34:11 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-$NetBSD: patch-tuntap.c,v 1.1 2021/11/06 16:43:23 rhialto Exp $
-
-NetBSD is not Linux. Conditionalize the compilation of Linux stuff.
-
---- tuntap.c.orig 2019-09-10 18:06:20.000000000 +0000
-+++ tuntap.c
-@@ -26,6 +26,11 @@
- /* Thus for preconfigured FreeBSD interfaces we need to modify the */
- /* name of the character file being opened. */
-
-+/* On NetBSD you open /dev/tun<n> which must be given by the user, */
-+/* who has pre-configured that tunnel for use. */
-+/* If you want a L2 (ethernet) interface, open /dev/tap or */
-+/* /dev/tap<n>. You cannot switch from one mode to the other. */
-+
-
- #include "hstdinc.h"
-
-@@ -71,6 +76,7 @@ static void tuntap_term( void* arg )
- //
- // TUNTAP_SetMode (TUNTAP_CreateInterface helper)
- //
-+#if defined(__linux__) || defined(OPTION_W32_CTCI)
- static int TUNTAP_SetMode (int fd, struct hifr *hifr, int iFlags)
- {
- int rc;
-@@ -157,6 +163,7 @@ static int TUNTAP_SetMode (int fd, struc
-
- return rc;
- } // End of function TUNTAP_SetMode()
-+#endif /* __linux__ || OPTION_W32_CTCI */
-
-
- //
-@@ -248,6 +255,7 @@ int TUNTAP_CreateInterface(
- if ( strncasecmp( utsbuf.sysname, "linux", 5 ) == 0 )
- #endif
- {
-+#if defined (__linux__) || defined(OPTION_W32_CTCI)
- // Linux kernel (builtin tun device) or Windows
- struct hifr hifr;
-
-@@ -271,10 +279,18 @@ int TUNTAP_CreateInterface(
- }
-
- strcpy( pszNetDevName, hifr.hifr_name );
-+#endif /* __linux__ || OPTION_W32_CTCI */
- }
- #if !defined( OPTION_W32_CTCI )
- else
- {
-+ if ((iFlags & IFF_TUN) && !strstr(pszTUNDevice, "tun")) {
-+ WRMSG( HHC00156, "W", pszTUNDevice );
-+ }
-+ if ((iFlags & IFF_TAP) && !strstr(pszTUNDevice, "tap")) {
-+ WRMSG( HHC00157, "W", pszTUNDevice );
-+ }
-+
- // Other OS: Simply use basename of the device
- // Notes: (JAP) This is problematic at best. Until we have a
- // clean FreeBSD compile from the base tree I can't
Home |
Main Index |
Thread Index |
Old Index