Merge remote-tracking branch 'stevee/proxy-cgi-ldap-hostname' into next

diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index 719a1d88f010e0d06fdf1cf3ae3d5c0a1c319164..77406150963d500aefb2f10b998f4d1e5b510574 100644 (file)
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -43,3 +43,4 @@ var/ipfire/general-functions.pl
 var/ipfire/langs
 var/ipfire/outgoing/bin/outgoingfw.pl
 var/ipfire/qos/bin/makeqosscripts.pl
+var/ipfire/updatexlrator/bin/download

diff --git a/config/rootfiles/packages/cifs-utils b/config/rootfiles/packages/cifs-utils
new file mode 100644 (file)
index 0000000..e26e37e
--- /dev/null
+++ b/config/rootfiles/packages/cifs-utils
@@ -0,0 +1,3 @@
+sbin/mount.cifs
+#usr/local/include/cifsidmap.h
+#usr/local/share/man/man8/mount.cifs.8

diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
index 0616b4ba2e25f10997c4468ed09e75dd1ade7876..fc8cc44fc2ddb31420c5f79e1f52b59fba16f0b3 100644 (file)
--- a/config/rootfiles/packages/samba
+++ b/config/rootfiles/packages/samba
@@ -1,11 +1,5 @@
 usr/bin/eventlogadm
 usr/bin/findsmb
-usr/bin/ldbadd
-usr/bin/ldbdel
-usr/bin/ldbedit
-usr/bin/ldbmodify
-usr/bin/ldbrename
-usr/bin/ldbsearch
 usr/bin/net
 usr/bin/nmblookup
 usr/bin/ntlm_auth
@@ -21,10 +15,12 @@ usr/bin/smbget
 usr/bin/smbpasswd
 usr/bin/smbspool
 usr/bin/smbstatus
+usr/bin/smbta-util
 usr/bin/smbtar
 usr/bin/smbtree
 usr/bin/tdbbackup
 usr/bin/tdbdump
+usr/bin/tdbrestore
 usr/bin/tdbtool
 usr/bin/testparm
 usr/bin/wbinfo
@@ -33,7 +29,6 @@ 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
@@ -43,8 +38,10 @@ usr/lib/libsmbsharemodes.so
 usr/lib/libsmbsharemodes.so.0
 usr/lib/libtalloc.so
 usr/lib/libtalloc.so.2
+usr/lib/libtalloc.so.2.0.5
 usr/lib/libtdb.so
 usr/lib/libtdb.so.1
+usr/lib/libtdb.so.1.2.9
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 #usr/lib/samba
@@ -55,11 +52,11 @@ usr/lib/samba/charset/CP437.so
 usr/lib/samba/charset/CP850.so
 usr/lib/samba/gpext
 usr/lib/samba/idmap
+usr/lib/samba/idmap/autorid.so
 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
 #usr/lib/samba/vfs
@@ -68,6 +65,7 @@ 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/crossrename.so
 usr/lib/samba/vfs/default_quota.so
 usr/lib/samba/vfs/dirsort.so
 usr/lib/samba/vfs/expand_msdfs.so
@@ -75,6 +73,7 @@ usr/lib/samba/vfs/extd_audit.so
 usr/lib/samba/vfs/fake_perms.so
 usr/lib/samba/vfs/fileid.so
 usr/lib/samba/vfs/full_audit.so
+usr/lib/samba/vfs/linux_xfs_sgid.so
 usr/lib/samba/vfs/netatalk.so
 usr/lib/samba/vfs/preopen.so
 usr/lib/samba/vfs/readahead.so
@@ -87,11 +86,11 @@ usr/lib/samba/vfs/smb_traffic_analyzer.so
 usr/lib/samba/vfs/streams_depot.so
 usr/lib/samba/vfs/streams_xattr.so
 usr/lib/samba/vfs/syncops.so
+usr/lib/samba/vfs/time_audit.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/winbindd
@@ -116,12 +115,6 @@ usr/sbin/winbindd
 #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
-#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
@@ -150,13 +143,13 @@ usr/sbin/winbindd
 #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_autorid.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
 #usr/share/man/man8/pam_winbind.8
@@ -164,19 +157,21 @@ usr/sbin/winbindd
 #usr/share/man/man8/smbd.8
 #usr/share/man/man8/smbpasswd.8
 #usr/share/man/man8/smbspool.8
+#usr/share/man/man8/smbta-util.8
 #usr/share/man/man8/swat.8
 #usr/share/man/man8/tdbbackup.8
 #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_aio_fork.8
+#usr/share/man/man8/vfs_aio_pthread.8
 #usr/share/man/man8/vfs_audit.8
 #usr/share/man/man8/vfs_cacheprime.8
 #usr/share/man/man8/vfs_cap.8
 #usr/share/man/man8/vfs_catia.8
 #usr/share/man/man8/vfs_commit.8
