gentoo resync : 05.12.2021

4 files changed, 83 insertions, 42 deletions

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:
+