Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hello, I uploaded an NMU of the dhcpdump package to experimental, with the following changes that had been submitted over time by several contributors: - fix for reproducible builds (it did build reproducibly [1]) - fix FTBFS in Hurd and kFreeBSD - fix for FTCBFS (cross-build) It was the first upload in many years, but the current version in testing is "fresh enough" -- the version was recently built for release arches due to the binNMUs for PIE. I submit this request in the case that you consider it worthy to be released with these changes in stretch -- in that case, I will move it to unstable. Cheers. [1] https://tests.reproducible-builds.org/debian/rb-pkg/experimental/amd64/dhcpdump.html
diff -u dhcpdump-1.8/debian/rules dhcpdump-1.8/debian/rules --- dhcpdump-1.8/debian/rules +++ dhcpdump-1.8/debian/rules @@ -17,6 +17,8 @@ # SHELL=/bin/bash +DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + # The name and version of the source # source = $(shell grep "^Source: " debian/control|head -1|sed 's/Source: \(.*\)/\1/g') @@ -27,17 +29,25 @@ installbin = install -g root -o root -m 755 installdoc = install -g root -o root -m 644 +# support non-Linux arches, see #622267 +EXTRAFLAG = $(shell dpkg-architecture -ilinux-any || echo "-D_BSD_SOURCE") + +ifeq ($(origin CC),default) +CC = $(DEB_HOST_GNU_TYPE)-gcc +endif + ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS = -g -O2 -Wall else CFLAGS = -O2 -Wall endif +STRIP = $(DEB_HOST_GNU_TYPE)-strip ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -STRIP = -s +STRIP = : strip endif build: - $(MAKE) CFLAGS="$(CFLAGS) -DHAVE_STRSEP" + $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS) $(EXTRAFLAG) -DHAVE_STRSEP" touch stamp-build cat debian/copyright LICENSE > copyright.txt @@ -63,14 +73,15 @@ $(installdoc) debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian # $(installdoc) copyright.txt debian/tmp/usr/share/doc/$(package)/copyright - gzip -9f debian/tmp/usr/share/doc/$(package)/changelog.Debian + gzip -9nf debian/tmp/usr/share/doc/$(package)/changelog.Debian # $(installbin) -d debian/tmp/usr/sbin - $(installbin) $(STRIP) dhcpdump debian/tmp/usr/sbin + $(STRIP) dhcpdump + $(installbin) dhcpdump debian/tmp/usr/sbin # $(installbin) -d debian/tmp/usr/share/man/man8 $(installdoc) dhcpdump.8 debian/tmp/usr/share/man/man8 - gzip -9 debian/tmp/usr/share/man/man?/* + gzip -9n debian/tmp/usr/share/man/man?/* # dpkg-shlibdeps debian/tmp/usr/sbin/dhcpdump dpkg-gencontrol -isp diff -u dhcpdump-1.8/debian/changelog dhcpdump-1.8/debian/changelog --- dhcpdump-1.8/debian/changelog +++ dhcpdump-1.8/debian/changelog @@ -1,3 +1,20 @@ +dhcpdump (1.8-2.1) experimental; urgency=low + + [ Manuel A. Fernandez Montecelo ] + * Non-maintainer upload. + + [ Svante Signell ] + * Fix to make dhcpdump build on GNU/Hurd (Closes: #622267) + - modified by mafm@d.o to support kFreeBSD arches + + [ Chris Lamb ] + * Fix for reproducible builds (Closes: #777309) + + [ Helmut Grohne ] + * Fix FTCBFS: use the host arch compiler (Closes: #793893) + + -- Manuel A. Fernandez Montecelo <m...@debian.org> Thu, 13 Apr 2017 17:34:33 +0200 + dhcpdump (1.8-2) unstable; urgency=low * Bump standards-version