X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsamba;h=33cdc418eecfc84c8587211623b2a9b8dcba5079;hb=c7845ac1102ab98add72d01a7d1d62e2aca493b8;hp=f74eeb959f9f0c420ab4430044421b31ce67697a;hpb=a8b159e729afb532d289fce4d398b728b9f2f75c;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/samba b/lfs/samba
index f74eeb959f..33cdc418ee 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,15 +26,15 @@
 
 include Config
 
-VER        = 3.0.22
+VER        = 3.0.23d
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.samba.org/pub/samba
+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
@@ -50,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5c39505af17cf5caf3d6ed8bab135036
+$(DL_FILE)_MD5 = afe6923d05fed5b5ccab593c7a407cd1
 
 install : $(TARGET)
 
@@ -107,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)