IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7859 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6666897c5c4f6e328e56e66e53750a906ef04ee6
by git＠ipfire.org 19 Jul '13

19 Jul '13

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 6666897c5c4f6e328e56e66e53750a906ef04ee6 (commit) via c92602f1615b9d1073de93e8653a743bc2d5bf81 (commit) from 1892a329f652188544a70ec0c614ef81c4f44acc (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 6666897c5c4f6e328e56e66e53750a906ef04ee6 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Fri Jul 19 18:19:40 2013 +0200 transmission: update to 2.81. commit c92602f1615b9d1073de93e8653a743bc2d5bf81 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Fri Jul 19 10:03:22 2013 +0200 start core72. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{70 => 72}/exclude | 0 config/rootfiles/{oldcore/55 => core/72}/filelists/files | 1 + config/rootfiles/core/{70 => 72}/meta | 0 config/rootfiles/{oldcore/48 => core/72}/update.sh | 15 +++++++++------ lfs/transmission | 6 +++--- make.sh | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) copy config/rootfiles/core/{70 => 72}/exclude (100%) copy config/rootfiles/{oldcore/55 => core/72}/filelists/files (52%) copy config/rootfiles/core/{70 => 72}/meta (100%) copy config/rootfiles/{oldcore/48 => core/72}/update.sh (89%) Difference in files: diff --git a/config/rootfiles/core/72/exclude b/config/rootfiles/core/72/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/72/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core/72/filelists/files new file mode 100644 index 0000000..efa4759 --- /dev/null +++ b/config/rootfiles/core/72/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +usr/local/bin/openvpnctrl diff --git a/config/rootfiles/core/72/meta b/config/rootfiles/core/72/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/72/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/update.sh new file mode 100644 index 0000000..f365abb --- /dev/null +++ b/config/rootfiles/core/72/update.sh @@ -0,0 +1,62 @@ +#!/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) 2013 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=72 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + + +# +#Extract files +extract_files + + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 + diff --git a/lfs/transmission b/lfs/transmission index b20ae88..9d5dfa5 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -24,7 +24,7 @@ include Config -VER = 2.80 +VER = 2.81 THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 7 +PAK_VER = 8 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2bde600d4b0a75d0bd3784550d59a8af +$(DL_FILE)_MD5 = db1ad10ecff07150486dab2365ccb3a8 install : $(TARGET) diff --git a/make.sh b/make.sh index 88af898..8ca36bf 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="71" # Core Level (Filename) +CORE="72" # Core Level (Filename) PAKFIRE_CORE="71" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1892a329f652188544a70ec0c614ef81c4f44acc
by git＠ipfire.org 18 Jul '13

