* Alasdair McWilliam:

> The original 2.0.0 release does indeed include a vulnerable zlib  
> verison.

Patch to use the system zlib is attached.  A compiled package is
temporarily available from:

  http://static.enyo.de/fw/volatile/rageircd_2.0.0-3.1_i386.deb

Unfortunately, I cannot test this package right now, and just
uploading it without testing seems to be a bit risky because it's the
first version built with GCC 4.0.

Wed Jul 13 19:11:42 CEST 2005  Florian Weimer <[EMAIL PROTECTED]>
  * Use system-wide zlib
diff -rN -u old-debian/changelog new-debian/changelog
--- old-debian/changelog        2005-07-13 23:14:03.000000000 +0200
+++ new-debian/changelog        2005-07-13 19:14:34.000000000 +0200
@@ -1,3 +1,11 @@
+rageircd (2.0.0-3.1) unstable; urgency=low
+
+  * NMU with permission from maintainer
+  * 10system-zlib.dpatch: Use system-wide zlib.  Add build dependency on
+    zlib1g-dev.  Closes: #309196.
+
+ -- Florian Weimer <[EMAIL PROTECTED]>  Wed, 13 Jul 2005 18:58:01 +0200
+
 rageircd (2.0.0-3) unstable; urgency=low
 
   * add dpatch to allow building on s390 (and which hopefully doesn't
diff -rN -u old-debian/control new-debian/control
--- old-debian/control  2005-07-13 23:14:03.000000000 +0200
+++ new-debian/control  2005-07-13 19:14:34.000000000 +0200
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Marc Haber <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), dpatch, patchutils, 
libssl-dev, openssl
+Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, debhelper (>= 4.1.0), 
dpatch, libssl-dev, openssl, zlib1g-dev
 Standards-Version: 3.6.1
 
 Package: rageircd
diff -rN -u old-debian/control.in new-debian/control.in
--- old-debian/control.in       2005-07-13 23:14:03.000000000 +0200
+++ new-debian/control.in       2005-07-13 19:14:34.000000000 +0200
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Marc Haber <[EMAIL PROTECTED]>
-Build-Depends: @cdbs@, libssl-dev, openssl
+Build-Depends: @cdbs@, libssl-dev, openssl, zlib1g-dev
 Standards-Version: 3.6.1
 
 Package: rageircd
diff -rN -u old-debian/patches/00list new-debian/patches/00list
--- old-debian/patches/00list   2005-07-13 23:14:03.000000000 +0200
+++ new-debian/patches/00list   2005-07-13 19:14:34.000000000 +0200
@@ -1,3 +1,4 @@
 01va_copy
 04umask
+10system-zlib
 
diff -rN -u old-debian/patches/10system-zlib.dpatch 
new-debian/patches/10system-zlib.dpatch
--- old-debian/patches/10system-zlib.dpatch     1970-01-01 01:00:00.000000000 
+0100
+++ new-debian/patches/10system-zlib.dpatch     2005-07-13 19:14:34.000000000 
+0200
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10system-zlib.dpatch by Florian Weimer <[EMAIL PROTECTED]>
+##
+## DP: Use the system-supplied zlib, not the private copy.
+
[EMAIL PROTECTED]@
+diff -urNad --exclude=CVS --exclude=.svn ./Makefile.in 
/tmp/dpep-work.SoQmLT/rageircd-2.0.0/Makefile.in
+--- ./Makefile.in      2005-07-13 19:06:40.000000000 +0200
++++ /tmp/dpep-work.SoQmLT/rageircd-2.0.0/Makefile.in   2005-07-13 
19:06:40.000000000 +0200
+@@ -35,9 +35,9 @@
+ PICFLAGS              = @PICFLAGS@
+ 
+ LIBS                  = @LIBS@
+-INCLUDEDIR            = -I../adns -I../include -I../zlib @OPENSSL_INCLUDE@
++INCLUDEDIR            = -I../adns -I../include @OPENSSL_INCLUDE@
+ 
+-SUBDIRS                       = adns doc zlib modules src tools
++SUBDIRS                       = adns doc modules src tools
+ 
+ BIN_DIR                       = [EMAIL PROTECTED]@
+ MOD_DIR                       = [EMAIL PROTECTED]@
+diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile.in 
/tmp/dpep-work.SoQmLT/rageircd-2.0.0/src/Makefile.in
+--- ./src/Makefile.in  2005-07-13 19:06:40.000000000 +0200
++++ /tmp/dpep-work.SoQmLT/rageircd-2.0.0/src/Makefile.in       2005-07-13 
19:06:57.000000000 +0200
+@@ -8,7 +8,7 @@
+ # $Id: Makefile.in,v 1.75.2.3 2005/01/15 21:01:55 amcwilliam Exp $
+ #
+ 
+-IRCLIBS                       = @STATIC_LIBS@ ../adns/libadns.a ../zlib/libz.a
++IRCLIBS                       = @STATIC_LIBS@ ../adns/libadns.a -lz
+ 
+ SOURCES                       = adns.c \
+                       auth.c \




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to