Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.bugs.dist > #1102843

Bug#1007569: pfqueue: diff for NMU version 0.5.6-9.2

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Control: tags 1007569 + patch
Control: tags 1007569 + pending

Dear maintainer,

I've prepared an NMU for pfqueue (versioned as 0.5.6-9.2) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru pfqueue-0.5.6/debian/changelog pfqueue-0.5.6/debian/changelog
--- pfqueue-0.5.6/debian/changelog	2022-05-11 16:51:45.000000000 -0400
+++ pfqueue-0.5.6/debian/changelog	2022-05-11 16:48:26.000000000 -0400
@@ -1,3 +1,22 @@
+pfqueue (0.5.6-9.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control:
+    + Replace transitional package dependency libncurses5-dev
+      with real package libncurses-dev.
+    + Drop pfqueue-dbg package in favor of automatic -dbgsym package.
+    + Bump Standards-Version to 4.6.0.
+    + Bump debhelper compat to v13.
+    + Mark library packages as Multi-Arch: same.
+  * debian/source/format: Use "3.0 (quilt)" format. (Closes: #1007569)
+  * debian/rules:
+    + Rewrite in dh sequencer.
+    + Do not install usr/lib/*.la files (lintian).
+    + Enable full hardening.
+    + Use dh_auto_configure for multiarch file installation.
+
+ -- Boyuan Yang <byang@debian.org>  Wed, 11 May 2022 16:48:26 -0400
+
 pfqueue (0.5.6-9.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru pfqueue-0.5.6/debian/compat pfqueue-0.5.6/debian/compat
--- pfqueue-0.5.6/debian/compat	2022-05-11 16:51:45.000000000 -0400
+++ pfqueue-0.5.6/debian/compat	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-7
diff -Nru pfqueue-0.5.6/debian/control pfqueue-0.5.6/debian/control
--- pfqueue-0.5.6/debian/control	2022-05-11 16:51:45.000000000 -0400
+++ pfqueue-0.5.6/debian/control	2022-05-11 16:48:25.000000000 -0400
@@ -2,8 +2,8 @@
 Section: mail
 Priority: optional
 Maintainer: Martin Zobel-Helas <zobel@debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, libncurses5-dev, dh-
autoreconf
-Standards-Version: 3.8.3
+Build-Depends: debhelper-compat (= 13), libncurses-dev
+Standards-Version: 4.6.1
 Homepage: http://pfqueue.sourceforge.net/
 
 Package: pfqueue
@@ -14,20 +14,10 @@
  pfqueue is a queue manager for different MTAs (currently postfix and
exim),
  allowing to delete, hold, release, or requeue messages.
 
-Package: pfqueue-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: pfqueue (= ${binary:Version}), libpfqueue0 (= ${binary:Version}),
libpfqueue-dev (= ${binary:Version})
-Description: interactive console-based tool to control MTA queues (debug)
- pfqueue is a queue manager for different MTAs (currently postfix and
exim),
- allowing to delete, hold, release, or requeue messages.
- .
- This package contains the debugging symbols.
-
 Package: libpfqueue0
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: pfqueue
 Description: interactive console-based tool to control MTA queues (library)
@@ -39,7 +29,8 @@
 Package: libpfqueue-dev
 Section: libdevel
 Architecture: any
-Depends: libpfqueue0 (= ${binary:Version}), libncurses5-dev
+Multi-Arch: same
+Depends: libpfqueue0 (= ${binary:Version}), libncurses-dev, ${misc:Depends}
 Description: interactive console-based tool to control MTA queues
(development)
  pfqueue is a queue manager for different MTAs (currently postfix and
exim),
  allowing to delete, hold, release, or requeue messages.
diff -Nru pfqueue-0.5.6/debian/libpfqueue0.install pfqueue-
0.5.6/debian/libpfqueue0.install
--- pfqueue-0.5.6/debian/libpfqueue0.install	2022-05-11
16:51:45.000000000 -0400
+++ pfqueue-0.5.6/debian/libpfqueue0.install	2022-05-11
16:46:52.000000000 -0400
@@ -1 +1 @@
-/usr/lib/*.so.*
+/usr/lib/*/*.so.*
diff -Nru pfqueue-0.5.6/debian/libpfqueue-dev.install pfqueue-
0.5.6/debian/libpfqueue-dev.install
--- pfqueue-0.5.6/debian/libpfqueue-dev.install	2022-05-11
16:51:45.000000000 -0400
+++ pfqueue-0.5.6/debian/libpfqueue-dev.install	2022-05-11
16:47:04.000000000 -0400
@@ -1,3 +1,2 @@
-/usr/lib/*.a
-/usr/lib/*.so
-/usr/lib/*.la
+/usr/lib/*/*.a
+/usr/lib/*/*.so
diff -Nru pfqueue-0.5.6/debian/rules pfqueue-0.5.6/debian/rules
--- pfqueue-0.5.6/debian/rules	2022-05-11 16:51:45.000000000 -0400
+++ pfqueue-0.5.6/debian/rules	2022-05-11 16:47:41.000000000 -0400
@@ -1,81 +1,28 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
 
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-	CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
-else
-	CROSS=
-endif
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	rm -f config.guess config.sub
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_autoreconf_clean
-	dh_clean
-
-config.status: configure
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-	dh_autoreconf
-	./configure --host=$(DEB_HOST_GNU_TYPE) --
build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-
z,defs"
-
-build: build-indep build-arch
-
-build-indep:
-	@echo dummy target, nothing built
-
-build-arch: build-stamp
-build-stamp: config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+export DEB_CFLAGS_MAINT_APPEND  = -Wno-error=format-security
+# package maintainers to append LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND =
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
-	mv debian/tmp/usr/bin debian/tmp/usr/sbin
+%:
+	dh $@
 
+execute_after_dh_auto_install:
+	mv debian/tmp/usr/bin debian/tmp/usr/sbin
+	rm -f debian/tmp/usr/lib/*/*.la
 	mv debian/tmp/usr/share/man/man1 debian/tmp/usr/share/man/man8
 	mv debian/tmp/usr/share/man/man8/pfqueue.1
debian/tmp/usr/share/man/man8/pfqueue.8
 	sed -i -e 's/TH PFQUEUE 1/TH PFQUEUE 8/'
debian/tmp/usr/share/man/man8/pfqueue.8
 	ln -s pfqueue.8 debian/tmp/usr/share/man/man8/spfqueue.8
 
-binary: binary-arch
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_install --fail-missing --sourcedir=debian/tmp
-	dh_strip --dbg-package=pfqueue-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build install binary binary-arch binary-indep
+override_dh_strip:
+	dh_strip --dbgsym-migration='pfqueue-dbg (<< 0.5.6-9.2~)'
diff -Nru pfqueue-0.5.6/debian/source/format pfqueue-
0.5.6/debian/source/format
--- pfqueue-0.5.6/debian/source/format	1969-12-31 19:00:00.000000000 -0500
+++ pfqueue-0.5.6/debian/source/format	2022-05-11 16:12:23.000000000 -0400
@@ -0,0 +1 @@
+3.0 (quilt)

Back to linux.debian.bugs.dist | Previous | Next | Find similar | Unroll thread

Thread

Bug#1007569: pfqueue: diff for NMU version 0.5.6-9.2 Boyuan Yang <byang@debian.org> - 2022-05-11 23:00 +0200

csiph-web