[packages_10.03.2] samba3: merge r28303 - r31247

[10.03/packages.git] / net / samba3 / patches / 120-owrt_paths.patch

diff --git a/net/samba3/patches/120-owrt_paths.patch b/net/samba3/patches/120-owrt_paths.patch
index 2cb2670..0d19f17 100644 (file)
--- a/net/samba3/patches/120-owrt_paths.patch
+++ b/net/samba3/patches/120-owrt_paths.patch
@@ -1,57 +1,35 @@
-Index: samba-3.0.24/source/Makefile
-===================================================================
---- samba-3.0.24.orig/source/Makefile  2008-08-06 23:33:20.000000000 +0200
-+++ samba-3.0.24/source/Makefile       2008-08-06 23:34:48.000000000 +0200
-@@ -12,7 +12,7 @@
- 
- # AR7
- # prefix=/usr/local/samba
--prefix=/var/samba
-+prefix=
- exec_prefix=${prefix}
- 
- # AR7
-@@ -108,11 +108,11 @@
- # These can be overridden by command line switches (see smbd(8))
+--- a/source/Makefile.in
++++ b/source/Makefile.in
+@@ -92,7 +92,7 @@ INSTALLPERMS = 0755
  # or in smb.conf (see smb.conf(5))
- LOGFILEBASE = ${VARDIR}
--CONFIGFILE = $(CONFIGDIR)/smb.conf
+ LOGFILEBASE = @logfilebase@
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
 -LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-+CONFIGFILE = /etc/samba/smb.conf
 +LMHOSTSFILE = /etc/lmhosts
  
  # This is where smbpasswd et al go
--PRIVATEDIR = ${prefix}/private
-+PRIVATEDIR = /etc/samba/
- 
- SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
- PRIVATE_DIR = $(PRIVATEDIR)
-@@ -121,10 +121,10 @@
- SWATDIR = ${prefix}/swat
- 
- # the directory where lock files go
--LOCKDIR = ${VARDIR}/locks
-+LOCKDIR = ${VARDIR}/lock
- 
- # the directory where pid files go
--PIDDIR = ${VARDIR}/locks
-+PIDDIR = ${VARDIR}/lock
- 
- LIBSMBCLIENT=bin/libsmbclient.a bin/libsmbclient.so
- LIBSMBCLIENT_MAJOR=0
-Index: samba-3.0.24/source/lib/util.c
-===================================================================
---- samba-3.0.24.orig/source/lib/util.c        2008-08-06 23:41:58.000000000 +0200
-+++ samba-3.0.24/source/lib/util.c     2008-08-06 23:42:10.000000000 +0200
-@@ -300,11 +300,7 @@
-       char *p;
-       if ((p = getenv("TMPDIR")))
-               return p;
--#if 1 /* AR7 */
--      return "/var/tmp";
--#else
-       return "/tmp";
--#endif
- }
- 
- /****************************************************************************
+ PRIVATEDIR = @privatedir@
+--- a/source/configure
++++ b/source/configure
+@@ -1536,8 +1536,8 @@ Optional Packages:
+   --with-fhs              Use FHS-compliant paths (default=no)
+   --with-privatedir=DIR   Where to put smbpasswd ($ac_default_prefix/private)
+   --with-rootsbindir=DIR  Which directory to use for root sbin ($ac_default_prefix/sbin)
+-  --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)
+-  --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)
++  --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/lock)
++  --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/run)
+   --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)
+   --with-configdir=DIR    Where to put configuration files ($libdir)
+   --with-logfilebase=DIR  Where to put log files ($VARDIR)
+@@ -2295,8 +2295,8 @@ fi
+ 
+ 
+ rootsbindir="\${SBINDIR}"
+-lockdir="\${VARDIR}/locks"
+-piddir="\${VARDIR}/locks"
++lockdir="\${VARDIR}/lock"
++piddir="\${VARDIR}/run"
+ test "${mandir}" || mandir="\${prefix}/man"
+ logfilebase="\${VARDIR}"
+ privatedir="\${prefix}/private"