* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2f7e8b59a69e3b1ca14a1d6c6b2ccb62e118a1f0
@ 2019-02-26 11:25 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2019-02-26 11:25 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6381 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 2f7e8b59a69e3b1ca14a1d6c6b2ccb62e118a1f0 (commit)
via f6a1d9e929041315d122ddd0babed554bdaeb23f (commit)
via 97499aa8a3c7b85de7609126f77ec41ab03cf469 (commit)
via ab83c4876a83c643d64d128828f50146710b7799 (commit)
from 82b405615f47bb1dc34f4a3b488cb282058e9be3 (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 2f7e8b59a69e3b1ca14a1d6c6b2ccb62e118a1f0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 25 02:31:23 2019 +0000
core129: Ship updated credits.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f6a1d9e929041315d122ddd0babed554bdaeb23f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 25 02:30:56 2019 +0000
Update list of contributors
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 97499aa8a3c7b85de7609126f77ec41ab03cf469
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 25 02:29:29 2019 +0000
core129: Ship updated OpenVPN
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ab83c4876a83c643d64d128828f50146710b7799
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Tue Feb 26 11:56:47 2019 +0100
OpenVPN: Update to version 2.4.7
Changelog can be found in here https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24 .
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.mailmap | 1 +
config/rootfiles/core/129/filelists/files | 1 +
config/rootfiles/{oldcore/100 => core/129}/filelists/openvpn | 0
config/rootfiles/core/129/update.sh | 4 ++++
html/cgi-bin/credits.cgi | 5 +++--
lfs/openvpn | 6 +++---
6 files changed, 12 insertions(+), 5 deletions(-)
copy config/rootfiles/{oldcore/100 => core/129}/filelists/openvpn (100%)
Difference in files:
diff --git a/.mailmap b/.mailmap
index ec5ad1987..f920b448f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,3 +32,4 @@ Peter Pfeiffer <root(a)VMipfire.pfeiffer-privat.de>
Rene Zingel <linuxadmin(a)ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Ronald Wiesinger <rowie(a)ipfire.org>
Stéphane Pautrel <steph78630(a)gmail.com>
+Erik Kapfer <ummeegge(a)ipfire.org>
diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/core/129/filelists/files
index 093f43ff0..a3d40802f 100644
--- a/config/rootfiles/core/129/filelists/files
+++ b/config/rootfiles/core/129/filelists/files
@@ -4,6 +4,7 @@ var/ipfire/langs
etc/rc.d/init.d/firewall
etc/rc.d/init.d/network
etc/rc.d/init.d/networking/red.up/50-ipsec
+srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/netovpnsrv.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/config/rootfiles/core/129/filelists/openvpn b/config/rootfiles/core/129/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/129/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/129/update.sh b/config/rootfiles/core/129/update.sh
index 3cd5b6a22..5ab078ea3 100644
--- a/config/rootfiles/core/129/update.sh
+++ b/config/rootfiles/core/129/update.sh
@@ -32,6 +32,8 @@ for (( i=1; i<=$core; i++ )); do
done
# Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
/usr/local/bin/ipsecctrl D
/etc/init.d/unbound stop
@@ -52,6 +54,8 @@ ldconfig
/etc/init.d/firewall restart
/etc/init.d/unbound start
/usr/local/bin/ipsecctrl S
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
# This update needs a reboot...
#touch /var/run/need_reboot
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 51965d302..6770cc5a4 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -83,8 +83,8 @@ Jan Lentfer,
Marcus Scholz,
Ersan Yildirim,
Joern-Ingo Weigert,
-Alfred Haas,
Wolfgang Apolinarski,
+Alfred Haas,
Lars Schuhmacher,
Rene Zingel,
Sascha Kilian,
@@ -95,8 +95,8 @@ Michael Eitelwein,
Bernhard Bitsch,
Dominik Hassler,
Larsen,
-Gabriel Rolland,
Stéphane Pautrel,
+Gabriel Rolland,
Anton D. Seliverstov,
Bernhard Bittner,
David Kleuker,
@@ -126,6 +126,7 @@ Logan Schmidt,
Nico Prenzel,
Osmar Gonzalez,
Paul T. Simmons,
+Rob Brewer,
Robert Möker,
Stefan Ernst,
Stefan Ferstl,
diff --git a/lfs/openvpn b/lfs/openvpn
index 2503654f1..61c805fdb 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 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.4.6
+VER = 2.4.7
THISAPP = openvpn-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3a1f3f63bdaede443b4df49957df9405
+$(DL_FILE)_MD5 = 4ad8a008e1e7f261b3aa0024e79e7fb7
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-02-26 11:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-26 11:25 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2f7e8b59a69e3b1ca14a1d6c6b2ccb62e118a1f0 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox