From 4a55fa564ad17940de8b69bfa59f16ded29cf9ef Mon Sep 17 00:00:00 2001
From: Maniacikarus <maniacikarus@ipfire.org>
Date: Thu, 2 Oct 2008 22:34:20 +0200
Subject: [PATCH] Upgraded samba to 3.2.4

---
 config/rootfiles/packages/samba | 23 ++++++++++------------
 lfs/samba                       | 35 ++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
index 4260fe1f7b..f0d1a83b74 100644
--- a/config/rootfiles/packages/samba
+++ b/config/rootfiles/packages/samba
@@ -8,7 +8,6 @@ lib/libnss_winbind.so
 lib/libnss_winbind.so.2
 lib/libnss_wins.so
 lib/libnss_wins.so.2
-sbin/mount.smbfs
 usr/bin/eventlogadm
 usr/bin/findsmb
 usr/bin/net
@@ -22,37 +21,35 @@ usr/bin/smbclient
 usr/bin/smbcontrol
 usr/bin/smbcquotas
 usr/bin/smbget
-usr/bin/smbmnt
-usr/bin/smbmount
 usr/bin/smbpasswd
 usr/bin/smbspool
 usr/bin/smbstatus
 usr/bin/smbtar
 usr/bin/smbtree
-usr/bin/smbumount
 usr/bin/tdbbackup
 usr/bin/tdbdump
 usr/bin/tdbtool
 usr/bin/testparm
 usr/bin/wbinfo
-#usr/include/libmsrpc.h
 #usr/include/libsmbclient.h
+usr/lib/libtalloc.so
+usr/lib/libtalloc.so.1
+usr/lib/libtdb.so
+usr/lib/libtdb.so.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
+usr/lib/libwbclient.so
+usr/lib/libwbclient.so.0
+usr/lib/samba/libsmbclient.so.0
+usr/lib/samba/libtalloc.so.1
+usr/lib/samba/libtdb.so.1
+usr/lib/samba/libwbclient.so.0
 #usr/lib/samba
 #usr/lib/samba/auth
 usr/lib/samba/auth/script.so
 #usr/lib/samba/charset
 usr/lib/samba/charset/CP437.so
 usr/lib/samba/charset/CP850.so
-usr/lib/samba/de.msg
-usr/lib/samba/en.msg
-#usr/lib/samba/fi.msg
-#usr/lib/samba/fr.msg
-#usr/lib/samba/idmap
-#usr/lib/samba/it.msg
-#usr/lib/samba/ja.msg
-usr/lib/samba/libmsrpc.so
 usr/lib/samba/libsmbclient.so
 usr/lib/samba/libsmbsharemodes.so
 usr/lib/samba/lowcase.dat
diff --git a/lfs/samba b/lfs/samba
index 7c48fcf470..53914bfcf2 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.32
+VER        = 3.2.4
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be13b8dbe2785212dba49e7ced352f30
+$(DL_FILE)_MD5 = 7870a6bb3a025c6081cd56688acd494a
 
 install : $(TARGET)
 
@@ -78,19 +78,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/source && ./configure \
-				    --prefix=/usr \
-				    --sysconfdir=/var/ipfire \
-				    --localstatedir=/var \
-				    --with-piddir=/var/run \
-				    --with-fhs \
-				    --with-smbmount \
-				    --with-winbind
+				--prefix=/usr \
+				--libdir=/usr/lib/samba \
+				--sysconfdir=/var/ipfire \
+				--localstatedir=/var \
+				--with-piddir=/var/run \
+				--with-fhs \
+				--with-winbind \
+				--disable-swat \
+				--enable-cups \
+				--with-cifsmount \
+				--with-syslog
 	cd $(DIR_APP)/source && make
 	cd $(DIR_APP)/source && make install
-	cd $(DIR_APP)/source && mv -v /usr/lib/samba/libsmbclient.so /usr/lib
-	cd $(DIR_APP)/source && ln -v -sf ../libsmbclient.so /usr/lib/samba
-	cd $(DIR_APP)/source && ln -v -sf libsmbclient.so /usr/lib/libsmbclient.so.0
-	cd $(DIR_APP)/source && chmod -v 644 /usr/include/lib{smbclient,msrpc}.h
+	cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib
+	cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so
+	cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so
+	cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so
+	cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so
+	cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h
+	cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h
 	cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_wins.so /lib
 	cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_winbind.so /lib
 	cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
-- 
2.39.2