+#usr/share/man/man8/vfs_crossrename.8
 #usr/share/man/man8/vfs_default_quota.8
 #usr/share/man/man8/vfs_dirsort.8
 #usr/share/man/man8/vfs_extd_audit.8
@@ -197,6 +192,7 @@ usr/sbin/winbindd
 #usr/share/man/man8/vfs_smb_traffic_analyzer.8
 #usr/share/man/man8/vfs_streams_depot.8
 #usr/share/man/man8/vfs_streams_xattr.8
+#usr/share/man/man8/vfs_time_audit.8
 #usr/share/man/man8/vfs_xattr_tdb.8
 #usr/share/man/man8/winbindd.8
 var/ipfire/backup/addons/includes/samba
@@ -218,6 +214,7 @@ var/ipfire/samba/smb.conf
 var/ipfire/samba/smb.conf.default
 var/lib/samba
 var/log/samba
+var/nmbd
 etc/rc.d/init.d/samba
 etc/rc.d/init.d/winbind
 srv/web/ipfire/cgi-bin/samba.cgi

diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt
index 8d0674a9c879da9df86e5a912913d9e360526837..47bfc802d55a44571043361312d3c9bef7fd1996 100644 (file)
--- a/config/rpi-firmware/config.txt
+++ b/config/rpi-firmware/config.txt
@@ -20,8 +20,8 @@ gpu_mem_512=32
 ###############################################################################
 #
 # underclock at idle
-arm_freq_min=500
-sdram_freq_min=250
+#arm_freq_min=500
+#sdram_freq_min=250
 #
 # use following paramters to overclock at load
 #arm_freq=1000

diff --git a/config/updxlrator/download b/config/updxlrator/download
index 6744d9c6e956eecef14ec04ed0528b07f0b42284..8b219bcab46fc3b0c43a99e29864d9ec924934b3 100644 (file)
--- a/config/updxlrator/download
+++ b/config/updxlrator/download
@@ -49,7 +49,7 @@ $vendorid =~ tr/A-Z/a-z/;
 unless (-d "$repository/download/$vendorid")
 {
        system("mkdir -p $repository/download/$vendorid");
-       system("chmod 775 $repository/download/$vendorid");
+       #system("chmod 775 $repository/download/$vendorid");
 }
 
 if($restartdl == 0)
@@ -159,13 +159,13 @@ if ($_ == 0)
        unless (-d "$repository/$vendorid")
        {
                system("mkdir -p $repository/$vendorid");
-               system("chmod 775 $repository/$vendorid");
+               #system("chmod 775 $repository/$vendorid");
        }
 
        unless (-d "$repository/$vendorid/$uuid")
        {
                system("mkdir -p $repository/$vendorid/$uuid");
-               system("chmod 775 $repository/$vendorid/$uuid");
+               #system("chmod 775 $repository/$vendorid/$uuid");
        }
 
        &writelog("Moving file to the cache directory: $vendorid/$uuid");
@@ -181,7 +181,7 @@ if ($_ == 0)
        &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
 
        system("/usr/local/bin/updxsetperms");
-       system("chmod 775 $repository/$vendorid/$uuid/*");
+       #system("chmod 775 $repository/$vendorid/$uuid/*");
 
        unlink ("$repository/download/$vendorid/$updatefile.info");
 

diff --git a/lfs/cifs-utils b/lfs/cifs-utils
new file mode 100644 (file)
index 0000000..f3b75f5
--- /dev/null
+++ b/lfs/cifs-utils
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 5.9
+
+THISAPP    = cifs-utils-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = cifs-utils
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7164ad6f7963a31fcbffbe4f14a7cfc6
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/samba b/lfs/samba
index ed4554a0c723e9564bf60e7f239bb548329a565e..5d0e17206bb44d85c86b82d21c685a5e8c138c6f 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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.5.20
+VER        = 3.6.11
 
 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    = 44
+PAK_VER    = 45
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5ac0420b2e7336f902204bcef3319b9f
+$(DL_FILE)_MD5 = 9039e0ab3e4fc632ff0a1a8f2433edb4
 
 install : $(TARGET)
 
@@ -87,7 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-winbind \
                                --disable-swat \
                                --enable-cups \
-                               --with-cifsmount \
                                --with-syslog
        cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP)/source3 && make install

diff --git a/make.sh b/make.sh
index 29facbffefd1b778feb0b7ce252399075e66920e..8c2bb0d0e8aa3306adb1ca526c28cb653f634dc6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -590,6 +590,7 @@ buildipfire() {
   ipfiremake ghostscript
   ipfiremake foomatic
   ipfiremake hplip
+  ipfiremake cifs-utils
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc