| 1 |
commit: eaa4df2ad0d1a6328b82fd01eee327061a7115b2 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 23 16:33:38 2017 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 23 16:34:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa4df2a |
| 7 |
|
| 8 |
net-nds/openldap: added sha2 contrib support pre bug 621670 and pr \#4973 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
net-nds/openldap/metadata.xml | 3 ++- |
| 13 |
net-nds/openldap/openldap-2.4.45.ebuild | 29 ++++++++++++++++++++++++++++- |
| 14 |
2 files changed, 30 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml |
| 17 |
index cda62a66159..4e5e2c49039 100644 |
| 18 |
--- a/net-nds/openldap/metadata.xml |
| 19 |
+++ b/net-nds/openldap/metadata.xml |
| 20 |
@@ -4,7 +4,7 @@ |
| 21 |
<maintainer type="project"> |
| 22 |
<email>ldap-bugs@g.o</email> |
| 23 |
</maintainer> |
| 24 |
- <use> |
| 25 |
+ <use> |
| 26 |
<flag name="experimental">Enable experimental backend options</flag> |
| 27 |
<flag name="kinit">Enable support for kerberos init</flag> |
| 28 |
<flag name="odbc">Enable ODBC and SQL backend options</flag> |
| 29 |
@@ -13,6 +13,7 @@ |
| 30 |
lanman passwords</flag> |
| 31 |
<flag name="minimal">Build libraries & userspace tools only. Does not install any server code.</flag> |
| 32 |
<flag name="pbkdf2">Enable support for pbkdf2 passwords</flag> |
| 33 |
+ <flag name="sha2">Enable support for pw-sha2 password hashes.</flag> |
| 34 |
</use> |
| 35 |
<upstream> |
| 36 |
<remote-id type="cpe">cpe:/a:openldap:openldap</remote-id> |
| 37 |
|
| 38 |
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild |
| 39 |
index b2493271ba4..e81d3543054 100644 |
| 40 |
--- a/net-nds/openldap/openldap-2.4.45.ebuild |
| 41 |
+++ b/net-nds/openldap/openldap-2.4.45.ebuild |
| 42 |
@@ -24,7 +24,7 @@ IUSE_DAEMON="crypt samba slp tcpd experimental minimal" |
| 43 |
IUSE_BACKEND="+berkdb" |
| 44 |
IUSE_OVERLAY="overlays perl" |
| 45 |
IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs" |
| 46 |
-IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2" |
| 47 |
+IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" |
| 48 |
IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" |
| 49 |
IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" |
| 50 |
|
| 51 |
@@ -618,6 +618,33 @@ multilib_src_compile() { |
| 52 |
pbkdf2.lo || die "linking pw-pbkdf2 failed" |
| 53 |
fi |
| 54 |
|
| 55 |
+ if use sha2 ; then |
| 56 |
+ cd "${S}/contrib/slapd-modules/passwd/sha2" || die |
| 57 |
+ einfo "Compiling contrib-module: pw-sha2" |
| 58 |
+ "${lt}" --mode=compile --tag=CC \ |
| 59 |
+ "${CC}" \ |
| 60 |
+ -I"${BUILD_DIR}"/include \ |
| 61 |
+ -I../../../../include \ |
| 62 |
+ ${CFLAGS} \ |
| 63 |
+ -o sha2.lo \ |
| 64 |
+ -c sha2.c || die "compiling pw-sha2 failed" |
| 65 |
+ "${lt}" --mode=compile --tag=CC \ |
| 66 |
+ "${CC}" \ |
| 67 |
+ -I"${BUILD_DIR}"/include \ |
| 68 |
+ -I../../../../include \ |
| 69 |
+ ${CFLAGS} \ |
| 70 |
+ -o slapd-sha2.lo \ |
| 71 |
+ -c slapd-sha2.c || die "compiling pw-sha2 failed" |
| 72 |
+ einfo "Linking contrib-module: pw-sha2" |
| 73 |
+ "${lt}" --mode=link --tag=CC \ |
| 74 |
+ "${CC}" -module \ |
| 75 |
+ ${CFLAGS} \ |
| 76 |
+ ${LDFLAGS} \ |
| 77 |
+ -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ |
| 78 |
+ -o pw-sha2.la \ |
| 79 |
+ sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed" |
| 80 |
+ fi |
| 81 |
+ |
| 82 |
# We could build pw-radius if GNURadius would install radlib.h |
| 83 |
cd "${S}/contrib/slapd-modules/passwd" || die |
| 84 |
einfo "Compiling contrib-module: pw-netscape" |
Archives