From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-crypt/libscrypt/Manifest | 8 +++ .../libscrypt/files/libscrypt-1.21-build.patch | 76 ++++++++++++++++++++++ app-crypt/libscrypt/libscrypt-1.20.ebuild | 28 ++++++++ app-crypt/libscrypt/libscrypt-1.21.ebuild | 36 ++++++++++ app-crypt/libscrypt/metadata.xml | 11 ++++ 5 files changed, 159 insertions(+) create mode 100644 app-crypt/libscrypt/Manifest create mode 100644 app-crypt/libscrypt/files/libscrypt-1.21-build.patch create mode 100644 app-crypt/libscrypt/libscrypt-1.20.ebuild create mode 100644 app-crypt/libscrypt/libscrypt-1.21.ebuild create mode 100644 app-crypt/libscrypt/metadata.xml (limited to 'app-crypt/libscrypt') diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest new file mode 100644 index 000000000000..28ea9eb26afc --- /dev/null +++ b/app-crypt/libscrypt/Manifest @@ -0,0 +1,8 @@ +AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b74cca797334f4f9351745f09195b SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d WHIRLPOOL facf16c15bed5bd38d8e3d9513d7dec10caebee1533996a8a83183655d59207a733e84846cddf595fc296a00dc9dc284305bcb45c2642fc6aed15a26eb07bc58 +DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac +DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0 +EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca +EBUILD libscrypt-1.21.ebuild 712 SHA256 7d067c5d9056ede1c25711c588c596c4629136d15606a2ef1b6bf972c6f15cab SHA512 a370183447611325dbb99fc3706764eb78ea321d09c80d57eb8870ddda76dce0a02f0254fe2bb1259a426eb9cc7439a4b1ffca703ecf1b07fb80f1ce433a33fe WHIRLPOOL 3ae71038cf9454f08ccf1c6bf05b83742db960bc4bd29ce7b115ded9d19e22adb4c9d03168b33f5b5f94e2c5a15c3ce3d65214fa837b3d0893fdd641999ec638 +MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245 +MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399 +MISC metadata.xml 345 SHA256 2b9eaf348e1fb04d7b556aff418828ed4fd94c3f97391cf82d2185822f766091 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383 WHIRLPOOL 7f355b8ac2c2547ea7ae61e0c17adc027216cf63e468a133a523432189ddf72d51ebba4400ea9ea23a991e2ceff43ec819c0c7230a70c1667fe38048f2f98b24 diff --git a/app-crypt/libscrypt/files/libscrypt-1.21-build.patch b/app-crypt/libscrypt/files/libscrypt-1.21-build.patch new file mode 100644 index 000000000000..236e80730d57 --- /dev/null +++ b/app-crypt/libscrypt/files/libscrypt-1.21-build.patch @@ -0,0 +1,76 @@ +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.20.ebuild b/app-crypt/libscrypt/libscrypt-1.20.ebuild new file mode 100644 index 000000000000..d0238e0ba978 --- /dev/null +++ b/app-crypt/libscrypt/libscrypt-1.20.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit flag-o-matic multilib 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 ~mips ppc ppc64 sparc x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_compile() { + export PREFIX=/usr + export LIBDIR=${PREFIX}/$(get_libdir) + export CC=$(tc-getCC) + export CFLAGS="$CFLAGS -fPIC" + export LDFLAGS="$LDFLAGS -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version" + export CFLAGS_EXTRA= + emake +} diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild new file mode 100644 index 000000000000..62eb7435c9c6 --- /dev/null +++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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 ~mips ~ppc ~ppc64 ~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) +} diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml new file mode 100644 index 000000000000..576146f2c144 --- /dev/null +++ b/app-crypt/libscrypt/metadata.xml @@ -0,0 +1,11 @@ + + + + + blueness@gentoo.org + Anthony G. Basile + + + technion/libscrypt + + -- cgit v1.2.3