[Pkg-cups-devel] r662 - in cupsys/trunk/debian: . patches

[Till Kamppeter]

Author: till-guest
Date: Wed Dec 19 11:01:41 2007
New Revision: 662

Log:
Added patch to fix detection of network interfaces.


Added:
   cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Wed Dec 19 11:01:41 2007
@@ -7,6 +7,12 @@
   * Update pdftops.pl to 1.20. It fixes overwriting arbitary files
     via symlink attack. (CVE-2007-6358, closes: #456960)
 
+  [ Till Kamppeter ]
+  * debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch :
+    Fix a regression in upstream code that has removed the network interface
+    update poll (CUPS STR #2631, LP: #177075). Thanks to Hugues Fournier
+    (hugues dot fournier at gmail dot com) for the patch.
+
  -- Kenshi Muto <kmuto at debian.org>  Wed, 19 Dec 2007 17:07:05 +0900
 
 cupsys (1.3.4-4) unstable; urgency=high

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Wed Dec 19 11:01:41 2007
@@ -13,3 +13,4 @@
 reactivate_recommended_driver.dpatch
 include_krb5_h_in_job_h.dpatch
 search_mime_files_in_usr_share.dpatch
+fix_regression_reactivate_net_ifaces_changes_detection.dpatch

Added: cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch	Wed Dec 19 11:01:41 2007
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_regression_reactivate_net_ifaces_changes_detection.dpatch by Hugues Fournier <hugues.fournier at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Forwarded and committed upstream: http://www.cups.org/str.php?L2631 (revision 7141 - pre 1.3.6)
+
+ at DPATCH@
+diff -urNad cupsys-1.3.4~/scheduler/main.c cupsys-1.3.4/scheduler/main.c
+--- cupsys-1.3.4~/scheduler/main.c	2007-12-19 06:36:48.000000000 +0100
++++ cupsys-1.3.4/scheduler/main.c	2007-12-19 06:38:57.000000000 +0100
+@@ -148,6 +148,9 @@
+   cups_file_t		*fp;		/* Fake lpsched lock file */
+   struct stat		statbuf;	/* Needed for checking lpsched FIFO */
+ #endif /* __sgi */
++#ifndef __APPLE__
++  time_t		netif_time = 0;	/* Time since last network update */
++#endif /* __APPLE__ */
+ #if HAVE_LAUNCHD
+   int			launchd_idle_exit;
+ 					/* Idle exit on select timeout? */
+@@ -808,6 +811,18 @@
+ 
+     current_time = time(NULL);
+ 
++#ifndef __APPLE__
++   /*
++    * Update the network interfaces once a minute...
++    */
++
++    if ((current_time - netif_time) >= 60)
++    {
++      netif_time  = current_time;
++      NetIFUpdate = 1;
++    }
++#endif /* !__APPLE__ */
++
+ #if HAVE_LAUNCHD
+    /*
+     * If no other work was scheduled and we're being controlled by launchd