[Pkg-samba-maint] r983 - in trunk: . patches

[Steve Langasek]

Author: vorlon
Date: 2006-01-23 08:57:53 +0000 (Mon, 23 Jan 2006)
New Revision: 983

Modified:
   trunk/changelog
   trunk/patches/autoconf.patch
Log:
Add missing changes to source/include/config.h.in into the autoconf.patch, so
that samba looks for files in /var/lib/samba like it's supposed to instead of
in /var/run/samba!



Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-01-23 02:24:45 UTC (rev 982)
+++ trunk/changelog	2006-01-23 08:57:53 UTC (rev 983)
@@ -8,8 +8,13 @@
   * Add "bind interfaces only" and "interfaces" options (commented)
     to the default smb.conf file. Closes: #349043
 
- -- Christian Perrier <bubulle at debian.org>  Sun, 22 Jan 2006 14:48:27 +0100
+  [ Steve Langasek ]
+  * Add missing changes to source/include/config.h.in into the
+    autoconf.patch, so that samba looks for files in /var/lib/samba like it's
+    supposed to instead of in /var/run/samba!  Closes: #349372, #349464.
 
+ -- Steve Langasek <vorlon at debian.org>  Mon, 23 Jan 2006 00:55:07 -0800
+
 samba (3.0.21a-3) unstable; urgency=low
 
   * Add Build-Depends on quilt (>= 0.40 as we use quilt.make)

Modified: trunk/patches/autoconf.patch
===================================================================
--- trunk/patches/autoconf.patch	2006-01-23 02:24:45 UTC (rev 982)
+++ trunk/patches/autoconf.patch	2006-01-23 08:57:53 UTC (rev 983)
@@ -1,7 +1,7 @@
 Index: samba-3.0.21a/source/configure
 ===================================================================
---- samba-3.0.21a.orig/source/configure	2005-12-29 15:50:51.000000000 -0800
-+++ samba-3.0.21a/source/configure	2006-01-18 07:37:42.000000000 -0800
+--- samba-3.0.21a.orig/source/configure	2006-01-23 00:49:17.000000000 -0800
++++ samba-3.0.21a/source/configure	2006-01-23 00:53:26.000000000 -0800
 @@ -310,7 +310,7 @@
  # include <unistd.h>
  #endif"
@@ -4144,3 +4144,17 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
+Index: samba-3.0.21a/source/include/config.h.in
+===================================================================
+--- samba-3.0.21a.orig/source/include/config.h.in	2006-01-23 00:53:02.000000000 -0800
++++ samba-3.0.21a/source/include/config.h.in	2006-01-23 00:54:38.000000000 -0800
+@@ -48,6 +48,9 @@
+ /* Define to turn on dmalloc debugging */
+ #undef ENABLE_DMALLOC
+ 
++/* Whether to use fully FHS-compatible paths */
++#undef FHS_COMPATIBLE
++
+ /* Whether the host os is FreeBSD */
+ #undef FREEBSD
+