Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/lfs/samba b/lfs/samba
index 71df43f8ebdaadfe7673a0566afc659b3c997a50..4dbb90fd004327143c799fd4de893d8a105f3fac 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.5
+VER        = 3.3.10
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 10
+PAK_VER    = 24
 
-DEPS       = "cups cyrus-sasl"
+DEPS       = "cups"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f7539e09803ae60a2912e70adf1c747
+$(DL_FILE)_MD5 = 84645ff5f0fb213e2371e629507dc8bb
 
 install : $(TARGET)
 
@@ -79,7 +79,7 @@ $(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 \
-                               --libdir=/usr/lib/samba \
+                               --libdir=/usr/lib/ \
                                --sysconfdir=/var/ipfire \
                                --localstatedir=/var \
                                --with-piddir=/var/run \
@@ -91,11 +91,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-syslog
        cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP)/source && make install
-       cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib
-       cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so
-       cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so
-       cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so
-       cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so
+#      cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib
+#      cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so
+#      cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so
+#      cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so
+#      cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so
        cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h
        cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h
        cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_wins.so /lib