diff options
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/Manifest | 2 | ||||
| -rw-r--r-- | net-nds/openldap/files/libldap-symbol-versions.patch | 14 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.48.ebuild (renamed from net-nds/openldap/openldap-2.4.47-r2.ebuild) | 15 |
3 files changed, 16 insertions, 15 deletions
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 19e8bea..4c689b5 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -1,2 +1,2 @@ -DIST openldap-2.4.47.tgz 5699678 BLAKE2B e172b3f0bb3c1dfdaa734fd76581758a5d51bb9abb9c038f9ae5dfa6de45ae0eaaecab443aa113b08f8c26b44b1b1ed684a85882732bffa42548029f80f4c1be SHA512 d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11 +DIST openldap-2.4.48.tgz 5704883 BLAKE2B ef856ff0b22c9187e68e9c09583a176fe4c2ee1f5bfe6b169f03bc0058294170ec4d1aa1b164e28eecd2ef6bafab539c1b942b0bd74e93852205beeaff39aeef SHA512 cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e diff --git a/net-nds/openldap/files/libldap-symbol-versions.patch b/net-nds/openldap/files/libldap-symbol-versions.patch index 769693e..fb28f49 100644 --- a/net-nds/openldap/files/libldap-symbol-versions.patch +++ b/net-nds/openldap/files/libldap-symbol-versions.patch @@ -10,7 +10,7 @@ libber. --- a/libraries/libldap_r/Makefile.in +++ b/libraries/libldap_r/Makefile.in -@@ -61,6 +61,9 @@ +@@ -61,6 +61,9 @@ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) @@ -22,7 +22,7 @@ libber. @for i in $(XXSRCS); do \ --- a/build/top.mk +++ b/build/top.mk -@@ -104,6 +104,9 @@ +@@ -104,6 +104,9 @@ LTFLAGS_MOD = $(@PLAT@_LTFLAGS_MOD) # LINK_LIBS referenced in library and module link commands. LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) @@ -32,7 +32,7 @@ libber. LTSTATIC = @LTSTATIC@ LTLINK = $(LIBTOOL) --mode=link \ -@@ -113,7 +116,7 @@ +@@ -113,7 +116,7 @@ LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ @@ -43,7 +43,7 @@ libber. $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c --- a/build/openldap.m4 +++ b/build/openldap.m4 -@@ -1136,3 +1136,54 @@ +@@ -1136,3 +1136,54 @@ AC_DEFUN([OL_SSL_COMPAT], #endif ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) ]) @@ -100,7 +100,7 @@ libber. +rm -f conftest*])]) --- a/configure.in +++ b/configure.in -@@ -1901,6 +1901,13 @@ +@@ -1909,6 +1909,13 @@ else fi AC_SUBST(LTSTATIC)dnl @@ -126,7 +126,7 @@ libber. +}; --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in -@@ -52,6 +52,9 @@ +@@ -52,6 +52,9 @@ XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $( XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) @@ -138,7 +138,7 @@ libber. $(LTLINK) -o $@ apitest.o $(LIBS) --- a/libraries/liblber/Makefile.in +++ b/libraries/liblber/Makefile.in -@@ -38,6 +38,9 @@ +@@ -38,6 +38,9 @@ XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) XXLIBS = NT_LINK_LIBS = $(AC_LIBS) UNIX_LINK_LIBS = $(AC_LIBS) diff --git a/net-nds/openldap/openldap-2.4.47-r2.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild index b6379df..78f2046 100644 --- a/net-nds/openldap/openldap-2.4.47-r2.ebuild +++ b/net-nds/openldap/openldap-2.4.48.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit db-use flag-o-matic multilib multilib-minimal ssl-cert eapi7-ver toolchain-funcs autotools user systemd +inherit autotools db-use eapi7-ver flag-o-matic multilib multilib-minimal ssl-cert toolchain-funcs user systemd BIS_PN=rfc2307bis.schema BIS_PV=20140524 @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz LICENSE="OPENLDAP GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE_DAEMON="crypt samba slp tcpd experimental minimal" IUSE_BACKEND="+berkdb" @@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" REQUIRED_USE="cxx? ( sasl ) - ?? ( gnutls libressl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )" @@ -50,8 +49,8 @@ CDEPEND=" libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) ) gnutls? ( - >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] + >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) ) sasl? ( dev-libs/cyrus-sasl:= ) @@ -85,7 +84,8 @@ CDEPEND=" ) " DEPEND="${CDEPEND} - sys-apps/groff" + sys-apps/groff +" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-ldap ) " @@ -276,7 +276,7 @@ openldap_find_versiontags() { eerror " against ${NEWVER} and your database may be inaccessible." echo fail=1 - elif [[ -n "${OLDVER}" ]]&& [[ -z "${NEWVER}" ]]; then + elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then eerror " Your existing version of OpenLDAP was built against" eerror " sys-libs/db:${OLDVER}, but the new one will not be" eerror " built against any version and your database may be" @@ -513,6 +513,7 @@ multilib_src_configure() { done tc-export AR CC CXX + CONFIG_SHELL="/bin/bash" \ ECONF_SOURCE="${S}" \ STRIP=/bin/true \ econf \ |