diff options
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/Manifest | 3 | ||||
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch | 49 |
3 files changed, 6 insertions, 52 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 3c5503766196..06ddf87a0c00 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,10 @@ # 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.497 2015/03/08 03:59:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.498 2015/03/08 04:28:12 robbat2 Exp $ + + 08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> + -files/openldap-2.4.28-contrib-smbk5pwd.patch: + Cleanup patches. 08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> -files/openldap-2.4.17-contrib-smbk5pwd.patch: diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index b8bd5a6e9a06..bdf02bfa3225 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -11,7 +11,6 @@ AUX openldap-2.4.11-libldap_r.patch 515 SHA256 3310a89d38bc39e6eb4333799d475411b AUX openldap-2.4.15-ppolicy.patch 418 SHA256 98269fa1e8a1a0e62dad9acd36fd9a33614fca9a5830d6e7e606db8eb7f85de5 SHA512 59db36c9b4d16e7ccf4b318af2a8d0c6e29cda7e567641b3bcc6069bb7d610a8ac8b56e16ca72165b3e50841abb1ef693b9e2958f16997ac637554f3a67b7146 WHIRLPOOL ae52ce30b17e0413ee87db55070d64e06e4ab5e14adf96f808a0cfba39c3f946fc5b4e4431d8fc6123c025261acd6a16e2245a1b46e1eb7a131444e5ffc7825f AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 SHA256 31e816eb9f3b52f5f9d183f82adebff75892e45e764187e579a92204c90889cb SHA512 6e4d3d04344433967ae099471e2af9d706e77206fc5e8d84d63681c5b975110f9abbee5d29be0a51e4cf8bc8ee157d8f386d99ffcebd059ef1be660530aaa096 WHIRLPOOL 38d4e60faff9d3a5f21e0783e688b4716d8d04976f549958798becad3e03b06eec2eeeac1b7491fe361e077b4aca5b75506bd45d65668746ab67db3a20d86a28 AUX openldap-2.4.17-gcc44.patch 509 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda SHA512 ea2c862c7a7b8bc17c31ece694c010dd648840cb4facd48d5640767d859bf3c9108d547007984cb759f4a8810ff99ab8295c82dc2ad069f568d037d8448e6ff4 WHIRLPOOL 5f597463b6e92b43e0d6beabf426f5d6000fb204dfe8080ebcf57ec71391712fb24f728f6e61d205dd3ef9e78c7eb8a443994c68469f80b2536cfea3cd75eed4 -AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 SHA256 62937bd82d218cddc8637d194c6aedc316cd1eb6179c00ba70cef0381b4e841b SHA512 0ef2d506fff828f466b2a18453193ddbdf98bbf8e199383708086559215a35e8bb4999216798f249e00acb3b81253a0bb4597c6c4815245c2cc190d2122b5994 WHIRLPOOL da17b5eb387ef35680984d30215d74715bb3dabdc06d9d5673244e7681a769c7268ca7876a65692187b48c3f7a8f3ff16293306834a2ea1cd19edc008bd66426 AUX openldap-2.4.28-fix-dash.patch 1101 SHA256 fddaad5f49cce39bf5492bb1dda10f2ce83419c48f128fe536661dde703b5d1b SHA512 f9b3a50eb972f746878afe4a8cda8d7e2a2807932ad2faf602f43e5a1b81166bea4fde764b4e1ae4be0000cc0713ee90a4620afab5809b8460f60ae39a716e9e WHIRLPOOL ba3856cd1008431025811aaa21d0a0ce94896590a16eee8cd27bdc84fd89884b0d27e8dce31bc79e4b4a91884bc90624f1a6afb38efb847839a036b4a2196af5 AUX openldap-2.4.28-gnutls-gcrypt.patch 340 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0 SHA512 53441707e9b24e774c0541ad8b63295eea6dc0352ae2ef3bf389f381da18f1df05fb2f7b41c816e1f697d8f1b208643d05891c03d8fba42d85e3b7689e5ee94f WHIRLPOOL 6be9eda56fd68c9e0818443ca70ee6c1e904aa6126576477d402c9abd2ee44952a0a313efc89f603b02cac35cbfea3c987de5b6ec3625a92bc691386edd85aa5 AUX openldap-2.4.30-contrib-samba4.patch 1639 SHA256 f47e416d8ef21dcfde6d0ecdace27063e8b20236f5d832675aa4efe222a5a69e SHA512 39a8b2675aa98b4d74a374e3ac45e83e07201ccc807c96eff0aa26e8571503c13fe48fa0d76d610fab99c4615f2ee1388b9bc386abb38a3fa162ca278f872241 WHIRLPOOL 9967fd742c3ee80f5d2dd0c1906b00393bf5e29ba3f7b8d0eef2779004d67292c203eb8ead4e34a993499e8e1aef0e0e5ca78ab64785488bd566be503b0af237 @@ -48,5 +47,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 87266 SHA256 8ac959168952b8e4b51ae80e9c7832e89d159c45d0da0de7cf3ac3b508792b68 SHA512 8f0d1f1f3ff96881ebe05307b4db8e2c1d36b6370c491fea91038f245cb9b4f3bebdcb7f069bd8e717d99ceae3e1aa1c18a9d9562e543193cad1f5f654ceb284 WHIRLPOOL e382b4f74b62cac6ff70f2bb5f2b76bed6fd84d102f1b1dca6e897855d7bcdf92fa6093b92a2672f39e3533bc0359d0c955dee63d0161cba792e0fbb72df5403 +MISC ChangeLog 87388 SHA256 930dee1c18fa1cad42df3453deef23383e38c8761d0cf2a5e95c7c24eb327acb SHA512 70afa873a560b96d4c32f3fdbe7d17edfa8716f1305bb9b95171d242050862c228753bcacca4353cfda5281b51c3015ce098f5ef1b105048ae2c5b200366a6b3 WHIRLPOOL a2f499b7938b0816a01fac296547fcb43735589c26c7f051aacfca6dfa6f1a4166b3b97a9287501a5c2be60e9638eb08a3ca65d44a29fd3983636d6ffde5deb6 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7 diff --git a/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch deleted file mode 100644 index 6e5972c90449..000000000000 --- a/net-nds/openldap/files/openldap-2.4.28-contrib-smbk5pwd.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nuar --exclude '*.orig' --exclude '*.rej' openldap-2.4.28.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.28/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.28.orig/contrib/slapd-modules/smbk5pwd/Makefile 2011-11-25 10:52:29.000000000 -0800 -+++ openldap-2.4.28/contrib/slapd-modules/smbk5pwd/Makefile 2012-02-02 02:37:47.928554958 -0800 -@@ -13,21 +13,25 @@ - # <http://www.OpenLDAP.org/license.html>. - - LIBTOOL=../../../libtool --OPT=-g -O2 -+#OPT= - CC=gcc - - # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. --DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW -+#DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW - --HEIMDAL_INC=-I/usr/heimdal/include -+#KRB5_INC= - SSL_INC= - LDAP_INC=-I../../../include -I../../../servers/slapd --INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) - --HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv -+KRB5_LIB=-lkrb5 -lkadm5srv - SSL_LIB=-lcrypto --LDAP_LIB=-lldap_r -llber --LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber -+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) -+ LIBS=$(LDAP_LIB) $(SSL_LIB) -+else -+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) -+endif - - prefix=/usr/local - exec_prefix=$(prefix) -@@ -41,10 +45,10 @@ - - - smbk5pwd.lo: smbk5pwd.c -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? - - smbk5pwd.la: smbk5pwd.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - clean: |