gentoo resync : 05.12.2021

8 files changed, 109 insertions, 168 deletions

diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest
index d66b03c9c254..b62c03bf0372 100644
--- a/app-emulation/hercules/Manifest
+++ b/app-emulation/hercules/Manifest
@@ -1,10 +1,7 @@
-AUX hercules-3.09-aliasing.patch 1721 BLAKE2B 556ef555ee61a470737bbb5214dec314d57aef3e5dd4312484fa47aba05ef3ae389b1db42899a25cb7f90c025e697f2d9f3e855085a50bbf849ca250373106dc SHA512 6f623193d126e6dcf21f6d93bff1a3b949236e2a10c71ca3c4fbdc2ad816894b673551b4dad65205f8b70a75f5c280ed0aa02d4ce0969592a31705e14e42d6e7
 AUX hercules-3.13-htmldir.patch 960 BLAKE2B 2eccc3c00c2cbc6025d65c1baff374b7f86edee3b0c4eec8d3ca791bed84e13b8c6c2cc0cde7b890c2f138f74e9d22fc9014bcd94c22dbb336009ccc84c7f851 SHA512 42b35915ee13fb94187e67baf969098327f8a2bb118a8b356236cba89a3d8dc360366bae1aec7e9542474ed57df2a733d8fd756bac19fd735750fc63cb704a82
-AUX hercules-3.13-unbundle-libltdl.patch 12565 BLAKE2B fe5e78dbd91b8bb4ca8d7f128f251aa3bcebcb7489fc815b572175be661face90ec5e1e0a114e2fd9f978f96c36841f3d1cacaf889135696c3d6babced83bfa7 SHA512 f80493e180f7d52aabf100ae250ae4a1e9c0d4dcdf07822541a62defcbcdd2a79befe9ed4bc33ccd495c7e68e4494b4bc97ea8967d6909ed547be560266ab043
-DIST hercules-3.10.tar.gz 2608321 BLAKE2B df6dd9c93531ee3d68efbfad5b0152ef984e1804e211861e86ea5f7b271081abbd29664d4e97d0e887af10315549bdd7e890ec741baa7b69336f1f08be63c6cf SHA512 de8b3e2e90fdb745dea9c8ce4dbe506de2aba3bf08b3e937605798e6a8020576a949d6ea3496b7c42bd23d617fc96648d2d8ec05a66e8ed174ce46a3bc31c5d1
-DIST hercules-3.12.tar.gz 2569617 BLAKE2B e6b6dc2406bc198e25ddcbdc5dbf141e52cd15ddd690711fdd4ed69ca5baaddd582c437e28aa7793ac667c03f7617adb3bdf3a00cc7c3a28e3f28984f665eb9a SHA512 81d6e151c1c8534753f2db532a0a7bd36fb3806c1ffbab5d6e4a9af3eecea46b95105c37574910714dcfc0fe9b74a72140d573099c24fd44021159ce697414ef
+AUX hercules-3.13-posix-test.patch 1184 BLAKE2B 4d87fe365de07270b3adea242e940ee2a8eea8c946b5f1c67ba0c4abfe3b51a656c5cba2b0154f2b8ff05d8a7a3414255c760eaa0e5a3922631c61d4355bf875 SHA512 23755468397fedc6dca0e1dd6c0c65323ebb32d29f642ee677279fcc00df369327eb8e0b7de6e1e9bbc90d591b6bdd0fedc7c150bea002617fb06ab6bf3d0ef6
+AUX hercules-3.13-unbundle-libltdl.patch 14102 BLAKE2B 45862802246327ae89a7778e2c27939dcc2e3d9db5cc0774d5c457799987a43093e07980add8d86cf3ab8010d9c0c66b6a7e8b315634f83a0df0a087c77305db SHA512 3be153d1baf29e066109e996fe9e3ec06c723f4ccbba997098a79b887324cd3041665d59eb3a1fa08698608e441a4755e9c52130e10624062d364d4ff91c926f
+AUX hercules-3.13-user-install.patch 655 BLAKE2B 1ec0fc4628312180ec0fbdc24f2da9b6dc4344143b4a92dad1d4cc90c8aaa8ca632800e0dfdb2a7af0795d4b2fa356ea73b340cfe01cce799ab284d69cf501df SHA512 e2ee00e9efb582bd5d02f9bbd1481b38db7eee91e721ebf4d3158a8b7e22086ba09b72b07b08f1a815ae24e0211b5e1181e3a3ae4f0316206ae3f8dc6c704d2a
 DIST hercules-3.13.tar.gz 2640742 BLAKE2B 1a84ceab346a591c494fb133d1654ffa73e44f73183564167a74f68eb3e5f3f187cc2f66cef444b951645fa85c111da261b9dd8907594ccb770f5b743f891649 SHA512 76f75ef3f1eb10c0fac0d6fa1ab9809b8d1dfe3deccbcd69366b05ee58f1ecb8ea0f387f7201ab4722b121478676f00e707ad27b6ecf1980fb09e900de63d718
