[Pkg-samba-maint] r2830 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-06-06 13:16:10 +0000 (Sat, 06 Jun 2009)
New Revision: 2830

Removed:
   trunk/samba/debian/patches/no-unnecessary-cups.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Drop patch. The issue that was worked around by this patch had been fixed by
introducing "cups connection timeout" in 3.3.0


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-06-06 12:58:38 UTC (rev 2829)
+++ trunk/samba/debian/changelog	2009-06-06 13:16:10 UTC (rev 2830)
@@ -10,6 +10,11 @@
   [ Debconf translations ]
   * Italian. Closes: #529350
 
+  [ Christian Perrier ]
+  * debian/patches/no-unnecessary-cups.patch dropped: "cups connection
+    timeout" was introduced in 3.3.0 to address the issue that
+    motivated this workaround
+
  -- Steve Langasek <vorlon at debian.org>  Sat, 16 May 2009 15:44:12 -0700
 
 samba (2:3.3.4-2) unstable; urgency=low

Deleted: trunk/samba/debian/patches/no-unnecessary-cups.patch
===================================================================
--- trunk/samba/debian/patches/no-unnecessary-cups.patch	2009-06-06 12:58:38 UTC (rev 2829)
+++ trunk/samba/debian/patches/no-unnecessary-cups.patch	2009-06-06 13:16:10 UTC (rev 2830)
@@ -1,22 +0,0 @@
-Goal: Don't try to contact the CUPS server when we can reliably
-determine that no printers are needed
-
-Fixes: bug #479512
-
-Upstream status: submitted as bugzilla bug #5525
-
-Index: samba-3.3.0rc2/source/smbd/server.c
-===================================================================
---- samba-3.3.0rc2.orig/source/smbd/server.c
-+++ samba-3.3.0rc2/source/smbd/server.c
-@@ -806,6 +806,10 @@
- 	int pnum = lp_servicenumber(PRINTERS_NAME);
- 	const char *pname;
- 
-+	if (!lp_load_printers()
-+	    && (lp_auto_services() == NULL || !strcmp(lp_auto_services(),"")))
-+		return;
-+
- 	pcap_cache_reload();
- 
- 	/* remove stale printers */

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2009-06-06 12:58:38 UTC (rev 2829)
+++ trunk/samba/debian/patches/series	2009-06-06 13:16:10 UTC (rev 2830)
@@ -16,6 +16,5 @@
 usershare.patch
 swat-de.patch
 smbtar-bashism.patch
-no-unnecessary-cups.patch
 shrink-dead-code.patch
 fix-manpages-warnings.patch