X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsamba;h=369bb18d5e9d6777d38291fe083f4d4d24e18fc7;hp=6aa78f8fb09fa5d1318187137d32d9702db78163;hb=164520ef0e18df389b7b839accaa26595a4b44bb;hpb=1c732fce8aa0858463f0044d1f6a5da721395410

diff --git a/lfs/samba b/lfs/samba
index 6aa78f8fb0..369bb18d5e 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) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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.2.8
+VER        = 3.5.7
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 13
+PAK_VER    = 33
 
-DEPS       = "cups cyrus-sasl"
+DEPS       = "cups"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 06efd6e6cc4aac628a1a0b082e4be0f2
+$(DL_FILE)_MD5 = b04441da711df05a1525bf57b92c051b
 
 install : $(TARGET)
 
@@ -77,9 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/source && ./configure \
+	cd $(DIR_APP)/source3 && ./configure \
 				--prefix=/usr \
-				--libdir=/usr/lib/samba \
+				--libdir=/usr/lib/ \
 				--sysconfdir=/var/ipfire \
 				--localstatedir=/var \
 				--with-piddir=/var/run \
@@ -89,21 +89,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 				--enable-cups \
 				--with-cifsmount \
 				--with-syslog
-	cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP)/source && make install
-	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
-	cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
-#	cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
-	cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
+	cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)/source3 && make install
+	cd $(DIR_APP)/source3 && chmod -v 644 /usr/include/libsmbclient.h
+	#cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_wins.so /lib
+	#cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib
+	#cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
+	#cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
+	cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
 	-mkdir -p /var/ipfire/samba	
 	cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
 	chown nobody:nobody -R /var/ipfire/samba/