Package: zlib Version: 1:1.2.8.dfsg-4 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for zlib (versioned as 1:1.2.8.dfsg-4.1) and uploaded it. Regards. -- Ben Hutchings All the simple programs have been written, and all the good names taken.
diff -Nru zlib-1.2.8.dfsg/debian/changelog zlib-1.2.8.dfsg/debian/changelog
--- zlib-1.2.8.dfsg/debian/changelog 2016-12-07 15:43:42.000000000 +0000
+++ zlib-1.2.8.dfsg/debian/changelog 2017-01-29 16:29:42.000000000 +0000
@@ -1,3 +1,13 @@
+zlib (1:1.2.8.dfsg-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert "Install zconf.h in multiarch path"; this broke lib{32,64}z1-dev
+ and is not necessary with upstream version 1.2.8 (Closes: #787956)
+ * Revert "Fix cross 32 builds."; this broke lib64z1-dev (Closes: #845793)
+ * Add stage1 profile that excludes multilib packages (Closes: #709623)
+
+ -- Ben Hutchings <b...@decadent.org.uk> Sun, 29 Jan 2017 16:29:42 +0000
+
zlib (1:1.2.8.dfsg-4) unstable; urgency=high
* Apply upstream fix for CVE-2016-9840.
diff -Nru zlib-1.2.8.dfsg/debian/control zlib-1.2.8.dfsg/debian/control
--- zlib-1.2.8.dfsg/debian/control 2016-12-07 09:15:02.000000000 +0000
+++ zlib-1.2.8.dfsg/debian/control 2017-01-29 16:28:37.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: Mark Brown <broo...@debian.org>
Standards-Version: 3.9.8
Homepage: http://zlib.net/
-Build-Depends: debhelper (>= 8.1.3~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x], dpkg-dev (>= 1.16.1)
+Build-Depends: debhelper (>= 8.1.3~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x] <!stage1>, dpkg-dev (>= 1.16.1)
Package: zlib1g
Architecture: any
@@ -54,6 +54,7 @@
Package: lib64z1
Architecture: sparc s390 i386 powerpc mips mipsel
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: amd64-libs (<< 1.4)
Description: compression library - 64 bit runtime
@@ -64,6 +65,7 @@
Package: lib64z1-dev
Section: libdevel
Architecture: sparc s390 i386 powerpc mips mipsel
+Build-Profiles: <!stage1>
Depends: lib64z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib64c-dev, ${misc:Depends}
Replaces: amd64-libs-dev (<< 1.4)
Provides: lib64z-dev
@@ -74,6 +76,7 @@
Package: lib32z1
Architecture: amd64 ppc64 kfreebsd-amd64 s390x
+Build-Profiles: <!stage1>
Conflicts: libc6-i386 (<= 2.9-18)
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ia32-libs (<< 1.5)
@@ -85,6 +88,7 @@
Package: lib32z1-dev
Section: libdevel
Architecture: amd64 ppc64 kfreebsd-amd64 s390x
+Build-Profiles: <!stage1>
Conflicts: libc6-i386 (<= 2.9-18)
Depends: lib32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib32c-dev, ${misc:Depends}
Provides: lib32z-dev
@@ -96,6 +100,7 @@
Package: libn32z1
Architecture: mips mipsel
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: compression library - n32 runtime
zlib is a library implementing the deflate compression method found
@@ -105,6 +110,7 @@
Package: libn32z1-dev
Section: libdevel
Architecture: mips mipsel
+Build-Profiles: <!stage1>
Depends: libn32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), libn32c-dev, ${misc:Depends}
Provides: libn32z-dev
Description: compression library - n32 development
diff -Nru zlib-1.2.8.dfsg/debian/rules zlib-1.2.8.dfsg/debian/rules
--- zlib-1.2.8.dfsg/debian/rules 2014-08-16 15:13:56.000000000 +0100
+++ zlib-1.2.8.dfsg/debian/rules 2017-01-29 16:28:28.000000000 +0000
@@ -34,6 +34,8 @@
CFLAGS += -O3
endif
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+
32-ARCHS=amd64 ppc64 kfreebsd-amd64 s390x
64-ARCHS=s390 sparc i386 powerpc mips mipsel
@@ -69,6 +71,8 @@
mn32=-mabi=n32
endif
+endif # !stage1
+
UNALIGNED_ARCHS=i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 lpia
ifneq (,$(findstring $(DEB_HOST_ARCH), $(UNALIGNED_ARCHS)))
CFLAGS+=-DUNALIGNED_OK
@@ -162,8 +166,7 @@
$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
- install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)
- mv debian/tmp/usr/include/zconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/
+ install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH)
mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so.* debian/tmp/lib/$(DEB_HOST_MULTIARCH)
ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$(readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so
@@ -195,17 +198,17 @@
dh_compress -s
dh_fixperms -s
dh_makeshlibs -pzlib1g -V"zlib1g (>= 1:1.2.3.3.dfsg-1)" --add-udeb=zlib1g-udeb
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS)))
dh_makeshlibs -plib32z1 -V"lib32z1 (>= 1:1.2.3.3.dfsg-1)"
endif
-ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS)))
ifneq (,$(findstring $(DEB_HOST_ARCH), $(64-ARCHS)))
dh_makeshlibs -plib64z1 -V"lib64z1 (>= 1:1.2.3.3.dfsg-1)"
endif
-endif
ifneq (,$(findstring $(DEB_HOST_ARCH), $(N32-ARCHS)))
dh_makeshlibs -plibn32z1 -V"libn32z1 (>= 1:1.2.3.3.dfsg-1)"
endif
+endif
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
diff -Nru zlib-1.2.8.dfsg/debian/zlib1g-dev.install zlib-1.2.8.dfsg/debian/zlib1g-dev.install
--- zlib-1.2.8.dfsg/debian/zlib1g-dev.install 2013-05-03 17:00:24.000000000 +0100
+++ zlib-1.2.8.dfsg/debian/zlib1g-dev.install 2017-01-29 15:14:40.000000000 +0000
@@ -1,5 +1,4 @@
-usr/include/zlib.h
-usr/include/*/zconf.h
+usr/include/*
usr/lib/*/libz.a
usr/lib/*/libz.so
usr/share/man/man3/*
signature.asc
Description: PGP signature
