From bde958a4a8e766d9cafd2a191330011fbbaacfae8d4edf3a03eb78508cbcc14f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 2 Aug 2007 21:30:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-ldap?expand=0&rev=3 --- python-ldap-2.2.0-dealloc.patch | 11 ----- python-ldap-2.2.0-ssize.patch | 80 --------------------------------- python-ldap-2.2.0.tar.bz2 | 3 -- python-ldap-2.3.1.tar.bz2 | 3 ++ python-ldap.changes | 10 +++++ python-ldap.spec | 25 ++++++----- 6 files changed, 27 insertions(+), 105 deletions(-) delete mode 100644 python-ldap-2.2.0-dealloc.patch delete mode 100644 python-ldap-2.2.0-ssize.patch delete mode 100644 python-ldap-2.2.0.tar.bz2 create mode 100644 python-ldap-2.3.1.tar.bz2 diff --git a/python-ldap-2.2.0-dealloc.patch b/python-ldap-2.2.0-dealloc.patch deleted file mode 100644 index 5e844d1..0000000 --- a/python-ldap-2.2.0-dealloc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/LDAPObject.c -+++ Modules/LDAPObject.c -@@ -54,7 +54,7 @@ - } - self->ldap = NULL; - } -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /*------------------------------------------------------------ diff --git a/python-ldap-2.2.0-ssize.patch b/python-ldap-2.2.0-ssize.patch deleted file mode 100644 index 94b9d51..0000000 --- a/python-ldap-2.2.0-ssize.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- Modules/LDAPObject.c -+++ Modules/LDAPObject.c -@@ -22,6 +22,8 @@ - #include - #endif - -+inline static int Py_wrap_ssize (Py_ssize_t s) { return (s > INT_MAX) ? INT_MAX : s; } -+ - static void free_attrs(char***); - - /* constructor */ -@@ -152,10 +154,10 @@ - if (lm->mod_bvalues[0] == NULL) - goto nomem; - lm->mod_bvalues[1] = NULL; -- lm->mod_bvalues[0]->bv_len = PyString_Size(list); -+ lm->mod_bvalues[0]->bv_len = Py_wrap_ssize(PyString_Size(list)); - lm->mod_bvalues[0]->bv_val = PyString_AsString(list); - } else if (PySequence_Check(list)) { -- nstrs = PySequence_Length(list); -+ nstrs = Py_wrap_ssize(PySequence_Length(list)); - lm->mod_bvalues = PyMem_NEW(struct berval *, nstrs + 1); - if (lm->mod_bvalues == NULL) - goto nomem; -@@ -173,7 +175,7 @@ - Py_DECREF(item); - goto error; - } -- lm->mod_bvalues[i]->bv_len = PyString_Size(item); -+ lm->mod_bvalues[i]->bv_len = Py_wrap_ssize(PyString_Size(item)); - lm->mod_bvalues[i]->bv_val = PyString_AsString(item); - Py_DECREF(item); - } -@@ -220,7 +222,7 @@ - return NULL; - } - -- len = PySequence_Length(list); -+ len = Py_wrap_ssize(PySequence_Length(list)); - - if (len < 0) { - PyErr_SetObject( PyExc_TypeError, Py_BuildValue("sO", -@@ -274,7 +276,7 @@ - "expected *list* of strings, not a string", attrlist )); - goto error; - } else if (PySequence_Check(attrlist)) { -- len = PySequence_Length(attrlist); -+ len = Py_wrap_ssize(PySequence_Length(attrlist)); - attrs = PyMem_NEW(char *, len + 1); - if (attrs == NULL) - goto nomem; ---- Modules/ldapcontrol.c -+++ Modules/ldapcontrol.c -@@ -14,6 +14,8 @@ - - #include "lber.h" - -+inline static int Py_wrap_ssize (Py_ssize_t s) { return (s > INT_MAX) ? INT_MAX : s; } -+ - /* Prints to stdout the contents of an array of LDAPControl objects */ - - /* XXX: This is a debugging tool, and the printf generates some warnings -@@ -109,7 +111,7 @@ - berbytes.bv_val = NULL; - } - else if (PyString_Check(bytes)) { -- berbytes.bv_len = PyString_Size(bytes); -+ berbytes.bv_len = Py_wrap_ssize(PyString_Size(bytes)); - berbytes.bv_val = PyString_AsString(bytes); - } - else { -@@ -141,7 +143,7 @@ - return NULL; - } - -- len = PySequence_Length(list); -+ len = Py_wrap_ssize(PySequence_Length(list)); - ldcs = PyMem_NEW(LDAPControl*, len + 1); - if (ldcs == NULL) { - PyErr_NoMemory(); diff --git a/python-ldap-2.2.0.tar.bz2 b/python-ldap-2.2.0.tar.bz2 deleted file mode 100644 index f327176..0000000 --- a/python-ldap-2.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:528d9c5b064100188899c6c27a67523da5bf456c3ac08f10a247e787ec6b3c60 -size 61856 diff --git a/python-ldap-2.3.1.tar.bz2 b/python-ldap-2.3.1.tar.bz2 new file mode 100644 index 0000000..4d4635c --- /dev/null +++ b/python-ldap-2.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96905d3eab5eb02274b1d3bfb51a3eed64c4604ee09200afa787567f3ea09fb9 +size 65814 diff --git a/python-ldap.changes b/python-ldap.changes index 895f467..1fffe98 100644 --- a/python-ldap.changes +++ b/python-ldap.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Aug 1 18:01:02 CEST 2007 - jmatejek@suse.cz + +- update to 2.3.1 + * openLDAP 2.3+ is now required + * upstream fixed python2.5 problems + * support for Cancel operation + * DN related functions moved to submodule ldap.dn + * numerous bugfixes + ------------------------------------------------------------------- Mon Jan 22 18:48:58 CET 2007 - jmatejek@suse.cz diff --git a/python-ldap.spec b/python-ldap.spec index 5f5ef7d..dd311f6 100644 --- a/python-ldap.spec +++ b/python-ldap.spec @@ -1,5 +1,5 @@ # -# spec file for package python-ldap (Version 2.2.0) +# spec file for package python-ldap (Version 2.3.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,20 +11,18 @@ # norootforbuild Name: python-ldap -BuildRequires: krb5 openldap2-client >= 2.2 openldap2-devel python-devel -Requires: openldap2-client >= 2.2 -License: Other License(s), see package +BuildRequires: krb5 openldap2-client >= 2.3 openldap2-devel python-devel +Requires: openldap2-client >= 2.3 +License: Public domain Group: Development/Libraries/Python Autoreqprov: on -Version: 2.2.0 -Release: 23 +Version: 2.3.1 +Release: 1 Summary: Python LDAP interface URL: http://python-ldap.sourceforge.net/ Source: python-ldap-%{version}.tar.bz2 Source1: setup.cfg.suse-linux Patch0: python-ldap-sasl.patch -Patch1: python-ldap-2.2.0-ssize.patch -Patch2: python-ldap-2.2.0-dealloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} @@ -43,8 +41,6 @@ Authors: %prep %setup %patch0 -%patch1 -%patch2 cp %{S:1} setup.cfg %build @@ -62,7 +58,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc README Demo CHANGES TODO LICENCE -%changelog -n python-ldap +%changelog +* Wed Aug 01 2007 - jmatejek@suse.cz +- update to 2.3.1 + * openLDAP 2.3+ is now required + * upstream fixed python2.5 problems + * support for Cancel operation + * DN related functions moved to submodule ldap.dn + * numerous bugfixes * Mon Jan 22 2007 - jmatejek@suse.cz - removed dependency on openldap, added dependency on openldap-client * Thu Nov 16 2006 - jmatejek@suse.cz