Verified Commit db9dc729 authored by Karel Koci's avatar Karel Koci 🤘
Browse files

Merge branch 'hotfix/rebase-patches' into hbl

parents 83f72868 9ca39e6e
Pipeline #80790 passed with stages
in 10 minutes and 37 seconds
From 8fe9940db66517679f09fa1d2f6f79229b6a8361 Mon Sep 17 00:00:00 2001
From 828c06b1fe8473d15afa8a8af5a5066afecebf67 Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 30 Nov 2018 14:03:50 +0100
Subject: [PATCH] openvpn: add generic hotplug mechanism
......@@ -20,30 +20,21 @@ Signed-off-by: Florian Eckert <fe@dev.tdt.de>
[reword commit message, move hotplug executable to /usr/libexec]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
package/network/services/openvpn/Makefile | 20 ++++++++++--
package/network/services/openvpn/Makefile | 18 ++++++++++-
.../files/etc/hotplug.d/openvpn/01-user | 32 +++++++++++++++++++
.../services/openvpn/files/etc/openvpn.user | 11 +++++++
.../services/openvpn/files/openvpn.init | 13 ++++++--
.../services/openvpn/files/openvpn.options | 3 --
.../openvpn/files/usr/libexec/openvpn-hotplug | 10 ++++++
6 files changed, 81 insertions(+), 8 deletions(-)
6 files changed, 80 insertions(+), 7 deletions(-)
create mode 100644 package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user
create mode 100644 package/network/services/openvpn/files/etc/openvpn.user
create mode 100644 package/network/services/openvpn/files/usr/libexec/openvpn-hotplug
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index 5f102d967d9f..f1170bbd37dd 100644
index 33da568..1a9cfed 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn
PKG_VERSION:=2.4.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
@@ -102,6 +102,7 @@ endef
define Package/openvpn-$(BUILD_VARIANT)/conffiles
......@@ -85,7 +76,7 @@ index 5f102d967d9f..f1170bbd37dd 100644
$(1)/usr/share/openvpn/openvpn.options
diff --git a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user
new file mode 100644
index 000000000000..6d45f0b7c690
index 0000000..6d45f0b
--- /dev/null
+++ b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user
@@ -0,0 +1,32 @@
......@@ -123,7 +114,7 @@ index 000000000000..6d45f0b7c690
+exit 0
diff --git a/package/network/services/openvpn/files/etc/openvpn.user b/package/network/services/openvpn/files/etc/openvpn.user
new file mode 100644
index 000000000000..a77566556a9d
index 0000000..a775665
--- /dev/null
+++ b/package/network/services/openvpn/files/etc/openvpn.user
@@ -0,0 +1,11 @@
......@@ -139,7 +130,7 @@ index 000000000000..a77566556a9d
+# $INSTANCE Name of the openvpn instance which went up or down
+
diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index a7d35d1a985e..a560b89ff243 100644
index a7d35d1..a560b89 100644
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -73,13 +73,17 @@ openvpn_add_instance() {
......@@ -187,7 +178,7 @@ index a7d35d1a985e..a560b89ff243 100644
start_service() {
diff --git a/package/network/services/openvpn/files/openvpn.options b/package/network/services/openvpn/files/openvpn.options
index 2da563968c12..5d7a387cd3c2 100644
index 2da5639..5d7a387 100644
--- a/package/network/services/openvpn/files/openvpn.options
+++ b/package/network/services/openvpn/files/openvpn.options
@@ -25,7 +25,6 @@ dev
......@@ -216,7 +207,7 @@ index 2da563968c12..5d7a387cd3c2 100644
verify_client_cert
diff --git a/package/network/services/openvpn/files/usr/libexec/openvpn-hotplug b/package/network/services/openvpn/files/usr/libexec/openvpn-hotplug
new file mode 100644
index 000000000000..9235fbacfe96
index 0000000..9235fba
--- /dev/null
+++ b/package/network/services/openvpn/files/usr/libexec/openvpn-hotplug
@@ -0,0 +1,10 @@
......@@ -230,3 +221,6 @@ index 000000000000..9235fbacfe96
+export ACTION=$ACTION
+export INSTANCE=$INSTANCE
+exec /sbin/hotplug-call openvpn "$@"
--
2.31.1
......@@ -92,10 +92,10 @@ index 000000000000..83fb1bb453e1
+}
+
From 5bc4201fa331197110c2f2856df80db037ab39fb Mon Sep 17 00:00:00 2001
From 29ebaaa1e25d270ecdac646cd5e84f5289460700 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal@hrusecky.net>
Date: Mon, 20 Jul 2020 15:23:07 +0200
Subject: [PATCH 2/2] openvpn: Allow override of interface name
Subject: [PATCH] openvpn: Allow override of interface name
If using a configuration file for OpenVPN, allow overriding name of the
interface. The reason is that then people could use configuration file
......@@ -105,23 +105,9 @@ configuration file.
Signed-off-by: Michal Hrusecky <michal@hrusecky.net>
---
package/network/services/openvpn/Makefile | 2 +-
.../services/openvpn/files/openvpn.init | 37 ++++++++++++++++++-
2 files changed, 37 insertions(+), 2 deletions(-)
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index 48c7072..1d5c5a7 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn
PKG_VERSION:=2.4.7
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index a560b89..a454eb4 100644
--- a/package/network/services/openvpn/files/openvpn.init
......@@ -178,5 +164,5 @@ index a560b89..a454eb4 100644
procd_set_param term_timeout 15
procd_set_param respawn
--
2.27.0
2.31.1
From d7b06b8a204e5c70b9b3c076230808ee1765a4db Mon Sep 17 00:00:00 2001
From 37eb0622ed2e8a264f40fadb1856d92b07a957ef Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@turris.com>
Date: Mon, 16 Nov 2020 14:34:19 +0100
Subject: [PATCH] openvpn: Support username and password options
......@@ -10,24 +10,10 @@ start of openpvn client.
Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
---
package/network/services/openvpn/Makefile | 2 +-
.../services/openvpn/files/openvpn.config | 7 ++++
.../services/openvpn/files/openvpn.init | 39 +++++++++++++++++--
3 files changed, 44 insertions(+), 4 deletions(-)
2 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index 1d5c5a7..711aef5 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn
PKG_VERSION:=2.4.7
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/services/openvpn/files/openvpn.config b/package/network/services/openvpn/files/openvpn.config
index 1fd846f..b62d5f2 100644
--- a/package/network/services/openvpn/files/openvpn.config
......@@ -118,5 +104,5 @@ index a454eb4..f100f40 100644
append_bools "$s" $OPENVPN_BOOLS
append_params "$s" $OPENVPN_PARAMS
--
2.30.0
2.31.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment