From 3bb443d93474030233fac7b7cbbabb4dd341871d Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:08:46 +0100 Subject: [PATCH 1/6] openvpn: refactoring INSTALL_DIR command call during install Move the 'INSTALL_DIR' creation in the make install target to the location where the files are also installed. This prevents directories that are no longer needed from being forgotten during refactoring. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index dd60e700f21ce..447d42872b0cd 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -92,34 +92,32 @@ endef define Package/openvpn-$(BUILD_VARIANT)/install $(INSTALL_DIR) \ - $(1)/usr/sbin \ - $(1)/usr/share/openvpn \ $(1)/etc/init.d \ $(1)/etc/config \ $(1)/etc/openvpn \ - $(1)/etc/uci-defaults \ $(1)/lib/functions \ - $(1)/lib/netifd/proto \ - $(1)/lib/upgrade/keep.d \ $(1)/usr/libexec \ $(1)/etc/hotplug.d/openvpn + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/sbin/openvpn \ $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/lib/netifd/proto $(INSTALL_BIN) \ files/lib/netifd/proto/openvpn.sh \ $(1)/lib/netifd/proto/ + $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_BIN) \ files/etc/uci-defaults/60_openvpn_migrate.sh \ $(1)/etc/uci-defaults/ + $(INSTALL_DIR) $(1)/usr/share/openvpn $(INSTALL_DATA) \ files/openvpn.options \ $(1)/usr/share/openvpn/openvpn.options - $(INSTALL_BIN) \ files/up.uc files/down.uc files/route-pre-down.uc files/route-up.uc \ files/ipchange.uc \ @@ -127,6 +125,7 @@ define Package/openvpn-$(BUILD_VARIANT)/install files/auth-user-pass-verify.uc files/tls-verify.uc \ $(1)/usr/share/openvpn/ + $(INSTALL_DIR) $(1)/lib/upgrade/keep.d $(INSTALL_DATA) \ files/openvpn.sysupgrade \ $(1)/lib/upgrade/keep.d/openvpn From 5831202b8adeba689f632f2f30975cc61de0bd82 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:11:12 +0100 Subject: [PATCH 2/6] openvpn: remove not needed INSTALL_DIR creations This 'INSTALL_DIR' creation are not needed anymore after refactoring. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 447d42872b0cd..d41adbad342fa 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -91,14 +91,6 @@ define Build/Configure endef define Package/openvpn-$(BUILD_VARIANT)/install - $(INSTALL_DIR) \ - $(1)/etc/init.d \ - $(1)/etc/config \ - $(1)/etc/openvpn \ - $(1)/lib/functions \ - $(1)/usr/libexec \ - $(1)/etc/hotplug.d/openvpn - $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/sbin/openvpn \ From 3339a8e832b6836542a62d6caf3311154a526bc9 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:14:09 +0100 Subject: [PATCH 3/6] openvpn: improve readability for files install target Each script to be installed is moved to its own line to improve readability. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index d41adbad342fa..8a4ae220fb8d3 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -111,10 +111,16 @@ define Package/openvpn-$(BUILD_VARIANT)/install files/openvpn.options \ $(1)/usr/share/openvpn/openvpn.options $(INSTALL_BIN) \ - files/up.uc files/down.uc files/route-pre-down.uc files/route-up.uc \ + files/up.uc\ + files/down.uc \ + files/route-pre-down.uc \ + files/route-up.uc \ files/ipchange.uc \ - files/client-connect.uc files/client-disconnect.uc files/client-crresponse.uc \ - files/auth-user-pass-verify.uc files/tls-verify.uc \ + files/client-connect.uc \ + files/client-disconnect.uc \ + files/client-crresponse.uc \ + files/auth-user-pass-verify.uc \ + files/tls-verify.uc \ $(1)/usr/share/openvpn/ $(INSTALL_DIR) $(1)/lib/upgrade/keep.d From 60816bc88578c19bdc3e2e8a1741a91cc40aa74d Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:17:38 +0100 Subject: [PATCH 4/6] openvpn: move lib/upgrade/keep.d file into its own dir By moving the file to a subdirectory, it is easier to track where the file is located on the target without having to check the Makefile every time. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 4 ++-- .../files/{openvpn.sysupgrade => lib/upgrade/keep.d/openvpn} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename net/openvpn/files/{openvpn.sysupgrade => lib/upgrade/keep.d/openvpn} (100%) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 8a4ae220fb8d3..1914f12991df1 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -125,8 +125,8 @@ define Package/openvpn-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/lib/upgrade/keep.d $(INSTALL_DATA) \ - files/openvpn.sysupgrade \ - $(1)/lib/upgrade/keep.d/openvpn + files/lib/upgrade/keep.d/openvpn \ + $(1)/lib/upgrade/keep.d/ endef $(eval $(call BuildPackage,openvpn-openssl)) diff --git a/net/openvpn/files/openvpn.sysupgrade b/net/openvpn/files/lib/upgrade/keep.d/openvpn similarity index 100% rename from net/openvpn/files/openvpn.sysupgrade rename to net/openvpn/files/lib/upgrade/keep.d/openvpn From 5eb12bcd076e5d2091dfdc886a8812d7d32f836e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:21:16 +0100 Subject: [PATCH 5/6] openvpn: move usr/share/openvpn files into its own dir By moving the file to a subdirectory, it is easier to track where the file is located on the target without having to check the Makefile every time. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 24 +++++++++---------- .../share/openvpn}/auth-user-pass-verify.uc | 0 .../{ => usr/share/openvpn}/client-connect.uc | 0 .../share/openvpn}/client-crresponse.uc | 0 .../share/openvpn}/client-disconnect.uc | 0 .../files/{ => usr/share/openvpn}/down.uc | 0 .../files/{ => usr/share/openvpn}/ipchange.uc | 0 .../{ => usr/share/openvpn}/openvpn.options | 0 .../{ => usr/share/openvpn}/route-pre-down.uc | 0 .../files/{ => usr/share/openvpn}/route-up.uc | 0 .../{ => usr/share/openvpn}/tls-verify.uc | 0 .../files/{ => usr/share/openvpn}/up.uc | 0 12 files changed, 12 insertions(+), 12 deletions(-) rename net/openvpn/files/{ => usr/share/openvpn}/auth-user-pass-verify.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/client-connect.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/client-crresponse.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/client-disconnect.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/down.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/ipchange.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/openvpn.options (100%) rename net/openvpn/files/{ => usr/share/openvpn}/route-pre-down.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/route-up.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/tls-verify.uc (100%) rename net/openvpn/files/{ => usr/share/openvpn}/up.uc (100%) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 1914f12991df1..6456dfbf5add6 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -108,19 +108,19 @@ define Package/openvpn-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/usr/share/openvpn $(INSTALL_DATA) \ - files/openvpn.options \ - $(1)/usr/share/openvpn/openvpn.options + files/usr/share/openvpn/openvpn.options \ + $(1)/usr/share/openvpn/ $(INSTALL_BIN) \ - files/up.uc\ - files/down.uc \ - files/route-pre-down.uc \ - files/route-up.uc \ - files/ipchange.uc \ - files/client-connect.uc \ - files/client-disconnect.uc \ - files/client-crresponse.uc \ - files/auth-user-pass-verify.uc \ - files/tls-verify.uc \ + files/usr/share/openvpn/up.uc \ + files/usr/share/openvpn/down.uc \ + files/usr/share/openvpn/route-pre-down.uc \ + files/usr/share/openvpn/route-up.uc \ + files/usr/share/openvpn/ipchange.uc \ + files/usr/share/openvpn/client-connect.uc \ + files/usr/share/openvpn/client-disconnect.uc \ + files/usr/share/openvpn/client-crresponse.uc \ + files/usr/share/openvpn/auth-user-pass-verify.uc \ + files/usr/share/openvpn/tls-verify.uc \ $(1)/usr/share/openvpn/ $(INSTALL_DIR) $(1)/lib/upgrade/keep.d diff --git a/net/openvpn/files/auth-user-pass-verify.uc b/net/openvpn/files/usr/share/openvpn/auth-user-pass-verify.uc similarity index 100% rename from net/openvpn/files/auth-user-pass-verify.uc rename to net/openvpn/files/usr/share/openvpn/auth-user-pass-verify.uc diff --git a/net/openvpn/files/client-connect.uc b/net/openvpn/files/usr/share/openvpn/client-connect.uc similarity index 100% rename from net/openvpn/files/client-connect.uc rename to net/openvpn/files/usr/share/openvpn/client-connect.uc diff --git a/net/openvpn/files/client-crresponse.uc b/net/openvpn/files/usr/share/openvpn/client-crresponse.uc similarity index 100% rename from net/openvpn/files/client-crresponse.uc rename to net/openvpn/files/usr/share/openvpn/client-crresponse.uc diff --git a/net/openvpn/files/client-disconnect.uc b/net/openvpn/files/usr/share/openvpn/client-disconnect.uc similarity index 100% rename from net/openvpn/files/client-disconnect.uc rename to net/openvpn/files/usr/share/openvpn/client-disconnect.uc diff --git a/net/openvpn/files/down.uc b/net/openvpn/files/usr/share/openvpn/down.uc similarity index 100% rename from net/openvpn/files/down.uc rename to net/openvpn/files/usr/share/openvpn/down.uc diff --git a/net/openvpn/files/ipchange.uc b/net/openvpn/files/usr/share/openvpn/ipchange.uc similarity index 100% rename from net/openvpn/files/ipchange.uc rename to net/openvpn/files/usr/share/openvpn/ipchange.uc diff --git a/net/openvpn/files/openvpn.options b/net/openvpn/files/usr/share/openvpn/openvpn.options similarity index 100% rename from net/openvpn/files/openvpn.options rename to net/openvpn/files/usr/share/openvpn/openvpn.options diff --git a/net/openvpn/files/route-pre-down.uc b/net/openvpn/files/usr/share/openvpn/route-pre-down.uc similarity index 100% rename from net/openvpn/files/route-pre-down.uc rename to net/openvpn/files/usr/share/openvpn/route-pre-down.uc diff --git a/net/openvpn/files/route-up.uc b/net/openvpn/files/usr/share/openvpn/route-up.uc similarity index 100% rename from net/openvpn/files/route-up.uc rename to net/openvpn/files/usr/share/openvpn/route-up.uc diff --git a/net/openvpn/files/tls-verify.uc b/net/openvpn/files/usr/share/openvpn/tls-verify.uc similarity index 100% rename from net/openvpn/files/tls-verify.uc rename to net/openvpn/files/usr/share/openvpn/tls-verify.uc diff --git a/net/openvpn/files/up.uc b/net/openvpn/files/usr/share/openvpn/up.uc similarity index 100% rename from net/openvpn/files/up.uc rename to net/openvpn/files/usr/share/openvpn/up.uc From 0ee8b3a1200a4765c96c72dd84d6cff2012cf951 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:42:34 +0100 Subject: [PATCH 6/6] openvpn: increment PKG_RELEASE by one Increment PKG_RELEASE by one. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 6456dfbf5add6..cc34f4ff1debe 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.6.14 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \