Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

diff --git a/config/backup/include b/config/backup/include
index 87abb071e37e5ce5ffd31b3909364ffb95895c72..8806640cffa645e4945db4be0adcac1405435482 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -7,6 +7,7 @@
 /etc/passwd
 /etc/shadow
 /etc/group
+/etc/ipsec.user.*
 /etc/sysconfig/*
 /etc/hosts*
 /etc/httpd/*
@@ -14,6 +15,7 @@
 /var/ipfire/auth/users
 /var/ipfire/dhcp/*
 /var/ipfire/main/*
+/var/ipfire/outgoing/groups
 /var/ipfire/outgoing/rules
 /var/ipfire/outgoing/p2protocols
 /var/ipfire/ovpn

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index faae91839f5cca2683c8f04462a412d0951a8f82..6737b6cca37d08fecf477d2ca289c07e24e68871 100644 (file)
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -3,6 +3,8 @@ etc/ssh/moduli
 etc/ssh/ssh_config
 #etc/ssh/ssh_host_dsa_key
 #etc/ssh/ssh_host_dsa_key.pub
+#etc/ssh/ssh_host_ecdsa_key
+#etc/ssh/ssh_host_ecdsa_key.pub
 #etc/ssh/ssh_host_key
 #etc/ssh/ssh_host_key.pub
 #etc/ssh/ssh_host_rsa_key

diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index c075845f628211dc342a7090fecc8f143c2fbea0..bc1ac49f0b86720f71602acacfb0d6292dff825b 100644 (file)
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1116,6 +1116,7 @@ usr/lib/libssl.so.0.9.8
 #usr/share/man/man3/dsa.3
 #usr/share/man/man3/ecdsa.3
 #usr/share/man/man3/engine.3
+#usr/share/man/man3/err.3
 #usr/share/man/man3/evp.3
 #usr/share/man/man3/hmac.3
 #usr/share/man/man3/i2d_ASN1_OBJECT.3

diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/core/46/exclude
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01b7a7f2ae19f30fe926138af409e181b810dcc4 100644 (file)
--- a/config/rootfiles/core/46/exclude
+++ b/config/rootfiles/core/46/exclude
@@ -0,0 +1,3 @@
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf

diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files
index 5f4605e5009f635406e2f5ad5903ff85bf56a407..956e06e572fd21780640fc058d8417747bb09e89 100644 (file)
--- a/config/rootfiles/core/46/filelists/files
+++ b/config/rootfiles/core/46/filelists/files
@@ -1,2 +1,11 @@
 etc/system-release
 boot/ipfirerd-2.6.32.28.img
+opt/pakfire/lib/functions.pl
+var/ipfire/backup/include
+srv/web/ipfire/cgi-bin/system.cgi
+srv/web/ipfire/cgi-bin/ddns.cgi
+usr/local/bin/setddns.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/es.pl
+var/ipfire/langs/fr.pl

diff --git a/config/rootfiles/core/46/filelists/openssh b/config/rootfiles/core/46/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/46/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/46/filelists/openssl b/config/rootfiles/core/46/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/46/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/config/rootfiles/core/46/filelists/squid b/config/rootfiles/core/46/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/46/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh
index f178d1013ce750b3a16dd9c5a2b55eabbbd3ea16..6d2a75dc49b4eb1b4c7f63006e77197fdb4695a3 100644 (file)
--- a/config/rootfiles/core/46/update.sh
+++ b/config/rootfiles/core/46/update.sh
@@ -36,10 +36,11 @@ extract_files
 
 #
 #Start services
+/etc/init.d/squid restart
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 # Rebuild initrd of optional pae and xen kernel
 KVER=2.6.32.28
@@ -53,5 +54,7 @@ depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
 
 #
 #Finish
+/etc/init.d/fireinfo start
+sendprofile
 #Don't report the exitcode last command
 exit 0

diff --git a/config/rootfiles/core/47/exclude b/config/rootfiles/core/47/exclude
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files
new file mode 100644 (file)
index 0000000..befb6bf
--- /dev/null
+++ b/config/rootfiles/core/47/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+var/ipfire/backup/include

diff --git a/config/rootfiles/core/47/meta b/config/rootfiles/core/47/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/47/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh
new file mode 100644 (file)
index 0000000..b67200a
--- /dev/null
+++ b/config/rootfiles/core/47/update.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove core updates from pakfire cache to save space...
+rm -f /var/cache/pakfire/core-upgrade-*.ipfire
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 17b99fdf6386c95d9254647573b03e8ddeb81929..fae43b8c41df449497478e603eff7f5d32aea114 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.7
+usr/lib/libclamav.so.6.1.9
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.7
+usr/lib/libclamunrar.so.6.1.9
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.7
+usr/lib/libclamunrar_iface.so.6.1.9
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 4dba22f535a058949936ce7f83c9b7c77d4da879..f7ae56852d8b4da6cb3c2513ecb6c7eca034dc47 100644 (file)
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -243,12 +243,12 @@ $checked{'SERVICE'}{'easydns.com'} = '';
 $checked{'SERVICE'}{'enom.com'} = '';
 $checked{'SERVICE'}{'freedns.afraid.org'} = '';
 $checked{'SERVICE'}{'hn.org'} = '';
-$checked{'SERVICE'}{'mydyn.de'} = '';
 $checked{'SERVICE'}{'no-ip.com'} = '';
 $checked{'SERVICE'}{'nsupdate'} = '';
 $checked{'SERVICE'}{'ovh.com'} = '';
 $checked{'SERVICE'}{'regfish.com'} = '';
 $checked{'SERVICE'}{'selfhost.de'} = '';
+$checked{'SERVICE'}{'strato.com'} = '';
 $checked{'SERVICE'}{'tzo.com'} = '';
 $checked{'SERVICE'}{'zoneedit.com'} = '';
 $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'";
@@ -336,12 +336,12 @@ print <<END
     <option $checked{'SERVICE'}{'enom.com'}>enom.com</option>
     <option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option>
     <option $checked{'SERVICE'}{'hn.org'}>hn.org</option>
-    <option $checked{'SERVICE'}{'mydyn.de'}>mydyn.de</option>
     <option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option>
     <option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option>
     <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option>
     <option $checked{'SERVICE'}{'regfish.com'}>regfish.com</option>
     <option $checked{'SERVICE'}{'selfhost.de'}>selfhost.de</option>
+    <option $checked{'SERVICE'}{'strato.com'}>strato.com</option>
 <!--    <option $checked{'SERVICE'}{'tzo.com'}>tzo.com</option>        comment this service out until a working fix is developed -->
     <option $checked{'SERVICE'}{'zoneedit.com'}>zoneedit.com</option>
     </select></td>

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 734e7dc8868d5d81d278dfe0102a2566eaf77675..7da270c97ecd23f1e2598fca216245703760d239 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") {
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
        #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}";
        #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
        #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}";
        #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
 } else {
        $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 424ca868f15161e1694d55217032080ddbc99ace..b6efe095849431c112ab8d36bd488833aaa829d5 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -279,6 +279,7 @@ sub isrunningaddon{
 
        if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+               $testcmd =~ s/.* //gi;
                $testcmd =~ s/[a-z_]//gi;
                $testcmd =~ s/\[[0-1]\;[0-9]+//gi;
                $testcmd =~ s/[\(\)\.]//gi;

diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index 4b8ee47e69a4ec3e42e03fe7d4ffc46879913af3..a0e7655ab95e1b62aec711eb501b68f626f3fa4c 100644 (file)
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -56,16 +56,16 @@ if ( $querry[0] =~ "cpufreq"){
        &Header::openpage($Lang::tr{'status information'}, 1, '');
        &Header::openbigbox('100%', 'left');
 
+       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+       &Graphs::makegraphbox("system.cgi","cpu","day","325");
+       &Header::closebox();
+
        if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
                &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
                &Graphs::makegraphbox("system.cgi","cpufreq","day","325");
                &Header::closebox();
        }
 
-       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
-       &Graphs::makegraphbox("system.cgi","cpu","day","325");
-       &Header::closebox();
-
        &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
        &Graphs::makegraphbox("system.cgi","load","day");
        &Header::closebox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b4db1feee23336fac3fe5109718c62fc412489de..808092e2492d71fb67362b93a70a68e107e71c1b 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -18,6 +18,7 @@
 'ConnSched ipsecstart' => 'IPSec (neu)starten',
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Neu verbinden',
+'cpu frequency per' => 'CPU Frequenz pro',
 'ConnSched scheduled actions' => 'Geplante Aktionen',
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Wähle Profil',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a1d687d05fd25aa3401110f0c9d419de88f61f73..26349e1925a93f9b01422db16c5bcefe0f272ca3 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -17,6 +17,7 @@
 'ConnSched down' => 'Down',
 'ConnSched ipsecstart' => 'IPSec (re)start',
 'ConnSched ipsecstop' => 'IPSec stop',
+'cpu frequency per' => 'CPU frequency per',
 'ConnSched reconnect' => 'Reconnect',
 'ConnSched scheduled actions' => 'Scheduled actions',
 'ConnSched scheduler' => 'Scheduler',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index f5640cf538652572858a4ffed7afbc4f8599a569..cad4406acbf88ae2469e337a5776182a8c0b552b 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -535,6 +535,7 @@
 'cpu idle usage' => 'Uso de CPU inactivo',
 'cpu interrupt usage' => 'Uso de interrupción de CPU',
 'cpu iowait usage' => 'CPU esperando IO',
+'cpu frequency per' => 'CPU frecuencia por',
 'cpu irq usage' => 'Uso de IRQ del CPU',
 'cpu nice usage' => 'Buen uso de CPU',
 'cpu steal usage' => 'uso de CPU steal',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 6ccb4d507c3a70697e081999e609976a6fcc9360..eb81c5227e39525a57df662272cdb9fd9e3e4b53 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -16,6 +16,7 @@
 'ConnSched days' => 'Jours :',
 'ConnSched down' => 'Arrêt',
 'ConnSched ipsecstart' => 'IPSec (re)démarrage',
+'cpu frequency per' => 'CPU fréquence par',
 'ConnSched ipsecstop' => 'IPSec arrêt',
 'ConnSched reconnect' => 'Reconnecter',
 'ConnSched scheduled actions' => 'Actions planifiées',

diff --git a/lfs/clamav b/lfs/clamav
index e5a0512adb4847d387ace82f630ea7e73e0b4919..a9d97098d0c963be0e04e34adc35a524c54301b6 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        = 0.96.5
+VER        = 0.97
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a
+$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
 
 install : $(TARGET)
 

diff --git a/lfs/openssh b/lfs/openssh
index c9ce7148bb842fe775087a7de1c26a32d9cf3908..9f1c280503d46c7420efc1a92769e8b20518fd2a 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        = 5.6p1
+VER        = 5.8p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0
+$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index dc65ef5bc1960449cca36e0507ae6bf9f5d53271..285cae343bf1b7f7f56fa6d8320c75163d43c738 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        = 0.9.8q
+VER        = 0.9.8r
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
+$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79
 
 install : $(TARGET)
 

diff --git a/lfs/squid b/lfs/squid
index 9bb8b50b8a0a5af0242bd0b399eafdc77d656ea2..16df6210109aa01ce0f309b90e6dcdd2a67e6373 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -87,7 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-referer-log \
              --enable-snmp \
           --with-pthreads --with-dl \
-          --with-maxfd="16384"
+          --with-maxfd="16384" \
+          --with-large-files
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index 389c825b79c9d09e19dd551650307b47a448162c..2a8abc8a6b9dec866aa72f0ed00d029ebd1ea37e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.9"                                                  # Version number
-CORE="46"                                                      # Core Level (Filename)
-PAKFIRE_CORE="45"                                              # Core Level (PAKFIRE)
+CORE="47"                                                      # Core Level (Filename)
+PAKFIRE_CORE="46"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index ba0242367fdfa6e571515b426f53e95db5cba6b4..133b4950f49a860557f3492edfea7bf5802906fc 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -865,7 +865,7 @@ sub checkcryptodb {
        unless ( "$ret" eq "0" ) {
                message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
                message("CRYPTO WARN: It's normal to see this on first execution.");
-               my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fd 2";
+               my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
                system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
                system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
        } else {

diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh
index 5e4b7b988670917a116db49144b55507f752891e..3b7610cd42c17574e90595afcf0da95e7dc469b9 100644 (file)
--- a/src/paks/clamav/install.sh
+++ b/src/paks/clamav/install.sh
@@ -23,4 +23,4 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
-/usr/local/bin/clamavctrl enable
+/usr/local/bin/clamavctrl enable &

diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl
index beb9af8b884ee7d530cb7a6cdf28992384ee9f5c..2c7c947f548d68f903e2034e0d93f7125d232cdc 100644 (file)
--- a/src/scripts/setddns.pl
+++ b/src/scripts/setddns.pl
@@ -174,33 +174,6 @@ if ($ip ne $ipcache) {
                                &General::log("Dynamic DNS ip-update for cjb.net ($settings{'LOGIN'}) : failure (could not connect to server)");
                            }
                        }
-                       elsif ($settings{'SERVICE'} eq 'mydyn') {
-                           # use proxy ?
-                           my %proxysettings;
-                           &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
-                           if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
-                               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
-                               Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
-                           }
-
-                           my ($out, $response) = Net::SSLeay::get_http(  'www.mydyn.de',
-                                                                           80,
-                                                                           "/cgi-bin/update.pl?$settings{'LOGIN'}-$settings{'PASSWORD'}",
-                                                                           Net::SSLeay::make_headers('User-Agent' => 'IPFire' )
-                                                                       );
-
-                           if ($response =~ m%HTTP/1\.. 200 OK%) {
-                               if ( $out !~ m/The IP address of the subdomain/ ) {
-                                   &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (bad password or login)");
-                               } else {
-                                   &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : success");
-                                   $success++;
-                               }
-                           } else {
-                               &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (could not connect to server)");
-                           }
-
-                       }
                        elsif ($settings{'SERVICE'} eq 'selfhost') {
                            # use proxy ?
                            my %proxysettings;
@@ -390,7 +363,7 @@ if ($ip ne $ipcache) {
                                &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)");
                            }
                        }
-                       elsif ($settings{'SERVICE'} eq 'regfish') {
+                       elsif ($settings{'SERVICE'} eq 'strato') {
                                # use proxy ?
                                my %proxysettings;
                                &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -398,25 +371,62 @@ if ($ip ne $ipcache) {
                                        my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
                                        Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
                                }
-                               my ($out, $response) = Net::SSLeay::get_https(  'dyndns.regfish.de',
-                                                                               443,
-                                                                               "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}",
-                                                                               Net::SSLeay::make_headers('User-Agent' => 'Ipfire' )
-                                                                               );
-                               #Valid responses from service are:
-                               # success|100|update succeeded!
-                               # success|101|no update needed at this time..
+
+                               if ($settings{'HOSTNAME'} eq '') {
+                                       $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'};
+                               } else {
+                                       $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}";
+                               }
+
+                               my ($out, $response) = Net::SSLeay::get_https(  'dyndns.strato.com',
+                                                                           443,
+                                                                           "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip",
+                                                                           Net::SSLeay::make_headers('User-Agent' => 'IPFire',
+                                                                            'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}") )
+                                                                        );
+
                                if ($response =~ m%HTTP/1\.. 200 OK%) {
-                                       if ( $out !~ m/(success\|(100|101)\|)/ig ) {
-                                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)");
+                                       #Valid responses from update => ErrCount=0
+                                       if ( $out =~ m/good |nochg /ig) {
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success");
+                                               $success++;
                                        } else {
-                                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success");
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure1 ($out)");
                                                $success++;
                                        }
+                               } elsif ( $out =~ m/<title>(.*)<\/title>/ig ) {
+                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure2 ($1)");
                                } else {
-                                       &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)");
+                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure3 ($response)");
                                }
                        }
+                       elsif ($settings{'SERVICE'} eq 'regfish') {
+                           # use proxy ?
+                           my %proxysettings;
+                           &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+                           if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
+                               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+                               Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
+                           }
+                                       my ($out, $response) = Net::SSLeay::get_https(  'dyndns.regfish.de',
+                                                                               443,
+                                                                               "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}",
+                                                                               Net::SSLeay::make_headers('User-Agent' => 'Ipfire' )
+                                                                               );
+                           #Valid responses from service are:
+                           #success|100|update succeeded!
+                           #success|101|no update needed at this time..
+                           if ($response =~ m%HTTP/1\.. 200 OK%) {
+                               if ( $out !~ m/(success\|(100|101)\|)/ig ) {
+                                   &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)");
+                               } else {
+                                   &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success");
+                                   $success++;
+                               }
+                           } else {
+                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)");
+                           }
+                       }
                        elsif ($settings{'SERVICE'} eq 'ovh') {
                                my %proxysettings;
                                &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);