Bring hang-fix in 2.3 to stable users

Package-Manager: portage-2.2.6/cvs/Linux x86_64

3 files changed, 8 insertions, 5 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 8094d46e0bed..262b12873a9e 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.442 2013/09/13 02:30:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.443 2013/09/16 04:27:41 patrick Exp $
+
+  16 Sep 2013; Patrick Lauer <patrick@gentoo.org> openldap-2.3.43-r4.ebuild:
+  Bring hang-fix in 2.3 to stable users
 
 *openldap-2.3.43-r4 (13 Sep 2013)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 588938e196e8..2814ddee8a58 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -44,7 +44,7 @@ DIST rfc2307bis.schema-20100722 9718 SHA256 c61c72e04b45d1e774de1e4084fb2a596210
 DIST rfc2307bis.schema-20120525 11922 SHA256 41f90e2eafab34925b8223887fa378fc4bbb2801937fdfd3e5a8cf3517229c38 SHA512 cf313fcbbc79d2d1085f7547ed277f58605d931592d70298204f80f40092bf6450561162178e23add2fa5baf19c0b8fff82f69fbf9c2fde6744e9f29f4dac699 WHIRLPOOL b5dd02f0a5ab183b2f981995d886a6e193ec37c0247195a5eb30bc622aa8762130a053f6cad76923bffd55635e0c4e0904aabf0c1124dc9d69080d33f3f53e1c
 EBUILD openldap-2.3.43-r1.ebuild 18090 SHA256 aae9a6a1eac2e8ade42e262e4aabe9c5a363e4149a08253d500f2b4194d0e760 SHA512 73245ce0081b52bc9be58142c9640b1c2965a0cd433b26871e9852fbb70e37e89f5583f6ba3be9ab0549f7c5d97d6f9760689326896a746fa6a2e2949d5a1260 WHIRLPOOL 84bbe8da6ab7bb10e6c4b434f6afbf58209d3167226a6d08d1cdf0115a55802a11d8116cdf784fdb8ba3cae83335e17a5e86517f1232e6d0e53b8d51f3363389
 EBUILD openldap-2.3.43-r3.ebuild 18089 SHA256 0cd0fa41bda28541c502aa4b9f195fdc5645c6496d75190956f74d9509833ed4 SHA512 9f8b8227840afe053de34255851c5ca65adca4621d147f8424023a29e13115e8cf6abb9b60d494b0eaa2a860252c010b67771a273b5e90de4bafbab04b7ebc1a WHIRLPOOL 85a1734e6fe638e1bbcb673f3607bca08d747d5a4d9f3185800e0eb2fefd954e2594feeaf6743bd93209ba07f438c7984c418f9b520045ac04b4a91add90a9f5
-EBUILD openldap-2.3.43-r4.ebuild 18292 SHA256 5b166082ffdf4ec5671e46328a06c42b07620c0a1de736beeb39e5afa97dc9f2 SHA512 cb6aa7e6970bfa909b412df65cdda44f8935136f8bd7365b05f7660e494dac7d2ff909c093d0ce36712b29ce8a5e908ae2192c569709710665501cb027140294 WHIRLPOOL 1c8423aec0338c95218df378f678b8c649137e8b581293341c9b99d72cc4cdd7b3585e92cdb2e04f3ff41ffb945ab0de069fd416decb2a9f97ef059059539a7d
+EBUILD openldap-2.3.43-r4.ebuild 18282 SHA256 2eb3c15f58c23ab44dc91945fa2b991ff538cbb3f606f5d32c30ea0cbb5a9a95 SHA512 7e87a3d5842953a948f8023684df1198a78874ba3b207831b3464242c853db41ad290de0043d41db80c3b626199191212eeea2ab6b64663e213e8135dfa11ba6 WHIRLPOOL 946eb623a67036c379cd8a037a7feddfa4e655929323f3eb7f2bb6d4d6855f5104833660e25769009d4b59cf85c68e0a24ea604f1124ee5f14aa2b3f9a22739c
 EBUILD openldap-2.4.19-r1.ebuild 19739 SHA256 b13cfe7371e4e139e92b74461bba139cd7202d613a416198fcdb5dbacb65e527 SHA512 33b2550dfbe4eff74cf39de433c5ab6f85f43b0b5ca4ac7ccfe7cc3061cde8acb5bc958ea708881f38e5c7d27bdbc5424a508b21133ec88c3d9bacf17c846741 WHIRLPOOL 5d51de159ae77c61248b8b8c1811f894bf86caf95ca542c16e7dca10ed178944b1fac7b071cffe0acdebfc44362360820423f2c72dde6e3b05303a2638724fd3
 EBUILD openldap-2.4.21.ebuild 20075 SHA256 6ece30fb44180dcde40004381a76a75e7f09f8d0cfa64f88e0b354bc83596e23 SHA512 2cb96f28e8209d4562282c28c472c4fc1def4465beab734fa8b09f9ed3abcba88e2026a6f7c53d45aa355c790b7d5714bbb2923fe014c6179712d6868400e07a WHIRLPOOL 22bf233bd84562354b8e16c5940c99508b19a9e1ebf9a96d940953bb7c82f6e39d18d72cfd86191272bfc947fccfe186fc8589ec0c2a822ffb058bb4bb3a5978
 EBUILD openldap-2.4.23.ebuild 20064 SHA256 be49b6abea0bbf5cb25179ffe4afb793617507915dc4d3fed213275ccb352e21 SHA512 fab787cd8a65223fd10b97fc36e9322d829d27fc90e530c0e9aaedd9b668689169aeeb59f20300a2a2e12b741ed49ada4946a039e05c77857574205db07768f6 WHIRLPOOL 8520f30d6abd3ef8ee6afe9d69448f861bf1e478131c805c8e40873abe99ed6f6c160a2700d6cdcc92719247f8a5ff038d8ccc5c81837b4cc584a9cc8add170f
