diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-05-15 02:49:17 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-05-15 02:49:17 +0000 |
| commit | 29813d539747e58a6e3322df3f48eae4338c60b5 (patch) | |
| tree | ad64253796dc7d189145d9bb72dbd175c35488f4 /security | |
| parent | -Update to 2.0.0b4.p7 (diff) | |
Remove painful examples of foo="", with particular prejudice against
constructions that parse out to [ -z "$foo" ] && foo=""
These are bad examples that get copied and pasted into new code, so the
hope is that with less bad examples there will be less need for me to
bring this up in review.
In a few of these files all that were changed were comments so that next
time I search for these patterns I won't trip on the file for no reason.
In a few places, add $FreeBSD$
No functional changes, so no PORTREVISION bumps
Diffstat (limited to 'security')
| -rw-r--r-- | security/openvpn-beta/files/openvpn.sh.in | 4 | ||||
| -rw-r--r-- | security/openvpn-devel/files/openvpn.sh.in | 4 | ||||
| -rw-r--r-- | security/openvpn/files/openvpn.sh.in | 4 | ||||
| -rw-r--r-- | security/openvpn20/files/openvpn.sh.in | 4 | ||||
| -rw-r--r-- | security/p5-openxpki-deployment/files/openxpki.sh.in | 3 | ||||
| -rw-r--r-- | security/sancp/files/sancp.in | 4 |
6 files changed, 12 insertions, 11 deletions
diff --git a/security/openvpn-beta/files/openvpn.sh.in b/security/openvpn-beta/files/openvpn.sh.in index 8fa3bace8823..a60af9ac9e21 100644 --- a/security/openvpn-beta/files/openvpn.sh.in +++ b/security/openvpn-beta/files/openvpn.sh.in @@ -44,10 +44,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in index 8fa3bace8823..a60af9ac9e21 100644 --- a/security/openvpn-devel/files/openvpn.sh.in +++ b/security/openvpn-devel/files/openvpn.sh.in @@ -44,10 +44,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in index 9a081ed48e4f..6e88286ad51c 100644 --- a/security/openvpn/files/openvpn.sh.in +++ b/security/openvpn/files/openvpn.sh.in @@ -45,10 +45,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in index 894b40538616..b80fe1560c74 100644 --- a/security/openvpn20/files/openvpn.sh.in +++ b/security/openvpn20/files/openvpn.sh.in @@ -44,10 +44,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.sh.in index 70374060fcf2..b79847e61488 100644 --- a/security/p5-openxpki-deployment/files/openxpki.sh.in +++ b/security/p5-openxpki-deployment/files/openxpki.sh.in @@ -13,8 +13,9 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# openxpki_flags (Set as needed) + openxpki_enable="${openxpki_enable-NO}" -# openxpki_flags="" openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid" case "$1" in diff --git a/security/sancp/files/sancp.in b/security/sancp/files/sancp.in index 80bc18641069..8e67d5e8e779 100644 --- a/security/sancp/files/sancp.in +++ b/security/sancp/files/sancp.in @@ -1,6 +1,7 @@ #!/bin/sh -# +# $FreeBSD$ +# # PROVIDE: sancp # REQUIRE: DAEMON # BEFORE: LOGIN @@ -73,7 +74,6 @@ load_rc_config $name : ${sancp_enable="NO"} : ${sancp_flags="-D"} : ${sancp_conf="%%PREFIX%%/etc/sancp.conf"} -: ${sancp_interface=""} command_args="-c ${sancp_conf} -i ${sancp_interface}" |
