Merge branch 'master' into core71

diff --git a/config/backup/include b/config/backup/include
index 8463a89493c5d98776037a06adc000b84bda8c10..c863a0e560ed525c74653fe612be75249a75a64f 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -14,6 +14,7 @@
 /etc/ssh/ssh_host*
 /var/ipfire/auth/users
 /var/ipfire/dhcp/*
+/var/ipfire/dnsforward/*
 /var/ipfire/main/*
 /var/ipfire/outgoing/groups
 /var/ipfire/outgoing/macgroups

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 3910b36a73258926faa8a11f0ee99aa26217c70c..cd33ec496ce72a93eaf29979373d8bbf0225a187 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -30,6 +30,8 @@ var/ipfire/dmzholes
 #var/ipfire/dmzholes/config
 var/ipfire/dns
 #var/ipfire/dns/settings
+var/ipfire/dnsforward
+#var/ipfire/dnsforward/config
 var/ipfire/ethernet
 #var/ipfire/ethernet/aliases
 #var/ipfire/ethernet/known_nics

diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files
index 9dd0e30eda637a2f04bbf8568162396029720d86..c7df219c63cc9d39057445fde1f32479d66d2584 100644 (file)
--- a/config/rootfiles/core/71/filelists/files
+++ b/config/rootfiles/core/71/filelists/files
@@ -19,6 +19,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
+var/ipfire/dnsforward/config
 var/ipfire/general-functions.pl
 var/ipfire/langs
 var/ipfire/backup/include

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 76d52b425157e0788a4fa4398af4aea30a3a6805..870042ae519e2044119d8fbe06bd8a848626e197 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3071,6 +3071,12 @@ icp_port 0
 
 END
        ;
+
+       # Include file with user defined settings.
+       if (-e "/etc/squid/squid.conf.pre.local") {
+               print FILE "include /etc/squid/squid.conf.pre.local\n\n";
+       }
+
        print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
        if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" }
        if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" }

diff --git a/lfs/configroot b/lfs/configroot
index 1f84a1691bbea53fa1164512ff751f0c4e4f77fd..1185236851fa6f695658bcc5db720f121d31a661 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -50,7 +50,7 @@ $(TARGET) :
        @$(PREBUILD)
 
        # Create all directories
-       for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \
+       for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns dnsforward \
                        ethernet extrahd/bin fwlogs isdn key langs logging mac main  menu.d modem net-traffic \
                        net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \
                        outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \
@@ -63,7 +63,7 @@ $(TARGET) :
        # Touch empty files
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
-           dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+           dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
            isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 79bf5d010ddb1ed2c7f1cf117d651b1035d94432..7d9e6afec2861342354c2d77a7aa8042b02b1ef7 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -80,7 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make install
-       install -v -m 755  $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
+       install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
+       chown -v root:nobody /etc/squidclamav.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav
        chmod 755 /srv/web/ipfire/html/clwarn.cgi
        @rm -rf $(DIR_APP)

diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh
index 4b542164e87f8260a45804d6a19b185f26a7ceae..43760856c6bf0714a0e7fc5aa919d5b80d41a6eb 100644 (file)
--- a/src/paks/squidclamav/update.sh
+++ b/src/paks/squidclamav/update.sh
@@ -28,21 +28,26 @@ extract_files
 VERSION=$(cat /opt/pakfire/db/installed/meta-squidclamav | grep Release | cut -d" " -f2)
 
 if [ "$VERSION" -gt "10" ]; then
- restore_backup ${NAME}
+       restore_backup ${NAME}
 fi
 
 if [ "$VERSION" -lt "11" ]; then
- sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf
+       sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf
 fi
 
 if [ "$VERSION" -lt "16" ]; then
- sed -e "s/proxy none//g" -i /etc/squidclamav.conf
- sed -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \
-     -e "s/^#squid_port 3128/squid_port 800/g" \
-     -e "s/^#trust_cache 1/trust_cache 1/g" -i /etc/squidclamav.conf
+       sed -i /etc/squidclamav.conf \
+               -e "s/proxy none//g" \
+               -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \
+               -e "s/^#squid_port 3128/squid_port 800/g" \
+               -e "s/^#trust_cache 1/trust_cache 1/g"
 
- # Regenerate configuration files.
- perl /srv/web/ipfire/cgi-bin/proxy.cgi
+       # Fix permissions.
+       chmod 664 /etc/squidclamav.conf
+       chown root.nobody /etc/squidclamav.conf
+
+       # Regenerate configuration files.
+       perl /srv/web/ipfire/cgi-bin/proxy.cgi
 fi
  
 /etc/init.d/squid restart