--- zlib-1.2.3.3.dfsg.orig/contrib/minizip/Makefile +++ zlib-1.2.3.3.dfsg/contrib/minizip/Makefile @@ -1,8 +1,8 @@ CC=cc -CFLAGS=-O -I../.. +CFLAGS=$(OPT) -I../.. -Dunix -UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a -ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a +UNZ_OBJS = miniunz.o unzip.o ioapi.o +ZIP_OBJS = minizip.o zip.o ioapi.o .c.o: $(CC) -c $(CFLAGS) $*.c @@ -10,10 +10,10 @@ all: miniunz minizip miniunz: $(UNZ_OBJS) - $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) + $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) -L ../.. -lz minizip: $(ZIP_OBJS) - $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) + $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) -L ../.. -lz test: miniunz minizip ./minizip test readme.txt --- zlib-1.2.3.3.dfsg.orig/debian/zlib-mingw32.install +++ zlib-1.2.3.3.dfsg/debian/zlib-mingw32.install @@ -0,0 +1 @@ +usr/i586-mingw32msvc/* --- zlib-1.2.3.3.dfsg.orig/debian/zlib-bin.install +++ zlib-1.2.3.3.dfsg/debian/zlib-bin.install @@ -0,0 +1,2 @@ +usr/bin/minizip +usr/bin/miniunzip --- zlib-1.2.3.3.dfsg.orig/debian/miniunzip.1 +++ zlib-1.2.3.3.dfsg/debian/miniunzip.1 @@ -0,0 +1,63 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH miniunzip 1 "Nov 7, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +miniunzip - uncompress and examine ZIP archives +.SH SYNOPSIS +.B miniunzip +.RI [ -exvlo ] +zipfile [ files_to_extract ] [-d tempdir] +.SH DESCRIPTION +.B minizip +is a simple tool which allows the extraction of compressed file +archives in the ZIP format used by the MS-DOS utility PKZIP. It was +written as a demonstration of the +.IR zlib (3) +library and therefore lack many of the features of the +.IR unzip (1) +program. +.SH OPTIONS +A number of options are supported. With the exception of +.BI \-d\ tempdir +these must be supplied before any +other arguments and are: +.TP +.BI \-l\ ,\ \-\-v +List the files in the archive without extracting them. +.TP +.B \-o +Overwrite files without prompting for confirmation. +.TP +.B \-x +Extract files (default). +.PP +The +.I zipfile +argument is the name of the archive to process. The next argument can be used +to specify a single file to extract from the archive. + +Lastly, the following option can be specified at the end of the command-line: +.TP +.BI \-d\ tempdir +Extract the archive in the directory +.I tempdir +rather than the current directory. +.SH SEE ALSO +.BR minizip (1), +.BR zlib (3), +.BR unzip (1). +.SH AUTHOR +This program was written by Gilles Vollant. This manual page was +written by Mark Brown . The -d tempdir option +was added by Dirk Eddelbuettel . --- zlib-1.2.3.3.dfsg.orig/debian/zlib-mingw32.dirs +++ zlib-1.2.3.3.dfsg/debian/zlib-mingw32.dirs @@ -0,0 +1,3 @@ +usr/i586-mingw32msvc/bin +usr/i586-mingw32msvc/lib +usr/i586-mingw32msvc/include --- zlib-1.2.3.3.dfsg.orig/debian/zlib-64.symbols +++ zlib-1.2.3.3.dfsg/debian/zlib-64.symbols @@ -0,0 +1,5 @@ + adler32_combine64@Base 1:1.2.3.3.dfsg + crc32_combine64@Base 1:1.2.3.3.dfsg + gzopen64@Base 1:1.2.3.3.dfsg + gzseek64@Base 1:1.2.3.3.dfsg + gztell64@Base 1:1.2.3.3.dfsg --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g.symbols +++ zlib-1.2.3.3.dfsg/debian/zlib1g.symbols @@ -0,0 +1,3 @@ +libz.so.1 zlib1g #MINVER# +#include "zlib-core.symbols" +#include "zlib-64.symbols" --- zlib-1.2.3.3.dfsg.orig/debian/changelog +++ zlib-1.2.3.3.dfsg/debian/changelog @@ -0,0 +1,971 @@ +zlib (1:1.2.3.3.dfsg-12ubuntu2~mingw32libs1) jaunty; urgency=low + + * Added i586-mingw32 cross compiler zlib package + + -- Hib Eris Fri, 17 Apr 2009 13:00:00 +0100 + +zlib (1:1.2.3.3.dfsg-12ubuntu2) jaunty; urgency=low + + * Move zlib.so.* to /lib. + + -- Colin Watson Wed, 18 Mar 2009 16:28:00 +0000 + +zlib (1:1.2.3.3.dfsg-12ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Add lpia to the list of UNALIGNED_OK architectures. + - Do not move from /usr/lib32 to /emul/ia32-linux/ in lib32z1 + + -- Michael Vogt Tue, 06 May 2008 12:02:39 +0200 + +zlib (1:1.2.3.3.dfsg-12) unstable; urgency=low + + * Apply patch from Arthur Loiret implementing + triarch support for MIPS (closes: #474097). + + -- Mark Brown Sun, 06 Apr 2008 19:09:18 +0100 + +zlib (1:1.2.3.3.dfsg-11) unstable; urgency=low + + * Correct library names for cross libraries. + * Turns out all our 64 bit architectures do off64_t. + + -- Mark Brown Sat, 19 Jan 2008 22:33:06 +0000 + +zlib (1:1.2.3.3.dfsg-10) unstable; urgency=low + + * dpkg-shlibdeps doesn't deal well with unbuilt packages (closes: 461474). + * Support packages using 64 bit cross symbols even when off_t is 64 + bits. + + -- Mark Brown Fri, 18 Jan 2008 22:56:48 +0000 + +zlib (1:1.2.3.3.dfsg-9) unstable; urgency=low + + * Remove Debian revisions from symbol files. + + -- Mark Brown Wed, 16 Jan 2008 10:53:27 +0000 + +zlib (1:1.2.3.3.dfsg-8) unstable; urgency=low + + * Add symbols files. Version information is provided by the upstream + map file. Architecture lists may need some adjustment. + * Fix udeb contents. + * Policy 3.7.3 (no changes). + + -- Mark Brown Sun, 16 Dec 2007 14:38:47 +0000 + +zlib (1:1.2.3.3.dfsg-7ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add lpia to the list of UNALIGNED_OK architectures. + - Do not move from /usr/lib32 to /emul/ia32-linux/ in lib32z1 + + -- Michael Vogt Thu, 15 Nov 2007 11:25:43 +0100 + +zlib (1:1.2.3.3.dfsg-7) unstable; urgency=low + + * Hard code uname to GNU so configure script can cope with non-Linux + ports (closes: #448651). + + -- Mark Brown Tue, 30 Oct 2007 22:01:55 +0000 + +zlib (1:1.2.3.3.dfsg-6) unstable; urgency=low + + * Configure the compiler and linker to use for the vanilla build too so that + cross compilation works (closes: #444727). + + -- Mark Brown Sun, 30 Sep 2007 23:34:54 +0100 + +zlib (1:1.2.3.3.dfsg-5ubuntu2) gutsy; urgency=low + + * Add lpia to the list of UNALIGNED_OK architectures. + + -- Adam Conrad Mon, 30 Jul 2007 11:39:40 +1000 + +zlib (1:1.2.3.3.dfsg-5ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Install multilib into /usr/lib32 on amd64. + + -- Matthias Klose Mon, 9 Jul 2007 17:25:35 +0200 + +zlib (1:1.2.3.3.dfsg-5) unstable; urgency=low + + * x86_64 uses a non-standard directory for the 32 bit runtime so we need + to do something completely different there (closes: #432262). + + -- Mark Brown Mon, 09 Jul 2007 09:30:52 +0100 + +zlib (1:1.2.3.3.dfsg-4) unstable; urgency=low + + * dh_makeshlibs needs to be handheld when building multiple library + packages (closes: #431873). + + -- Mark Brown Fri, 06 Jul 2007 19:26:23 +0100 + +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). + + -- Mark Brown Sat, 30 Jun 2007 11:49:23 +0100 + +zlib (1:1.2.3.3.dfsg-2) unstable; urgency=low + + * Add XS-VCS-Bzr. + + -- Mark Brown Fri, 22 Jun 2007 13:36:26 +0100 + +zlib (1:1.2.3.3.dfsg-1) unstable; urgency=low + + * New upstream release. + * Repackage without DBS, use quilt to manage patches instead. + * Drop checks for epoch support in dpkg. + * Upstream now supports _FILE_OFFSET_BITS (closes: #234237). + * Remove Provides: zlib1g from udeb (closes: #419603). + * Add -dbg packages. + + -- Mark Brown Tue, 19 Jun 2007 10:40:29 +0100 + +zlib (1:1.2.3-15ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Install multilib into /usr/lib32 on amd64. + + -- Matthias Klose Mon, 11 Jun 2007 18:48:29 +0200 + +zlib (1:1.2.3-15) unstable; urgency=low + + * Apparently gcc-multilib is actually a replacement for the arch-specific + GCCs (closes: #424657). + + -- Mark Brown Wed, 16 May 2007 20:56:52 +0100 + +zlib (1:1.2.3-14ubuntu1) gutsy; urgency=low + + * Merge from Debian, remaining changes: + - Drop b-d's on libc*-dev-* packages. + - Install multilib into /usr/lib32 on amd64. + + -- Matthias Klose Wed, 16 May 2007 18:22:57 +0200 + +zlib (1:1.2.3-14) unstable; urgency=low + + * The vibrations tell me that cross builds need to build depend on + gcc-multilib. + * Remove Provides: zlib1g from udeb (closes: #419603). + + -- Mark Brown Sat, 12 May 2007 11:10:32 +0100 + +zlib (1:1.2.3-13ubuntu4) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:28:16 +0000 + +zlib (1:1.2.3-13ubuntu3) feisty; urgency=low + + * Don't conflicts/replaces zlib1g-udeb in zlib1g; this makes d-i + unnecessarily difficult to build. + + -- Colin Watson Thu, 30 Nov 2006 10:19:07 +0000 + +zlib (1:1.2.3-13ubuntu2) edgy; urgency=low + + * Don't use -march/-mtune for the i386/64bit build; obsoleted by the + -mtune=generic backport. + + -- Matthias Klose Thu, 12 Oct 2006 08:06:38 +0000 + +zlib (1:1.2.3-13ubuntu1) edgy; urgency=low + + * Synchronize with unstable. + + -- Matthias Klose Mon, 10 Jul 2006 08:16:43 +0000 + +zlib (1:1.2.3-13) unstable; urgency=low + + * Add dependency from lib32z1-dev to lib32c-dev (closes: #376854). + + -- Mark Brown Sat, 8 Jul 2006 10:02:32 +0100 + +zlib (1:1.2.3-12ubuntu1) edgy; urgency=low + + * Synchronize with unstable. + * lib32z1-dev: Depend on lib32c-dev. + + -- Matthias Klose Wed, 5 Jul 2006 13:32:26 +0000 + +zlib (1:1.2.3-12) unstable; urgency=low + + * Apply patch from Volker Grabsch fixing cross + compilation. + + -- Mark Brown Wed, 21 Jun 2006 10:23:18 +0100 + +zlib (1:1.2.3-11) unstable; urgency=low + + * Add udeb line to shlibs (closes: #355293). + + -- Mark Brown Mon, 6 Mar 2006 22:14:08 +0000 + +zlib (1:1.2.3-10) unstable; urgency=low + + * Add a note to the gzerror() documentation specifying the rules for access + to the returned string (closes: #353407). + * Add a note to the gzclose() documentation pointing out that since the + function will always free the stream gzerror() can't be used to translate + the error message into plain text (closes: #354310). + * Change build dep to libc6-dev-i386 on amd64 (closes: #355170). + + -- Mark Brown Fri, 3 Mar 2006 19:27:26 +0000 + +zlib (1:1.2.3-9) unstable; urgency=low + + * Remove build dep on amd64-libs (closes: #344009). + + -- Mark Brown Tue, 20 Dec 2005 14:12:58 +0000 + +zlib (1:1.2.3-8) unstable; urgency=low + + * Replace old ia32-libs (closes: #339105). + + -- Mark Brown Tue, 15 Nov 2005 21:20:31 +0000 + +zlib (1:1.2.3-7) unstable; urgency=low + + * Check for EOF properly in gzio (closes: #130557). + + -- Mark Brown Sun, 30 Oct 2005 11:02:24 +0000 + +zlib (1:1.2.3-6ubuntu4) dapper; urgency=low + + * Replace (build-)dependency ia32-libs-dev [amd64] -> libc6-dev-i386 [amd64] + + -- Matthias Klose Fri, 13 Jan 2006 20:16:00 +0000 + +zlib (1:1.2.3-6ubuntu3) dapper; urgency=low + + * Add dependencies to the biarch packages. + + -- Matthias Klose Wed, 16 Nov 2005 04:57:09 +0100 + +zlib (1:1.2.3-6ubuntu2) dapper; urgency=low + + * Fix typo in lib64z1-dev dependency. + + -- Matthias Klose Wed, 16 Nov 2005 04:40:44 +0100 + +zlib (1:1.2.3-6ubuntu1) dapper; urgency=low + + * Synchronize with unstable. + + -- Matthias Klose Tue, 18 Oct 2005 00:58:59 +0200 + +zlib (1:1.2.3-6) unstable; urgency=low + + * Most of the changes in this version are based heavily on work done for + Ubuntu by Matthias Klose . Thanks! + * Build biarch packages on PowerPC (closes: #325560). + * Build biarch packages on i386, replacing amd64-libs prior to 1.4 which + included its own copy and adding a theoretically spurious build dep + on amd64-libs to work around binutils troubles (closes: #334013). + * Drop build dep on GCC 3.4 on amd64 - we already stopped using it. + * Update all the lib64 development dependencies to use lib64c-dev rather + than the specific libc-${ARCH}-dev package. + * Don't test lib64 builds - there's a good chance they'll fail due to the + system not being able to execute 64 bit code. Similarly, don't worry if + dh_shlibdeps fails and hard code an unversioned dependency on the + appropriate libc. + + -- Mark Brown Sun, 16 Oct 2005 19:38:11 +0100 + +zlib (1:1.2.3-5) unstable; urgency=low + + * Since GCC no longer ICEs at -O3 on m68k revert to using -O3 there like + we do elsewhere. + + -- Mark Brown Wed, 28 Sep 2005 23:00:52 +0100 + +zlib (1:1.2.3-4) unstable; urgency=low + + * Add ppc64 biarch support using patch included in the report by Andreas + Jochens (closes: #323591). + + -- Mark Brown Mon, 29 Aug 2005 12:30:04 +0100 + +zlib (1:1.2.3-3ubuntu4) breezy; urgency=low + + * Fix lib32z1-dev dependency. + + -- Matthias Klose Sat, 3 Sep 2005 07:44:54 +0200 + +zlib (1:1.2.3-3ubuntu3) breezy; urgency=low + + * Explicitely set -march/-mtune options for 64bit i386 build. + + -- Matthias Klose Mon, 22 Aug 2005 14:28:12 +0200 + +zlib (1:1.2.3-3ubuntu2) breezy; urgency=low + + * Fix typo in build dependencies. + + -- Matthias Klose Mon, 22 Aug 2005 11:53:18 +0200 + +zlib (1:1.2.3-3ubuntu1) breezy; urgency=low + + * Synchronize with Debian. + * Build lib64z1 for i386 and powerpc, conflicts/replaces amd64-libs. + * Ignore dh_shlibdeps failures, trying to run 32bit ldd on 64bit + binaries. + * lib64z1-dev: Depend on the needed libc6-dev package. + * debian/*dirs: Replace /emul/* with /usr/lib32. + + -- Matthias Klose Fri, 12 Aug 2005 09:55:10 +0200 + +zlib (1:1.2.3-3) unstable; urgency=low + + * Fix minizip build (closes: #321355). + + -- Mark Brown Fri, 5 Aug 2005 18:52:09 +0100 + +zlib (1:1.2.3-2) unstable; urgency=low + + * Fix noopt (closes: #320999). + * Apply CFLAGS to minizip too. + * Policy 3.6.2 (no changes). + + -- Mark Brown Wed, 3 Aug 2005 23:31:47 +0100 + +zlib (1:1.2.3-1ubuntu3) breezy; urgency=low + + * Put the libraries into /usr/lib32 on amd64. + + -- Tollef Fog Heen Tue, 9 Aug 2005 12:55:50 +0200 + +zlib (1:1.2.3-1ubuntu2) breezy; urgency=low + + * Stop calling dh_shlibdeps when building lib32z1 on amd64. + + -- Adam Conrad Fri, 22 Jul 2005 00:59:11 +0000 + +zlib (1:1.2.3-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolving conflicts (Ubuntu #12391). + - Drop patches incorporated upstream. + - Drop most of our changes in favour of Debian's to minimize our diff. + + -- Adam Conrad Thu, 21 Jul 2005 23:28:00 +0000 + +zlib (1:1.2.3-1) unstable; urgency=high + + * New upstream release. + * This release includes a fix for CAN-2005-1849. + + -- Mark Brown Mon, 18 Jul 2005 23:02:31 +0100 + +zlib (1:1.2.2-9) unstable; urgency=low + + * Work around an ICE on m68k by building at -O2 there. + * Implement noopt support while we're at it. + + -- Mark Brown Thu, 14 Jul 2005 18:06:21 +0300 + +zlib (1:1.2.2-8) unstable; urgency=low + + * Remove GCC 3.4 hack for amd64 since the default compiler is now supposed + to be able to do biarch. + + -- Mark Brown Sun, 10 Jul 2005 13:10:15 +0300 + +zlib (1:1.2.2-7) unstable; urgency=high + + * Add patch fixing CAN-2005-2096 in inflate. + + -- Mark Brown Mon, 4 Jul 2005 23:58:05 +0100 + +zlib (1:1.2.2-6) unstable; urgency=low + + * Fix some build failures on amd64 (closes: #316779). The package still + fails to build but this appears to be due to toolchain issues. + + -- Mark Brown Mon, 4 Jul 2005 21:49:55 +0100 + +zlib (1:1.2.2-5) unstable; urgency=low + + * Build a 32 bit copy on amd64 (closes: #311618). + * Hack build with GCC 3.4 on amd64 since the default 3.3 is broken for + biarch builds. This should be removed once the default compiler does + this properly. + * Remove libc5 support and therefore revert to using plain gcc when not + cross-compiling. + * Upgrade to Debhelper interface 4. + + -- Mark Brown Tue, 21 Jun 2005 09:52:45 +0100 + +zlib (1:1.2.2-4ubuntu6) breezy; urgency=low + + * SECURITY UPDATE: Fix another buffer overflow on invalid data streams. + * Add debian/patches/020_CAN-2005-1849: + - inftrees.h: Raise ENOUGH and MAXD to be big enough. + - Patch from zlib upstream author. + - CAN-2005-1849 + + -- Martin Pitt Thu, 21 Jul 2005 10:44:32 +0200 + +zlib (1:1.2.2-4ubuntu5) breezy; urgency=low + + * SECURITY UPDATE: Fix buffer overflow on invalid data streams. + * Add debian/patches/019_CAN-2005-2096.patch: + - Permit incomplete codes only if they consist of a single code of length + 1, as described in the spec. Longer codes overflowed various buffers. + - Patch from zlib upstream author. + - CAN-2005-2096 + + -- Martin Pitt Mon, 4 Jul 2005 08:39:33 +0200 + +zlib (1:1.2.2-4ubuntu4) breezy; urgency=low + + * Add a (temporary) build dependency on lib32gcc1. + + -- Matthias Klose Thu, 2 Jun 2005 21:33:16 +0200 + +zlib (1:1.2.2-4ubuntu3) breezy; urgency=low + + * Fix build failure with dpkg 1.13. + + -- Matthias Klose Thu, 2 Jun 2005 18:19:38 +0000 + +zlib (1:1.2.2-4ubuntu2) breezy; urgency=low + + * Build 32bit packages for amd64. + + -- Matthias Klose Sat, 21 May 2005 11:59:48 +0000 + +zlib (1:1.2.2-4ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Fri, 10 Dec 2004 13:00:13 +0000 + +zlib (1:1.2.2-4) unstable; urgency=low + + * Run dh_installdeb before dh_shlibdeps (closes: #282882). + * Specify the shlibs for the library directly to dpkg-shlibs. + + -- Mark Brown Tue, 7 Dec 2004 14:37:32 +0000 + +zlib (1:1.2.2-3ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- LaMont Jones Thu, 11 Nov 2004 17:15:32 -0700 + +zlib (1:1.2.2-3) unstable; urgency=low + + * Generate shared libraries sensibly for zlib-bin (closes: #278977). + + -- Mark Brown Sat, 30 Oct 2004 19:40:57 +0100 + +zlib (1:1.2.2-2) unstable; urgency=low + + * Remove shlibs from udeb. + + -- Mark Brown Sat, 9 Oct 2004 19:06:41 +0100 + +zlib (1:1.2.2-1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 27 Oct 2004 15:34:11 +0100 + +zlib (1:1.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown Wed, 6 Oct 2004 20:10:10 +0100 + +zlib (1:1.2.1.2-1) unstable; urgency=low + + * New upstream release. + * Upstream now includes patch improving error reporting when gzio is used on + empty files (closes: #258087). + * Upstream have fixed a valgrind warning. Other valgrind warnings remain + but have been analysed and found safe - uninitialised memory is read from + a buffer allocated by zlib during deflate but bounds checking is + subsequently performed and the output unaffected (closes: #270070). + + -- Mark Brown Sat, 11 Sep 2004 10:59:41 +0100 + +zlib (1:1.2.1.1-7) unstable; urgency=high + + * Once more, with feeling. + + -- Mark Brown Thu, 26 Aug 2004 20:49:42 +0100 + +zlib (1:1.2.1.1-6) testing; urgency=high + + * Fix the error handling in the new inflate implementation to avoid + incorrectly continuing to process in the error state. Thanks to Johan + Thelmén for his help in finding and fixing this + bug. This is CAN-2004-0797 (closes: #252253). + + -- Mark Brown Sat, 21 Aug 2004 23:30:57 +0100 + +zlib (1:1.2.1.1-5) unstable; urgency=low + + * Build a 64 bit libz on s390 and sparc. Original patch provided by Bastian + Blank but since modified (closes: #257940). + * Mark the udeb as such for Debhelper but note that the udeb support appears + not to cope with epochs so leave the code to build it. + * Apply patch from David Weinehall avoiding some XSIisms in + the package scripts (closes: #256363). + * Policy 3.6.1 (no changes). + + -- Mark Brown Sun, 11 Jul 2004 20:47:25 +0100 + +zlib (1:1.2.1.1-4) unstable; urgency=low + + * Incorporate current upstream patch to minizip. This supercedes most of + the current Debian patches (8,14,15 and 17) and has some additional + bugfixes. + + -- Mark Brown Sat, 12 Jun 2004 10:31:57 +0100 + +zlib (1:1.2.1.1-3ubuntu1) warty; urgency=high + + * Backport from 1:1.2.1.1-6 [debian/patches/018_CAN-2004-0797] + Fix the error handling in the new inflate implementation to avoid + incorrectly continuing to process in the error state. Thanks to Johan + Thelmn for his help in finding and fixing this + bug. This is CAN-2004-0797 (closes: #252253). + + -- Matt Zimmerman Fri, 10 Sep 2004 12:36:00 -0700 + +zlib (1:1.2.1.1-3) unstable; urgency=low + + * Fix -fPIC provision for HPPA (closes: #249289). + * Provide -D_REENTRANT while we're at it. + + -- Mark Brown Sun, 16 May 2004 18:54:08 +0100 + +zlib (1:1.2.1.1-2) unstable; urgency=low + + * Build with debug symbols. + * Revert partially done 64 bit support. + + -- Mark Brown Sun, 16 May 2004 12:22:14 +0100 + +zlib (1:1.2.1.1-1) unstable; urgency=low + + * New upstream release with bugfix for inflate (closes: #221590). + + -- Mark Brown Sat, 8 May 2004 11:27:44 +0100 + +zlib (1:1.2.1-5) unstable; urgency=low + + * Apparently udebs shouldn't call ldconfig (closes: #237345). + + -- Mark Brown Thu, 11 Mar 2004 21:27:09 +0000 + +zlib (1:1.2.1-4) unstable; urgency=low + + * Make checks when minizip is skipping arguments less likely to generate + false positives (closes: #231036). + + -- Mark Brown Sat, 7 Feb 2004 18:48:41 +0000 + +zlib (1:1.2.1-3) unstable; urgency=low + + * Use dpkg-architecture to get the target architecture and use the compiler + it tells us to. + * Don't run the testsuite when we're cross-compiling. + + -- Mark Brown Sat, 6 Dec 2003 14:49:48 +0000 + +zlib (1:1.2.1-2) unstable; urgency=low + + * Version build dependency on the DBS package (closes: #221599). + + -- Mark Brown Fri, 21 Nov 2003 14:13:40 +0000 + +zlib (1:1.2.1-1) unstable; urgency=low + + * New upstream release. + * The override fie tells me zlib1g is now required. + * Use dbs package to build rather than carting around our own copy. + * Many patches have been incorporated upstream. + * Upstream no longer has a readme.txt for zlib-bin. + * Check the return value of scanf() in miniunzip. + + -- Mark Brown Mon, 17 Nov 2003 23:49:22 +0000 + +zlib (1:1.1.4-17) unstable; urgency=low + + * Support GNU/KFreeBSD (closes: #220844). + + -- Mark Brown Sat, 15 Nov 2003 12:00:24 +0000 + +zlib (1:1.1.4-16) unstable; urgency=low + + * Check the return value of scanf in minizip (closes: #215658). + * Issue a diagnostic if minizip has no ZIP file to work on (closes: #215657). + + -- Mark Brown Thu, 16 Oct 2003 19:02:39 +0100 + +zlib (1:1.1.4-15) unstable; urgency=low + + * Replace "udeb" with "for Debian installer" in the short description for + the udeb (closes: #211019). + * Fix conflicts between real binary package and udeb. + + -- Mark Brown Tue, 16 Sep 2003 07:38:47 +0100 + +zlib (1:1.1.4-14) unstable; urgency=low + + * Remove the libc5 libraries from the control file. Apparently the archive + software isn't too keen on having packages built for the null set of + architectures. + + -- Mark Brown Sat, 12 Jul 2003 09:02:39 +0100 + +zlib (1:1.1.4-13) unstable; urgency=low + + * Nothing's actually appeared that uses the fact that zlib is in /lib so + move it back to /usr/lib. + * Drop libc5 support since it's breaking builds. The infrastructure is + still there so if we do decided to continue building libc5 stuff after all + it can be added back. + + -- Mark Brown Sat, 21 Jun 2003 14:07:39 +0100 + +zlib (1:1.1.4-12) unstable; urgency=low + + * Change section of zlib1g-dev to libdevel. + * GCC has now complains about improper usage of functions even without + prototypes so fix vsnprintf() test to call vsnprintf() with the + correct arguments (closes: #194828). + + -- Mark Brown Tue, 27 May 2003 08:32:02 +0100 + +zlib (1:1.1.4-11) unstable; urgency=low + + * The "Premature implementation is the root of all evil" release. + * Change udeb name to zlib1g-udeb (closes: #183296). + * Make the udeb provide zlib1g. + + -- Mark Brown Mon, 3 Mar 2003 22:00:21 +0000 + +zlib (1:1.1.4-10) unstable; urgency=low + + * Fix buffer overflow in gzprintf() by adding configure test for + vsnprintf() and failing the build out if it's not used. + * Use snprintf() for printing file descriptor name in gzdopen(). + * Remove Emacs variables from changelog. + + -- Mark Brown Sun, 23 Feb 2003 17:37:38 +0000 + +zlib (1:1.1.4-9) unstable; urgency=low + + * Build a zlib-udeb package. The changes are a modified version of some + provided by Sebastian Ley . + * Updated Standards-Version to 3.5.8 (no changes). + * Don't check for the preprocessor constant i386 in zconf.h, use the + better namespaced __i386__ instead. + + -- Mark Brown Mon, 30 Dec 2002 20:54:25 +0000 + +zlib (1:1.1.4-8) unstable; urgency=low + + * Leave libz.so in /usr/lib (closes: #169924). + + -- Mark Brown Wed, 20 Nov 2002 21:04:58 +0000 + +zlib (1:1.1.4-7) unstable; urgency=low + + * Install libz.so in /lib rather than /usr/lib (closes: #168797). + + -- Mark Brown Tue, 19 Nov 2002 00:01:34 +0000 + +zlib (1:1.1.4-6) unstable; urgency=low + + * Depend on libc-dev rather than libc6-dev (closes: #164649). + + -- Mark Brown Mon, 14 Oct 2002 11:35:09 +0100 + +zlib (1:1.1.4-5) unstable; urgency=low + + * Include patch from Joel Baker forcing -Dunix + when building minizip for NetBSD (closes: #164060). + * Don't set /usr/doc link in zlib1-altdev. + + -- Mark Brown Sat, 12 Oct 2002 19:32:25 +0100 + +zlib (1:1.1.4-4) unstable; urgency=low + + * Complete sentance in minzip.1 (closes: #160929). + + -- Mark Brown Sun, 15 Sep 2002 15:02:06 +0100 + +zlib (1:1.1.4-3) unstable; urgency=low + + * Update upstream URL in copyright file (closes: #154940). + + -- Mark Brown Wed, 31 Jul 2002 12:26:13 +0100 + +zlib (1:1.1.4-2) unstable; urgency=low + + * Build glibc static library without PIC (closes: #149939). + + -- Mark Brown Wed, 17 Jul 2002 20:37:50 +0100 + +zlib (1:1.1.4-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown Mon, 11 Mar 2002 21:44:13 +0000 + +zlib (1:1.1.3-19.1) unstable; urgency=high + + * Non-maintainer upload + * Apply patch for double-free bug + + -- Matt Zimmerman Sun, 10 Mar 2002 23:52:20 -0500 + +zlib (1:1.1.3-19) unstable; urgency=low + + * Include patch to minizip from Steve Kemp + fixing various stability issues with minizip. + + -- Mark Brown Sat, 19 Jan 2002 13:19:22 +0000 + +zlib (1:1.1.3-18) unstable; urgency=low + + * Fix -d option support so that archives can be extracted without + using -d (closes: #119898). + * s/pkzip/PKZIP/ in control file. + + -- Mark Brown Sat, 17 Nov 2001 13:42:23 +0000 + +zlib (1:1.1.3-17) unstable; urgency=low + + * Add patch from Dirk Eddelbuettel supporting an + additional "-d extractdir" option and correcting the miniunzip + manual page (closes: #118658). + + -- Mark Brown Wed, 7 Nov 2001 23:00:03 +0000 + +zlib (1:1.1.3-16) unstable; urgency=low + + * Add to LD_LIBRARY_PATH rather than setting it since fakeroot now + relies on setting it (closes: #108553). + + -- Mark Brown Mon, 27 Aug 2001 13:52:57 +0100 + +zlib (1:1.1.3-15) unstable; urgency=low + + * Call tar with --force-local in debian/rules to force it to interpret + filenames as filenames (closes: #96078). + * Supply manual pages for minizip and miniunzip. + * Update description of libc5 packages to mention that they are + libc5 variants. + + -- Mark Brown Wed, 2 May 2001 23:28:54 +0100 + +zlib (1:1.1.3-14) unstable; urgency=low + + * Update debian/rules for m68k again (closes: #91863). + * Upgrade priority of zlib1g to standard. + * Update to policy 3.5.2 (no changes). + + -- Mark Brown Thu, 22 Mar 2001 20:54:11 +0000 + +zlib (1:1.1.3-13) unstable; urgency=low + + * Don't build libc5 packages on m68k any more (closes: #90639). + + -- Mark Brown Thu, 22 Mar 2001 10:49:32 +0000 + +zlib (1:1.1.3-12) unstable; urgency=low + + * Install zlib.3 in zlib1g-dev (closes: #78122). + * Update to policy 3.2.1 (no changes). + + -- Mark Brown Mon, 1 Jan 2001 15:52:58 +0000 + +zlib (1:1.1.3-11) unstable; urgency=low + + * Build-depends on debhelper (closes: #72400). + + -- Mark Brown Mon, 25 Sep 2000 14:17:46 +0100 + +zlib (1:1.1.3-10) unstable; urgency=low + + * Fix bashism in build.vars (closes: #71756). + + -- Mark Brown Fri, 22 Sep 2000 14:04:10 +0100 + +zlib (1:1.1.3-9) unstable; urgency=low + + * Fix source dependancies (closes: #68469). + + -- Mark Brown Fri, 4 Aug 2000 01:24:49 +0100 + +zlib (1:1.1.3-8) unstable; urgency=low + + * New maintainer. + * Initialise DH_OPTIONS in debian/rules (closes: #67113). + * Add source dependancies. + * Update copyright information. + + -- Mark Brown Wed, 2 Aug 2000 18:05:16 +0100 + +zlib (1:1.1.3-7) unstable; urgency=low + + * Fixed zlib1g shlibs. Closes: #67164. + + -- Adam Heath Fri, 14 Jul 2000 11:06:06 -0500 + +zlib (1:1.1.3-6) unstable; urgency=low + + * Joel is taking a leave of absence(indefinate). He has given the package + to me. + * Ported to dbs, an enhanced source management system. + * Ported to debhelper. + * Fix broken libz.so link in -altdev. Closes: #54573. + * Incorrect shlibs file on hurd. Fixed in -5. Closes: #56125. + + -- Adam Heath Mon, 10 Jul 2000 16:38:02 -0500 + +zlib (1:1.1.3-5) unstable; urgency=low + + * Remove sparc from libc5-compat architectures. + * control: zlib1g: Provide libz1. + zlib1g-dev: Provide libz-dev. + * shlibs-libc6: Use libz1. + * /usr/doc symlinks. + * Correct zlib-bin description in debian/control. + * Only call ldconfig when configuring (closes:Bug#42518). + * Add hurd configure patch (closes:Bug#46899). + * Ensure contrib.tar.gz is really tarred *and* gzipped (closes:Bug#30367,#32001). + * zlib1g-dev has had the man page since 1.1.3-1 (closes:Bug#23802). + * Fix URL in minizip (closes:Bug#43888). + * Install example.c and minigzip.c in zlib1g-dev examples (closes:Bug#32002). + + -- Joel Klecker Sat, 30 Oct 1999 12:25:25 -0700 + +zlib (1:1.1.3-4) unstable; urgency=low + + * Policy 3.0.1. + * dpkg-architecture variables. + * zlib-bin: `miniunz' -> `miniunzip'. + * Source package is zlib again. + + -- Joel Klecker Sat, 31 Jul 1999 21:01:58 -0700 + +zlib1 (1:1.1.3-3) unstable; urgency=low + + * Made zlib-bin package containing `minizip' and `miniunz'. + + -- Joel Klecker Thu, 11 Mar 1999 13:16:58 -0800 + +zlib1 (1:1.1.3-2) unstable; urgency=low + + * Fix incorrect dependency in shlibs files (Bug:#28083). + + -- Joel Klecker Fri, 16 Oct 1998 23:58:41 -0700 + +zlib1 (1:1.1.3-1) unstable; urgency=low + + * New maintainer (hijacking the package due to non-response of + active maintainer to repeated queries). + * New upstream release. + * (shlibs-libc6): Paranoia: depend on >= 1:1.1.3. + (shlibs-libc5): likewise. + * (debian/control): changed source package to 'zlib1'. + * Fix /usr/doc/libz* + * Add contrib directory as .tar.gz in zlib1g-dev. + * Add man page. + * Add README, FAQ and algorithm.txt. + * lintian clean. + * Added sparc to libc5-compat architectures. + + -- Joel Klecker Tue, 13 Oct 1998 19:30:29 -0700 + +zlib (1:1.1.2-0.1) unstable; urgency=low + + * New upstream bugfix release. + * libc5 compat packages are now built on only i386 and m68k. + + -- Joel Klecker Mon, 11 May 1998 18:33:46 -0700 + +zlib (1:1.1.1-0.1) unstable; urgency=low + + * Non maintainer release. + * New upstream release. + * Made symlink in zlib1-altdev relative (fixes lintian warning). + * Removed executable bit on shared libs (fixes several lintian warnings). + + -- Joel Klecker Fri, 13 Mar 1998 20:19:15 -0800 + +zlib (1:1.0.4-7.1) unstable; urgency=low + + * Updated for libc6 + * Compiled with -D_REENTRANT. + * Non mantainer release. + + -- Enrique Zanardi Wed, 17 Sep 1997 01:28:05 +0100 + +zlib (1:1.0.4-7) stable unstable; urgency=low + + * Include --assert-working-epoch so people can't try to install with + bogus dpkg. (Bug#6848) + * Correct zlib1-dev description. (Bug#6061). + + -- Michael Alan Dorman Sun, 26 Jan 1997 16:49:19 -0500 + +zlib (1:1.0.4-6) stable unstable; urgency=high + + * Recompile with correct libc requirement. + * Correct zlib1-dev deps to include zlib1. + + -- Michael Alan Dorman Tue, 21 Jan 1997 17:57:22 -0500 + +zlib (1:1.0.4-5) stable; urgency=low + + * Add epoch, to make dselect happier + + -- Michael Alan Dorman Sat, 28 Dec 1996 11:02:43 -0500 + +zlib (1.0.4-4) stable; urgency=high + + * Remember to copy shlibs file to DEBIAN directory (thanks to Christoph + Lameter + + -- Michael Alan Dorman Sun, 15 Dec 1996 10:12:44 -0500 + +zlib (1.0.4-3) unstable; urgency=low + + * Added shlibs file + * Insured that shared library was stripped (Bug#5316) + + -- Michael Alan Dorman Sat, 23 Nov 1996 16:52:19 -0500 + +zlib (1.0.4-2) unstable; urgency=low + + * Accomodate the fact that dpkg-source doesn't properly preserve + permissions on scripts when extracting package. + + -- Michael Alan Dorman Mon, 23 Sep 1996 09:17:57 -0400 + +zlib (1.0.4-1) unstable; urgency=low + + * New upstream version. + * Moved to new source packaging format. + + -- Michael Alan Dorman Thu, 12 Sep 1996 15:19:35 -0400 + --- zlib-1.2.3.3.dfsg.orig/debian/lib32z1.symbols +++ zlib-1.2.3.3.dfsg/debian/lib32z1.symbols @@ -0,0 +1,3 @@ +libz.so.1 lib32z1 #MINVER# +#include "zlib-core.symbols" +#include "zlib-64.symbols" --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g.install +++ zlib-1.2.3.3.dfsg/debian/zlib1g.install @@ -0,0 +1 @@ +lib/lib*.so.* --- zlib-1.2.3.3.dfsg.orig/debian/lib32z1.install +++ zlib-1.2.3.3.dfsg/debian/lib32z1.install @@ -0,0 +1 @@ +usr/lib32/libz.so.* --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g-dev.examples +++ zlib-1.2.3.3.dfsg/debian/zlib1g-dev.examples @@ -0,0 +1,2 @@ +examples/* +minigzip.c --- zlib-1.2.3.3.dfsg.orig/debian/Makefile.mingw32 +++ zlib-1.2.3.3.dfsg/debian/Makefile.mingw32 @@ -0,0 +1,110 @@ +# Makefile for zlib, derived from Makefile.gcc. +# Modified for mingw32 cross compile by Hib Eris 11/11/2008. + +# Copyright (C) 1995-2003 Jean-loup Gailly. +# For conditions of distribution and use, see copyright notice in zlib.h + +STATICLIB = libz.a +SHAREDLIB = libz.dll +IMPLIB = libz.dll.a + +#LOC = -DASMV +#LOC = -DDEBUG -g + +CC = i586-mingw32msvc-gcc +CFLAGS = $(LOC) -O3 -Wall -DNO_FSEEKO + +AS = $(CC) +ASFLAGS = $(LOC) -Wall + +LD = $(CC) +LDFLAGS = $(LOC) -s + +AR = i586-mingw32msvc-ar +ARFLAGS = rcs + +RC = i586-mingw32msvc-windres +RCFLAGS = --define GCC_WINDRES + +DLLTOOL = i586-mingw32msvc-dlltool +STRIP = i586-mingw32msvc-strip +RANLIB = i586-mingw32msvc-ranlib + +CP = cp -fp +# If GNU install is available, replace $(CP) with install. +INSTALL = install +RM = rm -f + +EXEC_PATH = $(prefix)/bin +INCLUDE_PATH = $(prefix)/include +LIBRARY_PATH = $(prefix)/lib + +OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \ + inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o +OBJA = + +all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) + +.c.o: + $(CC) $(CFLAGS) -c -o $@ $< + +.S.o: + $(AS) $(ASFLAGS) -c -o $@ $< + +$(STATICLIB): $(OBJS) $(OBJA) + $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) + +$(SHAREDLIB): $(OBJS) $(OBJA) zlibrc.o + $(LD) --shared -o $@ $(OBJS) $(OBJA) zlibrc.o + $(STRIP) $(SHAREDLIB) + +$(IMPLIB): win32/zlib.def $(SHAREDLIB) + $(DLLTOOL) -d win32/zlib.def --dllname $(SHAREDLIB) --output-lib $@ + +zlibrc.o: win32/zlib1.rc + $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc + +# INCLUDE_PATH and LIBRARY_PATH must be set. + +.PHONY: install uninstall clean + +install: zlib.h zconf.h $(LIB) + -mkdir -p $(INCLUDE_PATH) + -$(INSTALL) zlib.h $(INCLUDE_PATH) + -$(INSTALL) zlibdefs.h $(INCLUDE_PATH) + -$(INSTALL) zconf.h $(INCLUDE_PATH) + -mkdir -p $(LIBRARY_PATH) + -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH) + -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH) + -$(RANLIB) $(IMPLIB) + -mkdir -p $(EXEC_PATH) + -$(INSTALL) $(SHAREDLIB) $(EXEC_PATH) + +uninstall: + -$(RM) $(INCLUDE_PATH)/zlib.h + -$(RM) $(INCLUDE_PATH)/zlibdefs.h + -$(RM) $(INCLUDE_PATH)/zconf.h + -$(RM) $(LIBRARY_PATH)/$(STATICLIB) + -$(RM) $(LIBRARY_PATH)/$(IMPLIB) + -$(RM) $(EXEC_PATH)/$(SHAREDLIB) + +clean: + -$(RM) $(STATICLIB) + -$(RM) $(SHAREDLIB) + -$(RM) $(IMPLIB) + -$(RM) *.o + +adler32.o: zlib.h zconf.h +compress.o: zlib.h zconf.h +crc32.o: crc32.h zlib.h zconf.h +deflate.o: deflate.h zutil.h zlib.h zconf.h +example.o: zlib.h zconf.h +gzio.o: zutil.h zlib.h zconf.h +inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +inftrees.o: zutil.h zlib.h zconf.h inftrees.h +minigzip.o: zlib.h zconf.h +trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +uncompr.o: zlib.h zconf.h +zutil.o: zutil.h zlib.h zconf.h --- zlib-1.2.3.3.dfsg.orig/debian/zlib-mingw32.postinst +++ zlib-1.2.3.3.dfsg/debian/zlib-mingw32.postinst @@ -0,0 +1,9 @@ +#! /bin/sh + +set -e + +#DEBHELPER# + +i586-mingw32msvc-ranlib /usr/i586-mingw32msvc/lib/libz.dll.a + +exit 0 --- zlib-1.2.3.3.dfsg.orig/debian/lib64z1.symbols +++ zlib-1.2.3.3.dfsg/debian/lib64z1.symbols @@ -0,0 +1,3 @@ +libz.so.1 lib64z1 #MINVER# +#include "zlib-core.symbols" +#include "zlib-64.symbols" --- zlib-1.2.3.3.dfsg.orig/debian/lib64z1.install +++ zlib-1.2.3.3.dfsg/debian/lib64z1.install @@ -0,0 +1 @@ +usr/lib64/libz.so.* --- zlib-1.2.3.3.dfsg.orig/debian/lib64z1-dev.dirs +++ zlib-1.2.3.3.dfsg/debian/lib64z1-dev.dirs @@ -0,0 +1 @@ +usr/lib64 --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g.dirs +++ zlib-1.2.3.3.dfsg/debian/zlib1g.dirs @@ -0,0 +1 @@ +lib --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g-dev.dirs +++ zlib-1.2.3.3.dfsg/debian/zlib1g-dev.dirs @@ -0,0 +1,4 @@ +usr/lib +usr/include +usr/share/doc/zlib1g-dev/examples +usr/share/man/man3 --- zlib-1.2.3.3.dfsg.orig/debian/compat +++ zlib-1.2.3.3.dfsg/debian/compat @@ -0,0 +1 @@ +5 --- zlib-1.2.3.3.dfsg.orig/debian/lib32z1.dirs +++ zlib-1.2.3.3.dfsg/debian/lib32z1.dirs @@ -0,0 +1 @@ +usr/lib32 --- zlib-1.2.3.3.dfsg.orig/debian/rules +++ zlib-1.2.3.3.dfsg/debian/rules @@ -0,0 +1,236 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=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_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_GNU_OS) + +CFLAGS = -Wall -g -D_REENTRANT + +# binutils doesn't supply the prefixed version normally like GCC does so +# we can't just unconditionally use DEB_HOST_GNU_TYPE-ar +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + AR=ar +else + AR=$(DEB_HOST_GNU_TYPE)-ar +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O3 +endif + + +64-ARCHS=s390 sparc i386 powerpc mips mipsel +ifneq (,$(findstring $(DEB_HOST_ARCH), $(64-ARCHS))) +EXTRA_INSTALL=install64 installmingw32 +EXTRA_BUILD=build64-stamp buildmingw32-stamp +# MIPS doesn't use -m64 +ifneq (,$(findstring $(DEB_HOST_ARCH), mips mipsel)) +m64=-mabi=64 +else +m64=-m64 +endif +endif + +32-ARCHS=amd64 ppc64 kfreebsd-amd64 +ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS))) +EXTRA_INSTALL=install32 installmingw32 +EXTRA_BUILD=build32-stamp buildmingw32-stamp +m32=-m32 +endif + +N32-ARCHS=mips mipsel +ifneq (,$(findstring $(DEB_HOST_ARCH), $(N32-ARCHS))) +EXTRA_INSTALL+=installn32 +EXTRA_BUILD+=buildn32-stamp +mn32=-mabi=n32 +endif + +UNALIGNED_ARCHS=i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 lpia +ifneq (,$(findstring $(DEB_HOST_ARCH), $(UNALIGNED_ARCHS))) +CFLAGS+=-DUNALIGNED_OK +endif + +COPYLIST=*.h *.c *.in zlib.map configure zlib.3 + +configure-stamp: configure patch + dh_testdir + + if [ ! -f Makefile.stash ]; then cp Makefile Makefile.stash ; fi + if [ ! -f zlibdefs.h.stash ]; then cp zlibdefs.h zlibdefs.h.stash ; fi + + AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc" CFLAGS="$(CFLAGS)" uname=GNU ./configure --shared --prefix=/usr + + touch $@ + +configure64-stamp: configure patch + dh_testdir + + mkdir -p debian/64 + cp $(COPYLIST) debian/64 + cd debian/64 && AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(m64)" \ + CFLAGS="$(CFLAGS)" \ + uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib64 + touch $@ + +configure32-stamp: configure patch + dh_testdir + + mkdir -p debian/32 + cp $(COPYLIST) debian/32 + cd debian/32 && AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(m32)" \ + CFLAGS="$(CFLAGS)" \ + uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib32 + touch $@ + +configuren32-stamp: configure patch + dh_testdir + + mkdir -p debian/n32 + cp $(COPYLIST) debian/n32 + cd debian/n32 && AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(mn32)" \ + CFLAGS="$(CFLAGS)" \ + uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/usr/lib32 + touch $@ + +configuremingw32-stamp: configure patch + dh_testdir + + mkdir -p debian/mingw32/win32 + cp $(COPYLIST) debian/mingw32 + cp debian/Makefile.mingw32 debian/mingw32/Makefile + cp win32/zlib.def debian/mingw32/win32 + cp win32/zlib1.rc debian/mingw32/win32 + sed -i -e 's/^#if _FILE_OFFSET_BITS == 64$$/#if _FILE_OFFSET_BITS == 64 \& !defined(WIN32)/g' debian/mingw32/zlib.h + touch $@ + +build: build-stamp $(EXTRA_BUILD) +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + $(MAKE) CC=$(DEB_HOST_GNU_TYPE)-gcc OPT="$(CFLAGS)" -C contrib/minizip + -$(MAKE) test + + touch $@ + +build64-stamp: configure64-stamp + dh_testdir + make -C debian/64 + touch $@ + +build32-stamp: configure32-stamp + dh_testdir + make -C debian/32 + touch $@ + +buildn32-stamp: configuren32-stamp + dh_testdir + make -C debian/n32 + touch $@ + +buildmingw32-stamp: configuremingw32-stamp + dh_testdir + make -C debian/mingw32 + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + + $(MAKE) -C contrib/minizip clean + $(MAKE) distclean + + rm -f build-stamp configure-stamp foo.gz + rm -rf debian/64 build64-stamp configure64-stamp + rm -rf debian/32 build32-stamp configure32-stamp + rm -rf debian/n32 buildn32-stamp configuren32-stamp + rm -rf debian/mingw32 buildmingw32-stamp configuremingw32-stamp + -mv Makefile.stash Makefile + -mv zlibdefs.h.stash zlibdefs.h + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install + install -d debian/tmp/lib + mv debian/tmp/usr/lib/libz.so.* debian/tmp/lib/ + ln -sf /lib/$$(readlink debian/tmp/usr/lib/libz.so) debian/tmp/usr/lib/libz.so + +install64: install build64-stamp + $(MAKE) -C debian/64 prefix=$(CURDIR)/debian/tmp install + +install32: install build32-stamp + $(MAKE) -C debian/32 prefix=$(CURDIR)/debian/tmp install + +installn32: install buildn32-stamp + $(MAKE) -C debian/n32 prefix=$(CURDIR)/debian/tmp install + +installmingw32: install buildmingw32-stamp + $(MAKE) -C debian/mingw32 prefix=$(CURDIR)/debian/tmp/usr/i586-mingw32msvc install + +# 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 $(EXTRA_INSTALL) + dh_testdir + dh_testroot + dh_installchangelogs -s ChangeLog + dh_installdocs -s + dh_installexamples -s + mkdir -p debian/tmp/usr/bin + cp contrib/minizip/minizip debian/tmp/usr/bin + cp contrib/minizip/miniunz debian/tmp/usr/bin/miniunzip + dh_install -s --sourcedir=debian/tmp + dh_installman -s + dh_link -s + dh_strip -s --dbg-package=zlib1g-dbg + dh_compress -s + dh_fixperms -s +ifeq ($(DEB_HOST_ARCH),amd64-DISABLED-FOR-UBUNTU) + # amd64 uses a totally different directory for some great reason + mkdir -p debian/lib32z1/emul/ia32-linux/usr + mv debian/lib32z1/usr/lib32 debian/lib32z1/emul/ia32-linux/usr/lib + mkdir -p debian/lib32z1-dev/emul/ia32-linux/usr + mv debian/lib32z1-dev/usr/lib32 debian/lib32z1-dev/emul/ia32-linux/usr/lib +endif + dh_makeshlibs -pzlib1g -V"zlib1g (>= 1:1.2.3.3.dfsg-1)" --add-udeb=zlib1g-udeb +ifneq (,$(findstring $(DEB_HOST_ARCH), $(64-ARCHS))) + dh_makeshlibs -plib64z1 -V"lib64z1 (>= 1:1.2.3.3.dfsg-1)" +endif +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), $(N32-ARCHS))) + dh_makeshlibs -plibn32z1 -V"libn32z1 (>= 1:1.2.3.3.dfsg-1)" +endif + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install install64 install32 installmingw32 --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g-dev.install +++ zlib-1.2.3.3.dfsg/debian/zlib1g-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/libz.a +usr/lib/libz.so +usr/share/man/man3/* --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g-udeb.install +++ zlib-1.2.3.3.dfsg/debian/zlib1g-udeb.install @@ -0,0 +1 @@ +lib/lib*.so.* --- zlib-1.2.3.3.dfsg.orig/debian/zlib-bin.manpages +++ zlib-1.2.3.3.dfsg/debian/zlib-bin.manpages @@ -0,0 +1,2 @@ +debian/minizip.1 +debian/miniunzip.1 --- zlib-1.2.3.3.dfsg.orig/debian/libn32z1.dirs +++ zlib-1.2.3.3.dfsg/debian/libn32z1.dirs @@ -0,0 +1 @@ +usr/lib32 --- zlib-1.2.3.3.dfsg.orig/debian/lib64z1.dirs +++ zlib-1.2.3.3.dfsg/debian/lib64z1.dirs @@ -0,0 +1 @@ +usr/lib64 --- zlib-1.2.3.3.dfsg.orig/debian/libn32z1.install +++ zlib-1.2.3.3.dfsg/debian/libn32z1.install @@ -0,0 +1 @@ +usr/lib32/libz.so.* --- zlib-1.2.3.3.dfsg.orig/debian/lib32z1-dev.dirs +++ zlib-1.2.3.3.dfsg/debian/lib32z1-dev.dirs @@ -0,0 +1 @@ +usr/lib32 --- zlib-1.2.3.3.dfsg.orig/debian/libn32z1-dev.install +++ zlib-1.2.3.3.dfsg/debian/libn32z1-dev.install @@ -0,0 +1,2 @@ +usr/lib32/libz.a +usr/lib32/libz.so --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g-dev.docs +++ zlib-1.2.3.3.dfsg/debian/zlib1g-dev.docs @@ -0,0 +1,3 @@ +FAQ +README +doc/* --- zlib-1.2.3.3.dfsg.orig/debian/minizip.1 +++ zlib-1.2.3.3.dfsg/debian/minizip.1 @@ -0,0 +1,46 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH minizip 1 "May 2, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +minizip - create ZIP archives +.SH SYNOPSIS +.B minizip +.RI [ -o ] +zipfile [ " files" ... ] +.SH DESCRIPTION +.B minizip +is a simple tool which allows the creation of compressed file archives +in the ZIP format used by the MS-DOS utility PKZIP. It was written as +a demonstration of the +.IR zlib (3) +library and therefore lack many of the features of the +.IR zip (1) +program. +.SH OPTIONS +The first argument supplied is the name of the ZIP archive to create or +.RI -o +in which case it is ignored and the second argument treated as the +name of the ZIP file. If the ZIP file already exists it will be +overwritten. +.PP +Subsequent arguments specify a list of files to place in the ZIP +archive. If none are specified then an empty archive will be created. +.SH SEE ALSO +.BR miniunzip (1), +.BR zlib (3), +.BR zip (1). +.SH AUTHOR +This program was written by Gilles Vollant. This manual page was +written by Mark Brown . + --- zlib-1.2.3.3.dfsg.orig/debian/control +++ zlib-1.2.3.3.dfsg/debian/control @@ -0,0 +1,126 @@ +Source: zlib +Section: libs +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Mark Brown +Standards-Version: 3.7.3 +XS-VCS-Bzr: http://bzr.debian.org/bzr/pkg-zlib/zlib/debian +Build-Depends: debhelper (>= 5), quilt, binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc], mingw32-binutils, mingw32, mingw32-runtime + +Package: zlib1g +Architecture: any +Depends: ${shlibs:Depends} +Priority: required +Conflicts: zlib1 (<= 1:1.0.4-7) +Provides: libz1 +Description: compression library - runtime + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the shared library. + +Package: zlib1g-dev +Section: libdevel +Architecture: any +Depends: zlib1g (= ${binary:Version}), libc6-dev | libc-dev +Conflicts: zlib1-dev +Provides: libz-dev +Description: compression library - development + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the development support + files. + +Package: zlib1g-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: zlib1g (= ${binary:Version}) +Provides: libz-dbg +Description: compression library - development + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes debugging symbols for use + when debugging applications which use zlib. + +Package: zlib-bin +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Description: compression library - sample programs + Some generally useful sample programs from the contrib directory. + Includes a "mini" implementation of `zip' and `unzip' called + `minizip' and `miniunzip' respectively. + +Package: zlib-mingw32 +Section: libdevel +Architecture: any +Depends: mingw32-binutils +Description: compression library - mingw32 development + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the development support + files for the mingw32 cross compiler chain. + +Package: zlib1g-udeb +XC-Package-Type: udeb +Architecture: any +Priority: optional +Section: debian-installer +Description: compression library - runtime for Debian installer + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This minimal package includes the shared library + for use with the Debian installer. + +Package: lib64z1 +Architecture: sparc s390 i386 powerpc mips mipsel +Depends: ${shlibs:Depends} +Replaces: amd64-libs (<< 1.4) +Description: compression library - 64 bit runtime + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes a 64 bit version of the + shared library. + +Package: lib64z1-dev +Section: libdevel +Architecture: sparc s390 i386 powerpc mips mipsel +Depends: lib64z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib64c-dev +Replaces: amd64-libs-dev (<< 1.4) +Provides: lib64z-dev +Description: compression library - 64 bit development + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the development support + files for building 64 bit applications. + +Package: lib32z1 +Architecture: amd64 ppc64 kfreebsd-amd64 +Depends: ${shlibs:Depends} +Replaces: ia32-libs (<< 1.5) +Description: compression library - 32 bit runtime + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes a 32 bit version of the + shared library. + +Package: lib32z1-dev +Section: libdevel +Architecture: amd64 ppc64 kfreebsd-amd64 +Depends: lib32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib32c-dev +Provides: lib32z-dev +Replaces: ia32-libs-dev (<< 1.5) +Description: compression library - 32 bit development + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the development support + files for building 32 bit applications. + +Package: libn32z1 +Architecture: mips mipsel +Depends: ${shlibs:Depends} +Description: compression library - n32 runtime + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes a n32 version of the shared + library. + +Package: libn32z1-dev +Section: libdevel +Architecture: mips mipsel +Depends: libn32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), libn32c-dev +Provides: libn32z-dev +Description: compression library - n32 development + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the development support + files for building n32 applications. --- zlib-1.2.3.3.dfsg.orig/debian/lib32z1-dev.install +++ zlib-1.2.3.3.dfsg/debian/lib32z1-dev.install @@ -0,0 +1,2 @@ +usr/lib32/libz.a +usr/lib32/libz.so --- zlib-1.2.3.3.dfsg.orig/debian/zlib1g-udeb.dirs +++ zlib-1.2.3.3.dfsg/debian/zlib1g-udeb.dirs @@ -0,0 +1 @@ +lib --- zlib-1.2.3.3.dfsg.orig/debian/lib64z1-dev.install +++ zlib-1.2.3.3.dfsg/debian/lib64z1-dev.install @@ -0,0 +1,2 @@ +usr/lib64/libz.a +usr/lib64/libz.so --- zlib-1.2.3.3.dfsg.orig/debian/zlib-core.symbols +++ zlib-1.2.3.3.dfsg/debian/zlib-core.symbols @@ -0,0 +1,65 @@ + ZLIB_1.2.0.2@ZLIB_1.2.0.2 1:1.2.0.2 + ZLIB_1.2.0.8@ZLIB_1.2.0.8 1:1.2.0.8 + ZLIB_1.2.0@ZLIB_1.2.0 1:1.2.0 + ZLIB_1.2.2.3@ZLIB_1.2.2.3 1:1.2.2.3 + ZLIB_1.2.2.4@ZLIB_1.2.2.4 1:1.2.2.4 + ZLIB_1.2.2@ZLIB_1.2.2 1:1.2.2 + adler32@Base 1:1.1.4 + adler32_combine@ZLIB_1.2.2 1:1.2.2 + compress2@Base 1:1.1.4 + compress@Base 1:1.1.4 + compressBound@ZLIB_1.2.0 1:1.2.0 + crc32@Base 1:1.1.4 + crc32_combine@ZLIB_1.2.2 1:1.2.2 + deflate@Base 1:1.1.4 + deflateBound@ZLIB_1.2.0 1:1.2.0 + deflateCopy@Base 1:1.1.4 + deflateEnd@Base 1:1.1.4 + deflateInit2_@Base 1:1.1.4 + deflateInit_@Base 1:1.1.4 + deflateParams@Base 1:1.1.4 + deflatePrime@ZLIB_1.2.0.8 1:1.2.0.8 + deflateReset@Base 1:1.1.4 + deflateSetDictionary@Base 1:1.1.4 + deflateSetHeader@ZLIB_1.2.2 1:1.2.2 + deflateTune@ZLIB_1.2.2.3 1:1.2.2.3 + get_crc_table@Base 1:1.1.4 + gzclearerr@ZLIB_1.2.0.2 1:1.2.0.2 + gzclose@Base 1:1.1.4 + gzdirect@ZLIB_1.2.2.3 1:1.2.2.3 + gzdopen@Base 1:1.1.4 + gzeof@Base 1:1.1.4 + gzerror@Base 1:1.1.4 + gzflush@Base 1:1.1.4 + gzgetc@Base 1:1.1.4 + gzgets@Base 1:1.1.4 + gzopen@Base 1:1.1.4 + gzprintf@Base 1:1.1.4 + gzputc@Base 1:1.1.4 + gzputs@Base 1:1.1.4 + gzread@Base 1:1.1.4 + gzrewind@Base 1:1.1.4 + gzseek@Base 1:1.1.4 + gzsetparams@Base 1:1.1.4 + gztell@Base 1:1.1.4 + gzungetc@ZLIB_1.2.0.2 1:1.2.0.2 + gzwrite@Base 1:1.1.4 + inflate@Base 1:1.1.4 + inflateBack@ZLIB_1.2.0 1:1.2.0 + inflateBackEnd@ZLIB_1.2.0 1:1.2.0 + inflateBackInit_@ZLIB_1.2.0 1:1.2.0 + inflateCopy@ZLIB_1.2.0 1:1.2.0 + inflateEnd@Base 1:1.1.4 + inflateGetHeader@ZLIB_1.2.2 1:1.2.2 + inflateInit2_@Base 1:1.1.4 + inflateInit_@Base 1:1.1.4 + inflatePrime@ZLIB_1.2.2.4 1:1.2.2.4 + inflateReset@Base 1:1.1.4 + inflateSetDictionary@Base 1:1.1.4 + inflateSync@Base 1:1.1.4 + inflateSyncPoint@Base 1:1.1.4 + inflateUndermine@Base 1:1.1.4 + uncompress@Base 1:1.1.4 + zError@Base 1:1.1.4 + zlibCompileFlags@ZLIB_1.2.0.2 1:1.2.0.2 + zlibVersion@Base 1:1.1.4 --- zlib-1.2.3.3.dfsg.orig/debian/libn32z1-dev.dirs +++ zlib-1.2.3.3.dfsg/debian/libn32z1-dev.dirs @@ -0,0 +1 @@ +usr/lib32 --- zlib-1.2.3.3.dfsg.orig/debian/copyright +++ zlib-1.2.3.3.dfsg/debian/copyright @@ -0,0 +1,36 @@ +This is the pre-packaged Debian Linux version of the zlib compression +library. It was packaged by Michael Alan Dorman +from sources originally retrieved from ftp.uu.net in the directory +/pub/archiving/zip/zlib as the file zlib-1.0.4.tar.gz. + +There is a homepage at http://www.gzip.org/zlib/ + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate + and zlib specifications were written by Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; + they are too numerous to cite here. + +Copyright notice: + + Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu --- zlib-1.2.3.3.dfsg.orig/debian/zlib-bin.dirs +++ zlib-1.2.3.3.dfsg/debian/zlib-bin.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1 --- zlib-1.2.3.3.dfsg.orig/debian/patches/series +++ zlib-1.2.3.3.dfsg/debian/patches/series @@ -0,0 +1 @@ +define-off64_t --- zlib-1.2.3.3.dfsg.orig/debian/patches/define-off64_t +++ zlib-1.2.3.3.dfsg/debian/patches/define-off64_t @@ -0,0 +1,17 @@ +We need to ensure that off64_t is defined when building with +_LARGEFILE64_SOURCE. + +--- zlib-1.2.3.3.old/zconf.h 2006-12-31 17:23:02 +0000 ++++ zlib-1.2.3.3/zconf.h 2007-06-12 15:20:36 +0000 +@@ -353,6 +353,10 @@ + + #include "zlibdefs.h" /* created by configure */ + ++#ifdef _LARGEFILE64_SOURCE ++#include ++#endif ++ + #ifndef SEEK_SET + # define SEEK_SET 0 /* Seek from beginning of file. */ + # define SEEK_CUR 1 /* Seek from current position. */ +