diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2008-11-01 15:50:06 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2008-11-01 15:50:06 +0000 |
| commit | f31462f90ded5e011f4c1aeb0e5dd725b756698d (patch) | |
| tree | 5cf43c65bce02f0a7b439da7f050124c1c7bdd62 /net-misc/openvpn | |
| parent | Add dependency to pkgconfig for bug #244606 (diff) | |
| download | historical-f31462f90ded5e011f4c1aeb0e5dd725b756698d.tar.gz historical-f31462f90ded5e011f4c1aeb0e5dd725b756698d.tar.bz2 historical-f31462f90ded5e011f4c1aeb0e5dd725b756698d.zip | |
Fix init script for bug #234667
Package-Manager: portage-2.1.4.5
Diffstat (limited to 'net-misc/openvpn')
| -rw-r--r-- | net-misc/openvpn/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openvpn/Manifest | 4 | ||||
| -rwxr-xr-x | net-misc/openvpn/files/openvpn-2.1.init | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 699484dd3983..9391fef3a2a7 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openvpn # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.138 2008/09/28 12:48:09 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.139 2008/11/01 15:50:06 cedk Exp $ + + 01 Nov 2008; Cédric Krier <cedk@gentoo.org> files/openvpn-2.1.init: + Fix init script for bug #234667 28 Sep 2008; Cédric Krier <cedk@gentoo.org> +files/openvpn-2.1_rc9-tests.patch, openvpn-2.1_rc9.ebuild: diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest index bc84a0a5364c..ddfc9ee64184 100644 --- a/net-misc/openvpn/Manifest +++ b/net-misc/openvpn/Manifest @@ -4,7 +4,7 @@ AUX openvpn-2.0.7-persistent.patch 1857 RMD160 b3232feb19810ac405cd7af6bb692ed03 AUX openvpn-2.0.9-pam.patch 1190 RMD160 e914b19aeeb9d9d108394aa61bacd019a3223d4a SHA1 774c1d7fd322249a3ba9d42995640d94093a33b2 SHA256 c485acbb8dae4c9440ebd76a92e2de733faa6320ee6fb2d2408111c802a74b7e AUX openvpn-2.0.9-persistent.patch 1851 RMD160 18571bd041024001339fce6dc2472567047c5508 SHA1 a982646053e94f99f514080c2188215a7edcab2a SHA256 60a825023db6b1e1082bc3de4c2efb47e6cf6c5bb73c78de03c29ab8fe79c7ac AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2 -AUX openvpn-2.1.init 4120 RMD160 fdfee02bd0653ee158a8f35fe6df97bc7000e6be SHA1 c87c439bd0a995c0b1075d31e98fabef3b5514e5 SHA256 5f353bfe3052a3d7398457d52fde74d1a9a78aa28bf594494911f473d3832d6b +AUX openvpn-2.1.init 4207 RMD160 07da4fa43c55f4096c3a59a8229ec0a790da1fa8 SHA1 22fab45a9c14ee6aabe96f060d14c0940f3fe94b SHA256 a0cc87fdb10928c9c6b820482a2551ee17599253cb43186dd4ea47f55f0dab06 AUX openvpn-2.1_rc9-tests.patch 1250 RMD160 671e35bc13f5d534828d0a99c81ec7adccfcba44 SHA1 c36c7d8af37fc62fb678001f38072edd95315042 SHA256 161d20f84861372b144b49db7d610dfc14a653cf27fef043c6d36623c69739ab AUX openvpn.init 1488 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 SHA1 48aabadee2cbb6ce9c4196b2730922491a96f003 SHA256 c074126c90d35c04a7316f4533cd00e9e14849e4e222ca5b87e6172f401ec95d AUX up.sh 2560 RMD160 34c2f0845a2c3b2eebb20da5a5c316e81cd1ef5a SHA1 d7026eeb7586fb931e5f938ca00fcc63c63923ad SHA256 3a7cedba5909fa06d0eb36b3426f0e5bc21bdc28943beaaa241ab651b4388218 @@ -16,5 +16,5 @@ EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 EBUILD openvpn-2.0.7-r2.ebuild 4174 RMD160 d4917068d83748cb9667f1fdb2f6a912f9cc7fdd SHA1 4f6388a0271bae7c53533eb9e3148575b43edd2e SHA256 51f9ac56227e3425f5074bf4b59ecf53663195ac2e0426431da41552ba46701e EBUILD openvpn-2.0.9.ebuild 4174 RMD160 3eb65eeccfdc37f5ccd718e5d4934e4d60672061 SHA1 559acebad7131994ccb81e520ca08efefaa918fb SHA256 67d348cda2c182f7ed6f4c69b102e0ae3c0c2ee4e82c2dea679a4a1480c371f1 EBUILD openvpn-2.1_rc9.ebuild 4409 RMD160 4c026717e798f2a398be9c25c10fcadd7e982050 SHA1 c0bdd9e720a2f827ed1a0b0d932f6dd1a254ce17 SHA256 071d23f8bf007082877ef064c1d26277f5047c780b40a76a24967e9632384296 -MISC ChangeLog 21970 RMD160 3ccbb84a963d6439d24c42dd6672dda295f50ed0 SHA1 9d3163e8df37aae61bca3ced7055001eb2cb47c2 SHA256 a687dbf8f837427a95fdf78633a8ea83534dff6bad9bd439c3184461b8ff8df7 +MISC ChangeLog 22076 RMD160 28977d1e794e3134268753bf157d09a238b7760a SHA1 62154b41b6a46ce1248302b8ce7d0f5081b31382 SHA256 fca04cec6645e2c96484eefa36556e7aeb2e50acb7c5f64eb6bda53e40438394 MISC metadata.xml 681 RMD160 38d44e8ca26011bef8b9072c41b7797dd32184bf SHA1 304f109764fe69865bf4ea490b8d3a6839a5ab9e SHA256 6f6898ac4534eeed083629ee9c581da086a65b728af16306d3a39edf100e7911 diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init index daa163582173..ae8d5980fc07 100755 --- a/net-misc/openvpn/files/openvpn-2.1.init +++ b/net-misc/openvpn/files/openvpn-2.1.init @@ -107,11 +107,12 @@ start() { fi # Ensure that our scripts get the PEER_DNS variable - export PEER_DNS + [ -n "${PEER_DNS}" ] && args="${args} --setenv PEER_DNS ${PEER_DNS}" [ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}" start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \ - -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args} + -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon \ + --setenv SVCNAME "${SVCNAME}" ${args} eend $? "Check your logs to see why startup failed" } |