| 1 |
commit: 3b52a51234c375a7c39b3299f94026226559db27 |
| 2 |
Author: Simon Levermann <simon <AT> slevermann <DOT> de> |
| 3 |
AuthorDate: Thu Feb 2 15:08:19 2017 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 2 15:08:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b52a512 |
| 7 |
|
| 8 |
app-crypt/argon2: version bump |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3644 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
app-crypt/argon2/Manifest | 1 + |
| 16 |
app-crypt/argon2/argon2-20161029.ebuild | 29 ++++++++++++++++++++++ |
| 17 |
.../argon2-20161029-makefile-soname-symlinks.patch | 28 +++++++++++++++++++++ |
| 18 |
3 files changed, 58 insertions(+) |
| 19 |
|
| 20 |
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest |
| 21 |
index 2a1ad7d..1bda176 100644 |
| 22 |
--- a/app-crypt/argon2/Manifest |
| 23 |
+++ b/app-crypt/argon2/Manifest |
| 24 |
@@ -1 +1,2 @@ |
| 25 |
DIST argon2-20160821.tar.gz 1170019 SHA256 f81456ae31337a13a1a1b8ffe994d71ace741833a97a75f0c1a76259639bf3b8 SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f WHIRLPOOL ad476d23572ebe8701a71a79aff09dd08a0db3dde9b0a6104884a91309d651298adfb514cc7de9c585672ffbc816c9afae67cbbe09b3f9a300624036981c3d78 |
| 26 |
+DIST argon2-20161029.tar.gz 1506864 SHA256 fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892 WHIRLPOOL d90a0bbd17abf146e47ef5f1c9a759234396d9779213210484047120091b9e420f11926d502c1bb03a464625f64d3ec1df34f10ec5ba23572d18184fddaf113b |
| 27 |
|
| 28 |
diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20161029.ebuild |
| 29 |
new file mode 100644 |
| 30 |
index 00000000..2658c7b |
| 31 |
--- /dev/null |
| 32 |
+++ b/app-crypt/argon2/argon2-20161029.ebuild |
| 33 |
@@ -0,0 +1,29 @@ |
| 34 |
+# Copyright 1999-2017 Gentoo Foundation |
| 35 |
+# Distributed under the terms of the GNU General Public License v2 |
| 36 |
+# $Id$ |
| 37 |
+ |
| 38 |
+EAPI=6 |
| 39 |
+ |
| 40 |
+DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)" |
| 41 |
+HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2" |
| 42 |
+SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 43 |
+ |
| 44 |
+LICENSE="|| ( Apache-2.0 CC0-1.0 )" |
| 45 |
+SLOT="0" |
| 46 |
+KEYWORDS="~amd64 ~x86" |
| 47 |
+IUSE="-static-libs" |
| 48 |
+ |
| 49 |
+S="${WORKDIR}/phc-winner-${P}" |
| 50 |
+PATCHES=( |
| 51 |
+ "${FILESDIR}/${P}-makefile-soname-symlinks.patch" |
| 52 |
+ ) |
| 53 |
+src_prepare() { |
| 54 |
+ default |
| 55 |
+ if ! use static-libs; then |
| 56 |
+ sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!" |
| 57 |
+ fi |
| 58 |
+ sed -i -e 's/-O3 //' Makefile || die "sed failed" |
| 59 |
+ sed -i -e 's/-g //' Makefile || die "sed failed" |
| 60 |
+ sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed" |
| 61 |
+ sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed" |
| 62 |
+} |
| 63 |
|
| 64 |
diff --git a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch |
| 65 |
new file mode 100644 |
| 66 |
index 00000000..11892de |
| 67 |
--- /dev/null |
| 68 |
+++ b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch |
| 69 |
@@ -0,0 +1,28 @@ |
| 70 |
+diff --git a/Makefile b/Makefile |
| 71 |
+index 1838c13..85aa710 100644 |
| 72 |
+--- a/Makefile |
| 73 |
++++ b/Makefile |
| 74 |
+@@ -87,8 +87,10 @@ endif |
| 75 |
+ endif |
| 76 |
+ |
| 77 |
+ LIB_SH := lib$(LIB_NAME).$(LIB_EXT) |
| 78 |
++LIB_SH_VERSION := $(LIB_SH).0 |
| 79 |
+ LIB_ST := lib$(LIB_NAME).a |
| 80 |
+ LIBRARIES = $(LIB_SH) $(LIB_ST) |
| 81 |
++INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION) |
| 82 |
+ HEADERS = include/argon2.h |
| 83 |
+ |
| 84 |
+ INSTALL = install |
| 85 |
+@@ -153,9 +155,11 @@ format: |
| 86 |
+ -i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h |
| 87 |
+ |
| 88 |
+ install: $(RUN) libs |
| 89 |
++ mv $(LIB_SH) $(LIB_SH_VERSION) |
| 90 |
++ ln -sf $(LIB_SH_VERSION) $(LIB_SH) |
| 91 |
+ $(INSTALL) -d $(INST_INCLUDE) |
| 92 |
+ $(INSTALL) $(HEADERS) $(INST_INCLUDE) |
| 93 |
+ $(INSTALL) -d $(INST_LIBRARY) |
| 94 |
+- $(INSTALL) $(LIBRARIES) $(INST_LIBRARY) |
| 95 |
++ $(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY) |
| 96 |
+ $(INSTALL) -d $(INST_BINARY) |
| 97 |
+ $(INSTALL) $(RUN) $(INST_BINARY) |
Archives