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, next has been updated via 92d75b2ed53e72427beab0dbda8f06577d42e4c5 (commit) via f1245444a8cfd2be1ebf1d348fe74d8261bc5cfd (commit) via b21d4f81e0f7dddf50f06aacd0ef3daf1dd1cc24 (commit) via 4537ec169c8e996a46e77909a698277413f95787 (commit) via c75cc1f68ead70bff8617fecfd46a6405b38a9ca (commit) via a45d2204afcdf47af93884b48cdf6705d6f39d15 (commit) via d54cea882a8b43a80e31587b00ade2203f769d54 (commit) via c25b6ae66a52e2cfe6320ea63916b738cfb1f232 (commit) via dcfc6334b91b8b6d24df73bb30e35e2fd865ee08 (commit) via e201b6d5376939eaeec36417f09d9fe6b6dcfe5d (commit) via 47713b5e2627438325d2644304d4249a309923a9 (commit) via 68e2d326edb9c8b514a47f6744bfda4484cb0004 (commit) from 5292c03dde57902d170a3a7bbd3a74e6ae1acdf9 (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 92d75b2ed53e72427beab0dbda8f06577d42e4c5 Merge: f124544 c25b6ae Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 20:14:27 2013 +0100

Merge remote-tracking branch 'ummeegge/ovpn-firewall-fixes' into next

commit f1245444a8cfd2be1ebf1d348fe74d8261bc5cfd Merge: b21d4f8 dcfc633 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 20:10:10 2013 +0100

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

commit b21d4f81e0f7dddf50f06aacd0ef3daf1dd1cc24 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 20:08:44 2013 +0100

core66: add updatexlerator download to updater.

commit 4537ec169c8e996a46e77909a698277413f95787 Merge: c75cc1f 68e2d32 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 20:06:18 2013 +0100

Merge remote-tracking branch 'stevee/axel-log-fix' into next

commit c75cc1f68ead70bff8617fecfd46a6405b38a9ca Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 19:57:14 2013 +0100

rpi-firmware: disabled idle underclock at default.

A user has reported connection problems if this is enabled.

commit a45d2204afcdf47af93884b48cdf6705d6f39d15 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 19:54:51 2013 +0100

cifs-utils: new package.

last samba update remove mount.cifs so it's now an extra package.

commit d54cea882a8b43a80e31587b00ade2203f769d54 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 26 19:54:10 2013 +0100

samba: update to 3.6.11.

commit c25b6ae66a52e2cfe6320ea63916b738cfb1f232 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Tue Jan 22 20:43:15 2013 +0100

firewall: Recreate openvpn chains after firewall restart.

Fixes #10216.

commit dcfc6334b91b8b6d24df73bb30e35e2fd865ee08 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Jan 22 19:38:12 2013 +0100

proxy.cgi: Allow to set a hostname as upstream proxy.

Fixes #10215.

commit e201b6d5376939eaeec36417f09d9fe6b6dcfe5d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Jan 21 21:15:50 2013 +0100

proxy.cgi: Also allow to use a hostname for the LDAP server.

Fixes #10265.

commit 47713b5e2627438325d2644304d4249a309923a9 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Thu Jan 10 10:13:30 2013 +0100

ovpn+firewall: Extend example and fixed typos

Bug reference #10193 and #10274

commit 68e2d326edb9c8b514a47f6744bfda4484cb0004 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Dec 19 20:47:07 2012 +0100

updxlerator: Disable call of chmod on downloader.

Disable the call of chmod after downloading a file. This is not woking because of different owner's and only flushes the log files.

Fixes #10088.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/66/filelists/files | 1 + config/rootfiles/packages/cifs-utils | 3 +++ config/rootfiles/packages/samba | 31 ++++++++++++++----------------- config/rpi-firmware/config.txt | 4 ++-- config/updxlrator/download | 8 ++++---- html/cgi-bin/proxy.cgi | 24 ++++++++++++++++-------- langs/de/cgi-bin/de.pl | 6 +++--- langs/en/cgi-bin/en.pl | 18 +++++++++--------- lfs/{libexif => cifs-utils} | 12 ++++++------ lfs/samba | 9 ++++----- make.sh | 1 + src/initscripts/init.d/firewall | 2 ++ 12 files changed, 65 insertions(+), 54 deletions(-) create mode 100644 config/rootfiles/packages/cifs-utils copy lfs/{libexif => cifs-utils} (92%)

Difference in files: diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files index 719a1d8..7740615 100644 --- 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 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 0616b4b..fc8cc44 100644 --- 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 8d0674a..47bfc80 100644 --- 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 6744d9c..8b219bc 100644 --- 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/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b217de3..0b28c2a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -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'})) { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a2a9e1e..93529d8 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -223,13 +223,13 @@ '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', @@ -1400,7 +1400,7 @@ '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)', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 23df6bd..7990e2a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -223,13 +223,13 @@ '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', @@ -758,14 +758,14 @@ '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.', @@ -1427,7 +1427,7 @@ '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 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 ed4554a..5d0e172 100644 --- 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 29facbf..8c2bb0d 100755 --- 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 diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 7478978..e54eced 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -335,7 +335,9 @@ case "$1" in ;; restart) $0 stop + $0 stopovpn $0 start + $0 startovpn ;; *) echo "Usage: $0 {start|stop|reload|restart}"

hooks/post-receive -- IPFire 2.x development tree