gentoo auto-resync : 04:10:2023 - 23:52:39

7 files changed, 118 insertions, 0 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 19a3be0d27f9..68212e40d62b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index fef95e69f672..fd64900c6fc1 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,3 +1,5 @@
+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 721 BLAKE2B 79fd5904d4b8968225989f9cdb33a956f7ecbb25f21676aca8feb2fc42a079077496933b7db32c71d30fcd4fc436d12d527b5cb523446563e75d1a1c594795e2 SHA512 4d5cdfa51c2ef63d894d2b0b5be77ebc12be71dacad0f825f9d424e49a070c10f4b23e393e9fed5c75efa462c8bade98079ab2c213a9bbbd1f91d3708ef70a4e
 EBUILD libscrypt-1.22.ebuild 651 BLAKE2B 5450158a061a864f203f10da091136f0aaaab11eecb3fe6f0c9b94cecfda50e0549ad88b6f498309ed4e16d813822e6a326655964a2b965e44e3712c63bcd45a SHA512 8fd7aa25a3662c4fe46a03641636d5b1fc5afd1f81f533ea77ace70880e4c1ac3329d21b0ef452256a3fc75bd387310a832fa79caf96f38e2d9dce5a7f11fa6b
 MISC metadata.xml 256 BLAKE2B 0583a0f48ddab7dd1ff43587374095c077c0d5afc7134fda41a688d537250f7b9942cf538518c890f3cb175c8c8f7dd170bc3a54ff717129ac16c2531bd48d56 SHA512 db3da96ac2e1680073a199ced5f81dd8b9f17954fef1cfd5b52a626f90a02024f7fcb9eaf4433194d0b6596c22553d5aec1695234a23f3a9d6fcb3e12c6c128f
diff --git a/app-crypt/libscrypt/files/libscrypt-1.22-no-clobber-fortify-source.patch b/app-crypt/libscrypt/files/libscrypt-1.22-no-clobber-fortify-source.patch
new file mode 100644
index 000000000000..c54dc522b380
--- /dev/null
+++ b/app-crypt/libscrypt/files/libscrypt-1.22-no-clobber-fortify-source.patch
@@ -0,0 +1,14 @@
+Don't clobber toolchain defaults.
+
+https://bugs.gentoo.org/892928
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@ MAKE_DIR     ?= install -d
+ INSTALL_DATA ?= install
+ 
+ CC?=gcc
+-CFLAGS?=$(CFLAGS_EXTRA) -D_FORTIFY_SOURCE=2 -fPIC
++CFLAGS?=$(CFLAGS_EXTRA) -fPIC
+ LDFLAGS?=$(LDFLAGS_EXTRA) -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
+ CFLAGS_EXTRA?=-Wl,-rpath=. -O2 -Wall -g -fstack-protector
+ LDFLAGS_EXTRA?=-Wl,-z,relro
diff --git a/app-crypt/libscrypt/libscrypt-1.22-r1.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r1.ebuild
new file mode 100644
index 000000000000..71ad49bd50fc
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.22-r1.ebuild
@@ -0,0 +1,31 @@
+# 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_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/pesign/Manifest b/app-crypt/pesign/Manifest
index 3e385ae1df1a..8e20a42ade08 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,6 +1,9 @@
 AUX pesign-114-format-string.patch 4359 BLAKE2B 12a7c43162d806050c2fe4c5cf8e289fe262a158ac8cefb60a26a3233831526cfe3e98bea956f7158ea648b22da6cd0cc36e807101485b299f8be6cb2bc93ec2 SHA512 133f452089ec6691d3b50ff7a73399382b5e300f1d1686e9e4f98ffcfa1fce824503c146589d249a67e28df5dfc7c737fb05ad67e2c707aa97fb1dfebb550993
 AUX pesign-114-no-werror.patch 537 BLAKE2B a92e320460d83a943f60ee2524344a24f907d5fa09416ecc1e5024941d7f4130afe339f508301594d7ff0e6f53166093086e64b774a8448c55a3fbb73e74568e SHA512 e64b2f3ebeabba2e74c281a2a8205faa0ba0fac91e9153a8979e3edbf695274d4e940502736db12ba6bcb19a70179c5529b262f6a8b23779f19a750ff810cda3
 AUX pesign-114-wanalyzer-diagnostic.patch 734 BLAKE2B dcfae1fb4bea691ffb2bbd3f2e4f40e1e21f16840f4dfcc9293f856fdf6f75913bf6c12f7739ffa0e453949a9aa0add9925e7a0ee4adea6452c1007c4a40e11b SHA512 21ef15d5d1358bb9ff92f337a1da149bf993f04a6c0cd391956ce7175ac15f83596a3601a68eb51a9f88eb76c69dba8a3f57b672d9e628d0f75e9678d819a593
