update from 2.2.0 to 2.3.1

python2.5.core on exit disappears

ok mbalmer@
This commit is contained in:
winiger 2008-01-14 11:11:33 +00:00
parent 4ecac5813b
commit 0fa9ad5efd
6 changed files with 40 additions and 19 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.16 2008/01/11 09:03:16 winiger Exp $
# $OpenBSD: Makefile,v 1.17 2008/01/14 11:11:33 winiger Exp $
SHARED_ONLY= Yes
COMMENT-main= LDAP client API for Python
COMMENT-examples= example programs for the LDAP client API for Python
V= 2.2.0
V= 2.3.1
DISTNAME= python-ldap-${V}
PKGNAME-main= py-ldap-${V}p1
PKGNAME-main= py-ldap-${V}
FULLPKGNAME-examples= py-ldap-examples-${V}
CATEGORIES= databases

View File

@ -1,5 +1,5 @@
MD5 (python-ldap-2.2.0.tar.gz) = 8XsC7x3GqxLYGb/vnANmJw==
RMD160 (python-ldap-2.2.0.tar.gz) = 0Nx/OFLcmAsDLiS7ibb3aH1WJBI=
SHA1 (python-ldap-2.2.0.tar.gz) = vCUnWvRpC3Q4coeHvUKeJJ5CgmA=
SHA256 (python-ldap-2.2.0.tar.gz) = FD5CVZgX0TmuTLwB5Su6M5UxoUbj9zlkFgS5YEWtx4Q=
SIZE (python-ldap-2.2.0.tar.gz) = 70993
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

View File

@ -1,12 +1,12 @@
--- setup.cfg.orig Thu Nov 16 11:00:19 2006
+++ setup.cfg Thu Nov 16 11:02:19 2006
--- 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]
-library_dirs = /usr/local/openldap-REL_ENG_2_1/lib /usr/local/cyrus-sasl/lib
-include_dirs = /usr/local/openldap-REL_ENG_2_1/include /usr/local/cyrus-sasl/include
+library_dirs = /usr/local/lib /usr/local/lib/sasl2/lib
-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
extra_compile_args =

View File

@ -1,6 +1,19 @@
--- setup.py.orig Wed Oct 27 00:29:10 2004
+++ setup.py Mon Nov 22 22:04:13 2004
@@ -27,8 +27,14 @@ f.close()
--- setup.py.orig Wed Jul 25 00:42:56 2007
+++ setup.py Mon Jan 14 11:12:16 2008
@@ -7,11 +7,7 @@ $Id: setup.py,v 1.61 2007/07/16 10:40:29 stroeder Exp
"""
has_setuptools = False
-try:
- from setuptools import setup, Extension
- has_setuptools = True
-except ImportError:
- from distutils.core import setup, Extension
+from distutils.core import setup, Extension
from ConfigParser import ConfigParser
import sys,os,string,time
@@ -33,8 +29,14 @@ f.close()
#-- A class describing the features and requirements of OpenLDAP 2.0
class OpenLDAP2:

View File

@ -1,9 +1,12 @@
@comment $OpenBSD: PLIST-examples,v 1.3 2008/01/11 09:03:16 winiger Exp $
@comment $OpenBSD: PLIST-examples,v 1.4 2008/01/14 11:11:33 winiger Exp $
share/examples/py-ldap/
share/examples/py-ldap/Demo/
share/examples/py-ldap/Demo/Lib/
share/examples/py-ldap/Demo/Lib/ldap/
share/examples/py-ldap/Demo/Lib/ldap/res/
share/examples/py-ldap/Demo/Lib/ldap/async/
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/urlsearch.py
share/examples/py-ldap/Demo/Lib/ldif/
@ -11,10 +14,14 @@ 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/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/prereadcontrol.py
share/examples/py-ldap/Demo/reconnect.py
share/examples/py-ldap/Demo/rename.py
share/examples/py-ldap/Demo/resiter.py
share/examples/py-ldap/Demo/sasl_bind.py
share/examples/py-ldap/Demo/schema.py
share/examples/py-ldap/Demo/schema_tree.py

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.1 2008/01/11 09:03:16 winiger Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2008/01/14 11:11:33 winiger Exp $
@option no-default-conflict
@conflict py-ldap-*-python${MODPY_VERSION}
lib/python${MODPY_VERSION}/site-packages/_ldap.so
lib/python${MODPY_VERSION}/site-packages/dsml.py
lib/python${MODPY_VERSION}/site-packages/dsml.pyc