X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsamba;h=2b308f5f155d3101001f08010c9cb98115a5901b;hb=5595bc0381fe971b538ddd0b7cf3bf4a9f31832c;hp=df99866f4ec3373a470bb032bcde0ca81629f937;hpb=59de0b00db1c180965df666517765ced67509787;p=ipfire-2.x.git

diff --git a/lfs/samba b/lfs/samba
index df99866f4e..2b308f5f15 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.24
+VER        = 3.0.28
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 1
+PAK_VER    = 4
+
+DEPS       = "cups cyrus-sasl"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 89273f67a6d8067cbbecefaa13747153
+$(DL_FILE)_MD5 = 8761cd7c02833d959fbebd4f69895075
 
 install : $(TARGET)
 
@@ -84,9 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 				    --with-piddir=/var/run \
 				    --with-fhs \
 				    --with-smbmount \
-				    --with-winbind \
-				    --without-pam
-	cd $(DIR_APP)/source && make && make nsswitch
+				    --with-winbind
+	cd $(DIR_APP)/source && make
 	cd $(DIR_APP)/source && make install
 	cd $(DIR_APP)/source && mv -v /usr/lib/samba/libsmbclient.so /usr/lib
 	cd $(DIR_APP)/source && ln -v -sf ../libsmbclient.so /usr/lib/samba
@@ -98,7 +97,6 @@ $(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
-	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/
@@ -108,8 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
+	-mkdir -p /var/log/samba
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)