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

diff --git a/lfs/samba b/lfs/samba
index eaffd938da..6104dcb50b 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 3.0.23a
+VER        = 3.0.23b
 
 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 = f2d1a513fd7138fd1515d3bdf702f7c7
 
 install : $(TARGET)
 
@@ -101,20 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #	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/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)