X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsamba;h=22bf2624cdbdd060e04987c2b3e8b25bd5c68593;hp=c3010e9c76c69acfb1f218e328e4e7c173abb68f;hb=8906905349244b1fbbb0642f8ed169d3f3a76adf;hpb=3b9f63495811d9ab2792f999d6fce150e7eea87b

diff --git a/lfs/samba b/lfs/samba
index c3010e9c76..22bf2624cd 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,13 +26,15 @@
 
 include Config
 
-VER        = 3.0.22
+VER        = 3.0.24
 
 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    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5c39505af17cf5caf3d6ed8bab135036
+$(DL_FILE)_MD5 = 89273f67a6d8067cbbecefaa13747153
 
 install : $(TARGET)
 
@@ -59,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh samba $(THISAPP)
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -83,13 +79,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/source && ./configure \
 				    --prefix=/usr \
-				    --sysconfdir=/etc \
+				    --sysconfdir=/var/ipfire \
 				    --localstatedir=/var \
 				    --with-piddir=/var/run \
 				    --with-fhs \
 				    --with-smbmount \
 				    --with-winbind \
-				    --with-pam
+				    --without-pam
 	cd $(DIR_APP)/source && make && make nsswitch
 	cd $(DIR_APP)/source && make install
 	cd $(DIR_APP)/source && mv -v /usr/lib/samba/libsmbclient.so /usr/lib
@@ -100,25 +96,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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 /etc/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 /etc/xinetd.d/swat"		>> /etc/xinetd.d/swat
-	echo ""					>> /etc/xinetd.d/swat
-	echo "service swat"				>> /etc/xinetd.d/swat
-	echo "{"					>> /etc/xinetd.d/swat
-	echo "    port            = 901"		>> /etc/xinetd.d/swat
-	echo "    socket_type     = stream"	>> /etc/xinetd.d/swat
-	echo "    wait            = no"		>> /etc/xinetd.d/swat
-	echo "    only_from       = 127.0.0.1"	>> /etc/xinetd.d/swat
-	echo "    user            = root"		>> /etc/xinetd.d/swat
-	echo "    server          = /usr/sbin/swat"	>> /etc/xinetd.d/swat
-	echo "    log_on_failure  += USERID"	>> /etc/xinetd.d/swat
-	echo "}"					>> /etc/xinetd.d/swat
-	echo ""					>> /etc/xinetd.d/swat
-	echo "# End /etc/xinetd.d/swat"		>> /etc/xinetd.d/swat
+#	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
+	cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)