From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2d934cf2bbc9409e878b719a6688476ab9b6874
Date: Wed, 04 Oct 2017 10:56:27 +0100 [thread overview]
Message-ID: <20171004095628.05B491081BA6@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8137 bytes --]
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 e2d934cf2bbc9409e878b719a6688476ab9b6874 (commit)
via 67970637d0965ee01255a4d3a27dfa186c57f54c (commit)
via fc9a434cbcef07ab3c5a81d5514036ac3962219c (commit)
via 36f5d20ef73844906b557808ecb651097238683f (commit)
via 082771c1f4d61fd633c04081ddbfebe25494db14 (commit)
from c42237247aec6de190d135b61213054b8b7e2e22 (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 e2d934cf2bbc9409e878b719a6688476ab9b6874
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 30 12:34:37 2017 +0100
core115: Ship update for OpenVPN
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 67970637d0965ee01255a4d3a27dfa186c57f54c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 30 07:41:56 2017 +0200
openvpn: Update to 2.3.18
Fixes CVE-2017-12166: out of bounds write in key-method 1
For details see:
https://community.openvpn.net/openvpn/wiki/CVE-2017-12166
Changelog:
https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.18
Removed an unrecognized 'configure'-option.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fc9a434cbcef07ab3c5a81d5514036ac3962219c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Sep 29 20:42:31 2017 +0200
tor: Update to 3.1.7
Fixes TROVE-2017-008 and CVE-2017-0380 and others....
For details see https://gitweb.torproject.org/tor.git/plain/ReleaseNotes?id=tor-0.3.1.7
"Tor 0.3.1.7 is the first stable release in the 0.3.1 series."
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 36f5d20ef73844906b557808ecb651097238683f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 24 20:23:06 2017 +0100
core115: Ship cosmetic improvements in proxy.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 082771c1f4d61fd633c04081ddbfebe25494db14
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Sep 21 01:46:27 2017 +0200
proxy.cgi: Some cosmetics for the absolutely lazy ones (V2)
Added clickable links for 'URL filter' and 'Update accelerator' for faster access,
this time without the need to alter the language-files.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/115/filelists/files | 1 +
config/rootfiles/{oldcore/100 => core/115}/filelists/openvpn | 0
config/rootfiles/core/115/update.sh | 4 ++++
html/cgi-bin/proxy.cgi | 4 ++--
lfs/openvpn | 7 +++----
lfs/tor | 6 +++---
6 files changed, 13 insertions(+), 9 deletions(-)
copy config/rootfiles/{oldcore/100 => core/115}/filelists/openvpn (100%)
Difference in files:
diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/core/115/filelists/files
index 409e5fe..d3c27e8 100644
--- a/config/rootfiles/core/115/filelists/files
+++ b/config/rootfiles/core/115/filelists/files
@@ -1,2 +1,3 @@
etc/system-release
etc/issue
+srv/web/ipfire/cgi-bin/proxy.cgi
diff --git a/config/rootfiles/core/115/filelists/openvpn b/config/rootfiles/core/115/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/115/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
index 31fc09d..e0ee121 100644
--- a/config/rootfiles/core/115/update.sh
+++ b/config/rootfiles/core/115/update.sh
@@ -32,6 +32,8 @@ for (( i=1; i<=$core; i++ )); do
done
# Stop services
+openvpnctrl -k
+openvpnctrl -kn2n
# Extract files
extract_files
@@ -43,6 +45,8 @@ ldconfig
#/usr/local/bin/update-lang-cache
# Start services
+openvpnctrl -s
+openvpnctrl -sn2n
# This update need a reboot...
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 0b7d36c..dd83bba 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -1054,11 +1054,11 @@ if ( -e "/usr/bin/squidclamav" ) {
} else {
print "<td></td>";
}
-print "<td class='base'><b>".$Lang::tr{'advproxy url filter'}."</b><br />";
+print "<td class='base'><a href='/cgi-bin/urlfilter.cgi'><b>".$Lang::tr{'advproxy url filter'}."</a></b><br />";
print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_FILTER' ".$checked{'ENABLE_FILTER'}{'on'}." /><br />";
print "+ ".int(($count**(1/3)) * 6);
print "</td>";
-print "<td class='base'><b>".$Lang::tr{'advproxy update accelerator'}."</b><br />";
+print "<td class='base'><a href='/cgi-bin/updatexlrator.cgi'><b>".$Lang::tr{'advproxy update accelerator'}."</a></b><br />";
print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_UPDXLRATOR' ".$checked{'ENABLE_UPDXLRATOR'}{'on'}." /><br />";
print "+ ".int(($count**(1/3)) * 5);
print "</td></tr>";
diff --git a/lfs/openvpn b/lfs/openvpn
index b7f5217..8307d01 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2017 IPFire Team <info(a)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 = 2.3.17
+VER = 2.3.18
THISAPP = openvpn-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = df9291c5bd466fe73c2544a800f3b441
+$(DL_FILE)_MD5 = 844ec9c64aae62051478784b8562f881
install : $(TARGET)
@@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--prefix=/usr \
--sysconfdir=/var/ipfire/ovpn \
--enable-iproute2 \
- --enable-password-save \
--enable-plugins \
--enable-plugin-auth-pam \
--enable-plugin-down-root
diff --git a/lfs/tor b/lfs/tor
index 9e46344..867f01f 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
include Config
-VER = 0.3.0.10
+VER = 0.3.1.7
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 22
+PAK_VER = 23
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c9920169798c28b60b03fa3f0e592509
+$(DL_FILE)_MD5 = ec7c9f588c9e1a42c09bcc097a1e55eb
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2017-10-04 9:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171004095628.05B491081BA6@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox