From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4269139694 for ; Fri, 23 Jun 2017 16:34:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5C88234050; Fri, 23 Jun 2017 16:34:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B107B234050 for ; Fri, 23 Jun 2017 16:34:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B52A9341728 for ; Fri, 23 Jun 2017 16:34:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 826E273E2 for ; Fri, 23 Jun 2017 16:34:43 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1498235667.eaa4df2ad0d1a6328b82fd01eee327061a7115b2.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/metadata.xml net-nds/openldap/openldap-2.4.45.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: eaa4df2ad0d1a6328b82fd01eee327061a7115b2 X-VCS-Branch: master Date: Fri, 23 Jun 2017 16:34:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6c272a31-d04a-442e-8cfd-56f9aab5da2f X-Archives-Hash: cbbdb2fec9fa0f90f8b0542ae1a5c82d commit: eaa4df2ad0d1a6328b82fd01eee327061a7115b2 Author: Matthew Thode gentoo org> AuthorDate: Fri Jun 23 16:33:38 2017 +0000 Commit: Matt Thode gentoo org> CommitDate: Fri Jun 23 16:34:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa4df2a net-nds/openldap: added sha2 contrib support pre bug 621670 and pr \#4973 Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-nds/openldap/metadata.xml | 3 ++- net-nds/openldap/openldap-2.4.45.ebuild | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml index cda62a66159..4e5e2c49039 100644 --- a/net-nds/openldap/metadata.xml +++ b/net-nds/openldap/metadata.xml @@ -4,7 +4,7 @@ ldap-bugs@gentoo.org - + Enable experimental backend options Enable support for kerberos init Enable ODBC and SQL backend options @@ -13,6 +13,7 @@ lanman passwords Build libraries & userspace tools only. Does not install any server code. Enable support for pbkdf2 passwords + Enable support for pw-sha2 password hashes. cpe:/a:openldap:openldap diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild index b2493271ba4..e81d3543054 100644 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ b/net-nds/openldap/openldap-2.4.45.ebuild @@ -24,7 +24,7 @@ IUSE_DAEMON="crypt samba slp tcpd experimental minimal" IUSE_BACKEND="+berkdb" IUSE_OVERLAY="overlays perl" IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs" -IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2" +IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" @@ -618,6 +618,33 @@ multilib_src_compile() { pbkdf2.lo || die "linking pw-pbkdf2 failed" fi + if use sha2 ; then + cd "${S}/contrib/slapd-modules/passwd/sha2" || die + einfo "Compiling contrib-module: pw-sha2" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -I"${BUILD_DIR}"/include \ + -I../../../../include \ + ${CFLAGS} \ + -o sha2.lo \ + -c sha2.c || die "compiling pw-sha2 failed" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -I"${BUILD_DIR}"/include \ + -I../../../../include \ + ${CFLAGS} \ + -o slapd-sha2.lo \ + -c slapd-sha2.c || die "compiling pw-sha2 failed" + einfo "Linking contrib-module: pw-sha2" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o pw-sha2.la \ + sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed" + fi + # We could build pw-radius if GNURadius would install radlib.h cd "${S}/contrib/slapd-modules/passwd" || die einfo "Compiling contrib-module: pw-netscape"