gentoo auto-resync : 07:01:2024 - 06:54:33

7 files changed, 45 insertions, 120 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 99c91d1dcc68..440cd5100abc 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index ff6cc714276c..ea9c8e23a5b7 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,4 +1,3 @@
-AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
 DIST johntheripper-jumbo-1.9.0_p20230717.tar.gz 56772470 BLAKE2B 33295dc28d32852a6284adaadbbf9d9c852fb78e1dc673df5e67c31befb6921dbd6d29310ca7b3406e4b1259cca6e8d643292d73f4324262b038a1c6bc7ff51b SHA512 fd48a6bccf3f2be0d495aa8a635af73bc386c5815fdaa62259f2920724afa89e0e9743585c412e595486a0d2677f1ec43c43606471078ec0611d5c05b01853de
 DIST johntheripper-jumbo-1.9.0_p20240102.tar.gz 55727974 BLAKE2B 10238f549b8d1d52d7858d0a0df080ae1e92a7026b3b31f4e19d00c2bf06df5ad1fe298291d5421a0f685786fca2ad954a5ed3b2adc23d80464ec1966db9c968 SHA512 c66898d12799d88d42e6a930768e27b4110362b6384a47957ab61300b8254af051d3a2821e54f12a90ded8a20c855b8a2f044942dba1605447ae355e2f7ecbaf
 EBUILD johntheripper-jumbo-1.9.0_p20230717.ebuild 3576 BLAKE2B 99ce00187d1bb442286ef1c2ccfaeccd807b0701faa3a7d8972f69e09d64fb89ce9df5d1c777dc26920bce604f929ad3e04461a91af2875d370eb7721b974fbe SHA512 1c39ed394a1152cd220c8249342d99e08e7c3b324fa3a649d126909f4070752626d7d32328b01a82363e14edc1bd2709174d36daca627c251b5559252e56eb71
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
deleted file mode 100644
index 2306bb018f36..000000000000
--- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/openwall/john/pull/4908
-https://bugs.gentoo.org/763828
-
-From 7a843229dff28cf0851fe3130c74b38dfaf38411 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 3 Dec 2021 03:40:00 +0000
-Subject: [PATCH 1/2] configure: check for 'strings' and respect $STRINGS
- variable
-
-It's possible to want a ${CHOST}-prefixed copy of strings,
-so add a check for 'strings' in configure.ac and respect
-$STRINGS within jtr_asm_magic.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/configure.ac        |  1 +
- src/m4/jtr_asm_magic.m4 |  2 +-
- 3 files changed, 98 insertions(+), 2 deletions(-)
-
-diff --git a/src/configure.ac b/src/configure.ac
-index 53b6a62592..98b28be202 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -346,6 +346,7 @@ AS_IF([test -z "$AS"], [AS="$CC"])
- AS_IF([test -z "$LD"], [LD="$CC"])
- AS_IF([test -z "$AR"], [AC_CHECK_TOOL([AR], [ar])])
- AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], [strip])])
-+AS_IF([test -z "$STRINGS"], [AC_CHECK_TOOL([STRINGS], [strings])])
- 
- dnl Check if we have this at all
- PKG_PROG_PKG_CONFIG
-diff --git a/src/m4/jtr_asm_magic.m4 b/src/m4/jtr_asm_magic.m4
-index 469a944589..162736d855 100644
---- a/src/m4/jtr_asm_magic.m4
-+++ b/src/m4/jtr_asm_magic.m4
-@@ -19,7 +19,7 @@ EXTRA_AS_FLAGS=
- AC_MSG_CHECKING([for extra ASFLAGS])
- CC="$CC_BACKUP"
- CFLAGS="$CFLAGS -O0"
--AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && strings - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
-+AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && ${STRINGS} - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
-       [JTR_LIST_ADD(EXTRA_AS_FLAGS, [-DUNDERSCORES])])
- 
- AC_LINK_IFELSE([AC_LANG_SOURCE(
-
-From 8c43ed0c2f7fdb793978d90306d6f6a118122e39 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 3 Dec 2021 03:46:44 +0000
-Subject: [PATCH 2/2] configure: fix bashisms
-
-'==' isn't recognised by POSIX-compliant shells, so let's use = too.
-
-No functional change.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/configure.ac             |  8 ++++----
- src/m4/jtr_utility_macros.m4 |  4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -339,7 +339,7 @@ AC_CACHE_SAVE
- AC_PATH_PROG([SORT], [sort])
- AC_PATH_PROG([FIND], [find])
- AC_PATH_PROG([PERL], [perl])
--if test "x$PERL" == x ; then
-+if test "x$PERL" = x ; then
-   AC_MSG_FAILURE([No perl executable found])
- fi
- AS_IF([test -z "$AS"], [AS="$CC"])
-@@ -370,7 +370,7 @@ dnl to succeeed.
- dnl
- if ( test -e ../run/john.pot ) ; then
- AC_MSG_CHECKING([if potcheck.pl succeeds])
--if test "x$PERL" == x ; then
-+if test "x$PERL" = x ; then
-    AC_MSG_RESULT([no Perl (unable to check)])
- else
-    $PERL ../run/potcheck.pl -validate < ../run/john.pot
-@@ -677,10 +677,10 @@ if test "x$enable_rexgen" != xno ; then
-         AC_MSG_RESULT([TOO old. Rexgen not usable!]))]
-     )]
-   )
--  if test "x$using_rexgen" == "xyes" ; then
-+  if test "x$using_rexgen" = "xyes" ; then
-     AC_DEFINE(HAVE_LIBREXGEN,1,[Define to 1 if you have the `rexgen' library (-lrexgen).])
-   else
--    if test "x$enable_rexgen" == "xyes" ; then
-+    if test "x$enable_rexgen" = "xyes" ; then
-       AC_MSG_FAILURE([rexgen not installed, or unusable version])
-     fi
-   fi
-diff --git a/src/m4/jtr_utility_macros.m4 b/src/m4/jtr_utility_macros.m4
-index 33501eeb71..6b5c58e2b7 100644
---- a/src/m4/jtr_utility_macros.m4
-+++ b/src/m4/jtr_utility_macros.m4
-@@ -189,11 +189,11 @@ dnl will be xno, xyes, xauto, etc.  forced_fail_msg is a message that
- dnl will be output, and the script will abort, IF forced is xyes which
- dnl means the user used --enable-foobar
- AC_DEFUN([JTR_MSG_RESULT_FAILIF_FORCED], [
--  if test "$1" == xyes; then
-+  if test "$1" = xyes; then
-     AC_MSG_RESULT([yes])
-   else
-     AC_MSG_RESULT([no])
--    if test "$2" == xyes; then
-+    if test "$2" = xyes; then
-       AC_MSG_FAILURE([$3])
-     fi
-   fi
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 56c1dbb9d14a..a75085090eba 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,5 +1,6 @@
 AUX libscrypt-1.22-no-clobber-fortify-source.patch 438 BLAKE2B e5089a6532f054447cd5161a8b7dbdfb32a432527b7702ce265d8c1bac76b8549d6adfcc6157e890bde4e0c9551d78f2d0aff24ea7ab989423a3716e65fcb334 SHA512 cbb9c1d6608c562c298abe5989d31b6b49f63e4640e271b93031d35fd749427182bafae64a75b6effc4e7143ae9f2867f3772090ec503f7c8073a3c10b53949f
 DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51
 EBUILD libscrypt-1.22-r1.ebuild 714 BLAKE2B 2059031221c9ace3a5fcb8e3f4632869078b1fbeba2101fcb68816434f43f1856edc073973ad3691aa17998c14c96ff84a29a794491fb60734c08004a2648a5b SHA512 d432ffdf0f3da3105c21de0de925169d60faf4af8ca760c2415b123241434758b7a47bd80b42e1bac53130386845401f5ffd88250786beb3926eb861f05999ea
+EBUILD libscrypt-1.22-r2.ebuild 805 BLAKE2B f14dd382f1bb994096e2cc3896e73330fd9857a1e10665681392af97e5f97905fedfd0b225abb4d9a694e981a2a119e391fdf9e72741b35bba9eb4dd2772e87f SHA512 ac1775eaaae09f2073606edad8ff98b3c6c787697b81e921dff4b42dab44a8f41fa924eb72f70fd65144024b878d1d8413844a9ba628fc3a879545832c0710c2
 EBUILD libscrypt-1.22.ebuild 651 BLAKE2B 5450158a061a864f203f10da091136f0aaaab11eecb3fe6f0c9b94cecfda50e0549ad88b6f498309ed4e16d813822e6a326655964a2b965e44e3712c63bcd45a SHA512 8fd7aa25a3662c4fe46a03641636d5b1fc5afd1f81f533ea77ace70880e4c1ac3329d21b0ef452256a3fc75bd387310a832fa79caf96f38e2d9dce5a7f11fa6b
 MISC metadata.xml 256 BLAKE2B 0583a0f48ddab7dd1ff43587374095c077c0d5afc7134fda41a688d537250f7b9942cf538518c890f3cb175c8c8f7dd170bc3a54ff717129ac16c2531bd48d56 SHA512 db3da96ac2e1680073a199ced5f81dd8b9f17954fef1cfd5b52a626f90a02024f7fcb9eaf4433194d0b6596c22553d5aec1695234a23f3a9d6fcb3e12c6c128f
diff --git a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
new file mode 100644
index 000000000000..a5954ba92ca6
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shared library to implement the scrypt algorithm"
+HOMEPAGE="https://github.com/technion/libscrypt"
+SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.22-no-clobber-fortify-source.patch
+)
+
+src_prepare() {
+	sed -i -e "s|ar rcs|$(tc-getAR) rcs|g" Makefile || die
+	default
+}
+
+src_configure() {
+	export LIBDIR=${PREFIX}/$(get_libdir)
+	export CFLAGS_EXTRA="${CFLAGS}"
+	export LDFLAGS_EXTRA="${LDFLAGS}"
+	export PREFIX=/usr
+	unset CFLAGS
+	unset LDFLAGS
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/app-crypt/scdrand/Manifest b/app-crypt/scdrand/Manifest
index b25500d1d59a..89e0698f7d73 100644
--- a/app-crypt/scdrand/Manifest
+++ b/app-crypt/scdrand/Manifest
@@ -1,3 +1,3 @@
 DIST scdtools-0.3.5.tar.gz 155529 BLAKE2B 9b0791d8a5d92240968be82fbffd1838229586ce33b857d13fa40732bf3424df88c33c5f792e8178b52fbe06ff91c9c74e59ee686552973f7a8bbf8b1249589b SHA512 5c45948f7e6b6357aa6305c942bb388f9693908991049b2b279bbf1f27bb2de3df1b8278da30b1cc423975880890cf4533f10ca3de42c9dc88182aacc6466ced
-EBUILD scdrand-0.3.5.ebuild 730 BLAKE2B 95794d69b38276185ba14e123d8ebd95317641fd16f3f277e9a04ffd409a10bff76ac74ea43c255c99f5cf3307b012586ecbb4ce439d3bf2a620f22cd35356c6 SHA512 03e9e4dee3bc1e0124f2c37ba7d4e9f2f6b39fc3e377c7b7203fc8923387b141a16ac665184c37b9445955439cf2c600f34d0876c89a8f6b617eef46ee549b97
+EBUILD scdrand-0.3.5.ebuild 767 BLAKE2B 16cede70be856677f057bb554284e6cdbe440ab03d57a266d1def0b8822c66aec3472b7849dac1a4cb80d159f79f1a8007f551c34fcc514a196748db8b4785b3 SHA512 fd92e206fb8646aba9b45fe19f3fbb3dd0a30c40f36a4922b36d1f871a6a6b342551248c1d64177b231b10063f67780ab8b236313cb2d742dfd0f0ce73896785
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-crypt/scdrand/scdrand-0.3.5.ebuild b/app-crypt/scdrand/scdrand-0.3.5.ebuild
index da331728dfe5..33f8ef8cb4ed 100644
--- a/app-crypt/scdrand/scdrand-0.3.5.ebuild
+++ b/app-crypt/scdrand/scdrand-0.3.5.ebuild
@@ -1,17 +1,19 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MY_P=scdtools-${PV}
+inherit toolchain-funcs
+
+MY_P="scdtools-${PV}"
 DESCRIPTION="Feed kernel entropy pool from smartcard's TRNG"
 HOMEPAGE="https://incenp.org/dvlpt/scdtools.html"
 SRC_URI="https://incenp.org/files/softs/scdtools/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="dev-libs/libgcrypt:=
 	dev-libs/libassuan:=
@@ -19,10 +21,8 @@ DEPEND="dev-libs/libgcrypt:=
 RDEPEND="${DEPEND}
 	app-crypt/gnupg"
 
-S=${WORKDIR}/${MY_P}
-
 src_compile() {
-	emake -C lib
+	emake AR="$(tc-getAR)" -C lib
 	emake -C src scdrand
 }