@@ -61,5 +61,5 @@ EBUILD openldap-2.4.33-r1.ebuild 22128 SHA256 ff2b9a7d59b468f696156d91957b210fb0
 EBUILD openldap-2.4.33-r2.ebuild 22185 SHA256 90adbb7cdf8097ffcdcc3d6a2113bb32599f61d09b8b45dfc87241b2bc4291f7 SHA512 aec70ec1058d3fcd522b7e609bb8501494fab08ed74639f6810e310e2e85887e1358645ed873d99f213b9fb710d0cb060e962b45d1d2b1a935b6b67debea889c WHIRLPOOL 8b08999deec515f41c6ed0c927f6b9ec174f60ee861494db97271ca33874c3e05aa0e1c522089d1bcb30e25b8c6954f320ea145b5f37899c6f6e052502d2af29
 EBUILD openldap-2.4.33.ebuild 22317 SHA256 0ce4a04acddb9bc60354329a543b67b41aa7750bff75e1487260df729e32e1fa SHA512 4b094db524df29aaa70bc75aee4aad2dfe87e78c77cd4eb8cd0d7dc227664f82c7b04716e26decf6a8b6f8315c693a417dda812c26844f8d51f97b2559476121 WHIRLPOOL cc3adda366efdf3334d879628b7541cb4650282e6123256a104486c82e678d12a9aad791ee24064da17497b4c9ed8fe32a26d02946747161b4d0efb62502fe6d
 EBUILD openldap-2.4.35.ebuild 22173 SHA256 8279211f8c3d28164cebf2edf8632820082759e004085c9d993d901237ba2fc4 SHA512 bc30c9303acbecafa727e998e76c513452f0562a9747e00c0d57ae0628fea1627eb684e2474add641e23855d9e8755d4cf50f2925d9d9979dcb5d87045abd7af WHIRLPOOL 20ec8d63012cc19a1c34f217b962f43e8192ce9c54ea08d22e8cc09ce5f980be6b7d78cde07a3edd88bf9188550ad938f2f59e9fc866a7748b3dd5181d3aea0e
-MISC ChangeLog 77773 SHA256 abccfaacdc85932705bc609adfa358f1e690aa1ad3fc6b49aa06658ed7b955cc SHA512 6fcc224faca0fbf9926fca580c2f2020d76024ed7fdef96d0d11c26b641d5d25670a07e656aadee5df2100a8e58052dc55a9389cc5b7ba3b5a343acab64111e9 WHIRLPOOL 3e2f5879f337a62e78560081e1a9995f019d81a2352d08b6588ad6e62953c464897be2296f3a784f569b99014ff81c3ebd790d4434b97507148c5c9bf5375337
+MISC ChangeLog 77891 SHA256 cc76a8c288e7b0735ce5d2b5f1dcd44f7e4f53e20b550e77ec8f265e0ff95b92 SHA512 5207162ac55648023c4f2a323ea8d8d4f0fd1f7934aeb881f23d819bfb7a3e0d3b7acee5c5d4cac386576f2c8f9638dafe0dad0f4f6cbfd4a2462470170402ea WHIRLPOOL acee489e0aceafcc5e9066495fc8dd99e10038b2c93487dbcf3d388f59556ab645add99eb7c1649ad68009ecfce6c602598cc913dfa3f82b5a802e414afd982f
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/openldap-2.3.43-r4.ebuild b/net-nds/openldap/openldap-2.3.43-r4.ebuild
index 1a0ba389e703..f3b14f00bc6e 100644
--- a/net-nds/openldap/openldap-2.3.43-r4.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r4.ebuild,v 1.1 2013/09/13 02:30:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r4.ebuild,v 1.2 2013/09/16 04:27:41 patrick Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl samba sasl slp smbkrb5passwd ssl tcpd selinux"
 
 # note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP