IPFire-SCM May 2015

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a8e3b15d77512134c29d86ec0489d25f8a801fec
by git＠ipfire.org 03 May '15

03 May '15

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 a8e3b15d77512134c29d86ec0489d25f8a801fec (commit) via 57e86b559393116238e67dd3a7593d0ffcff6a1e (commit) via 61e19f97aa1ee3a68e7b8e720ae1e55940ff43fc (commit) via 382ffe320c05b4dc99a77f4e5002265d0e0c70c6 (commit) from 0ee35ce0cac70ac4da8817f2ed3c84d84ddcfc44 (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 a8e3b15d77512134c29d86ec0489d25f8a801fec Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sun May 3 05:24:39 2015 +0200 squid-accounting: fix monthly dbmove funktion to put values in history table commit 57e86b559393116238e67dd3a7593d0ffcff6a1e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 3 12:53:28 2015 +0200 core90: Add updated netovpnsrv.cgi to update commit 61e19f97aa1ee3a68e7b8e720ae1e55940ff43fc Merge: 0ee35ce 382ffe3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 3 12:52:50 2015 +0200 Merge remote-tracking branch 'amarx/core90' into next commit 382ffe320c05b4dc99a77f4e5002265d0e0c70c6 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sun May 3 05:12:13 2015 +0200 Core90: make N2N Graphs higher to them correctly Graphs in core 89 where not heigh enough so that they where zoomed which looked bad ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/filelists/files | 1 + html/cgi-bin/netovpnsrv.cgi | 2 +- src/squid-accounting/acct-lib.pl | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 35f0798..d4dcfae 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/geoip-block.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/darkdos/include/style.css diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index ddf4177..15a95b6 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -59,7 +59,7 @@ if ( $querry[0] ne ""){ if (@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); + &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day",320); &Header::closebox(); } }else{ diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl index 779ecf8..58b154a 100644 --- a/src/squid-accounting/acct-lib.pl +++ b/src/squid-accounting/acct-lib.pl @@ -93,8 +93,10 @@ sub delbefore { } sub movedbdata { + &connectdb; $dbh->do("insert into ACCT_HIST select datetime(TIME_RUN,'unixepoch'),NAME,SUM(BYTES) from ACCT where datetime(TIME_RUN,'unixepoch') < datetime('now','start of month') group by NAME,datetime(TIME_RUN,'unixepoch');"); $dbh->do("DELETE FROM ACCT WHERE datetime(TIME_RUN,'unixepoch') < date('now','start of month');"); + &closedb; } sub gethourgraphdata { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 62fcf3c330b9d9eb6b8d0f5c74717e836954e704
by git＠ipfire.org 02 May '15

02 May '15

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 3.x development tree". The branch, master has been updated via 62fcf3c330b9d9eb6b8d0f5c74717e836954e704 (commit) via 59796c77a26b2e119c5d63ecf1f573e274a4a0f8 (commit) from 70e4c145a108ac84e46c75dcf9950ab81344655d (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 62fcf3c330b9d9eb6b8d0f5c74717e836954e704 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 2 21:57:31 2015 +0000 ethtool: Update to version 3.18 commit 59796c77a26b2e119c5d63ecf1f573e274a4a0f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 2 21:56:49 2015 +0000 dhcp: Add dhclient6 systemd service file ----------------------------------------------------------------------- Summary of changes: dhcp/dhcp.nm | 2 +- dhcp/systemd/dhclient6@.service | 19 +++++++++++++++++++ ethtool/ethtool.nm | 8 ++++---- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 dhcp/systemd/dhclient6@.service Difference in files: diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm index 1d15f65..91021cb 100644 --- a/dhcp/dhcp.nm +++ b/dhcp/dhcp.nm @@ -5,7 +5,7 @@ name = dhcp version = 4.2.5 -release = 1 +release = 2 groups = Networking/Daemons url = http://isc.org/products/DHCP/ diff --git a/dhcp/systemd/dhclient6@.service b/dhcp/systemd/dhclient6@.service new file mode 100644 index 0000000..34f20a2 --- /dev/null +++ b/dhcp/systemd/dhclient6@.service @@ -0,0 +1,19 @@ +[Unit] +Description=DHCP client daemon for IPv6 on %I + +[Service] +Restart=on-failure +ExecStartPre=/usr/lib/network/dhclient-helper start %I ipv6 +ExecStart=/usr/sbin/dhclient -d %I -6 -P -N \ + -cf /run/network/dhclient/%I/dhclient6.conf \ + -lf /var/lib/dhclient/dhclient6-%I.leases \ + -pf /run/network/dhclient/%I/dhclient6.pid +ExecStop=/usr/lib/network/dhclient-helper stop %I ipv6 + +# This could be used if you want to release a lease. +#ExecStop=/usr/sbin/dhclient -d -r %I -6 \ +# -cf /run/network/dhclient/%I/dhclient6.conf \ +# -lf /var/lib/dhclient/dhclient6-%I.leases \ +# -pf /run/network/dhclient/%I/dhclient6.pid + +UtmpIdentifier=%I diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm index a51ea7f..4dd2945 100644 --- a/ethtool/ethtool.nm +++ b/ethtool/ethtool.nm @@ -4,11 +4,11 @@ ############################################################################### name = ethtool -version = 2.6.34 -release = 3 +version = 3.18 +release = 1 groups = Applications/System -url = http://sourceforge.net/projects/gkernel/ +url = https://www.kernel.org/pub/software/network/ethtool/ license = GPLv2 summary = Ethernet settings tool for PCI ethernet cards. @@ -18,7 +18,7 @@ description network devices, especially of ethernet devices. end -source_dl = +source_dl = https://www.kernel.org/pub/software/network/ethtool/ packages package %{name} hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ee35ce0cac70ac4da8817f2ed3c84d84ddcfc44
by git＠ipfire.org 02 May '15

02 May '15

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 0ee35ce0cac70ac4da8817f2ed3c84d84ddcfc44 (commit) from 88b1e637ac581b836bcdfa4a44deeef2d8ff9711 (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 0ee35ce0cac70ac4da8817f2ed3c84d84ddcfc44 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 2 14:29:46 2015 +0200 core90: Also regenerate IPsec configuration during the update ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/update.sh | 3 +++ 1 file changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 2a69278..68798cb 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -195,6 +195,9 @@ fcrontab -z &>/dev/null # Generate ddns configuration file sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 88b1e637ac581b836bcdfa4a44deeef2d8ff9711
by git＠ipfire.org 02 May '15

02 May '15

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 88b1e637ac581b836bcdfa4a44deeef2d8ff9711 (commit) via 49c3105cc3fa4b988bc9d4596f4021c02fa15086 (commit) from 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040 (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 88b1e637ac581b836bcdfa4a44deeef2d8ff9711 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 2 12:56:09 2015 +0200 squid: Disable SSL support The SSL support parts of squid are a great security risk. The majority of all security issues has been in this area. As we are not using any of that in production we can as well disable SSL support. This won't affect squid's possibility to forward SSL connections with the CONNECT method. commit 49c3105cc3fa4b988bc9d4596f4021c02fa15086 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 2 11:20:37 2015 +0200 squid: Update to 3.4.13 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/84 => core/90}/filelists/squid | 0 lfs/squid | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/84 => core/90}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/90/filelists/squid b/config/rootfiles/core/90/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/90/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index 67e4a7d..d4fc4c5 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.4.9 +VER = 3.4.13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 497e5be7b3430d12667628296760beca +$(DL_FILE)_MD5 = a5f6c978b2d7a99b161c8275e1acb470 install : $(TARGET) @@ -78,12 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --libexecdir=/usr/lib/squid \ --localstatedir=/var \ --disable-ipv6 \ + --disable-ssl \ --enable-poll \ --disable-icmp \ --disable-wccp \ --enable-ident-lookups \ --enable-storeio="aufs,diskd,ufs" \ - --enable-ssl \ --enable-underscores \ --enable-http-violations \ --enable-removal-policies="heap,lru" \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040
by git＠ipfire.org 01 May '15

01 May '15

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 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040 (commit) from 8d1e36cca59e68d3061d2c53a535bfadebe4edf1 (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 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 1 16:57:13 2015 +0200 vpnmain.cgi: Fix ECP regex again for Brainpool curves The regular expression did not take into account that there could be characters like "bp" in case of the Brainpool curves (ecp512bp). ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 1d75356..2a020ea 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -3017,7 +3017,7 @@ sub make_algos($$$$$) { if ($mode eq "ike") { push(@algo, $int); - if ($grp =~ m/^e(\d+)/) { + if ($grp =~ m/^e(.*)$/) { push(@algo, "ecp$1"); } else { push(@algo, "modp$grp"); @@ -3030,7 +3030,7 @@ sub make_algos($$$$$) { push(@algo, $int); } - if ($grp =~ m/^e(\d+)/) { + if ($grp =~ m/^e(.*)$/) { push(@algo, "ecp$1"); } else { push(@algo, "modp$grp"); hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2015