From e7bf9e7c96f140a888445ed42c97228adbc585f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Krier?= Date: Sun, 28 Feb 2010 16:21:33 +0000 Subject: [PATCH] Fix init scripts to work with tabs for bug #301619 Package-Manager: portage-2.1.7.16/cvs/Linux i686 --- net-misc/openvpn/ChangeLog | 6 +++++- net-misc/openvpn/Manifest | 6 +++--- net-misc/openvpn/files/openvpn-2.1.init | 12 ++++++------ net-misc/openvpn/files/openvpn.init | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index e44e377e210d..e509e8718d5d 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openvpn # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.171 2010/02/28 16:11:18 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.172 2010/02/28 16:21:33 cedk Exp $ + + 28 Feb 2010; Cédric Krier files/openvpn-2.1.init, + files/openvpn.init: + Fix init scripts to work with tabs for bug #301619 28 Feb 2010; Cédric Krier openvpn-2.1.0-r1.ebuild: Filter out -maltivec on ppc for bug #293840 diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest index 61a4a23d620e..49debb45f5a0 100644 --- a/net-misc/openvpn/Manifest +++ b/net-misc/openvpn/Manifest @@ -4,10 +4,10 @@ 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 4198 RMD160 02564fa325a33aee08c643869f56c9947c27e5fc SHA1 57b9cf1b1dc62b7b1c9940acdd43e890ed5c79a2 SHA256 0c3e385e534992f6329c15b4be97a343b2e69a21d778e2d193297f40a33a13e0 +AUX openvpn-2.1.init 4186 RMD160 e71c8cb5abee5d1b7c6485fc910f35822330a853 SHA1 a25b319834208d7ac65b090f85ee500f5e752cdc SHA256 d1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b AUX openvpn-2.1_rc13-peercred.patch 251 RMD160 26123eedc9b685fb01de93c1141588f8008562f5 SHA1 8132510ebbd891ec55ef36d0cb8a86cb64a0145f SHA256 e7c2025ec49d3a5c2d95d80ee3c26ed9ccd0587d1664860b3a1eceb2bb7c778f AUX openvpn-2.1_rc20-pkcs11.patch 622 RMD160 7d7a41796096ed8f54f646f4ce57cf91b53cad2e SHA1 1748474195bc318c5232290fca5a9d6edaf95e1c SHA256 f972c473645f880c27b3c72379c49183f1e27d352f401d5ea7e734fad99f2d6c -AUX openvpn.init 1488 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 SHA1 48aabadee2cbb6ce9c4196b2730922491a96f003 SHA256 c074126c90d35c04a7316f4533cd00e9e14849e4e222ca5b87e6172f401ec95d +AUX openvpn.init 1486 RMD160 7005230b0dc3ea400aa22c9a01c2aa034d8baace SHA1 1670c08a2bec65c2e3529aec8d377bad6cb2e0e5 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e857053f86ea886dec8e8e6f45174df774 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e @@ -31,5 +31,5 @@ EBUILD openvpn-2.1_rc15.ebuild 4679 RMD160 f814096d99990986e910c1ecc933df636a586 EBUILD openvpn-2.1_rc19.ebuild 4685 RMD160 738549b27fc91bab472cdc83589c02cbb718e2a2 SHA1 74da0799d955e8f78f375e044ac32c6a6c41e7bb SHA256 278bf6d40ecc63a0f5a077b4dd1ec726efdfe5919718565a3e2d25646fbca5d5 EBUILD openvpn-2.1_rc20.ebuild 5430 RMD160 1496406547e3eb871aa9540f535714ebad931fe6 SHA1 3a13d8c306387201411ba5dffdb5355c9373981b SHA256 8b529b7937b50832463dcd50ff642ee4d929f36ebdf655945da8e46768d3c367 EBUILD openvpn-2.1_rc21.ebuild 5488 RMD160 b59322eafea45860b18cbdabae00727265e192fa SHA1 ead7f1079204379ff77830f178f6efa8dee61df1 SHA256 16e27575161bbd7fc0c5f3347b9876481237ecaa0998ad9e7d3f757da0cc9a93 -MISC ChangeLog 26199 RMD160 17495c1f4c42642567c84ede2553b25685b2f7ad SHA1 731e558b6f806413ab44e38de3f3f168203d4066 SHA256 142a0f0e470ca0697c588f9497c5290a820b0c379c536b497cdda409a9286a48 +MISC ChangeLog 26346 RMD160 bd255def6067bbb78e06d4154edd71abbb322b11 SHA1 db6fcbbf67fa2b4417fdaef83becd71ebdb58913 SHA256 7c744ef1a82e75900fbdcaaff788ed110b302bf55361fad48017b62efc4e9637 MISC metadata.xml 733 RMD160 c6fec2d3dfa62bf6800c0f47760a21e4cb2f0f6a SHA1 22f9b0d1527a69ecba158110f24aa23503ffd2e0 SHA256 8292ee60e6cb2eab0b1e3a7ca9b21cb935b1fbaf858113fa5e7bf4b32026633e diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init index 1786f4d50235..d65e6f8bd7c4 100755 --- a/net-misc/openvpn/files/openvpn-2.1.init +++ b/net-misc/openvpn/files/openvpn-2.1.init @@ -69,7 +69,7 @@ start() { local args="" reenter=${RE_ENTER:-no} # If the config file does not specify the cd option, we do # But if we specify it, we override the config option which we do not want - if ! grep -q "^[ \t]*cd[ \t].*" "${VPNCONF}" ; then + if ! grep -q "^[ ]*cd[ ].*" "${VPNCONF}" ; then args="${args} --cd ${VPNDIR}" fi @@ -77,7 +77,7 @@ start() { # When we get an authenticated packet from the peer then we run our script # which configures our DNS if any and marks us as up. if [ "${DETECT_CLIENT:-yes}" = "yes" ] && \ - grep -q "^[ \t]*remote[ \t].*" "${VPNCONF}" ; then + grep -q "^[ ]*remote[ ].*" "${VPNCONF}" ; then reenter="yes" args="${args} --up-delay --up-restart" args="${args} --script-security 2" @@ -85,7 +85,7 @@ start() { args="${args} --down-pre --down /etc/openvpn/down.sh" # Warn about setting scripts as we override them - if grep -Eq "^[ \t]*(up|down)[ \t].*" "${VPNCONF}" ; then + if grep -Eq "^[ ]*(up|down)[ ].*" "${VPNCONF}" ; then ewarn "WARNING: You have defined your own up/down scripts" ewarn "As you're running as a client, we now force Gentoo specific" ewarn "scripts to be run for up and down events." @@ -95,15 +95,15 @@ start() { # Warn about the inability to change ip/route/dns information when # dropping privs - if grep -q "^[ \t]*user[ \t].*" "${VPNCONF}" ; then + if grep -q "^[ ]*user[ ].*" "${VPNCONF}" ; then ewarn "WARNING: You are dropping root privileges!" ewarn "As such openvpn may not be able to change ip, routing" ewarn "or DNS configuration." fi else # So we're a server. Run as openvpn unless otherwise specified - grep -q "^[ \t]*user[ \t].*" "${VPNCONF}" || args="${args} --user openvpn" - grep -q "^[ \t]*group[ \t].*" "${VPNCONF}" || args="${args} --group openvpn" + grep -q "^[ ]*user[ ].*" "${VPNCONF}" || args="${args} --user openvpn" + grep -q "^[ ]*group[ ].*" "${VPNCONF}" || args="${args} --group openvpn" fi # Ensure that our scripts get the PEER_DNS variable diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init index a6e4529e1c8b..489ab497dce4 100644 --- a/net-misc/openvpn/files/openvpn.init +++ b/net-misc/openvpn/files/openvpn.init @@ -45,7 +45,7 @@ start() { local args="" # If the config file does not specify the cd option, we do # But if we specify it, we override the config option which we do not want - if ! grep -q "^[ \t]*cd[ \t].*" "${VPNCONF}" ; then + if ! grep -q "^[ ]*cd[ ].*" "${VPNCONF}" ; then args="${args} --cd ${VPNDIR}" fi -- 2.26.2