add patched python ldap

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1940 6952d904-891a-0410-993b-d76249ca496b
2010-02-05 18:30:23 +00:00 · 2010-02-05 18:30:23 +00:00 · 6a61197edc
commit 6a61197edc
parent d76e854b14
5 changed files with 397 additions and 0 deletions
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@ -0,0 +1,299 @@
+# ChangeLog for dev-python/python-ldap
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.75 2010/01/10 17:41:52 ranger Exp $
+
+  10 Jan 2010; Brent Baude <ranger@gentoo.org> python-ldap-2.3.10.ebuild:
+  stable ppc64, bug 295694
+
+  29 Dec 2009; Raúl Porcel <armin76@gentoo.org> python-ldap-2.3.10.ebuild:
+  alpha/ia64/sparc stable wrt #295694
+
+  16 Dec 2009; Markus Meier <maekke@gentoo.org> python-ldap-2.3.10.ebuild:
+  amd64/x86 stable, bug #295694
+
+  09 Dec 2009; nixnut <nixnut@gentoo.org> python-ldap-2.3.10.ebuild:
+  ppc stable #295694
+
+  08 Dec 2009; Jeroen Roovers <jer@gentoo.org> python-ldap-2.3.10.ebuild:
+  Stable for HPPA (bug #295694).
+
+  03 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-ldap-2.3.10.ebuild:
+  Update dependencies (bug #291671).
+
+*python-ldap-2.3.10 (01 Nov 2009)
+
+  01 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -python-ldap-2.2.1.ebuild, +python-ldap-2.3.10.ebuild:
+  Version bump.
+
+  05 Oct 2009; Raúl Porcel <armin76@gentoo.org> python-ldap-2.3.9.ebuild:
+  ia64/sparc stable wrt #284973
+
+  01 Oct 2009; Tobias Klausmann <klausman@gentoo.org>
+  python-ldap-2.3.9.ebuild:
+  Stable on alpha, bug #284973
+
+  27 Sep 2009; nixnut <nixnut@gentoo.org> python-ldap-2.3.9.ebuild:
+  ppc stable #284973
+
+  26 Sep 2009; Brent Baude <ranger@gentoo.org> python-ldap-2.3.9.ebuild:
+  Marking python-ldap-2.3.9 ppc64 for bug 284973
+
+  22 Sep 2009; Jeroen Roovers <jer@gentoo.org> python-ldap-2.3.9.ebuild:
+  Stable for HPPA (bug #284973).
+
+  18 Sep 2009; Markus Meier <maekke@gentoo.org> python-ldap-2.3.9.ebuild:
+  amd64 stable, bug #284973
+
+  16 Sep 2009; Christian Faulhammer <fauli@gentoo.org>
+  python-ldap-2.3.9.ebuild:
+  stable x86, bug 284973
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/python-ldap-2.3.5-gcc44.patch:
+  Remove unused patch.
+
+  04 Sep 2009; Patrick Lauer <patrick@gentoo.org> -python-ldap-2.3.1.ebuild,
+  -python-ldap-2.3.5.ebuild:
+  Remove old
+
+*python-ldap-2.3.9 (05 Aug 2009)
+
+  05 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +python-ldap-2.3.9.ebuild:
+  Version bump. Set SUPPORT_PYTHON_ABIS.
+
+  10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  python-ldap-2.3.5.ebuild, +files/python-ldap-2.3.5-gcc44.patch:
+  Fix compile with GCC 4.4 wrt #264543, thanks to Daniel J.
+
+*python-ldap-2.3.5 (10 Jul 2008)
+
+  10 Jul 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +python-ldap-2.3.5.ebuild:
+  Version bump, see bug #231378.
+
+*python-ldap-2.3.1 (15 Aug 2007)
+
+  15 Aug 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -python-ldap-2.3.ebuild, +python-ldap-2.3.1.ebuild:
+  Version bump, dropped old version.
+
+  24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -python-ldap-2.0.11.ebuild, python-ldap-2.2.1.ebuild:
+  Fixed $ROOT abuse (bug #167271), dropped old version.
+
+  15 Jun 2007; Raúl Porcel <armin76@gentoo.org> python-ldap-2.2.1.ebuild:
+  alpha stable wrt #172535
+
+  02 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  python-ldap-2.2.1.ebuild:
+  ppc stable, bug #172535
+
+  02 Apr 2007; Raúl Porcel <armin76@gentoo.org> python-ldap-2.2.1.ebuild:
+  ia64 stable wrt bug 172535
+
+  28 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  python-ldap-2.2.1.ebuild:
+  stable x86, bug 172535
+
+*python-ldap-2.3 (28 Mar 2007)
+
+  28 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +python-ldap-2.3.ebuild:
+  Version bump (bug #172470, thanks to Ken Garland)
+
+  28 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-ldap-2.2.1.ebuild:
+  Stable on sparc wrt #172535
+
+  17 Mar 2007; Steve Dibb <beandog@gentoo.org> python-ldap-2.2.1.ebuild:
+  amd64 stable
+
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  Transition to Manifest2.
+
+  04 Feb 2007; Markus Rothe <corsair@gentoo.org> python-ldap-2.2.1.ebuild:
+  Stable on ppc64; bug #164978
+
+  18 Jan 2007; Jeroen Roovers <jer@gentoo.org> python-ldap-2.2.1.ebuild:
+  Stable for HPPA (bug #147751).
+
+*python-ldap-2.2.1 (30 Dec 2006)
+
+  30 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
+  -python-ldap-2.2.0.ebuild, +python-ldap-2.2.1.ebuild:
+  Version bump, fixed bug #137503 and possible others. Dropped old version.
+
+  22 Dec 2006; Markus Rothe <corsair@gentoo.org> python-ldap-2.2.0.ebuild:
+  Added ~ppc64; bug #158855
+
+*python-ldap-2.2.0 (01 May 2006)
+
+  01 May 2006; Carsten Lohrke <carlo@gentoo.org> -python-ldap-2.0.6.ebuild,
+  -python-ldap-2.0.10.ebuild, +python-ldap-2.2.0.ebuild:
+  Version bump.
+
+  30 Apr 2006; Simon Stelling <blubb@gentoo.org> python-ldap-2.0.11.ebuild:
+  stable on amd64
+
+  12 Apr 2006; Bryan Østergaard <kloeri@gentoo.org
+  python-ldap-2.0.11.ebuild:
+  Stable on alpha, bug 123706.
+
+  23 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-ldap-2.0.11.ebuild:
+  Stable on sparc wrt #123706
+
+  23 Feb 2006; Joshua Jackson <tsunam@gentoo.org> python-ldap-2.0.11.ebuild:
+  stable on x86 for bug #123706
+
+  22 Feb 2006; <nixnut@gentoo.org> python-ldap-2.0.11.ebuild:
+  Stable on ppc. bug 123706
+
+  22 Feb 2006; Aron Griffis <agriffis@gentoo.org> python-ldap-2.0.11.ebuild:
+  Mark 2.0.11 stable on ia64. #123706
+
+*python-ldap-2.0.11 (01 Dec 2005)
+
+  01 Dec 2005; Carsten Lohrke <carlo@gentoo.org> +python-ldap-2.0.11.ebuild:
+  version bump
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  -python-ldap-2.0.0_pre05-r1.ebuild, -python-ldap-2.0.0_pre06.ebuild,
+  -python-ldap-2.0.0_pre13.ebuild, -python-ldap-2.0.0_pre15.ebuild,
+  -python-ldap-2.0.1.ebuild, -python-ldap-2.0.7.ebuild,
+  -python-ldap-2.0.8.ebuild, +python-ldap-2.0.10.ebuild:
+  clean up
+
+*python-ldap-2.0.10 (30 Sep 2005)
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +python-ldap-2.0.10.ebuild:
+  version bump
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> python-ldap-2.0.8.ebuild:
+  add ~ia64
+
+  14 Jul 2005; Simon Stelling <blubb@gentoo.org> python-ldap-2.0.8.ebuild:
+  added ~amd64 keyword
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.6.ebuild:
+  Stable on alpha.
+
+*python-ldap-2.0.8 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> +python-ldap-2.0.8.ebuild:
+  version bump
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-ldap-2.0.6.ebuild:
+  Stable on ppc.
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> python-ldap-2.0.6.ebuild:
+  Stable on SPARC.
+
+*python-ldap-2.0.7 (15 May 2005)
+
+  15 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.6.ebuild, +python-ldap-2.0.7.ebuild:
+  Version bump + x86 stable bump.
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-ldap-2.0.1.ebuild:
+  Stable on sparc
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.1.ebuild:
+  Stable on alpha.
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> python-ldap-2.0.6.ebuild:
+  err, whitespace
+
+*python-ldap-2.0.6 (14 Dec 2004)
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> python-ldap-2.0.1.ebuild,
+  +python-ldap-2.0.6.ebuild:
+  stable on x86, version bump
+
+  03 Nov 2004; <SeJo@gentoo.org> python-ldap-2.0.1.ebuild:
+  added ppc keyword
+
+  04 Jul 2004; David Holm <dholm@gentoo.org> python-ldap-2.0.1.ebuild:
+  Added to ~ppc.
+
+*python-ldap-2.0.1 (03 Jul 2004)
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +python-ldap-2.0.1.ebuild:
+  Version bump.
+
+  03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.0_pre15.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.0_pre05-r1.ebuild:
+  Add missing IUSE.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  Stable on sparc.
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre05-r1.ebuild, python-ldap-2.0.0_pre06.ebuild,
+  python-ldap-2.0.0_pre13.ebuild, python-ldap-2.0.0_pre15.ebuild:
+  fix license. it isn't public-domain
+
+*python-ldap-2.0.0_pre15 (13 Nov 2003)
+
+  13 Nov 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild, python-ldap-2.0.0_pre15.ebuild:
+  version bump
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  fix sasl header (#25693), updated compile/optimise options, made compatible
+  with python-2.3
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  added sasl dep and tweaked the usage of ldap and ldap_r in mylibs (#25143)
+
+*python-ldap-2.0.0_pre13 (01 Jul 2003)
+
+  01 Jul 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  version bump. adds sasl and ssl USE flags to correspond with openldap's USE
+  flags
+
+  22 May 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre06.ebuild:
+  uses distutils, dynamically patch setup.cfg
+
+*python-ldap-2.0.0_pre06 (15 Mar 2003)
+
+  15 Mar 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre06.ebuild:
+  version bump. thanks to Andy Dustman. #17519.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*python-ldap-2.0.0_pre05-r1 (24 Sep 2002)
+  24 Sep 2002; Jon Nelson <jnelson@gentoo.org> python-ldap-2.0.0_pre05-r1.ebuild:
+  Fix for bug 8275
+  Thanks to jason at penguinsolutions.com (Jason Jeremias)
+
+*python-ldap-2.0.0_pre05 (1 Aug 2002)
+
+  1 Aug 2002; Jon Nelson <jnelson@gentoo.org> python-ldap-2.0.0pre05.ebuild:
+  Update to pre05 and fix repoman errors in *this* release
+  
+*python-ldap-2.0.0pre04 (3 Apr 2002)
+
+  3 Apr 2002; Bruce A. Locke <blocke@shivan.org> python-ldap-2.0.0pre04.ebuild :
+
+  Initial Version
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@ -0,0 +1,7 @@
+DIST python-ldap-2.3.10.tar.gz 112840 RMD160 1784203fdb90b484c4d11edc032883ae75a64c84 SHA1 b15c15a71956c5f51a3642e513c206cf03d6248e SHA256 3c3bbf723440f2b8c7102994c9cd4666307df3d3538e110fff2d03681e7f284f
+DIST python-ldap-2.3.9.tar.gz 108209 RMD160 25d8555f548acdb418725f966f9ee94730f4ed77 SHA1 8d558259bfcda02e6b6be79e8dea18f744367dd5 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
+DIST python-ldap-docs-html-2.3.7.tar.gz 90650 RMD160 51a08f7008e36c360007f271a2e93de1b3f1adfa SHA1 246bcd4c164aa7f8cde9caae82d1a72fee5504ab SHA256 0e15675025504904cdbc2c5b23deba9149ab8b199b31cf7d532db57e4ef09102
+EBUILD python-ldap-2.3.10.ebuild 1875 RMD160 f9ad389d0238a9677fc7f11dc19d6d86c3457a5e SHA1 03eaf70905c7468994c96110289a5ca55ee2809a SHA256 4e076b8d922d3bc1ea84e692ccd731bd00f0a30f190e8f6aaff28a172802ad7b
+EBUILD python-ldap-2.3.9.ebuild 1829 RMD160 fe0dc9f08c6096a66b794a251ec55b47c0fc7f92 SHA1 1eff3082bcd6c8bb5f21540e6590709054c906b3 SHA256 ef740134038b1ba8bab51a82bcedeab3558d50c583fef20141daf5465eacdaf8
+MISC ChangeLog 9549 RMD160 913014b91a23263d02c1ef0bcd7d2af09574299e SHA1 4d59cad87ab5cbcd870645ce3699d9fc1b7ee392 SHA256 c578adb5d7e281619b8d2a05834443faaf079a7460b60fd03a95d2275859e7fe
+MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
--- a/dev-python/python-ldap/files/python-ldap-2.3.10-ldap-reconnect-1.patch
+++ b/dev-python/python-ldap/files/python-ldap-2.3.10-ldap-reconnect-1.patch
@ -0,0 +1,19 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-02-05
+Initial Package Version: 2.3.10
+Origin: https://ml.mandriva.net/wws/arc/mds-devel/2010-02/msg00004.html
+Upstream Status: unknown
+Description: pass on ldap reconnect
+ 
+diff -Naur python-ldap-2.3.10.orig/Lib/ldap/ldapobject.py python-ldap-2.3.10/Lib/ldap/ldapobject.py
+--- python-ldap-2.3.10.orig/Lib/ldap/ldapobject.py	2010-02-05 18:27:21.502050875 +0000
+++ python-ldap-2.3.10/Lib/ldap/ldapobject.py	2010-02-05 18:28:28.518334969 +0000
+@@ -783,6 +783,8 @@
+       del self._l
+       # Try to reconnect
+       self.reconnect(self._uri)
+      # Hide the error
+      pass
+       # Re-try last operation
+       return func(self,*args,**kwargs)
+ 
--- a/dev-python/python-ldap/metadata.xml
+++ b/dev-python/python-ldap/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+</pkgmetadata>
--- a/dev-python/python-ldap/python-ldap-2.3.10.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.3.10.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.10.ebuild,v 1.7 2010/01/10 17:41:52 ranger Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils multilib
+
+DOC_P="${PN}-docs-html-2.3.7"
+
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="http://pypi.python.org/packages/source/p/python-ldap/${P}.tar.gz
+	doc? ( http://www.python-ldap.org/doc/${DOC_P}.tar.gz )"
+HOMEPAGE="http://python-ldap.sourceforge.net/ http://pypi.python.org/pypi/python-ldap"
+
+SLOT="0"
+LICENSE="PYTHON"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc examples sasl ssl"
+
+RDEPEND=">=net-nds/openldap-2.4
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${DEPEND}
+	dev-python/setuptools"
+RESTRICT_PYTHON_ABIS="3.*"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/python-ldap-2.3.10-ldap-reconnect-1.patch
+	# Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4
+	sed -e "s:^library_dirs =.*:library_dirs =:" \
+		-e "s:^include_dirs =.*:include_dirs = /usr/include /usr/include/sasl:" \
+		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/$(get_libdir) -Wl,-rpath=/usr/$(get_libdir)/sasl2:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+
+	sed -e "s:^libs = .*:libs = lber resolv ${mylibs}:" \
+		-e "s:^compile.*:compile = 0:" \
+		-e "s:^optimize.*:optimize = 0:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+}
+
+src_install() {
+	distutils_src_install
+
+	use doc && dohtml -r "${WORKDIR}/${DOC_P}"/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r Demo
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize dsml.py ldapurl.py ldif.py ldap
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}