X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsamba;h=df99866f4ec3373a470bb032bcde0ca81629f937;hb=59de0b00db1c180965df666517765ced67509787;hp=eaffd938da662d46f8ecf3154548cebdd9573172;hpb=961f22c4a1fb968eeebb713f41451bcf5b99449b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/samba b/lfs/samba
index eaffd938da..df99866f4e 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 3.0.23a
+VER        = 3.0.24
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e48f196fa51c22ff67463680ce95a58d
+$(DL_FILE)_MD5 = 89273f67a6d8067cbbecefaa13747153
 
 install : $(TARGET)
 
@@ -98,23 +98,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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)/source && install -v -m755 -d /usr/share/doc/samba-3.0.22
-#	cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22
-#	cd $(DIR_APP)/source && ln -v -s ../../samba/swat  /usr/share/doc/samba-3.0.22
-	echo "swat            901/tcp" >> /etc/services
-	echo "# Begin /var/ipfire/xinetd/xinetd.d/swat"	>> /var/ipfire/xinetd/xinetd.d/swat
-	echo ""					>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "service swat"				>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "{"					>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "    port            = 901"		>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "    socket_type     = stream"	>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "    wait            = no"		>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "#    only_from       = 127.0.0.1"	>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "    user            = root"		>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "    server          = /usr/sbin/swat"	>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "    log_on_failure  += USERID"	>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "}"					>> /var/ipfire/xinetd/xinetd.d/swat
-	echo ""					>> /var/ipfire/xinetd/xinetd.d/swat
-	echo "# End /var/ipfire/xinetd/xinetd.d/swat"	>> /var/ipfire/xinetd/xinetd.d/swat
+	cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
+	-mkdir -p /var/ipfire/samba	
+	cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
+	chown nobody:nobody -R /var/ipfire/samba/
+	cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
+	cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
+	cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
+	cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
+	cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
+	cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
+	#useradd -c 'Samba User' -s /bin/false
+	#groupadd sambauser
+	#groupadd sambawks
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)