Merge remote-tracking branch 'ms/axel-fixperms' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Jan 2013 14:58:14 +0000 (15:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Jan 2013 14:58:14 +0000 (15:58 +0100)
15 files changed:
config/rootfiles/core/66/exclude
config/rootfiles/core/66/filelists/files
config/rootfiles/core/66/update.sh
config/rootfiles/packages/cifs-utils [new file with mode: 0644]
config/rootfiles/packages/samba
config/rpi-firmware/config.txt
html/cgi-bin/proxy.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/cifs-utils [new file with mode: 0644]
lfs/igb
lfs/r8168
lfs/samba
make.sh
src/initscripts/init.d/firewall

index 0b54d050622e84eb6bba667200572f9adcca7b30..18141fd3eeabb4d8f81478f667904023dbf4ba8f 100644 (file)
@@ -6,6 +6,7 @@ etc/ipsec.conf
 etc/ipsec.secrets
 etc/ipsec.user.conf
 etc/ipsec.user.secrets
+var/log/cache
 var/updatecache
 etc/localtime
 var/ipfire/ovpn
index 719a1d88f010e0d06fdf1cf3ae3d5c0a1c319164..77406150963d500aefb2f10b998f4d1e5b510574 100644 (file)
@@ -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
index c63db02b7c0135bdfd2d0a1c78267070c5a84cc4..d764c4322b46ed081909e1c6a791bfc439bb33b0 100644 (file)
@@ -294,6 +294,7 @@ case $(uname -m) in
                #
                # ReInstall grub
                #
+                       echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
                        grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
        ;;
 esac
diff --git a/config/rootfiles/packages/cifs-utils b/config/rootfiles/packages/cifs-utils
new file mode 100644 (file)
index 0000000..e26e37e
--- /dev/null
@@ -0,0 +1,3 @@
+sbin/mount.cifs
+#usr/local/include/cifsidmap.h
+#usr/local/share/man/man8/mount.cifs.8
index 0616b4ba2e25f10997c4468ed09e75dd1ade7876..fc8cc44fc2ddb31420c5f79e1f52b59fba16f0b3 100644 (file)
@@ -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
index 8d0674a9c879da9df86e5a912913d9e360526837..47bfc802d55a44571043361312d3c9bef7fd1996 100644 (file)
@@ -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
index b217de361cfacc02dcea2d78ee7f23da81930324..0b28c2adf36a4fa0738147fc1bc768c158144755 100644 (file)
@@ -358,12 +358,17 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                $errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
                goto ERROR;
        }
