diff options
Diffstat (limited to 'app-crypt/libscrypt')
| -rw-r--r-- | app-crypt/libscrypt/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/libscrypt/files/libscrypt-1.21-build.patch | 76 | ||||
| -rw-r--r-- | app-crypt/libscrypt/files/libscrypt-1.22-no-clobber-fortify-source.patch | 14 | ||||
| -rw-r--r-- | app-crypt/libscrypt/libscrypt-1.22-r1.ebuild | 31 | ||||
| -rw-r--r-- | app-crypt/libscrypt/libscrypt-1.22-r2.ebuild | 36 | ||||
| -rw-r--r-- | app-crypt/libscrypt/libscrypt-1.22.ebuild (renamed from app-crypt/libscrypt/libscrypt-1.21.ebuild) | 15 | ||||
| -rw-r--r-- | app-crypt/libscrypt/metadata.xml | 7 |
7 files changed, 88 insertions, 93 deletions
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest index 7540edc0a3af..8ced01895cbd 100644 --- a/app-crypt/libscrypt/Manifest +++ b/app-crypt/libscrypt/Manifest @@ -1 +1 @@ -DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 +DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51 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 <alon.barlev@gmail.com> -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 <alon.barlev@gmail.com> ---- - 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 <alon.barlev@gmail.com> -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 <alon.barlev@gmail.com> ---- - 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/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..a34dd8604875 --- /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/libscrypt/libscrypt-1.22-r2.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild new file mode 100644 index 000000000000..c01490457249 --- /dev/null +++ b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 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 PREFIX="${EPREFIX}"/usr + export LIBDIR=${PREFIX}/$(get_libdir) + export CFLAGS_EXTRA="${CFLAGS}" + export LDFLAGS_EXTRA="${LDFLAGS}" + unset CFLAGS + unset LDFLAGS +} + +src_compile() { + emake CC="$(tc-getCC)" +} diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.22.ebuild index b883b47b9bcc..f4b0f206dc02 100644 --- a/app-crypt/libscrypt/libscrypt-1.21.ebuild +++ b/app-crypt/libscrypt/libscrypt-1.22.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -11,16 +11,9 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86" +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}" @@ -32,5 +25,5 @@ pkg_setup() { src_compile() { emake \ - CC=$(tc-getCC) + CC="$(tc-getCC)" } diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml index 576146f2c144..44f2dd04edb6 100644 --- a/app-crypt/libscrypt/metadata.xml +++ b/app-crypt/libscrypt/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">technion/libscrypt</remote-id> </upstream> |