Samba-Update auf neues Patchlevel. Jaja, die Sicherheitsluecken oder sowas...

[people/pmueller/ipfire-2.x.git] / lfs / samba

diff --git a/lfs/samba b/lfs/samba
index 09810c786ed377d580ac1f18b50432865032f816..96f6e5d8cefbf252d892c1d4553ab93b0b1921eb 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 3.0.24
+VER        = 3.0.25b
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,6 +36,10 @@ 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
 ###############################################################################
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 89273f67a6d8067cbbecefaa13747153
+$(DL_FILE)_MD5 = e4979a6aa6f18f0e36bacc25cab7b02d
 
 install : $(TARGET)
 
@@ -84,9 +88,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,15 +101,15 @@ $(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 /var/samba        
-       cp -vf $(DIR_SRC)/config/samba /var/ipfire/samba
-       chown nobody:nobody /var/ipfire/samba/default.*
-       chmod 644 /var/ipfire/samba/default.*
+       -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)