Hi,
This diff updates py-ldap to the latest release 2.3.12.
Tested on amd64.
Comments ? OK ?
Cheers,
benoit
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 3 Sep 2010 12:34:55 -0000 1.23
+++ Makefile 1 Nov 2010 15:08:17 -0000
@@ -5,12 +5,10 @@
COMMENT-main= LDAP client API for Python
COMMENT-examples= example programs for the LDAP client API for Python
-V= 2.3.1
-DISTNAME= python-ldap-${V}
-PKGNAME-main= py-ldap-${V}
-REVISION-main = 4
-FULLPKGNAME-examples= py-ldap-examples-${V}
-REVISION-examples = 3
+MODPY_EGG_VERSION = 2.3.12
+DISTNAME= python-ldap-${MODPY_EGG_VERSION}
+PKGNAME-main= py-ldap-${MODPY_EGG_VERSION}
+FULLPKGNAME-examples= py-ldap-examples-${MODPY_EGG_VERSION}
FULLPKGPATH-examples= databases/py-ldap,-examples
CATEGORIES= databases
@@ -23,15 +21,15 @@
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-WANTLIB-main= crypto ssl
+WANTLIB-main= crypto ssl lber-2.3 ldap_r-2.3 sasl2
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+MASTER_SITES= ${MASTER_SITE_PYPI:=p/python-ldap/}
MODULES= lang/python
MODPY_VERSION= ${FLAVOR:S/python//}
-LIB_DEPENDS-main= ldap_r.>=7,lber.>=7::databases/openldap \
- sasl2.>=2::security/cyrus-sasl2
+LIB_DEPENDS-main= ::databases/openldap \
+ ::security/cyrus-sasl2
FLAVORS= python2.4 python2.6
FLAVOR?= python2.6
@@ -46,6 +44,9 @@
EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/setup.cfg
+
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
cd ${WRKSRC}; tar cf - Demo | tar xf - -C ${EXAMPLESDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-ldap/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 14 Jan 2008 11:11:33 -0000 1.10
+++ distinfo 1 Nov 2010 15:08:17 -0000
@@ -1,5 +1,5 @@
-MD5 (python-ldap-2.3.1.tar.gz) = Gpfg/vJWfjDXXtE3qJFFWQ==
-RMD160 (python-ldap-2.3.1.tar.gz) = CiiZyNJXSILGVa8pzroFR95zqRQ=
-SHA1 (python-ldap-2.3.1.tar.gz) = HqZZpTCBymNWUHx0vERcUv+aWUQ=
-SHA256 (python-ldap-2.3.1.tar.gz) =
KYat27FbvChdcb4ftgmMb6BREAOv52GQLxdBve5PKds=
-SIZE (python-ldap-2.3.1.tar.gz) = 76522
+MD5 (python-ldap-2.3.12.tar.gz) = La3FIbLCWQ2bAziUulxvMQ==
+RMD160 (python-ldap-2.3.12.tar.gz) = u3xxxFK4piPLt5BhSwlKEa4mJtY=
+SHA1 (python-ldap-2.3.12.tar.gz) = P7/RP9IfhI1VLKPhmB5N/+NUOME=
+SHA256 (python-ldap-2.3.12.tar.gz) =
PIUk36pZCdNa9ckn0kPCvYyIMexH5Y96LjCToyZKQrU=
+SIZE (python-ldap-2.3.12.tar.gz) = 112239
Index: patches/patch-Modules_constants_c
===================================================================
RCS file: patches/patch-Modules_constants_c
diff -N patches/patch-Modules_constants_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Modules_constants_c 1 Nov 2010 15:08:17 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- Modules/constants.c.orig Mon Nov 1 15:44:20 2010
++++ Modules/constants.c Mon Nov 1 15:45:39 2010
+@@ -181,7 +181,9 @@
+ #ifdef LDAP_OPT_X_TLS_CRLCHECK
+ /* only available if OpenSSL supports it => might cause backward
compability problems */
+ add_int(d,OPT_X_TLS_CRLCHECK);
++#ifdef LDAP_OPT_X_TLS_CRLFILE
+ add_int(d,OPT_X_TLS_CRLFILE);
++#endif
+ add_int(d,OPT_X_TLS_CRL_NONE);
+ add_int(d,OPT_X_TLS_CRL_PEER);
+ add_int(d,OPT_X_TLS_CRL_ALL);
Index: patches/patch-setup_cfg
===================================================================
RCS file: /cvs/ports/databases/py-ldap/patches/patch-setup_cfg,v
retrieving revision 1.7
diff -u -r1.7 patch-setup_cfg
--- patches/patch-setup_cfg 14 Jan 2008 11:11:33 -0000 1.7
+++ patches/patch-setup_cfg 1 Nov 2010 15:08:17 -0000
@@ -1,13 +1,14 @@
---- setup.cfg.orig Wed Nov 15 18:26:26 2006
-+++ setup.cfg Mon Jan 14 10:44:14 2008
-@@ -7,8 +7,8 @@
- # for wrapping OpenLDAP 2 libs
- [_ldap]
-
+$OpenBSD$
+--- setup.cfg.orig Thu Aug 5 16:44:52 2010
++++ setup.cfg Mon Nov 1 15:32:19 2010
+@@ -2,8 +2,8 @@
+ extra_objects =
+ extra_compile_args =
+ libs = ldap_r lber sasl2 ssl crypto
-library_dirs = /usr/local/openldap-2.3/lib
-include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl
-+library_dirs = /usr/local/lib
-+include_dirs = /usr/local/include /usr/local/include/sasl
++library_dirs = ${LOCALBASE}/lib
++include_dirs = ${LOCALBASE}/include ${LOCALBASE}/include/sasl
- extra_compile_args =
- extra_objects =
+ [egg_info]
+ tag_build =
Index: pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-examples,v
retrieving revision 1.6
diff -u -r1.6 PLIST-examples
--- pkg/PLIST-examples 30 Aug 2010 20:59:41 -0000 1.6
+++ pkg/PLIST-examples 1 Nov 2010 15:08:17 -0000
@@ -4,23 +4,32 @@
@pkgpath databases/py-ldap,-examples,python2.6
share/examples/py-ldap/
share/examples/py-ldap/Demo/
+share/examples/py-ldap/Demo/.cvsignore
share/examples/py-ldap/Demo/Lib/
+share/examples/py-ldap/Demo/Lib/.cvsignore
share/examples/py-ldap/Demo/Lib/ldap/
+share/examples/py-ldap/Demo/Lib/ldap/.cvsignore
share/examples/py-ldap/Demo/Lib/ldap/async/
+share/examples/py-ldap/Demo/Lib/ldap/async/.cvsignore
share/examples/py-ldap/Demo/Lib/ldap/async/deltree.py
share/examples/py-ldap/Demo/Lib/ldap/async/ldifwriter.py
share/examples/py-ldap/Demo/Lib/ldap/async/sizelimit.py
share/examples/py-ldap/Demo/Lib/ldapurl/
+share/examples/py-ldap/Demo/Lib/ldapurl/.cvsignore
share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
share/examples/py-ldap/Demo/Lib/ldif/
+share/examples/py-ldap/Demo/Lib/ldif/.cvsignore
share/examples/py-ldap/Demo/Lib/ldif/ldifcopy.py
share/examples/py-ldap/Demo/initialize.py
share/examples/py-ldap/Demo/ldapcontrols.py
+share/examples/py-ldap/Demo/matchedvalues.py
+share/examples/py-ldap/Demo/ms_ad_bind.py
share/examples/py-ldap/Demo/options.py
share/examples/py-ldap/Demo/page_control.py
share/examples/py-ldap/Demo/passwd_ext_op.py
share/examples/py-ldap/Demo/pickle_ldapobject.py
share/examples/py-ldap/Demo/pyasn1/
+share/examples/py-ldap/Demo/pyasn1/README
share/examples/py-ldap/Demo/pyasn1/prereadcontrol.py
share/examples/py-ldap/Demo/reconnect.py
share/examples/py-ldap/Demo/rename.py
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -r1.4 PLIST-main
--- pkg/PLIST-main 3 Sep 2010 12:34:55 -0000 1.4
+++ pkg/PLIST-main 1 Nov 2010 15:08:17 -0000
@@ -35,6 +35,9 @@
lib/python${MODPY_VERSION}/site-packages/ldap/modlist.py
lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyc
lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/resiter.py
+lib/python${MODPY_VERSION}/site-packages/ldap/resiter.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/resiter.pyo
lib/python${MODPY_VERSION}/site-packages/ldap/sasl.py
lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyc
lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyo
