diff options
author | 2014-11-10 00:51:27 +0000 | |
---|---|---|
committer | 2014-11-10 00:51:27 +0000 | |
commit | 5b6b01f02c0c6ad347bf321c084c885a34c40d64 (patch) | |
tree | 35698a44932e7a4b17952fd584352d8599ff6a82 /net-nds | |
parent | Whitespace and quoting (diff) | |
download | historical-5b6b01f02c0c6ad347bf321c084c885a34c40d64.tar.gz historical-5b6b01f02c0c6ad347bf321c084c885a34c40d64.tar.bz2 historical-5b6b01f02c0c6ad347bf321c084c885a34c40d64.zip |
Bug #527724: eval parsing boo.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'net-nds')
-rw-r--r-- | net-nds/openldap/ChangeLog | 8 | ||||
-rw-r--r-- | net-nds/openldap/Manifest | 5 | ||||
-rw-r--r-- | net-nds/openldap/files/slapd-initd-2.4.40-r1 | 4 | ||||
-rw-r--r-- | net-nds/openldap/openldap-2.4.40-r3.ebuild | 812 |
4 files changed, 824 insertions, 5 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 5edccc298659..9b604011d8f0 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.487 2014/11/08 05:09:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.488 2014/11/10 00:51:21 robbat2 Exp $ + +*openldap-2.4.40-r3 (10 Nov 2014) + + 10 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> +openldap-2.4.40-r3.ebuild, + files/slapd-initd-2.4.40-r1: + Bug #527724: eval parsing boo. 08 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r3.ebuild, openldap-2.3.43-r4.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.23.ebuild, diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 92f8ddcc725b..11e30c2394c7 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -29,7 +29,7 @@ AUX slapd-confd-2.4.28-r1 1072 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfe AUX slapd-initd 1277 SHA256 b0769a9790a6da8adfedcffc53b6d0d21756c299d94894ea635c3d9dea506844 SHA512 8bc6384ccf83900cac17ecc001251dedbbae945d48d7d51a65c3aaa4d2714a4a2f9de558a16a39d679aa2b0bd45c66a1fe1704e14021756bc0dd8512ecbb1345 WHIRLPOOL 799de21cdd8c836dee1751830431d7823e1741327062795891e14aac3421f67fe01ee1fcef27f6b3b79817003708527049114503d0f539c5380c34d14bf7e930 AUX slapd-initd-2.4.28-r1 981 SHA256 1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f SHA512 e57f1e26d3635cb9328aa021c7033abca5a02959eeb2ff9534c4cae6f89b1e4e4992590dd3ae9fcc5529fa6ab109973624d06bcfe3aac126214cfca08e8aed0e WHIRLPOOL bddd056cbf759ef5e9f510165eb786ed3153b1ed7f53191325ffff999adfc4360139da79873e2190d7988345559e62692dd5327f24fad1c28c7a8b6f38e8eb9f AUX slapd-initd-2.4.40 1510 SHA256 05ab6f1d7ffe731249ead7bdcaa3e1980bc0e89b9070890794bcda9512bf63b7 SHA512 6705aa3540af915025f1c192c24529a60fe95afb875dc91b712748d70e78c6bdb2e94ea8063bbf9dd1aa7dd98f402f07f9894c92fc3638c887e61e8a3e2bf23c WHIRLPOOL e9b559d8d50e5db5fb5f599c60db983db5ccbca444a5d8c7b47d6aa46291d6b431e41ad40fa4d8f72a878b452d365f6ef1fa13809e7f09044f000769ffa4e6f9 -AUX slapd-initd-2.4.40-r1 1841 SHA256 82ac6d0fcda9a50ab6b2bdc1b44fb70ffbf463962b2de424f2ebcd467c6f45a2 SHA512 83a79cbd93e423a1965e8f74a0f24825eb6a72ec7715d55dba949818f319524d94b2166750672609eb77a57247989a59336c9542e4cdcf7a3084fa469eb0c954 WHIRLPOOL a6d25b54c27e43e70207ec52d27b145eb11ca582a319b9fe5971d6588c2ca1cd28984b5f746c4ba522bcf69c143ef809fb3011cefa857dbc1ab0ba853201ab9c +AUX slapd-initd-2.4.40-r1 1844 SHA256 d579fe08a243aa35fc73dc877e96839046a6da6a347f9b110029ae8c75fbc174 SHA512 bd431809a795a55b8c93dc24455747e0d979f937a11017ef5fe2c5572dad56bfafb68e01f5f5bf384b97a0a9134d177d14dbddd3b4286e5e336f40fd6eff33cf WHIRLPOOL 795d53cfde7872de2f2822eb47bd0839cebd67ae5325cd4288e222810164ab8486e9a9ca16e47382283eb30cb8452f3c254995f60d78543c5924c47724769671 AUX slapd-initd2 622 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa SHA512 36faef3b274fbb8f958893a6375e8ba99949705f73ed06d0022b09e7e4531ff3fdc1f87b026a787fafab05a9d227b3381d769c79d54662542c5bc15f1fec3afa WHIRLPOOL dba6e25b5e7ceb0f72c5a46f39d6271e0e76410296584dee96e46c5c18793a995183154fa98dd76f4f926c76a8dc988c87dbe1912e9d8048bd7cf1bbffc1103c AUX slapd.service 284 SHA256 106563991611b44717cf93c10473edef39b4f0b4b391e29b9d5bdd3059c7a64a SHA512 450c93b320101e1c28681cad6694c24332fbe424ac98283b621a2f6e1eb01e9e2dbd80a4142e6e8d01d95c55018b44e847d4f4c55f11d7e0e0a11ae1827daa82 WHIRLPOOL d1ff7b8c672d9b38116cc8984567179a743b140211ae99bebd00729d8dc3cfcd4ed7c0833a18b071c9fa20eeb2cce4e053e7b6805474fc3ca8442167254c1e35 AUX slapd.service.conf 443 SHA256 462adb8f6fc1a9f742c792b4392346d30949eed523453dd19b64afc9dc448145 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b WHIRLPOOL 8697c1c1c82c5c3fbb5d3fffc43e56f1a05a8bf23443270f2a051fde7d6ca0d1c5102611ac62d244b2c190c6bd1fb675cc46a5978a715d2df4e72f13c58db3c8 @@ -61,6 +61,7 @@ EBUILD openldap-2.4.38-r1.ebuild 22526 SHA256 82c788d06106e4e5dad38f900469e077db EBUILD openldap-2.4.38-r2.ebuild 24008 SHA256 69069ef4ec0cc311c3513b1487daa53deee6687a4e5679b165da02404af9aa6f SHA512 b762789712f266887672f6c36ef1b95654d0681855958c76a1200d564d625dfd76161d5dd8f5b7b1992d1c2729b70e23398530d672af463282715ba0166eb6ce WHIRLPOOL b94656976e6f30a451512dc3904c33bd39f0647b903f5a926e1e1a14b059cc5a26123491bd28cb064145c8fa68c78cebe292facbfe114e81e64f30249b628ecc EBUILD openldap-2.4.39.ebuild 24012 SHA256 7097370f065bd4e6001be5b1e91aabca01702a2fb8a4178c41cf2664766cb7c9 SHA512 cf0d1fa9ec9bcd17891b657c81a79d116c2d05a1a6681771e70ee1242dfbb078a52ea65d2797b9460d28e1e9e381d9f7e6555bffbb05f10ac7e0110bb9e9bb31 WHIRLPOOL e935d519625bb5aaf73b6cfdbb88814680a01100e6ad850f2a01af6e79e0bdfc02e6fe4ce125e897eeabb2760042d36b250cecdbf0f11abe563b4ae61bb57fd4 EBUILD openldap-2.4.40-r2.ebuild 26227 SHA256 2fac256a6c93c5098ddf67f18bd9a8cb71a706d0fb8fe7e78aa0dda257550628 SHA512 b2d6f3320749ebd91c8a62834d87dac4f7840d6aae8d3ed698108fc2e7a42f9d83043ef8bc8892031e96208377d763a4010321ce0469a36d76e4338a43f0107d WHIRLPOOL 333ab08c7a2a0345d221156bdf7bfd9ea88bad942b0d66ed21652ac0dbfd628904ec62f5a2f7bd1dcc83f6dee0563d8b69a79db4890966b654cfc74eb9ad704e +EBUILD openldap-2.4.40-r3.ebuild 26229 SHA256 64bd6a64935c1aefe392f67376717c0ba717e783fe71aadfd8d216925f70ce63 SHA512 d009c34e55d20c5533c8d8a28d6639b5e755720954e608cdd696c328bb6d0a701386b6743d17be8d468b686c7b5e98012ee3791a18899ce8eaa6bb6c96edb0b5 WHIRLPOOL 0c2ccd6d6230d1dafed2cc3a73e5a735dfff68373163b42b22e7fd4e2cef6c90c8fbeb982da1437075baaf90189b92cd8004bc42e26188e0fd47b2667455b9ba EBUILD openldap-2.4.40.ebuild 26665 SHA256 de9e846d0c1576dceb0fb8fb26123a4ba7078786a425d2af76ea4b9efedae7f2 SHA512 e52158c029504321199c5dc495c2f88d00d298fc19eda768cb3895d5d1f5e5afdfb8e21cfe55e322ca646c4d5125b8340ae03b7ff7147effe7e4d38a82f29d67 WHIRLPOOL 9a060d2ea77c2ca4587d481b47938a57e30c2027d831ee615f3e1fddc324f59d0b1dfc38b7bba762f8417ddf728f6a79397c4ad74c8d1d4e15feca63dab39232 -MISC ChangeLog 86042 SHA256 7d262a4f4bfe63b4de6f3096f7d1c76553b53e7a0dfe6e1cb9fade5b6a83b863 SHA512 8ac423b06a5d13688a55cd6d553cc850a8f2ed09ac3aad5c1c85eb45d26f3b60cb99708f334d3a6c9b91f1cc2dacefacd14b696bb20788f086affaec902f4a7e WHIRLPOOL 638864a7001476b4faddf1e570be8bc67ba780cd45f07ea0a84eff3e3ab5e995404d096051a6e0da7a7be78081c46316fdc7df06814ff368b7acd42ca7e6e607 +MISC ChangeLog 86223 SHA256 544696ae180d1e79503ddbe09aaef15c7432a128482c00133aa80f802b6e8f29 SHA512 79af88956147747d80f4d4a315cbc8e892dbf8e9b63b57a9c2d051a61e62a729767b91ac0f63e53a431521150acfc2f7bd6e3468955234f7c61b090701725152 WHIRLPOOL 86f23942553060680c8ee26040e7ffcce207762d3cf7ec535abfea35c218493bd73980f1e961467089eab76db4566b741a20c623ff9cdcb3825ce6180ffb6356 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7 diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r1 b/net-nds/openldap/files/slapd-initd-2.4.40-r1 index 4229ca1053ab..4068af690efc 100644 --- a/net-nds/openldap/files/slapd-initd-2.4.40-r1 +++ b/net-nds/openldap/files/slapd-initd-2.4.40-r1 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.40-r1,v 1.1 2014/10/27 05:33:59 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.40-r1,v 1.2 2014/11/10 00:51:21 robbat2 Exp $ extra_commands="checkconfig" @@ -48,7 +48,7 @@ checkconfig() { # Fallback CONF=${CONF-/etc/openldap/slapd.conf} [ -d $CONF ] && CONF=${CONF}/* - DBDIRS=`eval awk '/^(directory|olcDbDirectory:)/{print $2}' $CONF` + DBDIRS=`eval awk '"/^(directory|olcDbDirectory:)/{print \$2}"' $CONF` for d in $DBDIRS; do if [ ! -d $d ]; then eerror "Directory $d in config does not exist!" diff --git a/net-nds/openldap/openldap-2.4.40-r3.ebuild b/net-nds/openldap/openldap-2.4.40-r3.ebuild new file mode 100644 index 000000000000..1144b812c3a6 --- /dev/null +++ b/net-nds/openldap/openldap-2.4.40-r3.ebuild @@ -0,0 +1,812 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r3.ebuild,v 1.1 2014/11/10 00:51:21 robbat2 Exp $ + +EAPI="5" + +inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd + +BIS_PN=rfc2307bis.schema +BIS_PV=20140524 +BIS_P="${BIS_PN}-${BIS_PV}" + +DESCRIPTION="LDAP suite of application and development tools" +HOMEPAGE="http://www.OpenLDAP.org/" + +# mirrors are mostly not working, using canonical URI +SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz + mirror://gentoo/${BIS_P}" + +LICENSE="OPENLDAP GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" + +IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" +IUSE_BACKEND="+berkdb" +IUSE_OVERLAY="overlays perl" +IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs" +IUSE_CONTRIB="smbkrb5passwd kerberos" +IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" +IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" + +REQUIRED_USE="cxx? ( sasl )" + +# always list newer first +# Do not add any AGPL-3 BDB here! +# See bug 525110, comment 15. +BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4' +BDB_PKGS='' +for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done + +# openssl is needed to generate lanman-passwords required by samba +CDEPEND="icu? ( dev-libs/icu:= ) + ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) ) + sasl? ( dev-libs/cyrus-sasl:= ) + !minimal? ( + sys-devel/libtool + sys-libs/e2fsprogs-libs + >=dev-db/lmdb-0.9.14 + tcpd? ( sys-apps/tcp-wrappers ) + odbc? ( !iodbc? ( dev-db/unixODBC ) + iodbc? ( dev-db/libiodbc ) ) + slp? ( net-libs/openslp ) + perl? ( dev-lang/perl[-build(-)] ) + samba? ( dev-libs/openssl ) + berkdb? ( + <sys-libs/db-6.0:= + || ( ${BDB_PKGS} ) + ) + smbkrb5passwd? ( + dev-libs/openssl + kerberos? ( app-crypt/heimdal ) + ) + kerberos? ( virtual/krb5 ) + cxx? ( dev-libs/cyrus-sasl:= ) + ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${CDEPEND} + sys-apps/groff" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-ldap ) +" +# for tracking versions +OPENLDAP_VERSIONTAG=".version-tag" +OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" + +MULTILIB_WRAPPED_HEADERS=( + # USE=cxx + /usr/include/LDAPAsynConnection.h + /usr/include/LDAPAttrType.h + /usr/include/LDAPAttribute.h + /usr/include/LDAPAttributeList.h + /usr/include/LDAPConnection.h + /usr/include/LDAPConstraints.h + /usr/include/LDAPControl.h + /usr/include/LDAPControlSet.h + /usr/include/LDAPEntry.h + /usr/include/LDAPEntryList.h + /usr/include/LDAPException.h + /usr/include/LDAPExtResult.h + /usr/include/LDAPMessage.h + /usr/include/LDAPMessageQueue.h + /usr/include/LDAPModList.h + /usr/include/LDAPModification.h + /usr/include/LDAPObjClass.h + /usr/include/LDAPRebind.h + /usr/include/LDAPRebindAuth.h + /usr/include/LDAPReferenceList.h + /usr/include/LDAPResult.h + /usr/include/LDAPSaslBindResult.h + /usr/include/LDAPSchema.h + /usr/include/LDAPSearchReference.h + /usr/include/LDAPSearchResult.h + /usr/include/LDAPSearchResults.h + /usr/include/LDAPUrl.h + /usr/include/LDAPUrlList.h + /usr/include/LdifReader.h + /usr/include/LdifWriter.h + /usr/include/SaslInteraction.h + /usr/include/SaslInteractionHandler.h + /usr/include/StringList.h + /usr/include/TlsOptions.h +) + +openldap_filecount() { + local dir="$1" + find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l +} + +openldap_find_versiontags() { + # scan for all datadirs + openldap_datadirs="" + if [ -f "${EROOT}"/etc/openldap/slapd.conf ]; then + openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${EROOT}/etc/openldap/slapd.conf)" + fi + openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" + + einfo + einfo "Scanning datadir(s) from slapd.conf and" + einfo "the default installdir for Versiontags" + einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" + einfo + + # scan datadirs if we have a version tag + openldap_found_tag=0 + have_files=0 + for each in ${openldap_datadirs}; do + CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` + CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} + if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then + einfo "- Checking ${each}..." + if [ -r ${CURRENT_TAG} ] ; then + # yey, we have one :) + einfo " Found Versiontag in ${each}" + source ${CURRENT_TAG} + if [ "${OLDPF}" == "" ] ; then + eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" + eerror "Please delete it" + eerror + die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" + fi + + OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` + + [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 + + # are we on the same branch? + if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then + ewarn " Versiontag doesn't match current major release!" + if [[ "${have_files}" == "1" ]] ; then + eerror " Versiontag says other major and you (probably) have datafiles!" + echo + openldap_upgrade_howto + else + einfo " No real problem, seems there's no database." + fi + else + einfo " Versiontag is fine here :)" + fi + else + einfo " Non-tagged dir ${each}" + [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 + if [[ "${have_files}" == "1" ]] ; then + einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" + echo + + eerror + eerror "Your OpenLDAP Installation has a non tagged datadir that" + eerror "possibly contains a database at ${CURRENT_TAGDIR}" + eerror + eerror "Please export data if any entered and empty or remove" + eerror "the directory, installation has been stopped so you" + eerror "can take required action" + eerror + eerror "For a HOWTO on exporting the data, see instructions in the ebuild" + eerror + openldap_upgrade_howto + die "Please move the datadir ${CURRENT_TAGDIR} away" + fi + fi + einfo + fi + done + [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" + + # Now we must check for the major version of sys-libs/db linked against. + SLAPD_PATH=${EROOT}/usr/$(get_libdir)/openldap/slapd + if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then + OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ + | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" + if use berkdb; then + # find which one would be used + for bdb_slot in $BDB_SLOTS ; do + NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")" + [[ -n "$NEWVER" ]] && break + done + fi + local fail=0 + if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then + : + # Nothing wrong here. + elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then + eerror " Your existing version of OpenLDAP was not built against" + eerror " any version of sys-libs/db, but the new one will build" + eerror " against ${NEWVER} and your database may be inaccessible." + echo + fail=1 + elif [ -n "${OLDVER}" -a -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" + eerror " inaccessible." + echo + fail=1 + elif [ "${OLDVER}" != "${NEWVER}" ]; then + eerror " Your existing version of OpenLDAP was built against" + eerror " sys-libs/db:${OLDVER}, but the new one will build against" + eerror " ${NEWVER} and your database would be inaccessible." + echo + fail=1 + fi + [ "${fail}" == "1" ] && openldap_upgrade_howto + fi + + echo + einfo + einfo "All datadirs are fine, proceeding with merge now..." + einfo +} + +openldap_upgrade_howto() { + eerror + eerror "A (possible old) installation of OpenLDAP was detected," + eerror "installation will not proceed for now." + eerror + eerror "As major version upgrades can corrupt your database," + eerror "you need to dump your database and re-create it afterwards." + eerror + eerror "Additionally, rebuilding against different major versions of the" + eerror "sys-libs/db libraries will cause your database to be inaccessible." + eerror "" + d="$(date -u +%s)" + l="/root/ldapdump.${d}" + i="${l}.raw" + eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" + eerror " 2. slapcat -l ${i}" + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}" + eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" + eerror " 5. emerge --update \=net-nds/${PF}" + eerror " 6. etc-update, and ensure that you apply the changes" + eerror " 7. slapadd -l ${l}" + eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" + eerror " 9. /etc/init.d/slapd start" + eerror "10. check that your data is intact." + eerror "11. set up the new replication system." + eerror + if [ "${FORCE_UPGRADE}" != "1" ]; then + die "You need to upgrade your database first" + else + eerror "You have the magical FORCE_UPGRADE=1 in place." + eerror "Don't say you weren't warned about data loss." + fi +} + +pkg_setup() { + if ! use sasl && use cxx ; then + die "To build the ldapc++ library you must emerge openldap with sasl support" + fi + # Bug #322787 + if use minimal && ! has_version "net-nds/openldap" ; then + einfo "No datadir scan needed, openldap not installed" + elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then + einfo "Skipping scan for previous datadirs as requested by minimal useflag" + else + openldap_find_versiontags + fi + + enewgroup ldap 439 + enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap +} + +src_prepare() { + # ensure correct SLAPI path by default + sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \ + "${S}"/include/ldap_defaults.h + + epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch + + epatch \ + "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ + "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch + + # bug #116045 - still present in 2.4.28 + epatch "${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch + # bug #408077 - samba4 + epatch "${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch + + # bug #189817 + epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch + + # bug #233633 + epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch + + # bug #281495 + epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch + + # bug #294350 + epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch + + # unbreak /bin/sh -> dash + epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch + + # bug #420959 + epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch + + # bug #421463 + #epatch "${FILESDIR}"/${PN}-2.4.33-gnutls.patch # merged upstream + + # unbundle lmdb + epatch "${FILESDIR}"/${P}-mdb-unbundle.patch + rm -rf "${S}"/libraries/liblmdb + + cd "${S}"/build || die + einfo "Making sure upstream build strip does not do stripping too early" + sed -i.orig \ + -e '/^STRIP/s,-s,,g' \ + top.mk || die "Failed to block stripping" + + # wrong assumption that /bin/sh is /bin/bash + sed -i \ + -e 's|/bin/sh|/bin/bash|g' \ + "${S}"/tests/scripts/* || die "sed failed" + + cd "${S}" || die + + AT_NOEAUTOMAKE=yes eautoreconf +} + +build_contrib_module() { + # <dir> <sources> <outputname> + cd "${S}/contrib/slapd-modules/$1" || die + einfo "Compiling contrib-module: $3" + # Make sure it's uppercase + local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -D${define_name}=SLAPD_MOD_DYNAMIC \ + -I"${BUILD_DIR}"/include \ + -I../../../include -I../../../servers/slapd ${CFLAGS} \ + -o ${2%.c}.lo -c $2 || die "compiling $3 failed" + einfo "Linking contrib-module: $3" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o $3.la ${2%.c}.lo || die "linking $3 failed" +} + +src_configure() { + #Fix for glibc-2.8 and ucred. Bug 228457. + append-cppflags -D_GNU_SOURCE + + # Bug 408001 + use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync + + # connectionless ldap per bug #342439 + append-cppflags -DLDAP_CONNECTIONLESS + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=() + + use debug && myconf+=( $(use_enable debug) ) + + # ICU usage is not configurable + export ac_cv_header_unicode_utypes_h="$(multilib_is_native_abi && use icu && echo yes || echo no)" + + if ! use minimal && multilib_is_native_abi; then + local CPPFLAGS=${CPPFLAGS} + + # re-enable serverside overlay chains per bug #296567 + # see ldap docs chaper 12.3.1 for details + myconf+=( --enable-ldap ) + + # backends + myconf+=( --enable-slapd ) + if use berkdb ; then + einfo "Using Berkeley DB for local backend" + myconf+=( --enable-bdb --enable-hdb ) + DBINCLUDE=$(db_includedir $BDB_SLOTS) + einfo "Using $DBINCLUDE for sys-libs/db version" + # We need to include the slotted db.h dir for FreeBSD + append-cppflags -I${DBINCLUDE} + else + myconf+=( --disable-bdb --disable-hdb ) + fi + for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do + myconf+=( --enable-${backend}=mod ) + done + + myconf+=( $(use_enable perl perl mod) ) + + myconf+=( $(use_enable odbc sql mod) ) + if use odbc ; then + local odbc_lib="unixodbc" + if use iodbc ; then + odbc_lib="iodbc" + append-cppflags -I"${EPREFIX}"/usr/include/iodbc + fi + myconf+=( --with-odbc=${odbc_lib} ) + fi + + # slapd options + myconf+=( + $(use_enable crypt) + $(use_enable slp) + $(use_enable samba lmpasswd) + $(use_enable syslog) + ) + if use experimental ; then + myconf+=( + --enable-dynacl + --enable-aci=mod + ) + fi + for option in aci cleartext modules rewrite rlookups slapi; do + myconf+=( --enable-${option} ) + done + + # slapd overlay options + # Compile-in the syncprov, the others as module + myconf+=( --enable-syncprov=yes ) + use overlays && myconf+=( --enable-overlays=mod ) + + else + myconf+=( + --disable-backends + --disable-slapd + --disable-bdb + --disable-hdb + --disable-mdb + --disable-overlays + --disable-syslog + ) + fi + + # basic functionality stuff + myconf+=( + $(use_enable ipv6) + $(multilib_native_use_with sasl cyrus-sasl) + $(multilib_native_use_enable sasl spasswd) + $(use_enable tcpd wrappers) + ) + + local ssl_lib="no" + if use ssl || ( ! use minimal && use samba ) ; then + ssl_lib="openssl" + use gnutls && ssl_lib="gnutls" + fi + + myconf+=( --with-tls=${ssl_lib} ) + + for basicflag in dynamic local proctitle shared; do + myconf+=( --enable-${basicflag} ) + done + + tc-export AR CC CXX + ECONF_SOURCE=${S} \ + STRIP=/bin/true \ + econf \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \ + $(use_enable static-libs static) \ + "${myconf[@]}" + emake depend +} + +src_configure_cxx() { + # This needs the libraries built by the first build run. + # So we have to run it AFTER the main build, not just after the main + # configure. + local myconf_ldapcpp=( + --with-ldap-includes="${S}"/include + ) + + mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die + cd "${BUILD_DIR}/contrib/ldapc++" || die + + local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS} + append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \ + -L"${BUILD_DIR}"/libraries/libldap/.libs + append-cppflags -I"${BUILD_DIR}"/include + ECONF_SOURCE=${S}/contrib/ldapc++ \ + econf "${myconf_ldapcpp[@]}" \ + CC="${CC}" \ + CXX="${CXX}" +} + +multilib_src_compile() { + tc-export AR CC CXX + emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash + local lt="${BUILD_DIR}/libtool" + export echo="echo" + + if ! use minimal && multilib_is_native_abi ; then + if use cxx ; then + einfo "Building contrib library: ldapc++" + src_configure_cxx + cd "${BUILD_DIR}/contrib/ldapc++" || die + emake \ + CC="${CC}" CXX="${CXX}" + fi + + if use smbkrb5passwd ; then + einfo "Building contrib-module: smbk5pwd" + cd "${S}/contrib/slapd-modules/smbk5pwd" || die + + MY_DEFS="-DDO_SHADOW" + if use samba ; then + MY_DEFS="${MY_DEFS} -DDO_SAMBA" + MY_KRB5_INC="" + fi + if use kerberos ; then + MY_DEFS="${MY_DEFS} -DDO_KRB5" + MY_KRB5_INC="$(krb5-config --cflags)" + fi + + emake \ + DEFS="${MY_DEFS}" \ + KRB5_INC="${MY_KRB5_INC}" \ + LDAP_BUILD="${BUILD_DIR}" \ + CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" + fi + + if use overlays ; then + einfo "Building contrib-module: samba4" + cd "${S}/contrib/slapd-modules/samba4" || die + + emake \ + LDAP_BUILD="${BUILD_DIR}" \ + CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" + fi + + if use kerberos ; then + build_contrib_module "kinit" "kinit.c" "kinit" + cd "${S}/contrib/slapd-modules/passwd" || die + einfo "Compiling contrib-module: pw-kerberos" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -I"${BUILD_DIR}"/include \ + -I../../../include \ + ${CFLAGS} \ + $(krb5-config --cflags) \ + -DHAVE_KRB5 \ + -o kerberos.lo \ + -c kerberos.c || die "compiling pw-kerberos failed" + einfo "Linking contrib-module: pw-kerberos" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o pw-kerberos.la \ + kerberos.lo || die "linking pw-kerberos 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" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -I"${BUILD_DIR}"/include \ + -I../../../include \ + ${CFLAGS} \ + -o netscape.lo \ + -c netscape.c || die "compiling pw-netscape failed" + einfo "Linking contrib-module: pw-netscape" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o pw-netscape.la \ + netscape.lo || die "linking pw-netscape failed" + + #build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only + #build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos + build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" + build_contrib_module "allop" "allop.c" "overlay-allop" + build_contrib_module "allowed" "allowed.c" "allowed" + build_contrib_module "autogroup" "autogroup.c" "autogroup" + build_contrib_module "cloak" "cloak.c" "cloak" + # build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand + build_contrib_module "denyop" "denyop.c" "denyop-overlay" + build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" + build_contrib_module "dupent" "dupent.c" "dupent" + build_contrib_module "lastbind" "lastbind.c" "lastbind" + # lastmod may not play well with other overlays + build_contrib_module "lastmod" "lastmod.c" "lastmod" + build_contrib_module "noopsrch" "noopsrch.c" "noopsrch" + build_contrib_module "nops" "nops.c" "nops-overlay" + #build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER + build_contrib_module "trace" "trace.c" "trace" + # build slapi-plugins + cd "${S}/contrib/slapi-plugins/addrdnvalues" || die + einfo "Building contrib-module: addrdnvalues plugin" + "${CC}" -shared \ + -I"${BUILD_DIR}"/include \ + -I../../../include \ + ${CFLAGS} \ + -fPIC \ + ${LDFLAGS} \ + -o libaddrdnvalues-plugin.so \ + addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" + + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + cd tests || die + emake tests || die "make tests failed" + fi +} + +multilib_src_install() { + local lt="${BUILD_DIR}/libtool" + emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install + use static-libs || prune_libtool_files --all + + if ! use minimal && multilib_is_native_abi; then + # openldap modules go here + # TODO: write some code to populate slapd.conf with moduleload statements + keepdir /usr/$(get_libdir)/openldap/openldap/ + + # initial data storage dir + keepdir /var/lib/openldap-data + use prefix || fowners ldap:ldap /var/lib/openldap-data + fperms 0700 /var/lib/openldap-data + + echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + + # use our config + rm "${ED}"etc/openldap/slapd.conf + insinto /etc/openldap + newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf + configfile="${ED}"etc/openldap/slapd.conf + + # populate with built backends + ebegin "populate config with built backends" + for x in "${ED}"usr/$(get_libdir)/openldap/openldap/back_*.so; do + einfo "Adding $(basename ${x})" + sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" + done + sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" + use prefix || fowners root:ldap /etc/openldap/slapd.conf + fperms 0640 /etc/openldap/slapd.conf + cp "${configfile}" "${configfile}".default + eend + + # install our own init scripts and systemd unit files + einfo "Install init scripts" + newinitd "${FILESDIR}"/slapd-initd-2.4.40-r1 slapd + newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd + einfo "Install systemd service" + systemd_dounit "${FILESDIR}"/slapd.service + systemd_install_serviced "${FILESDIR}"/slapd.service.conf + systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf + + if [[ $(get_libdir) != lib ]]; then + sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \ + "${ED}"/etc/init.d/slapd \ + "${ED}"/usr/lib/systemd/system/slapd.service || die + fi + # If built without SLP, we don't need to be before avahi + use slp \ + || sed -i \ + -e '/before/{s/avahi-daemon//g}' \ + "${ED}"etc/init.d/slapd + + if use cxx ; then + einfo "Install the ldapc++ library" + cd "${BUILD_DIR}/contrib/ldapc++" || die + emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install + cd "${S}"/contrib/ldapc++ || die + newdoc README ldapc++-README + fi + + if use smbkrb5passwd ; then + einfo "Install the smbk5pwd module" + cd "${S}/contrib/slapd-modules/smbk5pwd" || die + emake DESTDIR="${D}" \ + LDAP_BUILD="${BUILD_DIR}" \ + libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install + newdoc README smbk5pwd-README + fi + + if use overlays ; then + einfo "Install the samba4 module" + cd "${S}/contrib/slapd-modules/samba4" || die + emake DESTDIR="${D}" \ + LDAP_BUILD="${BUILD_DIR}" \ + libexecdir="/usr/$(get_libdir)/openldap" install + newdoc README samba4-README + fi + + einfo "Installing contrib modules" + cd "${S}/contrib/slapd-modules" || die + for l in */*.la; do + "${lt}" --mode=install cp ${l} \ + "${ED}"usr/$(get_libdir)/openldap/openldap || \ + die "installing ${l} failed" + done + + dodoc "${FILESDIR}"/DB_CONFIG.fast.example + docinto contrib + doman */*.5 + #newdoc acl/README* + newdoc addpartial/README addpartial-README + newdoc allop/README allop-README + newdoc allowed/README allowed-README + newdoc autogroup/README autogroup-README + newdoc dsaschema/README dsaschema-README + newdoc passwd/README passwd-README + cd "${S}/contrib/slapi-plugins" || die + insinto /usr/$(get_libdir)/openldap/openldap + doins */*.so + docinto contrib + newdoc addrdnvalues/README addrdnvalues-README + + insinto /etc/openldap/schema + newins "${DISTDIR}"/${BIS_P} ${BIS_PN} + + docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample* + docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample* + docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm + + dosbin "${S}"/contrib/slapd-tools/statslog + newdoc "${S}"/contrib/slapd-tools/README README.statslog + fi +} + +multilib_src_install_all() { + dodoc ANNOUNCEMENT CHANGES COPYRIGHT README + docinto rfc ; dodoc doc/rfc/*.txt +} + +pkg_preinst() { + # keep old libs if any + preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0) + # bug 440470, only display the getting started help there was no openldap before, + # or we are going to a non-minimal build + ! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]' + OPENLDAP_PRINT_MESSAGES=$((! $?)) +} + +pkg_postinst() { + if ! use minimal ; then + # You cannot build SSL certificates during src_install that will make + # binary packages containing your SSL key, which is both a security risk + # and a misconfiguration if multiple machines use the same key and cert. + if use ssl; then + install_cert /etc/openldap/ssl/ldap + use prefix || chown ldap:ldap "${EROOT}"etc/openldap/ssl/ldap.* + ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" + ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" + ewarn "add 'TLS_REQCERT allow' if you want to use them." + fi + + if use prefix; then + # Warn about prefix issues with slapd + eerror "slapd might NOT be usable on Prefix systems as it requires root privileges" + eerror "to start up, and requires that certain files directories be owned by" + eerror "ldap:ldap. As Prefix does not support changing ownership of files and" + eerror "directories, you will have to manually fix this yourself." + fi + + # These lines force the permissions of various content to be correct + use prefix || chown ldap:ldap "${EROOT}"var/run/openldap + chmod 0755 "${EROOT}"var/run/openldap + use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default} + chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default} + use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data + fi + + if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then + elog "Getting started using OpenLDAP? There is some documentation available:" + elog "Gentoo Guide to OpenLDAP Authentication" + elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" + elog "---" + elog "An example file for tuning BDB backends with openldap is" + elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" + fi + + preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0) +} |