Unless you plan to make a new upload in the next few days, or have any
objections to the following patch, I intend to NMU dircproxy shortly
to fix this RC bug.

The standards version also needs updating.


Regards,
Roger


diff -urN dircproxy-1.0.5.original/debian/changelog 
dircproxy-1.0.5/debian/changelog
--- dircproxy-1.0.5.original/debian/changelog   2005-07-21 21:32:23.000000000 
+0100
+++ dircproxy-1.0.5/debian/changelog    2005-07-21 22:11:59.219685784 +0100
@@ -1,3 +1,13 @@
+dircproxy (1.0.5-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Andreas Jochens to fix build failure with GCC
+    4.0 due to invalid lvalues (Closes: #285626).  
+  * debian/control: Use a versioned build-dependency on debhelper.
+  * debian/rules: Use debhelper version 4 compatibility mode.
+
+ -- Roger Leigh <[EMAIL PROTECTED]>  Thu, 21 Jul 2005 22:09:53 +0100
+
 dircproxy (1.0.5-3) unstable; urgency=low
 
   * New maintainer. (Closes: Bug#208586)
diff -urN dircproxy-1.0.5.original/debian/control dircproxy-1.0.5/debian/control
--- dircproxy-1.0.5.original/debian/control     2005-07-21 21:32:23.000000000 
+0100
+++ dircproxy-1.0.5/debian/control      2005-07-21 22:15:32.498262512 +0100
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Alex Pennace <[EMAIL PROTECTED]>
-Build-Depends: debhelper
+Build-Depends: debhelper (>= 4.0.2)
 Standards-Version: 3.5.7
 
 Package: dircproxy
diff -urN dircproxy-1.0.5.original/debian/rules dircproxy-1.0.5/debian/rules
--- dircproxy-1.0.5.original/debian/rules       2005-07-21 21:32:23.000000000 
+0100
+++ dircproxy-1.0.5/debian/rules        2005-07-21 21:58:15.391926640 +0100
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=2
+export DH_COMPAT=4
 
 configure: configure-stamp
 configure-stamp:
diff -urN dircproxy-1.0.5.original/src/dcc_net.c dircproxy-1.0.5/src/dcc_net.c
--- dircproxy-1.0.5.original/src/dcc_net.c      2001-12-21 20:15:55.000000000 
+0000
+++ dircproxy-1.0.5/src/dcc_net.c       2005-07-21 21:53:17.146266872 +0100
@@ -364,7 +364,8 @@
       n = p->next;
       _dccnet_free(p);
 
-      p = (l ? l->next : proxies) = n;
+      if (l) l->next = n; else proxies = n;
+      p = n;
     } else {
       l = p;
       p = p->next;
diff -urN dircproxy-1.0.5.original/src/irc_server.c 
dircproxy-1.0.5/src/irc_server.c
--- dircproxy-1.0.5.original/src/irc_server.c   2002-01-31 14:56:37.000000000 
+0000
+++ dircproxy-1.0.5/src/irc_server.c    2005-07-21 21:50:11.263525344 +0100
@@ -700,7 +700,8 @@
               free(s);
 
               /* Was in the squelch list, so remove it and stop looking */
-              s = (l ? l->next : p->squelch_modes) = n;
+              if (l) l->next = n; else p->squelch_modes = n;
+              s = n;
               squelch = 1;
               break;
             } else {
@@ -741,7 +742,8 @@
               free(s);
 
               /* Was in the squelch list, so remove it and stop looking */
-              s = (l ? l->next : p->squelch_modes) = n;
+              if (l) l->next = n; else p->squelch_modes = n;
+              s = n;
               squelch = 1;
               break;
             } else {
diff -urN dircproxy-1.0.5.original/src/net.c dircproxy-1.0.5/src/net.c
--- dircproxy-1.0.5.original/src/net.c  2002-01-01 17:55:23.000000000 +0000
+++ dircproxy-1.0.5/src/net.c   2005-07-21 21:54:35.157407376 +0100
@@ -458,8 +458,8 @@
 
     return 0;
   }
-  
-  l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last);
+
+  l = (buff == SB_IN) ? &s->in_buff_last : &s->out_buff_last; 
 
   /* Check whether we can just add to the existing buffer */
   if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) {


-- 
Roger Leigh
                Printing on GNU/Linux?  http://gimp-print.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.


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

Reply via email to