Merge lp:~vorlon/ubuntu/quantal/python-pam/python3 into lp:ubuntu/quantal/python-pam

[Steve Langasek]

python-pam is not maintained upstream or in Debian, so I guess it's up to
us to fix this one.

[Barry Warsaw (barry)]

Steve, this looks good. My only minor thought is the API change in the repr() to always be unicode. I.e. this is a change for the Python 2 version, but since it's just a repr it doesn't bother me. I like Saphhira's additional patch, though with a few changes.

I'll mark this approved, merge yours and Sapphira's into trunk and upload.

Thanks both of you for the patch!

[Barry Warsaw (barry)]

review: Approve

Unmerged revisions

20. By Steve Langasek on 2012-05-25

Modernize packaging to dh and debhelper 9.

19. By Steve Langasek on 2012-05-25

use PyModule_Create instead of Py_InitModule for python3

18. By Steve Langasek on 2012-05-25

use PyLong_FromLong when building for python3.

17. By Steve Langasek on 2012-05-25

use PyUnicode_FromString, not PyString_FromString

16. By Steve Langasek on 2012-05-25

* Port to python3; dead project upstream so not forwarding anywhere.
  - replace 'staticforward' with 'static'.
  - replace ob_type with Py_TYPE(ob).
  - drop tp_getattr function, we just need to set tp_methods instead.
  - fix PyTypeObject definition.

=== modified file 'PAMmodule.c'
--- PAMmodule.c	2012-03-08 08:06:43 +0000
+++ PAMmodule.c	2012-05-25 03:33:19 +0000
@@ -24,7 +24,7 @@
     PyObject            *userData;
 } PyPAMObject;
 
-staticforward PyTypeObject PyPAMObject_Type;
+static PyTypeObject PyPAMObject_Type;
 
 static void PyPAM_Err(PyPAMObject *self, int result)
 {
@@ -107,7 +107,7 @@
     PyPAMObject         *p;
     struct pam_conv     *spc;
 
-    PyPAMObject_Type.ob_type = &PyType_Type;
+    Py_TYPE(&PyPAMObject_Type) = &PyType_Type;
     p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type);
 
     if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) {
@@ -490,29 +490,23 @@
     PyObject_FREE(self);
 }
 
-static PyObject * PyPAM_getattr(PyPAMObject *self, char *name)
-{
-    return Py_FindMethod(PyPAMObject_Methods, (PyObject *) self, name);
-}
-
 static PyObject * PyPAM_repr(PyPAMObject *self)
 {
     char                buf[1024];
     
     snprintf(buf, 1024, "<pam object, service=\"%s\", user=\"%s\", conv=%p, pamh=%p>",
         self->service, self->user, self->conv, self->pamh);
-    return PyString_FromString(buf);
+    return PyUnicode_FromString(buf);
 }
 
 static PyTypeObject PyPAMObject_Type = {
-    PyObject_HEAD_INIT(0)   /* Must fill in type value later */
-    0,
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)   /* Must fill in type value later */
     "pam",
     sizeof(PyPAMObject),
     0,
     (destructor)PyPAM_dealloc,      /*tp_dealloc*/
     0,      /*tp_print*/
-    (getattrfunc)PyPAM_getattr,     /*tp_getattr*/
+    0,      /*tp_getattr*/
     0,      /*tp_setattr*/
     0,      /*tp_compare*/
     (reprfunc)PyPAM_repr,           /*tp_repr*/
@@ -526,6 +520,16 @@
     {NULL, NULL, 0, NULL}
 };
 
