X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsamba;h=11ee55eb215ade43fbc41105afb7f424c4e8de25;hp=2a338f254f4acc54bd54fd9db11181527a08360e;hb=b4f7f8b6f812119bc299418821d8a8987071d342;hpb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d

diff --git a/lfs/samba b/lfs/samba
index 2a338f254f..11ee55eb21 100644
--- 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.0.25c
+VER        = 3.3.6
 
 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    = 1
+PAK_VER    = 17
 
-DEPS       = "cups openldap cyrus-sasl"
+DEPS       = "cups cyrus-sasl"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 87950694270b86cbc1b2074cb53dd1aa
+$(DL_FILE)_MD5 = 858cb6c640358be0e81297c5de615a3c
 
 install : $(TARGET)
 
@@ -78,19 +78,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/source && ./configure \
-				    --prefix=/usr \
-				    --sysconfdir=/var/ipfire \
-				    --localstatedir=/var \
-				    --with-piddir=/var/run \
-				    --with-fhs \
-				    --with-smbmount \
-				    --with-winbind
-	cd $(DIR_APP)/source && make
+				--prefix=/usr \
+				--libdir=/usr/lib/ \
+				--sysconfdir=/var/ipfire \
+				--localstatedir=/var \
+				--with-piddir=/var/run \
+				--with-fhs \
+				--with-winbind \
+				--disable-swat \
+				--enable-cups \
+				--with-cifsmount \
+				--with-syslog
+	cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_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
-	cd $(DIR_APP)/source && ln -v -sf libsmbclient.so /usr/lib/libsmbclient.so.0
-	cd $(DIR_APP)/source && chmod -v 644 /usr/include/lib{smbclient,msrpc}.h
+#	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
 	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
@@ -107,5 +114,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)