[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 00a5af61dd2794316dbd50171b157a148a8629d2 - IPFire-SCM

10 Mar 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  00a5af61dd2794316dbd50171b157a148a8629d2 (commit)
       via  762b480cc4423b85d501577c8978c8b3a201dc8e (commit)
       via  9ed062c1f447d5957ea7e49077be6576f5b2ec7e (commit)
      from  54dae9b23c4a2909788b680e4100a3f1eb5da3a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 00a5af61dd2794316dbd50171b157a148a8629d2
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Wed Mar 10 23:03:29 2010 +0100
Updated samba to current stable.
The passsb packend has been change by the samba team, so we need
    to fix our config.
commit 762b480cc4423b85d501577c8978c8b3a201dc8e
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Wed Mar 10 22:44:35 2010 +0100
Enabled identd lookup for squid.
commit 9ed062c1f447d5957ea7e49077be6576f5b2ec7e
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Wed Mar 10 22:43:29 2010 +0100
Updated hostapd to current dev version which seems to be stable.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/samba |   35 +++++++++++++++++++++++++++++------
 config/samba/default.global     |    1 +
 html/cgi-bin/samba.cgi          |    1 +
 lfs/hostapd                     |    8 ++++----
 lfs/samba                       |   31 ++++++++++++-------------------
 lfs/squid                       |    2 +-
 src/paks/samba/update.sh        |    7 +++++--
 7 files changed, 53 insertions(+), 32 deletions(-)
Difference in files:

diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
index 2404362..95ed2aa 100644
--- a/config/rootfiles/packages/samba
+++ b/config/rootfiles/packages/samba
@@ -1,7 +1,3 @@
-lib/libnss_winbind.so
-lib/libnss_winbind.so.2
-lib/libnss_wins.so
-lib/libnss_wins.so.2
 usr/bin/eventlogadm
 usr/bin/findsmb
 usr/bin/ldbadd
@@ -37,6 +33,7 @@ usr/bin/wbinfo
 #usr/include/smb_share_modes.h
 #usr/include/talloc.h
 #usr/include/tdb.h
+#usr/include/wbc_async.h
 #usr/include/wbclient.h
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.0
@@ -45,7 +42,7 @@ usr/lib/libsmbclient.so.0
 usr/lib/libsmbsharemodes.so
 usr/lib/libsmbsharemodes.so.0
 usr/lib/libtalloc.so
-usr/lib/libtalloc.so.1
+usr/lib/libtalloc.so.2
 usr/lib/libtdb.so
 usr/lib/libtdb.so.1
 usr/lib/libwbclient.so
@@ -61,6 +58,7 @@ usr/lib/samba/idmap
 usr/lib/samba/lowcase.dat
 usr/lib/samba/nss_info
 usr/lib/samba/pdb
+usr/lib/samba/perfcount
 usr/lib/samba/rpc
 usr/lib/samba/upcase.dat
 usr/lib/samba/valid.dat
@@ -69,6 +67,7 @@ usr/lib/samba/vfs/acl_tdb.so
 usr/lib/samba/vfs/acl_xattr.so
 usr/lib/samba/vfs/audit.so
 usr/lib/samba/vfs/cap.so
+usr/lib/samba/vfs/catia.so
 usr/lib/samba/vfs/default_quota.so
 usr/lib/samba/vfs/dirsort.so
 usr/lib/samba/vfs/expand_msdfs.so
@@ -81,6 +80,7 @@ usr/lib/samba/vfs/preopen.so
 usr/lib/samba/vfs/readahead.so
 usr/lib/samba/vfs/readonly.so
 usr/lib/samba/vfs/recycle.so
+usr/lib/samba/vfs/scannedonly.so
 usr/lib/samba/vfs/shadow_copy.so
 usr/lib/samba/vfs/shadow_copy2.so
 usr/lib/samba/vfs/smb_traffic_analyzer.so
@@ -88,12 +88,33 @@ usr/lib/samba/vfs/streams_depot.so
 usr/lib/samba/vfs/streams_xattr.so
 usr/lib/samba/vfs/syncops.so
 usr/lib/samba/vfs/xattr_tdb.so
+usr/lib/security
+usr/lib/security/pam_smbpass.so
+usr/lib/security/pam_winbind.so
 usr/sbin/mount.cifs
 usr/sbin/nmbd
 usr/sbin/smbd
-usr/sbin/umount.cifs
 usr/sbin/winbindd
+#usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/da/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/de/LC_MESSAGES/net.mo
 #usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/es/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/it/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
 #usr/share/man/man1/findsmb.1
 #usr/share/man/man1/ldbadd.1
 #usr/share/man/man1/ldbdel.1
@@ -118,6 +139,7 @@ usr/sbin/winbindd
 #usr/share/man/man1/testparm.1
 #usr/share/man/man1/vfstest.1
 #usr/share/man/man1/wbinfo.1
+#usr/share/man/man5/pam_winbind.conf.5
 #usr/share/man/man5/lmhosts.5
 #usr/share/man/man5/smb.conf.5
 #usr/share/man/man5/smbgetrc.5
@@ -169,6 +191,7 @@ usr/sbin/winbindd
 #usr/share/man/man8/vfs_readahead.8
 #usr/share/man/man8/vfs_readonly.8
 #usr/share/man/man8/vfs_recycle.8
+#usr/share/man/man8/vfs_scannedonly.8
 #usr/share/man/man8/vfs_shadow_copy.8
 #usr/share/man/man8/vfs_shadow_copy2.8
 #usr/share/man/man8/vfs_smb_traffic_analyzer.8
diff --git a/config/samba/default.global b/config/samba/default.global
index 03b237d..48f572a 100644
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -4,6 +4,7 @@
 netbios name = ipfire
 server string = Samba
 workgroup = homeip.net
+passdb backend = smbpasswd
keep alive = 30
 os level = 33
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 4b8de89..4d90914 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -272,6 +272,7 @@ print FILE <<END
 netbios name = $sambasettings{'NETBIOSNAME'}
 server string = $sambasettings{'SRVSTRING'}
 workgroup = $sambasettings{'WORKGRP'}
+passdb backend = smbpasswd
wide links = $sambasettings{'WIDELINKS'}
 unix extensions = $sambasettings{'UNIXEXTENSION'}
diff --git a/lfs/hostapd b/lfs/hostapd
index c881f80..4f3ffb4 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
include Config
-VER        = 0.6.9
+VER        = 0.7.1
THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 16
+PAK_VER    = 17
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 83630d11fa66ade9091f1b304fccd74c
+$(DL_FILE)_MD5 = 3c4f71a889803935c7eb40fac6539d7c
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-usb_hw_did_not_ack.patch
+	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-usb_hw_did_not_ack.patch
    -cp /usr/src/linux/include/linux/genetlink.h /usr/include/linux/
    -cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/
    -cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/
diff --git a/lfs/samba b/lfs/samba
index 4dbb90f..a5fd0ad 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER        = 3.3.10
+VER        = 3.5.1
THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 24
+PAK_VER    = 25
DEPS       = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 84645ff5f0fb213e2371e629507dc8bb
+$(DL_FILE)_MD5 = 60811195b0507fa151b602684cece743
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/source && ./configure \
+	cd $(DIR_APP)/source3 && ./configure \
    			--prefix=/usr \
    			--libdir=/usr/lib/ \
    			--sysconfdir=/var/ipfire \
@@ -89,21 +89,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    			--enable-cups \
    			--with-cifsmount \
    			--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
-	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
-	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
+	cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)/source3 && make install
+	cd $(DIR_APP)/source3 && chmod -v 644 /usr/include/libsmbclient.h
+	#cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_wins.so /lib
+	#cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib
+	#cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
+	#cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
+	cd $(DIR_APP)/source3 && 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/
diff --git a/lfs/squid b/lfs/squid
index f1120ff..f895307 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
       --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
       --localstatedir=/var --sysconfdir=/etc/squid \
       --disable-poll --disable-icmp --disable-wccp \
-	   --disable-ident-lookups \
+	   --enable-ident-lookups \
       --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \
       --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
       --enable-http-violations --enable-auth=basic,ntlm \
diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh
index 89c40d0..6f4cb60 100644
--- a/src/paks/samba/update.sh
+++ b/src/paks/samba/update.sh
@@ -17,10 +17,13 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team info@ipfire.org.                        #
+# Copyright (C) 2010 IPFire-Team info@ipfire.org.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
-./install.sh
+extract_files
+restore_backup ${NAME}
+echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf
+/usr/local/bin/sambactrl smbstart
hooks/post-receive
--
IPFire 2.x development tree

    