Control: tags 808169 + patch Control: tags 808169 + pending Control: tags 836639 + patch Control: tags 836639 + pending
Dear maintainer,
I've prepared an NMU for nast (versioned as 0.2.0-6.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
I did the work in git, and I'm attaching the output of `git
format-patch`. I'll push my changes if my NMU is accepted.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
[0;0mdiffstat for nast-0.2.0 nast-0.2.0[0;0m [0;0m[0;0m [0;0m changelog | 16 +++++[0;0m [0;0m compat | 2 [0;0m [0;0m control | 6 -[0;0m [0;0m patches/configure_updates_version_0.2.0-5.2 | 2 [0;0m [0;0m rules | 89 +---------------------------[0;0m [0;0m 5 files changed, 24 insertions(+), 91 deletions(-)[0;0m [0;0m[0;0m [1;36mdiff -Nru nast-0.2.0/debian/changelog nast-0.2.0/debian/changelog[0;0m [0;31m--- nast-0.2.0/debian/changelog 2012-06-17 03:53:25.000000000 +0000[0;0m [0;32m+++ nast-0.2.0/debian/changelog 2016-09-27 22:15:03.000000000 +0000[0;0m [0;36m@@ -1,3 +1,19 @@[0;0m [0;32m+nast (0.2.0-6.1) unstable; urgency=medium[0;0m [0;32m+[0;0m [0;32m+ * Non-maintainer upload.[0;0m [0;32m+ * Use HTTPS in Vcs-Git and Vcs-Browser.[0;0m [0;32m+ * Stop explicitly using quilt, that's already dealt by dpkg with source[0;0m [0;32m+ format 3.0 (quilt).[0;0m [0;32m+ * Remove noise from a patch to avoid it trying to patch debian/changelog.[0;0m [0;32m+ Closes: #808169[0;0m [0;32m+ * Bump debhelper compat level to 9 (so that dh_* will export dpkg buildflags).[0;0m [0;32m+ * Rewrite debian/rules using the dh sequencer.[0;0m [0;32m+ * Stop using hardening-wrapper, make use of dpkg-buildflags with[0;0m [0;32m+ DEB_BUILD_MAINT_OPTIONS=hardening=+all[0;0m [0;32m+ instead. Closes: #836639[0;0m [0;32m+[0;0m [0;32m+ -- Mattia Rizzolo <[email protected]> Tue, 27 Sep 2016 22:15:03 +0000[0;0m [0;32m+[0;0m [0;0m nast (0.2.0-6) unstable; urgency=low[0;0m [0;0m [0;0m [0;0m * Update e-mail address[0;0m [1;36mdiff -Nru nast-0.2.0/debian/compat nast-0.2.0/debian/compat[0;0m [0;31m--- nast-0.2.0/debian/compat 2012-06-16 20:00:35.000000000 +0000[0;0m [0;32m+++ nast-0.2.0/debian/compat 2016-09-27 22:04:01.000000000 +0000[0;0m [0;36m@@ -1 +1 @@[0;0m [0;31m-5[0;0m [0;32m+9[0;0m [1;36mdiff -Nru nast-0.2.0/debian/control nast-0.2.0/debian/control[0;0m [0;31m--- nast-0.2.0/debian/control 2012-06-17 03:44:33.000000000 +0000[0;0m [0;32m+++ nast-0.2.0/debian/control 2016-09-27 22:04:11.000000000 +0000[0;0m [0;36m@@ -3,10 +3,10 @@[0;0m [0;0m Priority: optional[0;0m [0;0m Maintainer: Ryan Niebur <[email protected]>[0;0m [0;0m Homepage: http://nast.berlios.de/[0;0m [0;31m-Build-Depends: debhelper (>[7m> 5), libnet1-dev, libpcap0.8-dev, libncurses5-dev, quilt, hardening-wrapper[27m, autotools-dev[0;0m [0;32m+Build-Depends: debhelper (>[7m= 9), libnet1-dev, libpcap0.8-dev, libncurses5-dev[27m, autotools-dev[0;0m [0;0m Standards-Version: 3.9.3[0;0m [0;31m-Vcs-Git: [7mgit://git[27m.debian.org/git/collab-maint/nast.git[0;0m [0;31m-Vcs-Browser: http[7m://git.debian.org/?p=collab-maint/nast.git;a=summary[27m[0;0m [0;32m+Vcs-Git: [7mhttps://anonscm[27m.debian.org/git/collab-maint/nast.git[0;0m [0;32m+Vcs-Browser: http[7ms://anonscm.debian.org/git/collab-maint/nast.git[27m[0;0m [0;0m [0;0m [0;0m Package: nast[0;0m [0;0m Architecture: any[0;0m [1;36mdiff -Nru nast-0.2.0/debian/patches/configure_updates_version_0.2.0-5.2 nast-0.2.0/debian/patches/configure_updates_version_0.2.0-5.2[0;0m [0;31m--- nast-0.2.0/debian/patches/configure_updates_version_0.2.0-5.2 2012-06-17 03:27:26.000000000 +0000[0;0m [0;32m+++ nast-0.2.0/debian/patches/configure_updates_version_0.2.0-5.2 2016-09-27 12:32:16.000000000 +0000[0;0m [0;36m@@ -2516,5 +2516,3 @@[0;0m [0;0m ENABLE_NCRS="no"[0;0m [0;0m AC_CHECK_LIB(menu, menu_opts_off, ENABLE_NCRS="yes"; MENU=ncurses/n_menu.o; LIBS="-lmenu $LIBS"; AC_DEFINE(HAVE_LIBMENU), AC_MSG_RESULT([[0;0m [0;0m [0;0m [0;31m-diff --git a/debian/changelog b/debian/changelog[0;0m [0;31m-index b6a0be5..9a8fb45 100644[0;0m [1;36mdiff -Nru nast-0.2.0/debian/rules nast-0.2.0/debian/rules[0;0m [0;31m--- nast-0.2.0/debian/rules 2012-06-17 03:37:59.000000000 +0000[0;0m [0;32m+++ nast-0.2.0/debian/rules 2016-09-27 22:10:01.000000000 +0000[0;0m [0;36m@@ -1,93 +1,12 @@[0;0m [0;0m #!/usr/bin/make -f[0;0m [0;31m-# Sample debian/rules that uses debhelper.[0;0m [0;31m-# GNU copyright 1997 to 1999 by Joey Hess.[0;0m [0;0m [0;0m [0;0m # Uncomment this to turn on verbose mode.[0;0m [0;0m #export DH_VERBOSE=1[0;0m [0;0m [0;0m [0;31m-export DEB_BUILD_[7mHARDENING=1[27m[0;0m [0;32m+export DEB_BUILD_[7mMAINT_OPTIONS = hardening=+all,-pie[27m[0;0m [0;0m [0;0m [0;31m-include /usr/share/quilt/quilt.make[0;0m [0;32m+%:[0;0m [0;32m+ dh $@[0;0m [0;0m [0;0m [0;31m-# These are used for cross-compiling and for saving the configure script[0;0m [0;31m-# from having to guess our platform (since we know it already)[0;0m [0;31m-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)[0;0m [0;31m-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)[0;0m [0;31m-[0;0m [0;31m-[0;0m [0;31m-CFLAGS = -Wall -g[0;0m [0;31m-[0;0m [0;31m-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))[0;0m [0;31m- CFLAGS += -O0[0;0m [0;31m-else[0;0m [0;31m- CFLAGS += -O2[0;0m [0;31m-endif[0;0m [0;31m-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))[0;0m [0;31m- INSTALL_PROGRAM += -s[0;0m [0;31m-endif[0;0m [0;31m-[0;0m [0;31m-config.status: configure $(QUILT_STAMPFN)[0;0m [0;31m- dh_testdir[0;0m [0;31m- cp -f /usr/share/misc/config.sub config.sub[0;0m [0;31m- cp -f /usr/share/misc/config.guess config.guess[0;0m [0;31m- # Add here commands to configure the package.[0;0m [0;31m- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info[0;0m [0;31m-[0;0m [0;31m-[0;0m [0;31m-build: build-arch build-indep[0;0m [0;31m-build-arch: build-stamp[0;0m [0;31m-build-indep: build-stamp[0;0m [0;31m-[0;0m [0;31m-build-stamp: config.status[0;0m [0;31m- dh_testdir[0;0m [0;31m-[0;0m [0;31m- # Add here commands to compile the package.[0;0m [0;31m- $(MAKE)[0;0m [0;31m- #/usr/bin/docbook-to-man debian/nast.sgml > nast.1[0;0m [0;31m-[0;0m [0;31m- touch build-stamp[0;0m [0;31m-[0;0m [0;31m-clean: unpatch[0;0m [0;31m- dh_testdir[0;0m [0;31m- dh_testroot[0;0m [0;31m- rm -f build-stamp [0;0m [0;31m-[0;0m [0;31m- # Add here commands to clean up after the build process.[0;0m [0;31m- [ ! -f Makefile ] || $(MAKE) distclean[0;0m [0;31m-[0;0m [0;31m- dh_clean config.sub config.guess[0;0m [0;31m-[0;0m [0;31m-install: build[0;0m [0;31m- dh_testdir[0;0m [0;31m- dh_testroot[0;0m [0;31m- dh_clean -k[0;0m [0;31m- dh_installdirs[0;0m [0;31m-[0;0m [0;31m- # Add here commands to install the package into debian/nast.[0;0m [0;32m+override_dh_auto_install:[0;0m [0;0m $(MAKE) install prefix=$(CURDIR)/debian/nast/usr[0;0m [0;31m-[0;0m [0;31m-[0;0m [0;31m-# Build architecture-independent files here.[0;0m [0;31m-binary-indep: build install[0;0m [0;31m-# We have nothing to do by default.[0;0m [0;31m-[0;0m [0;31m-# Build architecture-dependent files here.[0;0m [0;31m-binary-arch: build install[0;0m [0;31m- dh_testdir[0;0m [0;31m- dh_testroot[0;0m [0;31m- dh_installchangelogs ChangeLog[0;0m [0;31m- dh_installdocs[0;0m [0;31m- dh_installexamples[0;0m [0;31m- dh_installman[0;0m [0;31m- dh_link[0;0m [0;31m- dh_strip[0;0m [0;31m- dh_compress[0;0m [0;31m- dh_fixperms[0;0m [0;31m- dh_installdeb[0;0m [0;31m- dh_shlibdeps[0;0m [0;31m- dh_gencontrol[0;0m [0;31m- dh_md5sums[0;0m [0;31m- dh_builddeb[0;0m [0;31m-[0;0m [0;31m-binary: binary-indep binary-arch[0;0m [0;31m-.PHONY: build clean binary-indep binary-arch binary install [0;0m
From 374e25cbcdf32299a3fd4cf113857a4d1bdd2d9b Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 12:10:41 +0000 Subject: [PATCH 1/7] Use HTTPS in Vcs-Git and Vcs-Browser. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 18cbc9b..76b7853 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Ryan Niebur <[email protected]> Homepage: http://nast.berlios.de/ Build-Depends: debhelper (>> 5), libnet1-dev, libpcap0.8-dev, libncurses5-dev, quilt, hardening-wrapper, autotools-dev Standards-Version: 3.9.3 -Vcs-Git: git://git.debian.org/git/collab-maint/nast.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/nast.git;a=summary +Vcs-Git: https://anonscm.debian.org/git/collab-maint/nast.git +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/nast.git Package: nast Architecture: any -- 2.9.3
From d36ac5daa4502da70a119a8722300e4e28735dbe Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 12:12:26 +0000 Subject: [PATCH 2/7] Stop explicitly using quilt, that's already dealt by dpkg with source format 3.0 (quilt). --- debian/control | 2 +- debian/rules | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 76b7853..8abf62d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Ryan Niebur <[email protected]> Homepage: http://nast.berlios.de/ -Build-Depends: debhelper (>> 5), libnet1-dev, libpcap0.8-dev, libncurses5-dev, quilt, hardening-wrapper, autotools-dev +Build-Depends: debhelper (>> 5), libnet1-dev, libpcap0.8-dev, libncurses5-dev, hardening-wrapper, autotools-dev Standards-Version: 3.9.3 Vcs-Git: https://anonscm.debian.org/git/collab-maint/nast.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/nast.git diff --git a/debian/rules b/debian/rules index ffa1b72..33860d0 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,6 @@ export DEB_BUILD_HARDENING=1 -include /usr/share/quilt/quilt.make - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -47,7 +45,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp -- 2.9.3
From f1874ffa1ba99adf9a95f8e525ff898992328aa4 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 12:32:30 +0000 Subject: [PATCH 3/7] Remove noise from a patch to avoid it trying to patch debian/changelog. Closes: #808169 --- debian/patches/configure_updates_version_0.2.0-5.2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/patches/configure_updates_version_0.2.0-5.2 b/debian/patches/configure_updates_version_0.2.0-5.2 index a954b5b..acb2e8e 100644 --- a/debian/patches/configure_updates_version_0.2.0-5.2 +++ b/debian/patches/configure_updates_version_0.2.0-5.2 @@ -2516,5 +2516,3 @@ index b3266db..7d0ea11 100644 ENABLE_NCRS="no" AC_CHECK_LIB(menu, menu_opts_off, ENABLE_NCRS="yes"; MENU=ncurses/n_menu.o; LIBS="-lmenu $LIBS"; AC_DEFINE(HAVE_LIBMENU), AC_MSG_RESULT([ -diff --git a/debian/changelog b/debian/changelog -index b6a0be5..9a8fb45 100644 -- 2.9.3
From 8057e274a6eb0a8039d0fe640c1490be46be57b5 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 22:11:17 +0000 Subject: [PATCH 4/7] Bump debhelper compat level to 9 (so that dh_* will export dpkg buildflags) --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8abf62d..4c4d1a8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Ryan Niebur <[email protected]> Homepage: http://nast.berlios.de/ -Build-Depends: debhelper (>> 5), libnet1-dev, libpcap0.8-dev, libncurses5-dev, hardening-wrapper, autotools-dev +Build-Depends: debhelper (>= 9), libnet1-dev, libpcap0.8-dev, libncurses5-dev, hardening-wrapper, autotools-dev Standards-Version: 3.9.3 Vcs-Git: https://anonscm.debian.org/git/collab-maint/nast.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/nast.git -- 2.9.3
From 906efa9c8f864f566aa83a1ab37499d7b9235e56 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 22:13:53 +0000 Subject: [PATCH 5/7] Rewrite debian/rules using the dh sequencer --- debian/rules | 85 +++--------------------------------------------------------- 1 file changed, 3 insertions(+), 82 deletions(-) diff --git a/debian/rules b/debian/rules index 33860d0..d0d9c74 100755 --- a/debian/rules +++ b/debian/rules @@ -1,91 +1,12 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 export DEB_BUILD_HARDENING=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +%: + dh $@ - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -config.status: configure $(QUILT_STAMPFN) - dh_testdir - cp -f /usr/share/misc/config.sub config.sub - cp -f /usr/share/misc/config.guess config.guess - # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/nast.sgml > nast.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean config.sub config.guess - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/nast. +override_dh_auto_install: $(MAKE) install prefix=$(CURDIR)/debian/nast/usr - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install -- 2.9.3
From a8d4d4778d0d2242b7e81049e38d16829aad70d2 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 22:14:28 +0000 Subject: [PATCH 6/7] Stop using hardening-wrapper, make use of dpkg-buildflags with DEB_BUILD_MAINT_OPTIONS=hardening=+all instead Closes: #836639 --- debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 4c4d1a8..460fc1b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Ryan Niebur <[email protected]> Homepage: http://nast.berlios.de/ -Build-Depends: debhelper (>= 9), libnet1-dev, libpcap0.8-dev, libncurses5-dev, hardening-wrapper, autotools-dev +Build-Depends: debhelper (>= 9), libnet1-dev, libpcap0.8-dev, libncurses5-dev, autotools-dev Standards-Version: 3.9.3 Vcs-Git: https://anonscm.debian.org/git/collab-maint/nast.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/nast.git diff --git a/debian/rules b/debian/rules index d0d9c74..da342d9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie %: dh $@ -- 2.9.3
From ea9386cdba2eee028997311bfc76ef3ea40cb921 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo <[email protected]> Date: Tue, 27 Sep 2016 22:16:33 +0000 Subject: [PATCH 7/7] Changelog for 0.2.0-6.1 --- debian/changelog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index eb2f41c..332405a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +nast (0.2.0-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use HTTPS in Vcs-Git and Vcs-Browser. + * Stop explicitly using quilt, that's already dealt by dpkg with source + format 3.0 (quilt). + * Remove noise from a patch to avoid it trying to patch debian/changelog. + Closes: #808169 + * Bump debhelper compat level to 9 (so that dh_* will export dpkg buildflags). + * Rewrite debian/rules using the dh sequencer. + * Stop using hardening-wrapper, make use of dpkg-buildflags with + DEB_BUILD_MAINT_OPTIONS=hardening=+all + instead. Closes: #836639 + + -- Mattia Rizzolo <[email protected]> Tue, 27 Sep 2016 22:15:03 +0000 + nast (0.2.0-6) unstable; urgency=low * Update e-mail address -- 2.9.3
signature.asc
Description: PGP signature
