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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-06-27 07:24:51 +0000 (Wed, 27 Jun 2007)
New Revision: 1467

Removed:
   trunk/samba/debian/patches/nmbd-signalling.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Dropped patch (applied upstream)


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-06-27 07:20:59 UTC (rev 1466)
+++ trunk/samba/debian/changelog	2007-06-27 07:24:51 UTC (rev 1467)
@@ -2,6 +2,8 @@
 
   * New upstream version
   * Bugs fixed upstream:
+  * Drop patches that have been applied upstream:
+    - nmbd-signalling.patch
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 27 Jun 2007 08:40:18 +0200
 

Deleted: trunk/samba/debian/patches/nmbd-signalling.patch
===================================================================
--- trunk/samba/debian/patches/nmbd-signalling.patch	2007-06-27 07:20:59 UTC (rev 1466)
+++ trunk/samba/debian/patches/nmbd-signalling.patch	2007-06-27 07:24:51 UTC (rev 1467)
@@ -1,33 +0,0 @@
-Goal: Make sure nmbd still responds to SIGTERM if it has no interfaces to
-      listen on
-
-Fixes: #168079
-
-Status wrt upstream: forwarded to samba-technical 2007/05/30
-                     will be in 3.0.26
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Note: To be confirmed by Steve
-
-Index: samba-3.0.25a/source/nmbd/nmbd_subnetdb.c
-===================================================================
---- samba-3.0.25a.orig/source/nmbd/nmbd_subnetdb.c	2007-05-26 07:45:40.136219349 +0200
-+++ samba-3.0.25a/source/nmbd/nmbd_subnetdb.c	2007-05-26 07:46:31.104625382 +0200
-@@ -185,12 +185,16 @@
- 	struct in_addr unicast_ip, ipzero;
- 
- 	if(num_interfaces == 0) {
-+		void (*old_handler)(int);
-+
- 		DEBUG(0,("create_subnets: No local interfaces !\n"));
- 		DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
-+		old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
- 		while (iface_count() == 0) {
- 			sleep(5);
- 			load_interfaces();
- 		}
-+		CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
- 	}
- 
- 	num_interfaces = iface_count();

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2007-06-27 07:20:59 UTC (rev 1466)
+++ trunk/samba/debian/patches/series	2007-06-27 07:24:51 UTC (rev 1467)
@@ -3,7 +3,6 @@
 fhs.patch
 installswat.sh.patch
 make-distclean.patch
-nmbd-signalling.patch
 non-linux-ports.patch
 pam-examples.patch
 README_nosmbldap-tools.patch