diff options
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/Manifest | 4 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.19-r1.ebuild | 599 |
3 files changed, 5 insertions, 603 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index fd5a008501b6..bd87c9e71158 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.490 2015/03/07 23:16:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.491 2015/03/07 23:48:28 robbat2 Exp $ + + 07 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> -openldap-2.4.19-r1.ebuild: + Cleanup. 07 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> -openldap-2.4.35.ebuild, -openldap-2.4.38-r1.ebuild: diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index b40cda758ff6..d1e83d3dea89 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -36,7 +36,6 @@ AUX slapd.service.conf 443 SHA256 462adb8f6fc1a9f742c792b4392346d30949eed523453d AUX slapd.tmpfilesd 90 SHA256 8039a0190bd5b701f29661c63e03e4fb439a8eb50fdd7be5ce96a7f7f3aaeb1b SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec WHIRLPOOL 2fb28068fa2b8113041544bd88a58060aa309b012b58bd903b58e2ff853fec0882de2f2b0fa28da76eaa5550dcccbe7ed6e8b792df7f788b6bf0d324a0dc0e52 AUX slurpd-initd 494 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff SHA512 d47c8ea473f3d9495583449d455581766b7bd3b913a314d720c514cfeae6b4e01973f1f2aa060f5cc5f2335fe57c2f4e78a56d02ba7859fc113cf69f6c233359 WHIRLPOOL 60bd05139e6af4710d265e71efe4aacaec468ae4289e8524870f157c2a36f427ef480cefed0f94c53414a2e31864127a6f5bf9ce3ebe0a217ff5e6aeaea020ef DIST openldap-2.3.43.tgz 3803011 SHA256 d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba8dc16974bff9f51a9f3d37e1 SHA512 2b0ebb35adbeed34673e1a55cc7a89b348ddee7ad6ce7f915ca3745198cee992aba7281bf0d56197dcfd59665935d5d3764db0ba487975e4dbc2a2507d6ea7a6 WHIRLPOOL 7457112bbad83d75f7ad01230da97511a8d983a98f7e31357dbffd79a7ed7e53057af781002cae8c610d3ad7834dfeefbd7f223798d45aea8cd00b70f5ee0e39 -DIST openldap-2.4.19.tgz 5474200 SHA256 b7a2642f620f98bebf6b52a227ba66b93c5028c68088bf107b7403d2ce6e1533 SHA512 f802fd91596aba9f406e68797008edaebbcc65f7c0a71088c792fa358553e787b82e087e4e2461a27db3f4ed7dd2fc6ac8dabb8a58788d84406061826651570d WHIRLPOOL 5cfe98e627484935d13d281040a3e4d7300288573a7b7b9891fb24b6dbb63ac7f1fb3cf65c9825add6cbee655615cd4915c20d754c37b63eea15ef28005619f1 DIST openldap-2.4.23.tgz 5182440 SHA256 5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3 SHA512 cca9c32ab319cbe6fb851c0244a25d9e372f34f780a939b75cfe35fb77995918669b7d4e815bb7a7941a844f5b55b886caccc769180bfe87b20d66e4441008e2 WHIRLPOOL ba72e3857e0309b6db92626d600a13241ee110acf5cfd47e733b22582ac5118dc502eb3e60eec0026216671736281c110603b7527a1f8e21a311ed0052f13df3 DIST openldap-2.4.24.tgz 5240643 SHA256 fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614 SHA512 d889d5e5ec079a73a946719915b1b5f540676b735a628c764ec04e5f2b6786d35ead8de331e583b3e9c8b00f26023861ce5c32c935872ab7c0b66fe66b0aa09a WHIRLPOOL 58e279e5bc44f200a38b0993b340647d4c23834f72f9f736c2e454d3cdb9d7a96b64ccfc9a432ba16478ef6f9ed9d4627528376cb4dd844d9697dc637f163012 DIST openldap-2.4.28.tgz 5436340 SHA256 332ab5b13dbc0f85b1112d7a6f3485069108bfbd4d2603c8b548adbfa9bbc371 SHA512 585f01cac1facf4e703b975d8132fe3cc4c5687d315f5825c5456971cdafae5f08f006c440764898789c1c87619428ac9629de0a499b83c3f63b7e4ccd46f1fe WHIRLPOOL 2c1b22b479a2f89e34f27831d5db8dae89a647c5368c862d9e9fbdc45840a5f352ec2be54d6acfc536dfb050d9941202efa627cd39972392e416397c281209c7 @@ -50,7 +49,6 @@ DIST rfc2307bis.schema-20120525 11922 SHA256 41f90e2eafab34925b8223887fa378fc4bb DIST rfc2307bis.schema-20140524 12262 SHA256 6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e WHIRLPOOL 40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de EBUILD openldap-2.3.43-r3.ebuild 18130 SHA256 6b80a022b58cddd5234af88b26704ae8673a087eeaf33780e77aefe9764ab9e4 SHA512 02539369713bebb149d1fb7327ac2ac0f7df3211320755bce17e46297941c8ac0015d89e6836f7896fe4c2807c1a705f079eaab0f1c22d27c740e423560029f3 WHIRLPOOL 20784ec12fd826a07a1f26154b3c26b2b82df2f8c70a75a1346b7e48cdc9655da1009e2d1760a010392def997f10f9f5b39ab860fe9562b3377251e25c71a7f0 EBUILD openldap-2.3.43-r4.ebuild 18322 SHA256 32459f254d843acdff9a25fc0892b8fbaf810f9f8959bd4f67fe69794a4de1b0 SHA512 62c104c1d7db911524a79bc557bca1fa561e771c097397369244944bdbfb05bf0d6b7edd4ca866d33121dd52001d786b0328dd2fb9b217df8a8941378dec7641 WHIRLPOOL 0dd83b2806534ddd830b013059ce3e5edb4b2f05c3ac679d433c01f1dedb479246f5703ca61a6f3f42c3e2e4c03ec65a994fffbdd784375af804eba9bfc7e0b5 -EBUILD openldap-2.4.19-r1.ebuild 19773 SHA256 f32a25aa7bc9ea0b0c2a10840fae952cabdcbc71e470fc89a5b5aed5fc622635 SHA512 a38cf2ca30a5df57a6ed658214bd060cd04dd0f38fd8d55d59c92a3a6da089cb6f764f30ae7566280c0c248b228577e1ee94d6e09a513ff4811049ac4482f907 WHIRLPOOL 54561fc97957b364411203ea0dcf96861d88a7436d4ba0b8573c37dfa58ad7fcce9236f8cbe53b9a9d0f672e70c5d5ed23cf7125082e45e0113897a47036b321 EBUILD openldap-2.4.23.ebuild 20098 SHA256 0093d4162cf7d890283e1fef0e80f78a901a884bdc0499190453df3930b77954 SHA512 28ca8f2403c8cfd27697df7131a29d791ce4ef154845a63eef2e4dd5f35e66c86a9c82fbf95bc9fddc31001830b4a4c7a52ec19edc1305571d620a2ea0afaf94 WHIRLPOOL 74a386f4121a5011281f41a7999cbbc205df02a0a83fadb2802a32c5bcb55443f87ca35c4771cea897ab34fb70b1b466d55a9240d7bf3e2825f7891118c46a81 EBUILD openldap-2.4.24.ebuild 20098 SHA256 f1e162f3eff91c8e5fa4ddf0e755c2a48924cf41405984706a7a0c4cbf22cba8 SHA512 11b23821724e291a32d91422eaf760a4e2dff18363a371ea4ad673c023b95ea10e2e729c6fa0a5e5e336aa64f11b40358292232d0f88ea15aea89b587bbcda32 WHIRLPOOL 1ceba1817ccffe002cb2d96786264ed28d021127b34473e17e4d6a0e214ba6dcaa219db5ff1c5ff88080ba9eca65398a82148643caf1a90adc8982b052f86800 EBUILD openldap-2.4.28-r1.ebuild 22002 SHA256 9980b9e7df99c662074dbc0aaaa4ab4daab6e0de7bec1492529526a39bdcc013 SHA512 0e6cf1678c90fdc3ece660af52228fefb03534978682ddef9304400863f815489799f0e9253f0a2788c4da9dd5c9e635fcf2d120d788488acdc6f34e74121bdb WHIRLPOOL dbb0087d8fd713c27314ecdb8a8a0584f8bba73c93cf9e98b42a8a2c66341228c55c4694997123abb9244664ba6c9763caff8a169730874c08b5c7cb23037a7d @@ -61,5 +59,5 @@ EBUILD openldap-2.4.39.ebuild 24012 SHA256 7097370f065bd4e6001be5b1e91aabca01702 EBUILD openldap-2.4.40-r2.ebuild 26227 SHA256 2fac256a6c93c5098ddf67f18bd9a8cb71a706d0fb8fe7e78aa0dda257550628 SHA512 b2d6f3320749ebd91c8a62834d87dac4f7840d6aae8d3ed698108fc2e7a42f9d83043ef8bc8892031e96208377d763a4010321ce0469a36d76e4338a43f0107d WHIRLPOOL 333ab08c7a2a0345d221156bdf7bfd9ea88bad942b0d66ed21652ac0dbfd628904ec62f5a2f7bd1dcc83f6dee0563d8b69a79db4890966b654cfc74eb9ad704e EBUILD openldap-2.4.40-r3.ebuild 26233 SHA256 85868ef21a22a604537f419f8044966d9f30299c58e11411d81152342a791801 SHA512 4420594ab4483046a997e30f1b7cefc1a3ec38dec0183f941af83a6f255b2d55a015e89c90fbc3a4bf46e113d2a94fe34a35db9de6be57d690ab9c0e1256468a WHIRLPOOL 0e5c7fcce630bb4bd5dfc0e774a53de5cdebe4d34fd541f05707786ef3e932aaab9d584f93ba3815cf77ac83c56187a8e8440dfb42b5636ce7c692c4f0a3e5ad EBUILD openldap-2.4.40.ebuild 26665 SHA256 de9e846d0c1576dceb0fb8fb26123a4ba7078786a425d2af76ea4b9efedae7f2 SHA512 e52158c029504321199c5dc495c2f88d00d298fc19eda768cb3895d5d1f5e5afdfb8e21cfe55e322ca646c4d5125b8340ae03b7ff7147effe7e4d38a82f29d67 WHIRLPOOL 9a060d2ea77c2ca4587d481b47938a57e30c2027d831ee615f3e1fddc324f59d0b1dfc38b7bba762f8417ddf728f6a79397c4ad74c8d1d4e15feca63dab39232 -MISC ChangeLog 86512 SHA256 21f2418377fe1fd0e9eb49aa2fe2399fb110a5d19aedcfc9b2edfc581a742ba5 SHA512 33f0261b658e989eba8ce956dc0990a3525a00e6655a6f2bab111e0fb3d56e0d9f7029ab11a70497e907299bf2d388d21d9c444e18ad9740dc6bc7799454001b WHIRLPOOL 85b8f0bab10039f5c3d748b483cad96d5d8937a828d1bc2ff41cd818b4a413c86d5a48e3b978bd66710e7c722eb8e4d592060526622345823651b2c41064d018 +MISC ChangeLog 86605 SHA256 026f4f979b47b8860b3d26c85b1df49d013e40f224bcd270d3fa2f4af42eee8d SHA512 3de478ffee4abfa473f9bf6071754a78a9d021cf99176642c7e91f1f76a30c19f8ce7fccb7088f252a7c94bbfae5cfb3ef5a1d747b739c15400c95f2b67693ef WHIRLPOOL 95bde4a88a61e6753a8daa5bd90c9761157b90a8938b462e5a87990e47b0d58679024865934f7eaf8628e79d3a5f5886a986f550485efcd1e5479588b4cdd638 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7 diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild deleted file mode 100644 index 1f45380b29aa..000000000000 --- a/net-nds/openldap/openldap-2.4.19-r1.ebuild +++ /dev/null @@ -1,599 +0,0 @@ -# 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.19-r1.ebuild,v 1.20 2014/11/08 05:09:25 robbat2 Exp $ - -EAPI="2" -inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs user - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz" - -LICENSE="OPENLDAP GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" - -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" -IUSE_CONTRIB="smbkrb5passwd kerberos" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -# openssl is needed to generate lanman-passwords required by samba -RDEPEND="sys-libs/ncurses - sys-devel/libtool - icu? ( dev-libs/icu ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( <net-libs/gnutls-3 ) ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) - samba? ( dev-libs/openssl ) - berkdb? ( sys-libs/db ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal ) - kerberos? ( virtual/krb5 ) - cxx? ( dev-libs/cyrus-sasl ) - ) - selinux? ( sec-policy/selinux-ldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -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 "${ROOT}"/etc/openldap/slapd.conf ]; then - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/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 - 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=${ROOT}/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}')" - NEWVER="$(use berkdb && db_findver sys-libs/db)" - 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 - if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then - einfo - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - einfo - 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 "/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.19 - epatch "${FILESDIR}"/${PN}-2.4.19-contrib-smbk5pwd.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 - - cd "${S}"/build - 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" -} - -build_contrib_module() { - lt="${S}/libtool" - # <dir> <sources> <outputname> - cd "${S}/contrib/slapd-modules/$1" - 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../../../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 /usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - local myconf - - #Fix for glibc-2.8 and ucred. Bug 228457. - append-flags -D_GNU_SOURCE - - use debug && myconf="${myconf} $(use_enable debug)" - - # ICU usage is not configurable - export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)" - - if ! use minimal ; then - # backends - myconf="${myconf} --enable-slapd" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} --enable-bdb --enable-hdb" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I$(db_includedir) - else - ewarn - ewarn "Note: if you disable berkdb, you can only use remote-backends!" - ewarn - ebeep 5 - myconf="${myconf} --disable-bdb --disable-hdb" - fi - for backend in dnssrv ldap meta monitor null passwd relay shell sock; do - myconf="${myconf} --enable-${backend}=mod" - done - - myconf="${myconf} $(use_enable perl perl mod)" - - myconf="${myconf} $(use_enable odbc sql mod)" - if use odbc ; then - local odbc_lib="unixodbc" - use iodbc && odbc_lib="iodbc" - myconf="${myconf} --with-odbc=${odbc_lib}" - fi - - # slapd options - myconf="${myconf} $(use_enable crypt) $(use_enable slp)" - myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)" - if use experimental ; then - myconf="${myconf} --enable-dynacl" - myconf="${myconf} --enable-aci=mod" - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf="${myconf} --enable-${option}" - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf="${myconf} --enable-syncprov=yes" - use overlays && myconf="${myconf} --enable-overlays=mod" - - else - myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb" - myconf="${myconf} --disable-overlays --disable-syslog" - fi - - # basic functionality stuff - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)" - myconf="${myconf} $(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="${myconf} --with-tls=${ssl_lib}" - - for basicflag in dynamic local proctitle shared static; do - myconf="${myconf} --enable-${basicflag}" - done - - tc-export CC AR CXX - STRIP=/bin/true \ - econf \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "econf failed" -} - -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. - if ! use minimal ; then - if use cxx ; then - local myconf_ldapcpp - myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include" - cd "${S}/contrib/ldapc++" - OLD_LDFLAGS="$LDFLAGS" - OLD_CPPFLAGS="$CPPFLAGS" - append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs - append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs - append-cppflags -I../../../include - econf ${myconf_ldapcpp} \ - CC="${CC}" \ - CXX="${CXX}" \ - || die "econf ldapc++ failed" - CPPFLAGS="$OLD_CPPFLAGS" - LDFLAGS="${OLD_LDFLAGS}" - fi - fi -} - -src_compile() { - emake depend || die "emake depend failed" - emake CC="${CC}" AR="${AR}" || die "emake failed" - lt="${S}/libtool" - export echo="echo" - - if ! use minimal ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${S}/contrib/ldapc++" - emake \ - CC="${CC}" CXX="${CXX}" \ - || die "emake ldapc++ failed" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" - - emake \ - DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="$(krb5-config --cflags)" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake smbk5pwd failed" - fi - - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -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 /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" - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -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 /usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - 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 "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "nops" "nops.c" "nops-overlay" - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -src_test() { - cd tests ; make tests || die "make tests failed" -} - -src_install() { - lt="${S}/libtool" - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # 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 - fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - fowners ldap:ldap /var/run/openldap - fperms 0755 /var/run/openldap - - if ! use minimal; then - # use our config - rm "${D}"etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf - configfile="${D}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "populate config with built backends" - for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do - elog "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default - eend - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd slapd - newconfd "${FILESDIR}"/slapd-confd slapd - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd - fi - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${S}/contrib/ldapc++" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed" - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed" - newdoc README smbk5pwd-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do - "${lt}" --mode=install cp ${l} \ - "${D}"usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - docinto contrib - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - doman allop/slapo-allop.5 - newdoc autogroup/README autogroup-README - newdoc denyop/denyop.c denyop-denyop.c - newdoc dsaschema/README dsaschema-README - doman lastmod/slapo-lastmod.5 - doman nops/slapo-nops.5 - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - fi -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0 -} - -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 - chown ldap:ldap "${ROOT}"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 never' if you want to use them." - fi - - # These lines force the permissions of various content to be correct - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default} - chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm} - fi - - 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}/" - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0 -} |