Your message dated Sat, 30 Jun 2007 13:17:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#406018: fixed in zlib 1:1.2.3.3.dfsg-3
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: zlib
Version: 1:1.2.3-13
Severity: normal
Tags: patch
Hi,
Please find attached a patch to support biarch on GNU/kFreeBSD amd64.
The 32-bit libraries directory is /usr/lib32 on this architecture, that
explains some of the changes. Note that it is also the case on ppc64,
though it does not seems to be handled in zlib currently.
Could you please apply this patch in the next upload?
Thanks in advance,
Aurelien
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-amd64
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
diff -u zlib-1.2.3/debian/rules zlib-1.2.3/debian/rules
--- zlib-1.2.3/debian/rules
+++ zlib-1.2.3/debian/rules
@@ -34,7 +34,7 @@
DOBINARY := binary-lib64z1 binary-lib64z1-dev
endif
-32-ARCHS=amd64 ppc64
+32-ARCHS=amd64 kfreebsd-amd64 ppc64
ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS)))
DOBUILD += $(STAMP_DIR)/build-32 $(STAMP_DIR)/build-32-nopic
DOBINARY := binary-lib32z1 binary-lib32z1-dev
@@ -111,11 +111,22 @@
$(STAMP_DIR)/build-32-nopic: $(STAMP_DIR)/source.make
dh_testdir
mkdir -p debian/nopic-tmp
+ifeq ($(DEB_HOST_ARCH), amd64)
cd $(BUILD_TREE) && CC="$(CC32)" CFLAGS="$(CFLAGS) -D_REENTRANT"
./configure --libdir=\$${prefix}/emul/ia32-linux/usr/lib/
+else
+ cd $(BUILD_TREE) && CC="$(CC32)" CFLAGS="$(CFLAGS) -D_REENTRANT"
./configure --libdir=\$${prefix}/usr/lib32/
+endif
$(MAKE) -C $(BUILD_TREE) clean
$(MAKE) -C $(BUILD_TREE) all libz.a $(TESTS)
$(MAKE) -C $(BUILD_TREE) install prefix=$(CURDIR)/debian/nopic-tmp
+ifeq ($(DEB_HOST_ARCH), amd64)
+ mkdir -p debian/nopic-tmp/emul/ia32-linux/usr/lib/
install -m 644 $(BUILD_TREE)/libz.a
debian/nopic-tmp/emul/ia32-linux/usr/lib/libz.a
+else
+ mkdir -p debian/nopic-tmp/usr/lib32/
+ install -m 644 $(BUILD_TREE)/libz.a debian/nopic-tmp/usr/lib32/libz.a
+endif
+ $(MAKE) -C $(BUILD_TREE) clean
$(MAKE) -C $(BUILD_TREE) clean
touch $@
@@ -172,18 +183,6 @@
dh_clean -k $(DH_OPTIONS)
dh_installdirs $(DH_OPTIONS)
dh_link $(DH_OPTIONS)
-ifeq ($(DEB_HOST_ARCH),i386)
- echo 'lib64:Depends=libc6-amd64' >> debian/$*.substvars
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
- echo 'lib64:Depends=libc6-ppc64' >> debian/$*.substvars
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
- echo 'lib64:Depends=libc6-s390x' > debian/$*.substvars
-endif
-ifeq ($(DEB_HOST_ARCH),sparc)
- echo 'lib64:Depends=libc6-sparc64' > debian/$*.substvars
-endif
post-binary-%: $(STAMP_DIR)/build
$(nodocs)if [ "$(manpages1)" != "" ]; then cp $(manpages1)
$(tmpdir)/usr/share/man/man1 ; fi
@@ -276,13 +275,28 @@
ln -s libz.so.1 $(tmpdir)/usr/lib64/libz.so
middle-binary-lib32z1: $(STAMP_DIR)/build-32
+ifeq ($(DEB_HOST_ARCH), amd64)
+ mkdir -p $(tmpdir)/emul/ia32-linux/usr/lib/
install -m 644 -s $(BUILD_TREE)/libz.so.$(VERSION)
$(tmpdir)/emul/ia32-linux/usr/lib/libz.so.$(VERSION)
ln -s libz.so.$(VERSION)
$(tmpdir)/emul/ia32-linux/usr/lib/libz.so.$(SONAME)
+else
+ mkdir -p $(tmpdir)/usr/lib32
+ install -m 644 -s $(BUILD_TREE)/libz.so.$(VERSION)
$(tmpdir)/usr/lib32/libz.so.$(VERSION)
+ ln -s libz.so.$(VERSION) $(tmpdir)/usr/lib32/libz.so.$(SONAME)
+endif
middle-binary-lib32z1-dev: $(STAMP_DIR)/build-32-nopic
+ifeq ($(DEB_HOST_ARCH), amd64)
+ mkdir -p $(tmpdir)/emul/ia32-linux/usr/lib/
install -m 644 debian/nopic-tmp/emul/ia32-linux/usr/lib/libz.a \
$(tmpdir)/emul/ia32-linux/usr/lib/libz.a
ln -s libz.so.1 $(tmpdir)/emul/ia32-linux/usr/lib/libz.so
+else
+ mkdir -p $(tmpdir)/usr/lib32
+ install -m 644 debian/nopic-tmp/usr/lib32/libz.a \
+ $(tmpdir)/usr/lib32/libz.a
+ ln -s libz.so.1 $(tmpdir)/usr/lib32/libz.so
+endif
# Below here is fairly generic really
diff -u zlib-1.2.3/debian/control zlib-1.2.3/debian/control
--- zlib-1.2.3/debian/control
+++ zlib-1.2.3/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Mark Brown <[EMAIL PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.2), dbs (>= 0.21), libc6-dev-powerpc [ppc64],
libc6-dev-i386 [amd64], lib64c-dev [i386 powerpc s390 sparc]
+Build-Depends: debhelper (>= 4.2), dbs (>= 0.21), lib32c-dev [amd64
kfreebsd-amd64 ppc64], lib64c-dev [i386 powerpc s390 sparc]
Package: zlib1g
Architecture: any
@@ -68,7 +68,7 @@
files for building 64 bit applications.
Package: lib32z1
-Architecture: amd64 ppc64
+Architecture: amd64 kfreebsd-amd64 ppc64
Depends: ${shlibs:Depends}
Replaces: ia32-libs (<< 1.5)
Description: compression library - 32 bit runtime
@@ -78,7 +78,7 @@
Package: lib32z1-dev
Section: libdevel
-Architecture: amd64 ppc64
+Architecture: amd64 kfreebsd-amd64 ppc64
Depends: lib32z1 (= ${Source-Version}), zlib1g-dev (= ${Source-Version}),
lib32c-dev
Provides: lib32z-dev
Replaces: ia32-libs-dev (<< 1.5)
--- zlib-1.2.3/debian/lib32z1.dirs
+++ zlib-1.2.3.orig/debian/lib32z1.dirs
@@ -1 +0,0 @@
-emul/ia32-linux/usr/lib/
--- zlib-1.2.3/debian/lib32z1-dev.dirs
+++ zlib-1.2.3.orig/debian/lib32z1-dev.dirs
@@ -1 +0,0 @@
-emul/ia32-linux/usr/lib/
--- End Message ---
--- Begin Message ---
Source: zlib
Source-Version: 1:1.2.3.3.dfsg-3
We believe that the bug you reported is fixed in the latest version of
zlib, which is due to be installed in the Debian FTP archive:
lib64z1-dev_1.2.3.3.dfsg-3_powerpc.deb
to pool/main/z/zlib/lib64z1-dev_1.2.3.3.dfsg-3_powerpc.deb
lib64z1_1.2.3.3.dfsg-3_powerpc.deb
to pool/main/z/zlib/lib64z1_1.2.3.3.dfsg-3_powerpc.deb
zlib-bin_1.2.3.3.dfsg-3_powerpc.deb
to pool/main/z/zlib/zlib-bin_1.2.3.3.dfsg-3_powerpc.deb
zlib1g-dbg_1.2.3.3.dfsg-3_powerpc.deb
to pool/main/z/zlib/zlib1g-dbg_1.2.3.3.dfsg-3_powerpc.deb
zlib1g-dev_1.2.3.3.dfsg-3_powerpc.deb
to pool/main/z/zlib/zlib1g-dev_1.2.3.3.dfsg-3_powerpc.deb
zlib1g-udeb_1.2.3.3.dfsg-3_powerpc.udeb
to pool/main/z/zlib/zlib1g-udeb_1.2.3.3.dfsg-3_powerpc.udeb
zlib1g_1.2.3.3.dfsg-3_powerpc.deb
to pool/main/z/zlib/zlib1g_1.2.3.3.dfsg-3_powerpc.deb
zlib_1.2.3.3.dfsg-3.diff.gz
to pool/main/z/zlib/zlib_1.2.3.3.dfsg-3.diff.gz
zlib_1.2.3.3.dfsg-3.dsc
to pool/main/z/zlib/zlib_1.2.3.3.dfsg-3.dsc
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 [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mark Brown <[EMAIL PROTECTED]> (supplier of updated zlib 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 [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sat, 30 Jun 2007 11:49:23 +0100
Source: zlib
Binary: lib32z1 zlib1g-dev zlib1g lib64z1 zlib-bin zlib1g-dbg lib32z1-dev
lib64z1-dev zlib1g-udeb
Architecture: source powerpc
Version: 1:1.2.3.3.dfsg-3
Distribution: unstable
Urgency: low
Maintainer: Mark Brown <[EMAIL PROTECTED]>
Changed-By: Mark Brown <[EMAIL PROTECTED]>
Description:
lib64z1 - compression library - 64 bit runtime
lib64z1-dev - compression library - 64 bit development
zlib-bin - compression library - sample programs
zlib1g - compression library - runtime
zlib1g-dbg - compression library - development
zlib1g-dev - compression library - development
zlib1g-udeb - compression library - runtime for Debian installer (udeb)
Closes: 386357 406018 431124
Changes:
zlib (1:1.2.3.3.dfsg-3) unstable; urgency=low
.
* Support building with UNALIGNED_OK and enable it on i386 and amd64.
This seems to provide a small speedup in my tests (closes: #386357).
* Build 32 bit version on KFreeBSD-amd64 (closes: #406018).
* Provide versioned dependency shlibs (closes: #431124).
Files:
aca001e6c6052bf197389bb4dc24e213 792 libs optional zlib_1.2.3.3.dfsg-3.dsc
1363931b1d898de395b9e7bf8ed8f7d5 11597 libs optional
zlib_1.2.3.3.dfsg-3.diff.gz
85086ba26a629d04d4bd23400b6f6d11 72878 libs required
zlib1g_1.2.3.3.dfsg-3_powerpc.deb
5b17ebe8052b9d315af8e6b76230f953 160570 libdevel optional
zlib1g-dev_1.2.3.3.dfsg-3_powerpc.deb
9dbd57c192d91f9efe3c8d1dbfbf2d00 165900 libdevel optional
zlib1g-dbg_1.2.3.3.dfsg-3_powerpc.deb
c1fc92ea4f6ad7f122655680f0299ccf 48396 utils optional
zlib-bin_1.2.3.3.dfsg-3_powerpc.deb
95044b250a1ac5a8b91b344d79d802f1 738 debian-installer optional
zlib1g-udeb_1.2.3.3.dfsg-3_powerpc.udeb
56555b143d663e14dc47657363cff73b 77938 libs optional
lib64z1_1.2.3.3.dfsg-3_powerpc.deb
6d22626a342e785f8eb50cd8534690ce 80192 libdevel optional
lib64z1-dev_1.2.3.3.dfsg-3_powerpc.deb
Package-Type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGhlPRJ2Vo11xhU60RAgmdAJ9SesLylcirp9ex0C8wX1pg2/RPyACfX8uz
vQ1YODedxmn08WrvuBNt3V0=
=xgkc
-----END PGP SIGNATURE-----
--- End Message ---