+AUX pesign-116-no-werror.patch 501 BLAKE2B 44e1fb6353ff374cc17ee495a0e5cc52ed0c537319f0ae05e917af183725ec5c3e7c9e179d9f33562d81bdead6fa188bc50fdcb090b1ceb10eb1ab94568666b7 SHA512 f3f3723fe595b7d3e4b4d76af8e0b4e7a263321588a9dd98905f0928e2c80f647bac78e2fab4bfe9c88b08e00c69c922b324eaf47707baed37ddc9dbf3803d0b
 DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
+DIST pesign-116.tar.bz2 120424 BLAKE2B a1bce804c13a0aba1eb5fdf0b3963d658011484d4708d58bd9265b6ad8a3d2d3e3156a49736e6fb029bd5d8cc175f6440e62dbc34722357888a239e4d7e7d9e2 SHA512 be3e1083f5e9f889cb8f7c50a8ebe723542fb2f6d1de8de9b04a9f21526ebaa8ab1efc7d4be11bcb0bc9862fa4bc6f78ee35e4d3496dd3b8927170b97795d25c
 EBUILD pesign-114.ebuild 1233 BLAKE2B b61a091d19b2f6d58e697af779ca5032b44f29a89c97c42c5f1b4c64eb595ea616fe37dc2c7155ce4f3d1eff82ffcc326cd58448e1cbb05a079fec6d2d517f08 SHA512 0b7f43429fa81ebbe551044da0a737745891f2b2d8cd16bf71e8a88faef631151e32059e8f85c156160295f5577d151cca27a4b4061e4185febfaab2e152a8db
+EBUILD pesign-116.ebuild 1171 BLAKE2B feeda32fcf949177480eb1bd8a009654aeddafe2cc5e63d195e32f7c366d1a34add0801ded817f2855bb9d468f867bb912d844d2af242528c9f1d4d5383eae48 SHA512 991fd53b7e581cb5930788f7ccbd8c53e5140124b538ee213591dbb731bfe1545ed401d221ce5da0eb0dfd71ce65a3a936f7370a37a25464cafa2eeb95f0db96
 MISC metadata.xml 249 BLAKE2B 0928166bc28197e80603bef476a41c55e1e593a7e2636ecb634cecd26b5df5896667b06f049e1a2737f6da0330d243387068b6beededab2c3c8cab7208c1016d SHA512 dcbdae805ad96a8343af41708b249dfb119c7b18146279212b9747a91fbb64beb9e23b606151a77b42ea4f2fbbcf9f81d48067cd26122c61dee8b8178277d307
diff --git a/app-crypt/pesign/files/pesign-116-no-werror.patch b/app-crypt/pesign/files/pesign-116-no-werror.patch
new file mode 100644
index 000000000000..0563a749baf6
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-116-no-werror.patch
@@ -0,0 +1,11 @@
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -60,7 +60,7 @@ cflags	= $(CFLAGS) $(ARCH3264) \
+ 	-Wall -Wextra -Wsign-compare -Wno-unused-result \
+ 	-Wno-unused-function -Wno-missing-field-initializers \
+ 	$(call enabled,ENABLE_LEAK_CHECKER,-Wno-analyzer-malloc-leak,) \
+-	-Werror -Wno-error=cpp -Wno-free-nonheap-object \
++	-Wno-error=cpp -Wno-free-nonheap-object \
+ 	-std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
+ 	-D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
+ 	'-DRUNDIR="$(rundir)"' \
diff --git a/app-crypt/pesign/pesign-116.ebuild b/app-crypt/pesign/pesign-116.ebuild
new file mode 100644
index 000000000000..d890d561aad2
--- /dev/null
+++ b/app-crypt/pesign/pesign-116.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/rhboot/pesign"
+SRC_URI="https://github.com/rhboot/pesign/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/openssl:=
+	dev-libs/popt
+	sys-apps/util-linux
+	>=sys-libs/efivar-38
+"
+DEPEND="
+	${RDEPEND}
+	sys-boot/gnu-efi
+"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-116-no-werror.patch
+)
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		ARFLAGS="-cvqs" \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		rundir="${EPREFIX}/var/run"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
+	einstalldocs
+
+	# remove some files that don't make sense for Gentoo installs
+	rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die
+}