-EBUILD hercules-3.10.ebuild 1318 BLAKE2B c9bf2cd72c3659c9d4354ffc85fe4312960c2b3b4d9fae808479838dc22d47fa17d7d46d8343dba3a21d72694d8f888d58478a447bea19ef99e772465c8e1132 SHA512 80d4414b3c6304c556c2640ba74d47dd26d3996ea88b876b0fcb7359b9c4d2e34f5518b14b988766e048faa1009a6f1fcf29146641ffe202c20acf4cd0044831
-EBUILD hercules-3.12.ebuild 1322 BLAKE2B 120cfd78bec73dc3643cf74dd81186dc7f12fab88cdde485658f8f6231892168414a5459c2b020d118a6562c16f62ce9c933495df74c363a60a6927e81c94bfe SHA512 79c7bc909d84d2fb0fdfc48df4dc5aabcfd159c9e6c431799134bbaeabcae2ed69a94490c474793a0e9329b899a46d60c40c7eb66813b710f07ad998dd5620c8
-EBUILD hercules-3.13.ebuild 1212 BLAKE2B d82513e767db471cd21313903b779994dd1131c6196d4e450600395e0d8a191bdff269122cb07363e3d5b801de73b594dfb2790e9deef51c277aa2c0d6f39004 SHA512 2bdcb55add001df9265f3b1e156a6a10e83bd91060758589ec59409062b8ec07fcc5e918e565fb01647f7a4fa2c352093d22c1c146e3cf625160c355a0c79cbf
+EBUILD hercules-3.13-r1.ebuild 1688 BLAKE2B d4464256340ec4122b073c08aac46d9bb78a7ee8085e09cf09bc16b78c4f2f8700bf2d7cd0499d45cca4074812be52b5c0f051fc8b746e3fa67ce65f4be56ff9 SHA512 77e0506446a350c484bde679833e341dfd76b1ad28433b0f2fb2a9da3008f4763963d50bdec6b35be066681e25575cd3b72f6319fae65e2598003dea7b04c8ec
 MISC metadata.xml 581 BLAKE2B e496bce70b75cb622a88b3255197f93e2bcf68dcfe8f1895493e3fbcedb385771357a22b5c38015738f7472d2398036f024d1d6b9d220b75df2c86ca707a4318 SHA512 9880d7a3f31697415f9483975391a45dd2b8adc69453b7c50ad1dd4ef8fc6333bc01d391823686480728a22e416d59adf804fcf34b2a48af79ab074a24c6bcb3
