X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsamba;h=19941f5081b3ce88cd06978e3828dbda7dc72421;hp=c3608500f73a5dbe5a4d2b699a29a4020ec70236;hb=e12bc37dca92fb3c92cde6e1585cb85471d23c78;hpb=fb26467bb390ba85c09f4af1fb16422ef7d800dc

diff --git a/lfs/samba b/lfs/samba
index c3608500f7..19941f5081 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.4
+VER        = 3.5.2
 
 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    = 15
+PAK_VER    = 26
 
-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 = 1443165edb7cb3f56f1e77aec1ee3266
+$(DL_FILE)_MD5 = 6f8cf649207ccd8c2c17e28c335f4e9d
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(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/ \
 				--sysconfdir=/var/ipfire \
@@ -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/