X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsamba;h=b09d67b64f772b2be7b0c6b55e861bc35e27c2b9;hp=b846f38edd6259386e211c8de66bcc977f564e22;hb=449749f1ef56fa7eb147f4637e867c6e076f21d7;hpb=07bfc29212778c7feaa338a358bfd3b195995af4

diff --git a/lfs/samba b/lfs/samba
index b846f38edd..b09d67b64f 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.29
+VER        = 3.3.10
 
 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    = 6
+PAK_VER    = 22
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ac338e28f159e59a8d25cb1d0895cf8e
+$(DL_FILE)_MD5 = 84645ff5f0fb213e2371e629507dc8bb
 
 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
-	cd $(DIR_APP)/source && make
+				--prefix=/usr \
+				--libdir=/usr/lib/ \
+				--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 proto && make all $(MAKETUNING) $(EXTRA_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