+#if PY_MAJOR_VERSION > 2
+static struct PyModuleDef PyPAM_Module = {
+    PyModuleDef_HEAD_INIT,
+    "PAM",    /* name of module */
+    NULL,     /* module documentation */
+    -1,       /* size of per-interpreter state */
+    PyPAM_Methods
+};
+#endif
+
 static char PyPAMObject_doc[] = "";
 
 /* Convenience routine to export an integer value.
@@ -535,7 +539,11 @@
  */
 static void insint(PyObject *d, char *name, int value)
 {
+#if PY_MAJOR_VERSION > 2
+    PyObject            *v = PyLong_FromLong((long) value);
+#else
     PyObject            *v = PyInt_FromLong((long) value);
+#endif
 
     if (!v || PyDict_SetItemString(d, name, v))
         PyErr_Clear();
@@ -547,7 +555,11 @@
 {
     PyObject            *m, *d;
 
+#if PY_MAJOR_VERSION > 2
+    m = PyModule_Create(&PyPAM_Module);
+#else
     m = Py_InitModule("PAM", PyPAM_Methods);
+#endif
     d = PyModule_GetDict(m);
     
     PyPAM_Error = PyErr_NewException("PAM.error", NULL, NULL);
@@ -555,8 +567,8 @@
         return;
     PyDict_SetItemString(d, "error", PyPAM_Error);
 
-    PyPAMObject_Type.ob_type = &PyType_Type;
     PyPAMObject_Type.tp_doc = PyPAMObject_doc;
+    PyPAMObject_Type.tp_methods = PyPAMObject_Methods,
     Py_INCREF(&PyPAMObject_Type);
 
     insint(d, "PAM_SUCCESS", PAM_SUCCESS);
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-08 08:06:43 +0000
+++ debian/changelog	2012-05-25 03:33:19 +0000
@@ -1,3 +1,17 @@
+python-pam (0.4.2-12.2ubuntu5) UNRELEASED; urgency=low
+
+  * Port to python3; dead project upstream so not forwarding anywhere.
+    - replace 'staticforward' with 'static'.
+    - replace ob_type with Py_TYPE(ob).
+    - drop tp_getattr function, we just need to set tp_methods instead.
+    - fix PyTypeObject definition.
+    - use PyUnicode_FromString, not PyString_FromString
+    - use PyLong_FromLong when building for python3.
+    - use PyModule_Create instead of Py_InitModule for python3
+  * Modernize packaging to dh and debhelper 9.
+
+ -- Steve Langasek <[e-mail]>  Thu, 24 May 2012 22:56:26 +0000
+
 python-pam (0.4.2-12.2ubuntu4) precise; urgency=low
 
   * SECURITY UPDATE: possible code execution via double-free (LP: #949218)
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-05-25 03:33:19 +0000
@@ -0,0 +1,1 @@
+9
 
=== modified file 'debian/control'
--- debian/control	2012-03-08 08:06:43 +0000
+++ debian/control	2012-05-25 03:33:19 +0000
@@ -1,14 +1,16 @@
 Source: python-pam
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-all-dbg, libpam0g-dev
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.3.5-11), python-all-dbg, python3-all-dev, python3-all-dbg, libpam0g-dev
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Dima Barsky <[e-mail]>
-Standards-Version: 3.7.2
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Standards-Version: 3.9.3
 
 Package: python-pam
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python2.3-pam, python2.4-pam
 Replaces: python2.3-pam, python2.4-pam
 Provides: ${python:Provides}
@@ -22,10 +24,32 @@
 Package: python-pam-dbg
 Priority: extra
 Architecture: any
-Depends: python-pam (= ${Source-Version}), python-dbg
+Depends: python-pam (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 Description: A Python interface to the PAM library (debug extension)
  This module makes the PAM (Pluggable Authentication Modules) functions
  available in Python. With this module you can write Python applications
  that implement authentication services using PAM.
  .
  This package contains the extension built for the python debug interpreter.
+
+Package: python3-pam
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
+Suggests: python3-pam-dbg
+XB-Python-Version: ${python3:Versions}
+Description: A Python interface to the PAM library
+ This module makes the PAM (Pluggable Authentication Modules) functions
+ available in Python 3. With this module you can write Python 3 applications
+ that implement authentication services using PAM.
+
+Package: python3-pam-dbg
+Priority: extra
+Architecture: any
+Depends: python3-pam (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: A Python interface to the PAM library (debug extension)
+ This module makes the PAM (Pluggable Authentication Modules) functions
+ available in Python 3. With this module you can write Python 3 applications
+ that implement authentication services using PAM.
+ .
+ This package contains the extension built for the python debug interpreter.
 
=== added file 'debian/python-pam-dbg.install'
--- debian/python-pam-dbg.install	1970-01-01 00:00:00 +0000
+++ debian/python-pam-dbg.install	2012-05-25 03:33:19 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2*/dist-packages/*_d.so
 
=== added file 'debian/python-pam.examples'
--- debian/python-pam.examples	1970-01-01 00:00:00 +0000
+++ debian/python-pam.examples	2012-05-25 03:33:19 +0000
@@ -0,0 +1,1 @@
+examples/*
 
=== added file 'debian/python-pam.install'
--- debian/python-pam.install	1970-01-01 00:00:00 +0000
+++ debian/python-pam.install	2012-05-25 03:33:19 +0000
@@ -0,0 +1,2 @@
+usr/lib/python2*/dist-packages/*[!_][!_].so
+usr/lib/python2*/dist-packages/*.egg-info
 
=== added file 'debian/python3-pam-dbg.install'
--- debian/python3-pam-dbg.install	1970-01-01 00:00:00 +0000
+++ debian/python3-pam-dbg.install	2012-05-25 03:33:19 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3/dist-packages/*-[0-9][0-9]d*.so
 
=== added file 'debian/python3-pam.examples'
--- debian/python3-pam.examples	1970-01-01 00:00:00 +0000
+++ debian/python3-pam.examples	2012-05-25 03:33:19 +0000
@@ -0,0 +1,1 @@
+examples/*
 
=== added file 'debian/python3-pam.install'
--- debian/python3-pam.install	1970-01-01 00:00:00 +0000
+++ debian/python3-pam.install	2012-05-25 03:33:19 +0000
@@ -0,0 +1,2 @@
+usr/lib/python3/dist-packages/*-[0-9][0-9][!d]*.so
+usr/lib/python3/dist-packages/*.egg-info
 
=== modified file 'debian/rules'
--- debian/rules	2010-11-24 16:06:15 +0000
+++ debian/rules	2012-05-25 03:33:19 +0000
@@ -2,67 +2,37 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=5
-
-PYVERS=$(shell pyversions -r)
-
--include /usr/share/python/python.mk
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	set -e; \
-	for python in $(PYVERS); do \
-		$$python setup.py build; \
-		$$python-dbg setup.py build; \
-	done
-	touch build-stamp
-
-clean:
-	dh_testdir
-	set -e; \
-	for python in $(PYVERS); do \
-		$$python setup.py clean; \
-		$$python-dbg setup.py clean; \
-	done
-	rm -rf build-stamp build
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	set -e; \
-	for python in $(PYVERS); do \
-		$$python setup.py install --root=debian/python-pam --install-layout=deb; \
-		$$python-dbg setup.py install --root=debian/python-pam-dbg --install-layout=deb; \
-	done
-	find debian/python-pam-dbg ! -type d ! -name '*_d.so' | xargs rm -f
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -a AUTHORS README
-	dh_installexamples -a examples/*
-	dh_installchangelogs -a ChangeLog
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
+%:
+	dh $@ --with python2,python3
+
+build-python%:
+	python$* setup.py build
+	python$*-dbg setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+	python$*-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf *.egg-info
+
+override_dh_installdocs:
+	dh_installdocs AUTHORS README
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
 	rm -rf debian/python-pam-dbg/usr/share/doc/python-pam-dbg
 	ln -sf python-pam debian/python-pam-dbg/usr/share/doc/python-pam-dbg
-	dh_strip -a -Npython-pam-dbg --dbg-package=python-pam-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_python2 -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+	rm -rf debian/python3-pam-dbg/usr/share/doc/python3-pam-dbg
+	ln -sf python3-pam debian/python3-pam-dbg/usr/share/doc/python3-pam-dbg