X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsamba;h=96f6e5d8cefbf252d892c1d4553ab93b0b1921eb;hb=a794edfd37abe41cb2a1810b3102b68aebaf5261;hp=bd86d757a98bda33eb620b6af9093913fba215c9;hpb=54113aa2ddb38e8e6338e2d8043c9d77bd08638a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/samba b/lfs/samba
index bd86d757a9..96f6e5d8ce 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,19 @@
 
 include Config
 
-VER        = 3.0.22
+VER        = 3.0.25b
 
 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
+
+DESCDE     = "Samba ist ein Windows-File- und Printserver."
+DESCEN     = "Samba is a file- and printserver for Windows."
+DEPS       = "cups openldap cyrus-sasl"
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5c39505af17cf5caf3d6ed8bab135036
+$(DL_FILE)_MD5 = e4979a6aa6f18f0e36bacc25cab7b02d
 
 install : $(TARGET)
 
@@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh samba $(THISAPP)
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -83,14 +83,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
-	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
@@ -100,26 +99,17 @@ $(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
+	-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
+	-mkdir -p /var/log/samba
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)