18 Jul '13

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 1892a329f652188544a70ec0c614ef81c4f44acc (commit) from 3d454690b7e4a8b4b17b8db38a21a88c407de3e3 (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 1892a329f652188544a70ec0c614ef81c4f44acc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 18 13:10:22 2013 +0200 vdr: Add /etc/sysconfig/vdr to backup. ----------------------------------------------------------------------- Summary of changes: config/backup/includes/vdr | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr index 38bd82a..a2b5d83 100644 --- a/config/backup/includes/vdr +++ b/config/backup/includes/vdr @@ -1 +1,2 @@ /etc/vdr +/etc/sysconfig/vdr hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d454690b7e4a8b4b17b8db38a21a88c407de3e3
by git＠ipfire.org 18 Jul '13

18 Jul '13

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 3d454690b7e4a8b4b17b8db38a21a88c407de3e3 (commit) from cdbe35044232c89db38f045c70b1ef1948f4d6e4 (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 3d454690b7e4a8b4b17b8db38a21a88c407de3e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 18 13:06:42 2013 +0200 vdr: Disable debugging logging. 3 is default and includes a lot of debugging output which leads to really heavy IO with installations with a lot of channels (satellite mainly). http://www.vdr-wiki.de/wiki/index.php/VDR_Optionen ----------------------------------------------------------------------- Summary of changes: config/vdr/vdr.sysconfig | 2 +- lfs/vdr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig index a1cebf1..9c79069 100644 --- a/config/vdr/vdr.sysconfig +++ b/config/vdr/vdr.sysconfig @@ -3,7 +3,7 @@ # The "master" options. Some examples of options you may want to set # here are -r, -t, and --rcu. See the vdr(1) man page for more info. # -VDR_OPTIONS=(--vfat) +VDR_OPTIONS=(--vfat --log=1) # VDR_PLUGIN_ORDER is a space separated list of plugins that should be # loaded in a specific order. This affects eg. the order the plugins' diff --git a/lfs/vdr b/lfs/vdr index 0dd2c0f..b1feb01 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 6 +PAK_VER = 7 DEPS = "vdr_streamdev" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cdbe35044232c89db38f045c70b1ef1948f4d6e4
by git＠ipfire.org 17 Jul '13

17 Jul '13

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 cdbe35044232c89db38f045c70b1ef1948f4d6e4 (commit) from b5c00b8654ccbe438d6d38d29859c67fbf0a6cc7 (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 cdbe35044232c89db38f045c70b1ef1948f4d6e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 17 18:53:13 2013 +0200 openvpnctrl: Save the binary from crashing with wrong input. See #10390. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index e366294..76916f1 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -362,6 +362,10 @@ char* calcTransferNetAddress(const connection* conn) { char *subnetmask = strdup(conn->transfer_subnet); char *address = strsep(&subnetmask, "/"); + if ((address == NULL) || (subnetmask == NULL)) { + goto ERROR; + } + in_addr_t _address = inet_addr(address); in_addr_t _subnetmask = inet_addr(subnetmask); _address &= _subnetmask; @@ -496,12 +500,11 @@ void setFirewallRules(void) { local_subnet_address = getLocalSubnetAddress(conn); transfer_subnet_address = calcTransferNetAddress(conn); - if ((!local_subnet_address) || (!transfer_subnet_address)) - continue; - - snprintf(command, STRING_SIZE, "/sbin/iptables -t nat -A %s -s %s -j SNAT --to-source %s", - OVPNNAT, transfer_subnet_address, local_subnet_address); - executeCommand(command); + if ((local_subnet_address) && (transfer_subnet_address)) { + snprintf(command, STRING_SIZE, "/sbin/iptables -t nat -A %s -s %s -j SNAT --to-source %s", + OVPNNAT, transfer_subnet_address, local_subnet_address); + executeCommand(command); + } } conn = conn->next; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core71, created. f7e3815db2c732e724d450d1092ed19cfe92b773
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 tag, v2.13-core71 has been created at f7e3815db2c732e724d450d1092ed19cfe92b773 (commit) - Log ----------------------------------------------------------------- commit f7e3815db2c732e724d450d1092ed19cfe92b773 Merge: c7929cf 9c55c65 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 23:06:56 2013 +0200 Merge branch 'master' into core71 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core71, updated. f7e3815db2c732e724d450d1092ed19cfe92b773
by git＠ipfire.org 16 Jul '13

16 Jul '13

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, core71 has been updated via f7e3815db2c732e724d450d1092ed19cfe92b773 (commit) via 9c55c65e050d60c2604490247a4f7ccb0b0032b5 (commit) via cfab012b143b6aaf7f181243c96616e060c08d05 (commit) via 25848b36da1363f46ad85570501e6aff7a3eec1e (commit) via 8b417dd143a02900f8ba06510d7ffa3039f15be8 (commit) from c7929cf54604d989986ddb8b6bbf491955c48258 (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 f7e3815db2c732e724d450d1092ed19cfe92b773 Merge: c7929cf 9c55c65 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 23:06:56 2013 +0200 Merge branch 'master' into core71 ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/common/configroot | 2 ++ config/rootfiles/core/71/filelists/files | 1 + html/cgi-bin/proxy.cgi | 6 ++++++ lfs/configroot | 4 ++-- lfs/squidclamav | 3 ++- src/paks/squidclamav/update.sh | 21 +++++++++++++-------- 7 files changed, 27 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/backup/include b/config/backup/include index 8463a89..c863a0e 100644 --- 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 3910b36..cd33ec4 100644 --- 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 9dd0e30..c7df219 100644 --- 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 76d52b4..870042a 100644 --- 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 1f84a16..1185236 100644 --- 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 79bf5d0..7d9e6af 100644 --- 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 4b54216..4376085 100644 --- 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b5c00b8654ccbe438d6d38d29859c67fbf0a6cc7
by git＠ipfire.org 16 Jul '13

16 Jul '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9c55c65e050d60c2604490247a4f7ccb0b0032b5
by git＠ipfire.org 16 Jul '13

16 Jul '13

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, master has been updated via 9c55c65e050d60c2604490247a4f7ccb0b0032b5 (commit) via cfab012b143b6aaf7f181243c96616e060c08d05 (commit) via 25848b36da1363f46ad85570501e6aff7a3eec1e (commit) via 8b417dd143a02900f8ba06510d7ffa3039f15be8 (commit) from 15f78770b1d4ee730dca39166590393e3b24a666 (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 9c55c65e050d60c2604490247a4f7ccb0b0032b5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 22:58:13 2013 +0200 dnsforward: add config to iso and updater. ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/common/configroot | 2 ++ config/rootfiles/core/71/filelists/files | 1 + html/cgi-bin/proxy.cgi | 6 ++++++ lfs/configroot | 4 ++-- lfs/squidclamav | 3 ++- src/paks/squidclamav/update.sh | 21 +++++++++++++-------- 7 files changed, 27 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/backup/include b/config/backup/include index 8463a89..c863a0e 100644 --- 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 3910b36..cd33ec4 100644 --- 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 9dd0e30..c7df219 100644 --- 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 76d52b4..870042a 100644 --- 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 1f84a16..1185236 100644 --- 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 79bf5d0..7d9e6af 100644 --- 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 4b54216..4376085 100644 --- 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15be554282c3c424d5d9eab9de62f6fde4203585
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 15be554282c3c424d5d9eab9de62f6fde4203585 (commit) from cfab012b143b6aaf7f181243c96616e060c08d05 (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 15be554282c3c424d5d9eab9de62f6fde4203585 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 20:54:28 2013 +0200 strongswan: Enable EAP authentication algorithms. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 10 ++++++++++ lfs/strongswan | 6 ++++++ 2 files changed, 16 insertions(+) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 2d5d42b..c94ce6f 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -31,6 +31,11 @@ usr/lib/ipsec/libradius.so.0.0.0 usr/lib/ipsec/libstrongswan.so usr/lib/ipsec/libstrongswan.so.0 usr/lib/ipsec/libstrongswan.so.0.0.0 +#usr/lib/ipsec/libtls.a +#usr/lib/ipsec/libtls.la +usr/lib/ipsec/libtls.so +usr/lib/ipsec/libtls.so.0 +usr/lib/ipsec/libtls.so.0.0.0 #usr/lib/ipsec/plugins usr/lib/ipsec/plugins/libstrongswan-aes.so usr/lib/ipsec/plugins/libstrongswan-attr.so @@ -39,7 +44,12 @@ usr/lib/ipsec/plugins/libstrongswan-constraints.so usr/lib/ipsec/plugins/libstrongswan-curl.so usr/lib/ipsec/plugins/libstrongswan-des.so usr/lib/ipsec/plugins/libstrongswan-dnskey.so +usr/lib/ipsec/plugins/libstrongswan-eap-identity.so +usr/lib/ipsec/plugins/libstrongswan-eap-mschapv2.so +usr/lib/ipsec/plugins/libstrongswan-eap-peap.so usr/lib/ipsec/plugins/libstrongswan-eap-radius.so +usr/lib/ipsec/plugins/libstrongswan-eap-tls.so +usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so usr/lib/ipsec/plugins/libstrongswan-fips-prf.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so diff --git a/lfs/strongswan b/lfs/strongswan index b3ce846..a6075a2 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -84,7 +84,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir="/etc" \ --enable-curl \ --enable-openssl \ + --enable-xauth-eap \ --enable-eap-radius \ + --enable-eap-tls \ + --enable-eap-ttls \ + --enable-eap-peap \ + --enable-eap-mschapv2 \ + --enable-eap-identity \ $(PADLOCK) cd $(DIR_APP) && make $(MAKETUNING) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cfab012b143b6aaf7f181243c96616e060c08d05
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 cfab012b143b6aaf7f181243c96616e060c08d05 (commit) via 25848b36da1363f46ad85570501e6aff7a3eec1e (commit) from 8b417dd143a02900f8ba06510d7ffa3039f15be8 (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 cfab012b143b6aaf7f181243c96616e060c08d05 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 19:46:29 2013 +0200 squidclamav: Fix indentation of update script. commit 25848b36da1363f46ad85570501e6aff7a3eec1e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 19:42:53 2013 +0200 squidclamav: Fix permissions of /etc/squidclamav.conf. The file must not be executable, but writeable by anybody in the group nobody. ----------------------------------------------------------------------- Summary of changes: lfs/squidclamav | 3 ++- src/paks/squidclamav/update.sh | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) Difference in files: diff --git a/lfs/squidclamav b/lfs/squidclamav index 79bf5d0..7d9e6af 100644 --- 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 4b54216..4376085 100644 --- 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 hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM