From 398c033d3c836f59a4f2668f3c27b680b7ed1f54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 6 Sep 2022 10:26:32 +0100 Subject: gentoo auto-resync : 06:09:2022 - 10:26:32 --- app-crypt/Manifest.gz | Bin 23967 -> 23967 bytes app-crypt/libscrypt/Manifest | 3 - .../libscrypt/files/libscrypt-1.21-build.patch | 76 --------------------- app-crypt/libscrypt/libscrypt-1.21.ebuild | 36 ---------- 4 files changed, 115 deletions(-) delete mode 100644 app-crypt/libscrypt/files/libscrypt-1.21-build.patch delete mode 100644 app-crypt/libscrypt/libscrypt-1.21.ebuild (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index 8249c1cca88b..4c209f074bf6 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest index e3f8df7ff4cf..19288e6ad7a2 100644 --- a/app-crypt/libscrypt/Manifest +++ b/app-crypt/libscrypt/Manifest @@ -1,6 +1,3 @@ -AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e713d0bb5a30ab736eab36b2e8918d2ce47c8b3dc264b50172868c9c5108d0cd093c68e4fe4d3668301d84b15269c SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d -DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51 -EBUILD libscrypt-1.21.ebuild 727 BLAKE2B b321164f5a0f62a20ee3d9bfbe8b28412190a8082883c6c859a971549049e5556103b3f7d27103f699b58fc78ae134a90a61741387b107245da99f95de8c263e SHA512 bb48155d4e4134fb93b41d4bfd8e70ce905d75af9678f72990402ce42780f6e4183a00284910d9a51cde8023551c6b6cbb4afa9126f7573a4498016d560b2020 EBUILD libscrypt-1.22.ebuild 682 BLAKE2B 4fa6a542d1b5d68bb9c37896216a90c87c9ba7c0648b7f26758e39da323202ab3489f357fce856d9e4229fb62056ce84a919402b52496ce8ee0249aa5990dbff SHA512 969e90ed4b6ee17e99494e8a7ed1aba7f15e52c576a8e768618a8239582491379e6598befa02a8d3e37c56a0027c900d4b430c8aaeff596c435e84128d2ce909 MISC metadata.xml 346 BLAKE2B 98662f24e6b883032afb7ee0afd68a249c56a87d8c581f9edf7926332147d0905bcff8c34ea8e531e2a049a5c326748f002a88b33974ae3897cb0aa20eb4220b SHA512 3c255d66cb79b5e9d959285ea196a112242d6bc1dfe3a0dddfdcd1d9a8ae99cacb06816c881d94d93087593924ea3a20e7c4c7ec0d3de672b9327b2bf5bff6e6 diff --git a/app-crypt/libscrypt/files/libscrypt-1.21-build.patch b/app-crypt/libscrypt/files/libscrypt-1.21-build.patch deleted file mode 100644 index 236e80730d57..000000000000 --- a/app-crypt/libscrypt/files/libscrypt-1.21-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -From bdfec26744122e8f52a58bc086c89b27faaf5888 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 1 Jul 2017 23:06:41 +0300 -Subject: [PATCH 1/2] build: move non-essential flags to *_EXTRA - -This enables downstream to selectively add/replace the optimization and -other non-essential flags. - -Signed-off-by: Alon Bar-Lev ---- - Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 7022a4a..c9313cb 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,21 +5,22 @@ MAKE_DIR ?= install -d - INSTALL_DATA ?= install - - CC?=gcc --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version --CFLAGS_EXTRA?=-Wl,-rpath=. -+CFLAGS?=$(CFLAGS_EXTRA) -D_FORTIFY_SOURCE=2 -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 - - all: reference - - OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o - - libscrypt.so.0: $(OBJS) -- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc -+ $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc - ar rcs libscrypt.a $(OBJS) - - reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o - ln -s -f libscrypt.so.0 libscrypt.so -- $(CC) -Wall -o reference main.o b64.o crypto_scrypt-hexconvert.o $(CFLAGS_EXTRA) -L. -lscrypt -+ $(CC) -o reference main.o b64.o crypto_scrypt-hexconvert.o $(CFLAGS) $(LDFLAGS_EXTRA) -L. -lscrypt - - clean: - rm -f *.o reference libscrypt.so* libscrypt.a endian.h --- -2.13.0 - -From 7899df0447e0fcad32a6cce7439eef1f1295aaeb Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 1 Jul 2017 23:14:29 +0300 -Subject: [PATCH 2/2] build: run tests with local library - -Ensure tests can run and when run are run with current library. - -Signed-off-by: Alon Bar-Lev ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c9313cb..783c537 100644 ---- a/Makefile -+++ b/Makefile -@@ -26,7 +26,7 @@ clean: - rm -f *.o reference libscrypt.so* libscrypt.a endian.h - - check: all -- ./reference -+ LD_LIBRARY_PATH=. ./reference - - devtest: - splint crypto_scrypt-hexconvert.c --- -2.13.0 - diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild deleted file mode 100644 index 101c8f622047..000000000000 --- a/app-crypt/libscrypt/libscrypt-1.21.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Shared library to impliment 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" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) - -pkg_setup() { - 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)" -} -- cgit v1.2.3