From: maniacikarus Date: Wed, 1 Apr 2009 16:21:39 +0000 (+0200) Subject: Updated samba to current stable for testing X-Git-Tag: v2.5-beta1~62 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=97e7cfaf262bcc5c71288caafdc0b5ef3fe932e5 Updated samba to current stable for testing --- diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba index 3422f532e5..fa3d715558 100644 --- a/config/rootfiles/packages/samba +++ b/config/rootfiles/packages/samba @@ -8,6 +8,7 @@ usr/bin/ldbadd usr/bin/ldbdel usr/bin/ldbedit usr/bin/ldbmodify +usr/bin/ldbrename usr/bin/ldbsearch usr/bin/net usr/bin/nmblookup @@ -15,6 +16,7 @@ usr/bin/ntlm_auth usr/bin/pdbedit usr/bin/profiles usr/bin/rpcclient +usr/bin/sharesec usr/bin/smbcacls usr/bin/smbclient usr/bin/smbcontrol @@ -36,8 +38,12 @@ usr/bin/wbinfo #usr/include/talloc.h #usr/include/tdb.h #usr/include/wbclient.h +usr/lib/libnetapi.so +usr/lib/libnetapi.so.0 usr/lib/libsmbclient.so 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/libtdb.so @@ -50,19 +56,8 @@ usr/lib/samba/auth/script.so #usr/lib/samba/charset usr/lib/samba/charset/CP437.so usr/lib/samba/charset/CP850.so +usr/lib/samba/gpext usr/lib/samba/idmap -usr/lib/samba/libnetapi.so -usr/lib/samba/libnetapi.so.0 -usr/lib/samba/libsmbclient.so -usr/lib/samba/libsmbclient.so.0 -usr/lib/samba/libsmbsharemodes.so -usr/lib/samba/libsmbsharemodes.so.0 -usr/lib/samba/libtalloc.so -usr/lib/samba/libtalloc.so.1 -usr/lib/samba/libtdb.so -usr/lib/samba/libtdb.so.1 -usr/lib/samba/libwbclient.so -usr/lib/samba/libwbclient.so.0 usr/lib/samba/lowcase.dat usr/lib/samba/nss_info usr/lib/samba/pdb @@ -70,6 +65,8 @@ usr/lib/samba/rpc usr/lib/samba/upcase.dat usr/lib/samba/valid.dat #usr/lib/samba/vfs +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/default_quota.so @@ -79,6 +76,7 @@ usr/lib/samba/vfs/fake_perms.so usr/lib/samba/vfs/fileid.so usr/lib/samba/vfs/full_audit.so usr/lib/samba/vfs/netatalk.so +usr/lib/samba/vfs/preopen.so usr/lib/samba/vfs/readahead.so usr/lib/samba/vfs/readonly.so usr/lib/samba/vfs/recycle.so @@ -94,17 +92,20 @@ usr/sbin/nmbd usr/sbin/smbd usr/sbin/umount.cifs usr/sbin/winbindd +#usr/share/locale/de/LC_MESSAGES/pam_winbind.mo #usr/share/man/man1/findsmb.1 #usr/share/man/man1/ldbadd.1 #usr/share/man/man1/ldbdel.1 #usr/share/man/man1/ldbedit.1 #usr/share/man/man1/ldbmodify.1 +#usr/share/man/man1/ldbrename.1 #usr/share/man/man1/ldbsearch.1 #usr/share/man/man1/log2pcap.1 #usr/share/man/man1/nmblookup.1 #usr/share/man/man1/ntlm_auth.1 #usr/share/man/man1/profiles.1 #usr/share/man/man1/rpcclient.1 +#usr/share/man/man1/sharesec.1 #usr/share/man/man1/smbcacls.1 #usr/share/man/man1/smbclient.1 #usr/share/man/man1/smbcontrol.1 @@ -123,13 +124,16 @@ usr/sbin/winbindd #usr/share/man/man7/libsmbclient.7 #usr/share/man/man7/pam_winbind.7 #usr/share/man/man7/samba.7 -#usr/share/man/man8/cifs.upcall.8 +#usr/share/man/man7/winbind_krb5_locator.7 #usr/share/man/man8/eventlogadm.8 #usr/share/man/man8/idmap_ad.8 +#usr/share/man/man8/idmap_adex.8 +#usr/share/man/man8/idmap_hash.8 #usr/share/man/man8/idmap_ldap.8 #usr/share/man/man8/idmap_nss.8 #usr/share/man/man8/idmap_rid.8 #usr/share/man/man8/idmap_tdb.8 +#usr/share/man/man8/idmap_tdb2.8 #usr/share/man/man8/mount.cifs.8 #usr/share/man/man8/net.8 #usr/share/man/man8/nmbd.8 @@ -142,6 +146,8 @@ usr/sbin/winbindd #usr/share/man/man8/tdbdump.8 #usr/share/man/man8/tdbtool.8 #usr/share/man/man8/umount.cifs.8 +#usr/share/man/man8/vfs_acl_tdb.8 +#usr/share/man/man8/vfs_acl_xattr.8 #usr/share/man/man8/vfs_audit.8 #usr/share/man/man8/vfs_cacheprime.8 #usr/share/man/man8/vfs_cap.8 @@ -156,6 +162,7 @@ usr/sbin/winbindd #usr/share/man/man8/vfs_netatalk.8 #usr/share/man/man8/vfs_notify_fam.8 #usr/share/man/man8/vfs_prealloc.8 +#usr/share/man/man8/vfs_preopen.8 #usr/share/man/man8/vfs_readahead.8 #usr/share/man/man8/vfs_readonly.8 #usr/share/man/man8/vfs_recycle.8 @@ -190,4 +197,4 @@ etc/rc.d/init.d/winbind srv/web/ipfire/cgi-bin/samba.cgi srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu -usr/local/bin/sambactrl +usr/local/bin/sambactrl \ No newline at end of file diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 2deb58443e..392034a58c 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -184,7 +184,6 @@ * lzo-2.02 * m4-1.4.4 * mISDNuser-1_1_9 -* mISDNuser-1_1_9.1 * madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.21 * make-3.81 * man-db-2.4.3 @@ -256,7 +255,7 @@ * rssdler-0.4.0a * rsync-3.0.4 * rtorrent-0.8.4 -* samba-3.2.8 +* samba-3.3.2 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 83b44e65c9..28518867ed 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -90,6 +90,8 @@ $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Never'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; +$sambasettings{'SYSLOGLEVEL'} = '1'; +$sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; $sambasettings{'DISPLAYCHARSET'} = 'CP850'; @@ -154,6 +156,8 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Never'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; + $sambasettings{'SYSLOGLEVEL'} = '1'; + $sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; $sambasettings{'DISPLAYCHARSET'} = 'CP850'; @@ -240,6 +244,7 @@ if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasettings{'WINSSUPPORT'} = "tru if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";} if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";} if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} +if ($sambasettings{'SYSLOGONLY'} eq 'on'){ $sambasettings{'SYSLOGONLY'} = "yes";} else { $sambasettings{'SYSLOGONLY'} = "no";} ############################################################################################################################ ############################################# Schreiben der Samba globals ################################################## @@ -286,7 +291,9 @@ log file = /var/log/samba/samba-log.%m lock directory = /var/lock/samba pid directory = /var/run/ log level = $sambasettings{'LOGLEVEL'} - +syslog = $sambasettings{'SYSLOGLEVEL'} +syslog only = $sambasettings{'SYSLOGONLY'} + preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} local master = $sambasettings{'LOCALMASTER'} @@ -352,6 +359,9 @@ if ($errormessage) ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### +$checked{'SYSLOGONLY'}{'off'} = ''; +$checked{'SYSLOGONLY'}{'on'} = ''; +$checked{'SYSLOGONLY'}{$sambasettings{'SYSLOGONLY'}} = "checked='checked'"; $checked{'WINSSUPPORT'}{'off'} = ''; $checked{'WINSSUPPORT'}{'on'} = ''; $checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked'"; @@ -432,6 +442,9 @@ print <$Lang::tr{'display charset'} $Lang::tr{'server string'} $Lang::tr{'log level'} +Sys$Lang::tr{'log level'} +Syslog onlyon / + off $Lang::tr{'interfaces'}on / off | OpenVpn - $ovpnsettings{'DOVPN_SUBNET'} diff --git a/lfs/samba b/lfs/samba index 6aa78f8fb0..374636e82e 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.2.8 +VER = 3.3.2 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 = 13 +PAK_VER = 14 DEPS = "cups cyrus-sasl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 06efd6e6cc4aac628a1a0b082e4be0f2 +$(DL_FILE)_MD5 = 5c5178ea2c5d9bd5f6569285f2e0e6d7 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