diff --git a/app-emulation/hercules/files/hercules-3.09-aliasing.patch b/app-emulation/hercules/files/hercules-3.09-aliasing.patch
deleted file mode 100644
index 3d03e9b6dc1b..000000000000
--- a/app-emulation/hercules/files/hercules-3.09-aliasing.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7d3255a18ad845953cc8083371e8623e771ad4f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 27 Aug 2013 12:25:49 -0400
-Subject: [PATCH] sha: fix strict aliasing warnings
-
-sha256.c:492:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
-sha256.c:784:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
-sha256.c:785:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- crypto/sha256.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/sha256.c b/crypto/sha256.c
-index 1a6a243..b1e90b4 100644
---- a/crypto/sha256.c
-+++ b/crypto/sha256.c
-@@ -489,7 +489,7 @@ SHA256_Final(u_int8_t digest[], SHA256_CTX *context)
-    *context->buffer = 0x80;
-   }
-   /* Set the bit count: */
--  *(u_int64_t *)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
-+  memcpy (&context->buffer[SHA256_SHORT_BLOCK_LENGTH], &context->bitcount, 8);
- 
-   /* Final transform: */
-   SHA256_Transform(context, context->buffer);
-@@ -781,8 +781,8 @@ SHA512_Last(SHA512_CTX *context)
-   *context->buffer = 0x80;
-  }
-  /* Store the length of input data (in bits): */
-- *(u_int64_t *)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
-- *(u_int64_t *)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
-+ memcpy (&context->buffer[SHA512_SHORT_BLOCK_LENGTH], &context->bitcount[1], 8);
-+ memcpy (&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8], &context->bitcount[0], 8);
- 
-  /* Final transform: */
-  SHA512_Transform(context, context->buffer);
--- 
-1.8.3.2
-
diff --git a/app-emulation/hercules/files/hercules-3.13-posix-test.patch b/app-emulation/hercules/files/hercules-3.13-posix-test.patch
new file mode 100644
index 000000000000..abee4b0cc5ed
--- /dev/null
+++ b/app-emulation/hercules/files/hercules-3.13-posix-test.patch
@@ -0,0 +1,29 @@
+https://github.com/rbowler/spinhawk/pull/106
+
+From 9a9f7182069b8fe0483383c177882218244bad16 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 18 Nov 2021 02:32:02 -0500
+Subject: [PATCH] avoid bashism in test call
+
+POSIX test only supports =, not ==.
+---
+ autoconf/hercules.m4 | 2 +-
+ configure.ac         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f12d47058562..8dd420af8d13 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -562,7 +562,7 @@ AC_CHECK_DECLS( SIOCADDRT,            [hc_cv_have_siocaddrt=yes],           [hc_
+ AC_CHECK_DECLS( SIOCDELRT,            [hc_cv_have_siocdelrt=yes],           [hc_cv_have_siocdelrt=no],           [#include <linux/sockios.h>] )
+ AC_CHECK_DECLS( SIOCDIFADDR,          [hc_cv_have_siocdifaddr=yes],         [hc_cv_have_siocdifaddr=no],         [#include <linux/sockios.h>] )
+ 
+-if test "$hc_cv_have_sys_mtio_h" == "yes"; then
++if test "$hc_cv_have_sys_mtio_h" = "yes"; then
+     AC_CHECK_DECLS( MTEWARN,          [hc_cv_have_mtewarn=yes],             [hc_cv_have_mtewarn=no],             [#include <sys/mtio.h>] )
+ else
+     hc_cv_have_mtewarn=no
+-- 
+2.33.0
+
diff --git a/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch b/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
index 7aec7f602de4..c96831d96ad2 100644
--- a/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
+++ b/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
@@ -282,7 +282,7 @@
    DYNMOD_LD_FLAGS =
    DYNMOD_LD_ADD =
    LIB_LD_FLAGS    = $(XSTATIC)    \
-@@ -295,8 +295,7 @@
+@@ -295,12 +295,11 @@
                          memrchr.c    \
                          parser.c     \
                          pttrace.c    \
@@ -292,6 +292,11 @@
  
    libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
  
+-  libhercu_la_LIBADD  = $(LDADD) libhercs.la
++  libhercu_la_LIBADD  = $(LDADD) libhercs.la $(LIB_LD_ADD)
+ 
+ #
+ # Core Hercules (shared) library
 @@ -372,8 +371,7 @@
                               memrchr.c        \
                               $(dynamic_SRC)   \
@@ -345,3 +350,30 @@
    LIB_LD_FLAGS    = $(XSTATIC)    \
  		   -no-undefined \
  		   -avoid-version
+--- a/autoconf/hercules.m4
++++ b/autoconf/hercules.m4
+@@ -270,7 +270,7 @@
+ 
+     else
+ 
+-        if test $(./libtool --features | fgrep "enable shared libraries" | wc -l) -ne 1; then
++        if test "$enable_shared" != "yes"; then
+ 
+             #  Libtool doesn't support shared libraries,
+             #  and thus our wrapper kludge is not needed.
+@@ -280,11 +280,11 @@
+                 }
+ DUPGETOPT2
+ 
+-            ./libtool --mode=compile ${CC-cc} conftest1.c -c -o conftest1.lo > /dev/null 2>&1
+-            ./libtool --mode=compile ${CC-cc} conftest2.c -c -o conftest2.lo > /dev/null 2>&1
++            libtool --mode=compile ${CC-cc} conftest1.c -c -o conftest1.lo > /dev/null 2>&1
++            libtool --mode=compile ${CC-cc} conftest2.c -c -o conftest2.lo > /dev/null 2>&1
+ 
+-            ./libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest1.lo                 -o libconftest1.la > /dev/null 2>&1
+-            ./libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest2.lo libconftest1.la -o libconftest2.la > /dev/null 2>&1
++            libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest1.lo                 -o libconftest1.la > /dev/null 2>&1
++            libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest2.lo libconftest1.la -o libconftest2.la > /dev/null 2>&1
+ 
+             if test $? = 0; then
+ 
diff --git a/app-emulation/hercules/files/hercules-3.13-user-install.patch b/app-emulation/hercules/files/hercules-3.13-user-install.patch
new file mode 100644
index 000000000000..bcde1181e873
--- /dev/null
+++ b/app-emulation/hercules/files/hercules-3.13-user-install.patch
@@ -0,0 +1,21 @@
+the ebuild will handle these, so no need to do it directly which will fail when
+building as non-root.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -730,15 +730,6 @@ endif
+ 	(cd $(DESTDIR)$(bindir); @LN_S@ ./dasdcopy$(EXEEXT) cfba2fba$(EXEEXT))
+ 	rm -f $(DESTDIR)$(bindir)/cckd2ckd$(EXEEXT)
+ 	(cd $(DESTDIR)$(bindir); @LN_S@ ./dasdcopy$(EXEEXT) cckd2ckd$(EXEEXT))
+-if SETUID_HERCIFC
+-	chown root $(DESTDIR)$(bindir)/hercifc
+-if HERCIFC_GROUPSET
+-	chgrp $(HERCIFC_GROUPNAME) $(DESTDIR)$(bindir)/hercifc
+-endif
+-	chmod 0750 $(DESTDIR)$(bindir)/hercifc
+-	chmod +s   $(DESTDIR)$(bindir)/hercifc
+-	rm                             hercifc
+-endif
+ 
+ uninstall-local:
+ 
diff --git a/app-emulation/hercules/hercules-3.12.ebuild b/app-emulation/hercules/hercules-3.12.ebuild
deleted file mode 100644
index ea0d3fecd24e..000000000000
--- a/app-emulation/hercules/hercules-3.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
-HOMEPAGE="http://www.hercules-390.eu/"
-SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos"
-IUSE="bzip2 custom-cflags +suid"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	net-libs/libnsl:0=
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.09-aliasing.patch
-)
-
-src_prepare() {
-	default
-
-	# The local modules need local libs, so when doing a parallel install
-	# of the modules and libs breaks during relinking.  Force the libs to
-	# install first, and then the modules that use those libs.  #488126
-	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2) \
-	econf \
-		$(use_enable bzip2 cckd-bzip2) \
-		$(use_enable bzip2 het-bzip2) \
-		$(use_enable suid setuid-hercifc) \
-		--enable-custom="Gentoo ${PF}.ebuild" \
-		--disable-optimization
-}
-
-src_install() {
-	default
-	insinto /usr/share/hercules
-	doins hercules.cnf
-	dodoc README.* RELEASE.NOTES
-	docinto html
-	dodoc -r html
-}
diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.13-r1.ebuild
index 2759a92bd42b..608739f4b314 100644
--- a/app-emulation/hercules/hercules-3.10.ebuild
+++ b/app-emulation/hercules/hercules-3.13-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
 HOMEPAGE="http://www.hercules-390.eu/"
@@ -14,18 +14,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86 ~x64-macos"
 IUSE="bzip2 custom-cflags +suid"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
+RDEPEND="
+	dev-libs/libltdl:=
 	net-libs/libnsl:0=
-	sys-libs/zlib"
+	sys-libs/zlib:=
+	bzip2? ( app-arch/bzip2:= )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.09-aliasing.patch
+	"${FILESDIR}"/${PN}-3.13-htmldir.patch
+	"${FILESDIR}"/${PN}-3.13-posix-test.patch
+	"${FILESDIR}"/${PN}-3.13-unbundle-libltdl.patch
+	"${FILESDIR}"/${PN}-3.13-user-install.patch
 )
 
 src_prepare() {
 	default
 
+	# delete bundled libltdl, #252716
+	rm ltdl.{c,h} || die
+	eautoreconf
+
 	# The local modules need local libs, so when doing a parallel install
 	# of the modules and libs breaks during relinking.  Force the libs to
 	# install first, and then the modules that use those libs.  #488126
@@ -34,7 +43,7 @@ src_prepare() {
 
 src_configure() {
 	use custom-cflags || strip-flags
-	ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2) \
+	local -x ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2)
 	econf \
 		$(use_enable bzip2 cckd-bzip2) \
 		$(use_enable bzip2 het-bzip2) \
@@ -45,9 +54,13 @@ src_configure() {
 
 src_install() {
 	default
+	dodoc RELEASE.NOTES
+
+	use suid && fperms 4711 /usr/bin/hercifc
+
 	insinto /usr/share/hercules
 	doins hercules.cnf
-	dodoc README.* RELEASE.NOTES
-	docinto html
-	dodoc -r html
+
+	# No static archives.  Have to leave .la files for modules. #720342
+	rm "${ED}/usr/$(get_libdir)/"*.la || die
 }
diff --git a/app-emulation/hercules/hercules-3.13.ebuild b/app-emulation/hercules/hercules-3.13.ebuild
deleted file mode 100644
index 1131976ea5ea..000000000000
--- a/app-emulation/hercules/hercules-3.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
-HOMEPAGE="http://www.hercules-390.eu/"
-SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos"
-IUSE="bzip2 custom-cflags +suid"
-
-RDEPEND="
-	dev-libs/libltdl
-	net-libs/libnsl:0=
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.13-htmldir.patch
-	"${FILESDIR}"/${PN}-3.13-unbundle-libltdl.patch
-)
-
-src_prepare() {
-	default
-
-	# delete bundled libltdl, #252716
-	rm ltdl.{c,h} || die
-	eautoreconf
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	local -x ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2)
-	econf \
-		$(use_enable bzip2 cckd-bzip2) \
-		$(use_enable bzip2 het-bzip2) \
-		$(use_enable suid setuid-hercifc) \
-		--enable-custom="Gentoo ${PF}.ebuild" \
-		--disable-optimization
-}
-
-src_install() {
-	default
-	dodoc RELEASE.NOTES
-
-	insinto /usr/share/hercules
-	doins hercules.cnf
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}