Author: idra Date: 2007-09-03 16:09:30 +0000 (Mon, 03 Sep 2007) New Revision: 24938
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24938 Log: Patches to build 3.0.25c Added: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch Removed: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch Changeset: Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog =================================================================== --- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog 2007-09-03 13:13:25 UTC (rev 24937) +++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog 2007-09-03 16:09:30 UTC (rev 24938) @@ -1,3 +1,15 @@ +samba (3.0.25c-1) stable; urgency=low + + * samba 3.0.25c bugfix release + + -- Simo Sorce <[EMAIL PROTECTED]> Mon, 3 Sep 2007 11:18:30 -0400 + +samba (3.0.25b-1) stable; urgency=low + + * samba 3.0.25b bugfix release + + -- Simo Sorce <[EMAIL PROTECTED]> Mon, 2 Jul 2007 12:16:30 -0400 + samba (3.0.25a-2) stable; urgency=low * Fix bug in fhs.patch Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch =================================================================== --- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch 2007-09-03 13:13:25 UTC (rev 24937) +++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch 2007-09-03 16:09:30 UTC (rev 24938) @@ -13,15 +13,15 @@ .PP @@ -87,12 +94,12 @@ .TP 3n - • + \(bu -/usr/local/samba/sbin/swat +/usr/sbin/swat .TP 3n - • + \(bu -/usr/local/samba/swat/images/* +/usr/share/samba/swat/images/* .TP 3n - • + \(bu -/usr/local/samba/swat/help/* +/usr/share/samba/swat/help/* .SS "Inetd Installation" @@ -43,8 +43,8 @@ -you should add a line like this: +you should add a line like this (not needed for Debian since the maintainer scripts do it automatically. You need to uncomment the line, though, because it is added commented out for security reasons): .PP --\fBswat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat\fR -+\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR +-swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat ++swat stream tcp nowait.400 root /usr/sbin/swat swat .PP Once you have edited \fI/etc/services\fR Deleted: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch =================================================================== --- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch 2007-09-03 13:13:25 UTC (rev 24937) +++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch 2007-09-03 16:09:30 UTC (rev 24938) @@ -1,20 +0,0 @@ -diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c ---- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c 2002-11-26 20:54:19.000000000 -0600 -+++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c 2002-12-16 23:34:13.000000000 -0600 -@@ -214,12 +214,16 @@ - extern struct in_addr loopback_ip; - - 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(); Copied: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused (from rev 24937, branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch) Added: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch =================================================================== --- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch 2007-09-03 13:13:25 UTC (rev 24937) +++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch 2007-09-03 16:09:30 UTC (rev 24938) @@ -0,0 +1,11 @@ +--- samba-3.0.25c.orig/source/python/py_smb.c 2007-09-03 15:34:13.000000000 +0000 ++++ samba-3.0.25c/source/python/py_smb.c 2007-09-03 15:34:31.000000000 +0000 +@@ -48,7 +48,7 @@ + + ZERO_STRUCT(ip); + +- if (!cli_connect(cli, server, &ip)) ++ if (!NT_STATUS_IS_OK(cli_connect(cli, server, &ip))) + return NULL; + + return new_cli_state_object(cli);