-       if (!($proxysettings{'UPSTREAM_PROXY'} eq '')) {
-         my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
-         if (!(&General::validip($temp[0]))) {
-           $errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
-           goto ERROR;
-          }
+       if (!($proxysettings{'UPSTREAM_PROXY'} eq ''))
+       {
+               my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
+               if (!(&General::validip($temp[0])))
+               {
+                       if (!(&General::validdomainname($temp[0])))
+                       {
+                               $errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
+                               goto ERROR;
+                       }
+               }
         }
        if (!($proxysettings{'CACHE_SIZE'} =~ /^\d+/) ||
                ($proxysettings{'CACHE_SIZE'} < 10))
@@ -512,8 +517,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                }
                if (!&General::validip($proxysettings{'LDAP_SERVER'}))
                {
-                       $errormessage = $Lang::tr{'advproxy errmsg ldap server'};
-                       goto ERROR;
+                       if (!&General::validdomainname($proxysettings{'LDAP_SERVER'}))
+                       {
+                               $errormessage = $Lang::tr{'advproxy errmsg ldap server'};
+                               goto ERROR;
+                       }
                }
                if (!&General::validport($proxysettings{'LDAP_PORT'}))
                {
index a2a9e1e76e14cfaa2da709273c4b82e573131e4c..93529d805400badbddc25d4b914ef6e9af28f2bb 100644 (file)
 'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse',
 'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
-'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
+'advproxy errmsg invalid upstream proxy' => 'Ungültige IP/Hostname für Upstream-Proxy',
 'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
 'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
 'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
 'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
 'advproxy errmsg ldap port' => 'Ungültige LDAP-Portnummer',
-'advproxy errmsg ldap server' => 'Ungültige IP-Adresse für den LDAP-Server',
+'advproxy errmsg ldap server' => 'Ungültige IP-Adresse/Hostname für den LDAP-Server',
 'advproxy errmsg max userip' => 'Ungültige Anzahl von IP-Adressen pro Benutzer',
 'advproxy errmsg mem cache size' => 'Ungültiger Wert für die Größe des RAM-Cachespeichers',
 'advproxy errmsg no browser' => 'Mindestens ein Browser oder Client muss für den Web-Zugriff zugelassen sein',
 'ovpn on blue' => 'OpenVPN auf BLAU',
 'ovpn on orange' => 'OpenVPN auf ORANGE',
 'ovpn on red' => 'OpenVPN auf ROT',
-'ovpn routes push' => 'Routen (eine pro Zeile)',
+'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Route push Optionen',
 'ovpn server status' => 'OpenVPN-Server-Status',
 'ovpn subnet' => 'OpenVPN-Subnetz (z.B. 10.0.10.0/255.255.255.0)',
index 23df6bd6a87bf7be492b00cf2fadb362d536d0cd..7990e2adff3056e9601f21148c220b69a758ce1f 100644 (file)
 'advproxy errmsg invalid mac' => 'Invalid MAC address',
 'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
 'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
-'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
+'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP/hostname',
 'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
 'advproxy errmsg invalid user' => 'Username does not exist',
 'advproxy errmsg ldap base dn' => 'LDAP base DN required',
 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
 'advproxy errmsg ldap port' => 'Invalid LDAP port number',
-'advproxy errmsg ldap server' => 'Invalid IP address for LDAP Server',
+'advproxy errmsg ldap server' => 'Invalid IP address/hostname for LDAP Server',
 'advproxy errmsg max userip' => 'Invalid number of IP addresses per user',
 'advproxy errmsg mem cache size' => 'Invalid value for memory cache size',
 'advproxy errmsg no browser' => 'At least one browser or client must be selected for web access',
 'download root certificate' => 'Download root certificate',
 'dpd action' => 'Dead Peer Detection action',
 'driver' => 'Driver',
-'drop input' => 'Log dropped input pakets',
-'drop newnotsyn' => 'Log dropped new not syn pakets',
-'drop output' => 'Log dropped output pakets',
-'drop portscan' => 'Log dropped portscan pakets',
+'drop input' => 'Log dropped input packets',
+'drop newnotsyn' => 'Log dropped new not syn packets',
+'drop output' => 'Log dropped output packets',
+'drop portscan' => 'Log dropped portscan packets',
 'drop proxy' => 'Drop all packets not addressed to proxy',
 'drop samba' => 'Drop all Microsoft ports 135,137,138,139,445,1025',
-'drop wirelessforward' => 'Log dropped wireless forward pakets',
-'drop wirelessinput' => 'Log dropped wireless input pakets',
+'drop wirelessforward' => 'Log dropped wireless forward packets',
+'drop wirelessinput' => 'Log dropped wireless input packets',
 'dst port' => 'Dst Port',
 'dstprt range overlaps' => 'Destination port range overlaps an already defined port.',
 'dstprt within existing' => 'Destination port is within an already defined port range.',
 'ovpn on blue' => 'OpenVPN on BLUE',
 'ovpn on orange' => 'OpenVPN on ORANGE',
 'ovpn on red' => 'OpenVPN on RED',
-'ovpn routes push' => 'Routes (one per line):',
+'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Route push options',
 'ovpn server status' => 'Current OpenVPN server status:',
 'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)',
diff --git a/lfs/cifs-utils b/lfs/cifs-utils
new file mode 100644 (file)
index 0000000..f3b75f5
--- /dev/null
@@ -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/igb b/lfs/igb
index 29da8bb888ee9127f1c794db8b63dbfece6ce749..0ebf466ea1d81d43770d4e5b0b86a4fff8056441 100644 (file)
--- a/lfs/igb
+++ b/lfs/igb
@@ -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        #
@@ -32,7 +32,7 @@ else
        MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
 endif
 
-VER        = 3.4.8
+VER        = 4.1.2
 
 THISAPP    = igb-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 36bd0eface2761577f52d84d5c5b78ea
+$(DL_FILE)_MD5 = 0a5462b76310b83a40c9023edae50d72
 
 install : $(TARGET)
 
index 940172fe9aecc28db92d6a5729589542866b97ae..c4aa6a960ada3fdf917d99163a5d26503a500bcf 100644 (file)
--- a/lfs/r8168
+++ b/lfs/r8168
@@ -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        #
@@ -32,7 +32,7 @@ else
        MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
 endif
 
-VER        = 8.032.00
+VER        = 8.035.00
 
 THISAPP    = r8168-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 942ce02459a181093f77bb4d5cc75d45
+$(DL_FILE)_MD5 = 80b8d23e463e5408dced1b1377579dae
 
 install : $(TARGET)
 
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
index 7478978671fa9cf318e82eb1e873b0c15dc1be52..e54ecedc6b1dc7dc194954354c974805f54720e4 100644 (file)
@@ -335,7 +335,9 @@ case "$1" in
        ;;
   restart)
        $0 stop
+       $0 stopovpn
        $0 start
+       $0 startovpn
        ;;
   *)
         echo "Usage: $0 {start|stop|reload|restart}"