commit: da23c443933f51b4a9fd9ff98175f804dc52af37 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Mon Feb 20 14:35:51 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 11 16:25:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da23c443
net-vpn/openvpn: fix crushing multiple instances In environment with multiple openvpn's instances if one of them get crushed, trying to restart it will result to stoping ALL of other openvpn instances. Introduced `--config "${VPNCONF}"` option to prevent it as suggested by Zhixu Liu. Closes: https://bugs.gentoo.org/829949 Suggested-by: Zhixu Liu <zhixu.liu <AT> gmail.com> Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29685 Signed-off-by: Sam James <sam <AT> gentoo.org> net-vpn/openvpn/files/openvpn-2.1.init | 5 +++-- net-vpn/openvpn/{openvpn-2.5.2-r2.ebuild => openvpn-2.5.2-r3.ebuild} | 0 net-vpn/openvpn/{openvpn-2.5.6.ebuild => openvpn-2.5.6-r1.ebuild} | 0 net-vpn/openvpn/{openvpn-2.5.7.ebuild => openvpn-2.5.7-r1.ebuild} | 0 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net-vpn/openvpn/files/openvpn-2.1.init b/net-vpn/openvpn/files/openvpn-2.1.init index ba05689a1e09..3af33f5e6392 100644 --- a/net-vpn/openvpn/files/openvpn-2.1.init +++ b/net-vpn/openvpn/files/openvpn-2.1.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VPNDIR=${VPNDIR:-/etc/openvpn} @@ -126,7 +126,8 @@ stop() { ebegin "Stopping ${SVCNAME}" start-stop-daemon --stop --quiet \ - --exec /usr/sbin/openvpn --pidfile "${VPNPID}" + --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \ + -- --config "${VPNCONF}" eend $? } diff --git a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r3.ebuild similarity index 100% rename from net-vpn/openvpn/openvpn-2.5.2-r2.ebuild rename to net-vpn/openvpn/openvpn-2.5.2-r3.ebuild diff --git a/net-vpn/openvpn/openvpn-2.5.6.ebuild b/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild similarity index 100% rename from net-vpn/openvpn/openvpn-2.5.6.ebuild rename to net-vpn/openvpn/openvpn-2.5.6-r1.ebuild diff --git a/net-vpn/openvpn/openvpn-2.5.7.ebuild b/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild similarity index 100% rename from net-vpn/openvpn/openvpn-2.5.7.ebuild rename to net-vpn/openvpn/openvpn-2.5.7-r1.ebuild