Your message dated Thu, 01 Dec 2016 10:50:41 +0000
with message-id <e1ccowr-000chy...@fasolo.debian.org>
and subject line Bug#670859: fixed in pam-mysql 0.8.0-1
has caused the Debian Bug report #670859,
regarding [PATCH] pam-mysql: Helping to update to packaging format 3.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
670859: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670859
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: pam-mysql
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 8081a6755004f4ca83f8abbd3b9a827cb1e6b2ea Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 29 Apr 2012 21:30:49 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
Makefile.in | 2 +-
aclocal.m4 | 2 +-
debian/changelog | 17 +++++++++---
debian/compat | 2 +-
debian/control | 4 +--
debian/libpam-mysql.config | 2 ++
debian/libpam-mysql.postinst | 4 +++
debian/patches/00list | 2 --
debian/patches/10-local-changes.patch | 29 ++++++++++++++++++++
.../patches/{01_openssl.patch => 20-openssl.patch} | 8 ++----
.../patches/{02_libpam.patch => 30-libpam.patch} | 9 ++----
debian/patches/series | 3 ++
debian/rules | 22 +++++++++------
debian/source/format | 1 +
14 files changed, 74 insertions(+), 33 deletions(-)
mode change 100644 => 100755 debian/libpam-mysql.config
mode change 100644 => 100755 debian/libpam-mysql.postinst
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/10-local-changes.patch
rename debian/patches/{01_openssl.patch => 20-openssl.patch} (63%)
rename debian/patches/{02_libpam.patch => 30-libpam.patch} (63%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/Makefile.in b/Makefile.in
index d62c22e..3640c99 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,7 +110,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-pam_mysql_la_LIBADD = -lpam
+pam_mysql_la_LIBADD =
pam_mysql_la_OBJECTS = pam_mysql.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/aclocal.m4 b/aclocal.m4
index 30d8c9a..31f37d2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -297,7 +297,7 @@ AC_DEFUN([PAM_MYSQL_CHECK_OPENSSL], [
if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
name="$ssl_lib_name"
if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
- LIBS="$LIBS -l$crypto_lib_name"
+ LIBS="$LIBS -l$crypto_lib_name -l$ssl_lib_name"
AC_CHECK_LIB([$crypto_lib_name], [CRYPTO_free], [
AC_CHECK_LIB([$ssl_lib_name], [SSL_CTX_new], [
diff --git a/debian/changelog b/debian/changelog
index 52ac334..5ded3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+pam-mysql (0.7~RC1-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets to rules file.
+ * Fix maintainer-script-lacks-debhelper-token (Lintian).
+ * Fix maintainer-script-ignores-errors (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix outdated-autotools-helper-file (Lintian); add depends autotools-dev.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 29 Apr 2012 21:03:37 +0300
+
pam-mysql (0.7~RC1-4) unstable; urgency=low
* Set bogus passwd in pam_mysql.conf so that root won't be able to
@@ -123,7 +136,3 @@ pam-mysql (0.1) unstable; urgency=low
* Initial Release.
-- Michael Alan Dorman <mdor...@debian.org> Wed, 1 Mar 2000 15:27:10 -0500
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index ac0ee61..efde692 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
Priority: extra
Maintainer: Paweł Więcek <co...@debian.org>
Uploaders: Lars Bahner <bah...@debian.org>
-Standards-Version: 3.8.0
-Build-Depends: libpam0g-dev, libmysqlclient15-dev, debhelper (>= 5.0.0), libssl-dev, dpatch
+Standards-Version: 3.9.3
+Build-Depends: libpam0g-dev, libmysqlclient15-dev, debhelper (>= 9), libssl-dev, autotools-dev
Package: libpam-mysql
Architecture: any
diff --git a/debian/libpam-mysql.config b/debian/libpam-mysql.config
old mode 100644
new mode 100755
index 3d079d6..cc07b53
--- a/debian/libpam-mysql.config
+++ b/debian/libpam-mysql.config
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
. /usr/share/debconf/confmodule
if [ -e /etc/pam-mysql.conf ]; then
diff --git a/debian/libpam-mysql.postinst b/debian/libpam-mysql.postinst
old mode 100644
new mode 100755
index d94d45c..4a8ab5b
--- a/debian/libpam-mysql.postinst
+++ b/debian/libpam-mysql.postinst
@@ -1,8 +1,12 @@
#!/bin/sh
+set -e
+
. /usr/share/debconf/confmodule
if [ -e /etc/pam-mysql.conf ] ; then
db_get pam-mysql/config_file_noread
if [ "$RET" = "true" ]; then chmod 0600 /etc/pam-mysql.conf; fi
fi
+
+#DEBHELPER#
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5d1aaa7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_openssl.patch
-02_libpam.patch
diff --git a/debian/patches/10-local-changes.patch b/debian/patches/10-local-changes.patch
new file mode 100644
index 0000000..1b624ce
--- /dev/null
+++ b/debian/patches/10-local-changes.patch
@@ -0,0 +1,29 @@
+From: Unknown
+Subject: Debian local changes
+
+diff --git a/Makefile.in b/Makefile.in
+index 3640c99..d62c22e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -110,7 +110,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-pam_mysql_la_LIBADD =
++pam_mysql_la_LIBADD = -lpam
+ pam_mysql_la_OBJECTS = pam_mysql.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff --git a/aclocal.m4 b/aclocal.m4
+index 31f37d2..30d8c9a 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -297,7 +297,7 @@ AC_DEFUN([PAM_MYSQL_CHECK_OPENSSL], [
+ if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
+ name="$ssl_lib_name"
+ if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
+- LIBS="$LIBS -l$crypto_lib_name -l$ssl_lib_name"
++ LIBS="$LIBS -l$crypto_lib_name"
+
+ AC_CHECK_LIB([$crypto_lib_name], [CRYPTO_free], [
+ AC_CHECK_LIB([$ssl_lib_name], [SSL_CTX_new], [
diff --git a/debian/patches/01_openssl.patch b/debian/patches/20-openssl.patch
similarity index 63%
rename from debian/patches/01_openssl.patch
rename to debian/patches/20-openssl.patch
index e8a9224..1f663ab 100644
--- a/debian/patches/01_openssl.patch
+++ b/debian/patches/20-openssl.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_openssl.patch by Lars Bahner <bah...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch makes sure Makefile references OPENSSL.
+From: Lars Bahner <bah...@debian.org>
+Subject: This patch makes sure Makefile references OPENSSL.
-@DPATCH@
diff -Naur pam_mysql-0.7RC1/Makefile.in pam-mysql-0.7~RC1/Makefile.in
--- pam_mysql-0.7RC1/Makefile.in 2006-01-09 11:36:34.000000000 +0100
+++ pam-mysql-0.7~RC1/Makefile.in 2009-01-25 22:03:56.000000000 +0100
diff --git a/debian/patches/02_libpam.patch b/debian/patches/30-libpam.patch
similarity index 63%
rename from debian/patches/02_libpam.patch
rename to debian/patches/30-libpam.patch
index c4bf38a..8f0d7fc 100644
--- a/debian/patches/02_libpam.patch
+++ b/debian/patches/30-libpam.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_libpam.patch by Lars Bahner <bah...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch makes sure Makefile references -lpam
-## to insure correct linking
+From: Lars Bahner <bah...@debian.org>
+Subject: This patch makes sure Makefile references -lpam
-@DPATCH@
diff -Naur old/Makefile.in pam-mysql_0.7~RC1/Makefile.in
--- old/Makefile.in 2009-01-30 18:11:47.000000000 +0100
+++ pam-mysql_0.7~RC1/Makefile.in 2009-01-26 08:44:59.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d9406ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-local-changes.patch
+20-openssl.patch
+30-libpam.patch
diff --git a/debian/rules b/debian/rules
index d7739b9..77da371 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-include /usr/share/dpatch/dpatch.make
arrange: arrange-stamp
arrange-stamp: install
@@ -33,23 +32,28 @@ binary-indep: binary-indep-stamp
binary-indep-stamp: arrange
touch binary-indep-stamp
-build: build-stamp patch
-build-stamp: config
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
+build-stamp: configure
dh_testdir
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- -$(MAKE) distclean
- dh_clean arrange-stamp binary-stamp binary-arch-stamp binary-indep-stamp build-stamp config-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) distclean
+ dh_clean arrange-stamp binary-stamp binary-arch-stamp binary-indep-stamp build-stamp configure-stamp install-stamp _i386.build confi.guess congig.sub
-config: config-stamp
-config-stamp:
+configure: configure-stamp
+configure-stamp:
dh_testdir
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
./configure --prefix=/usr --with-openssl --with-pam_mods_dir=/lib/security --with-pam=/usr
- touch config-stamp
+ touch configure-stamp
install: install-stamp
install-stamp: build
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
--- End Message ---
--- Begin Message ---
Source: pam-mysql
Source-Version: 0.8.0-1
We believe that the bug you reported is fixed in the latest version of
pam-mysql, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 670...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ferenc Wágner <wf...@debian.org> (supplier of updated pam-mysql package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 01 Dec 2016 11:19:34 +0100
Source: pam-mysql
Binary: libpam-mysql
Architecture: source
Version: 0.8.0-1
Distribution: unstable
Urgency: medium
Maintainer: Ferenc Wágner <wf...@debian.org>
Changed-By: Ferenc Wágner <wf...@debian.org>
Description:
libpam-mysql - PAM module interfacing with MySQL databases
Closes: 153915 490772 542084 670859 685480 685580 687555 687709 687723 687816
687945 688052 688154 688431 689040 689462 701104 765492 845886
Changes:
pam-mysql (0.8.0-1) unstable; urgency=medium
.
* [3c01801] Add gbp.conf
* [94abb69] Add watch file
* [c2aa7a2] New upstream release (0.8.0) (Closes: #153915, #701104, #765492)
* [35f1b01] Switch to 3.0 (quilt) source format (Closes: #670859)
* [b72aca0] Convert the needed dpatch into a quilt patch.
The OpenSSL define isn't needed anymore with 0.8.0.
* [9baf691] Run wrap-and-sort -ast
* [0277080] Switch to debhelper 9 and the dh sequencer
(Closes: #490772, #542084)
* [8c1a121] OpenSSL is used via pkg-config (Closes: #685480)
* [722876f] Conffiles under /etc are registered automatically by debhelper
* [0d425f6] 0.8.0 ships AUTHORS instead of CREDITS
* [f7bcabc] Play safe: add #DEBHELPER# token to our postinst
* [05aa024] Adopt the package
* [0207e87] Update Standards-Version to 3.9.8 (no changes required)
* [ac4dfab] Abort maintainer script execution on errors
* [cb277fa] Remove useless debian/libpam-mysql.substvarsold
* [ac5e1b2] Rip out debconf interface.
The generally sensible configuration is the default one.
For the rest, dpkg-statoverride is there.
(Closes: #685580, #687555, #687709, #687723, #687816, #687945, #688052,
#688154, #688431, #689040, #689462)
* [c7c2a4d] Override Lintian warning about permissions of pam-mysql.conf
* [bbbd6c8] Switch to machine-readable debian/copyright
* [7d69003] MariaDB client libraries are equally good for us (Closes:
#845886)
* [be2238a] Enable multi-arch
* [46f061c] Remove stale TODO file
* [65d9806] Enable hardening
* [e2fd9b5] Add Homepage field
* [65c419b] Add Vcs-Git and Vcs-Browser fields
* [b88603e] New patch Don-t-destroy-CPPFLAGS.patch.
Don't destroy CPPFLAGS
* [c8ad7b0] New patch Eliminate-obsolete-AC_OUTPUT-argument.patch.
Eliminate obsolete AC_OUTPUT argument
* [b5bd0a5] Fail build on undefined symbols in the module
* [0f734a2] New patch AC_CONFIG_FILES-are-automatically-distributed.patch.
AC_CONFIG_FILES are automatically distributed
* [bf7533a] Reword the package description.
Thanks to Justin B Rye in #685580.
* [bd601cf] New patch Fix-spelling-in-README-slogs-slows.patch.
Fix spelling in README: slogs -> slows
Checksums-Sha1:
52b593332fc103aa381562dda81ed3c47e656bca 1932 pam-mysql_0.8.0-1.dsc
88e65d665129a1af97e6aac6c15a7964629fcda2 41530 pam-mysql_0.8.0.orig.tar.gz
ca552db67e139fbeeed3da54cbac33c0c8f70c46 6508 pam-mysql_0.8.0-1.debian.tar.xz
Checksums-Sha256:
4b40783969001c84c288e2899ef60e4e9de3dfbb0077d7a0d31d6e6399aacac5 1932
pam-mysql_0.8.0-1.dsc
da57c877f6336f8a0c4022fdc654a20d3ce6e9551e29ae0181751ed3540d499b 41530
pam-mysql_0.8.0.orig.tar.gz
7dcfa07caf390a00e43861be35bdecc05fef6f8f7f6ecdc1c08e45d4712dd060 6508
pam-mysql_0.8.0-1.debian.tar.xz
Files:
836718686093e1cf79b09cab9174ef11 1932 admin extra pam-mysql_0.8.0-1.dsc
1a33d4f7a063f0dbb74514722afec1ad 41530 admin extra pam-mysql_0.8.0.orig.tar.gz
41c2fac0570352768630308ae8deb2de 6508 admin extra
pam-mysql_0.8.0-1.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCgAGBQJYP/pOAAoJEDrI9xZHftsjkSQQAJYMYZWVli56iTAJqivRNOYV
gMEbRYn5yQW8ge+AYgdSbuAv2FKFsLiA+PAsWJlyL2MJUDjUngj8b6jzLk5Fjmw3
+BB9XaUxC1Ru6gBda5z/9Q1zQOdNC/sfNFHk7T8votiW/umjS5uDjlysd5tn2xO7
EDQuCnXdw4GnLODR3CIdvdjXLDX/Do6AisFRCrn06R2BeGKCPTm2uIjTwc7Ib/7f
Qm3SEn9gQWHkY7SbA9HsJeZfBocIASPUKSJSAOCnGjws+cBtBfCuKNrVTyjZsjTw
k9Gx8oJRWv0uXqzY1O+/8v1yVVgT8ggDGYybzY3MDL7puGdLZhPWhOXZO18Cdicu
/pI9jsCjwhuBZ7wiSgjErFNt1uvXJUypmaQa9PDl9iCYKSmAWnJ+ZqVsNjM9dzc7
1ScxAteKq1oGCQ21EgfA0dbRjY05K9JqG/y4gaVnPr1wT2WlBEQGA/cNW9WhpyK6
oSgWzNVPNUr1mcq4UjPLnuTQqOhqwdi3GttGsC89YEiltp1PQhQ51UhMp/eiK40k
tOkjzh4b+KK0bRz5FomvUZdqK5BJe2a7Ucmw6L3xvAgeZQBOhsgQV8K3PE+XZRV/
LA6VmFc7mlbRu0nGgH7OkCoOWbritT2ghdPxmrg8N852s515QR4sQZ3g1VAOC172
eAFH18p8q8gvDQA7LDxH
=MZmv
-----END PGP SIGNATURE-----
--- End Message ---
