Hello mentors, I sent the RFS for pam-pgsql below on Jan 24th. I would like a review from you and if the package is ok from your POV an upload to experimental. The package can be built in pbuilder. For your convenience I attach a debdiff against the version that is currently in the archive. The original upstream tarball contained a debian directory that I removed before building the package. I already filed a bug in upstreams bugtracker to remove this directory from the distributed tarball [1]. The change to the upstream tarball is mentioned in debian/README.source. [1] https://sourceforge.net/tracker2/?func=detail&aid=2543480&group_id=62198&atid=499727 Regards Jan Dittberner On Sat, Jan 24, 2009 at 12:01:09AM +0100, Jan Dittberner wrote: > Dear mentors, > > I am looking for a sponsor for the new version 0.6.4-1 > of my package "pam-pgsql". > > It builds these binary packages: > libpam-pgsql - PAM module to authenticate using a PostgreSQL database > > The package appears to be lintian clean. > > The upload would fix these bugs: 456679 (ITA) > > The package can be found on mentors.debian.net: > - URL: http://mentors.debian.net/debian/pool/main/p/pam-pgsql > - Source repository: deb-src http://mentors.debian.net/debian unstable main contrib non-free > - dget > http://mentors.debian.net/debian/pool/main/p/pam-pgsql/pam-pgsql_0.6.4-1.dsc > > I took the orphaned package and updated it to the latest upstream > version. I setup a git repository on git.debian.org and put the latest > uploaded version into the repository to use as base for the > packaging. My changes to the package are accurately documented in the > changelog and in the git repository. > > I would be glad if someone uploaded this package for me. > > Kind regards > Jan Dittberner
diffstat for pam-pgsql-0.6.3 pam-pgsql-0.6.4
debian/README.source | 34 ++++++++++++++++++++++++++++++++++
debian/changelog | 17 +++++++++++++++++
debian/control | 9 ++++++---
debian/copyright | 3 +--
debian/patches/ftbfs_441679.patch | 1 +
debian/patches/security_481970.patch | 13 -------------
debian/patches/series | 1 -
debian/watch | 2 +-
pam_pgsql.c | 2 +-
9 files changed, 61 insertions(+), 21 deletions(-)
diff -Nru pam-pgsql-0.6.3/debian/changelog pam-pgsql-0.6.4/debian/changelog
--- pam-pgsql-0.6.3/debian/changelog 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/changelog 2009-01-31 12:57:01.000000000 +0100
@@ -1,3 +1,20 @@
+pam-pgsql (0.6.4-1) experimental; urgency=low
+
+ * New Upstream Version
+ * Update watch file to use new upstream naming convention
+ * add debian/README.source
+ * debian/control:
+ - update Standards-Version to 3.8.0
+ - rewrap Build-Depends
+ - New maintainer (Closes: #456679)
+ - add Vcs-Git and Vcs-Browser fields
+ * remove debian/patches/security_481970.patch because it has been
+ applied by upstream
+ * debian/patches/ftbfs_441679.patch: add header to describe patch
+ * debian/copyright: update upstream URL
+
+ -- Jan Dittberner <jan@dittberner.info> Fri, 23 Jan 2009 23:48:08 +0100
+
pam-pgsql (0.6.3-2) unstable; urgency=high
* High-urgency QA upload to get security fix into testing.
diff -Nru pam-pgsql-0.6.3/debian/control pam-pgsql-0.6.4/debian/control
--- pam-pgsql-0.6.3/debian/control 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/control 2009-01-31 12:57:01.000000000 +0100
@@ -1,10 +1,13 @@
Source: pam-pgsql
Section: admin
Priority: extra
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5.0), autotools-dev, quilt (>= 0.40), libpam0g-dev, libpq-dev, libmhash-dev
+Maintainer: Jan Dittberner <jan@dittberner.info>
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5.0), autotools-dev, quilt (>= 0.40),
+ libpam0g-dev, libpq-dev, libmhash-dev
Homepage: http://sourceforge.net/projects/pam-pgsql/
+Vcs-Git: git://git.debian.org/git/collab-maint/pam-pgsql.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/pam-pgsql.git;a=summary
Package: libpam-pgsql
Architecture: any
diff -Nru pam-pgsql-0.6.3/debian/copyright pam-pgsql-0.6.4/debian/copyright
--- pam-pgsql-0.6.3/debian/copyright 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/copyright 2009-01-31 12:57:01.000000000 +0100
@@ -1,5 +1,5 @@
Upstream Author: David D.W. Downey ("pgpkeys") <david-downey@codecastle.com>
-Upstream Source: http://libpam-pgsql.codecastle.com
+Upstream Source: http://sourceforge.net/projects/pam-pgsql/
Copyright (c) 2000. Leon J Breedt <ljb@debian.org>, Copyright (c) 2002. David D.W. Downey ("pgpkeys") <david-downey@codecastle.com>
@@ -7,4 +7,3 @@
the GNU General Public License v2.0 or later.
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL file.
-
diff -Nru pam-pgsql-0.6.3/debian/patches/ftbfs_441679.patch pam-pgsql-0.6.4/debian/patches/ftbfs_441679.patch
--- pam-pgsql-0.6.3/debian/patches/ftbfs_441679.patch 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/patches/ftbfs_441679.patch 2009-01-31 12:57:01.000000000 +0100
@@ -1,3 +1,4 @@
+Fix FTBFS by including missing security/pam_client.h
--- pam-pgsql-0.5.2/pam_get_service.c~ 2007-09-13 09:27:02.000000000 +0200
+++ pam-pgsql-0.5.2/pam_get_service.c 2007-09-13 09:27:12.000000000 +0200
@@ -3,6 +3,7 @@
diff -Nru pam-pgsql-0.6.3/debian/patches/security_481970.patch pam-pgsql-0.6.4/debian/patches/security_481970.patch
--- pam-pgsql-0.6.3/debian/patches/security_481970.patch 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/patches/security_481970.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-Index: pam-pgsql-0.6.3/pam_pgsql.c
-===================================================================
---- pam-pgsql-0.6.3.orig/pam_pgsql.c 2008-05-24 19:37:21.000000000 +0200
-+++ pam-pgsql-0.6.3/pam_pgsql.c 2008-05-24 19:43:17.000000000 +0200
-@@ -583,7 +583,7 @@
- if ((rc = pam_get_user(pamh, &user, NULL)) == PAM_SUCCESS) {
- if ((rc = get_module_options(argc, argv, &options)) == PAM_SUCCESS) {
- DBGLOG("attempting to authenticate: %s", user);
-- if ((rc = pam_get_pass(pamh, PAM_AUTHTOK, &password, PASSWORD_PROMPT, options->std_flags) == PAM_SUCCESS)) {
-+ if ((rc = pam_get_pass(pamh, PAM_AUTHTOK, &password, PASSWORD_PROMPT, options->std_flags)) == PAM_SUCCESS) {
- if ((rc = auth_verify_password(pam_get_service(pamh), user, password, rhost, options)) == PAM_SUCCESS) {
- if ((password == 0 || *password == 0) && (flags & PAM_DISALLOW_NULL_AUTHTOK)) {
- rc = PAM_AUTH_ERR;
diff -Nru pam-pgsql-0.6.3/debian/patches/series pam-pgsql-0.6.4/debian/patches/series
--- pam-pgsql-0.6.3/debian/patches/series 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/patches/series 2009-01-31 12:57:01.000000000 +0100
@@ -1,2 +1 @@
ftbfs_441679.patch
-security_481970.patch
diff -Nru pam-pgsql-0.6.3/debian/README.source pam-pgsql-0.6.4/debian/README.source
--- pam-pgsql-0.6.3/debian/README.source 1970-01-01 01:00:00.000000000 +0100
+++ pam-pgsql-0.6.4/debian/README.source 2009-01-31 12:57:01.000000000 +0100
@@ -0,0 +1,34 @@
+The debian directory included by upstream has been removed from the
+tarball.
+
+This package uses quilt in order to apply patches to the upstream
+source. Patches are stored in debian/patches. For further details,
+see the man page for quilt.
+
+All commands described below should be run from the top directory of
+the package source tree, unless otherwise stated.
+
+ * To generate the fully patched source, in a form ready for editing,
+ that would be built to create Debian packages, run:
+
+ export QUILT_PATCHES=debian/patches
+ quilt push -a
+
+ * To modify the source and save those modifications so that they will
+ be applied when building the package, pick a suitably informative
+ patch file name, for example Modify_README.source, and then run:
+
+ export QUILT_PATCHES=debian/patches
+ quilt new Modify_README.source
+ quilt edit README.source
+
+ This will place you in your default editor to modify the file.
+ Once your are done editing, save the file and run:
+
+ quilt refresh
+
+ * To remove source modifications that are currently being applied
+ when building the package, run:
+
+ export QUILT_PATCHES=debian/patches
+ quilt top
diff -Nru pam-pgsql-0.6.3/debian/watch pam-pgsql-0.6.4/debian/watch
--- pam-pgsql-0.6.3/debian/watch 2009-01-31 12:57:01.000000000 +0100
+++ pam-pgsql-0.6.4/debian/watch 2009-01-31 12:57:01.000000000 +0100
@@ -1,3 +1,3 @@
version=3
-http://sf.net/pam-pgsql/libpam-pgsql-([\d.]+)\.tar\.bz2
+http://sf.net/pam-pgsql/pam-pgsql_([\d.]+)\.tar\.gz
diff -Nru pam-pgsql-0.6.3/pam_pgsql.c pam-pgsql-0.6.4/pam_pgsql.c
--- pam-pgsql-0.6.3/pam_pgsql.c 2006-05-16 23:59:44.000000000 +0200
+++ pam-pgsql-0.6.4/pam_pgsql.c 2009-01-23 22:15:25.000000000 +0100
@@ -583,7 +583,7 @@
if ((rc = pam_get_user(pamh, &user, NULL)) == PAM_SUCCESS) {
if ((rc = get_module_options(argc, argv, &options)) == PAM_SUCCESS) {
DBGLOG("attempting to authenticate: %s", user);
- if ((rc = pam_get_pass(pamh, PAM_AUTHTOK, &password, PASSWORD_PROMPT, options->std_flags) == PAM_SUCCESS)) {
+ if ((rc = pam_get_pass(pamh, PAM_AUTHTOK, &password, PASSWORD_PROMPT, options->std_flags)) == PAM_SUCCESS) {
if ((rc = auth_verify_password(pam_get_service(pamh), user, password, rhost, options)) == PAM_SUCCESS) {
if ((password == 0 || *password == 0) && (flags & PAM_DISALLOW_NULL_AUTHTOK)) {
rc = PAM_AUTH_ERR;
Attachment:
signature.asc
Description: Digital signature