diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-30 07:30:53 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-30 07:30:53 +0200 |
| commit | e94cf198efec5862a3979bdc47157bd3f33e8244 (patch) | |
| tree | c29e8b8cc3c75c3ac5bedc467a415d738c578256 /debian | |
| parent | 1c54daf5d79ed0df33b66a5e91d919fefe11b77a (diff) | |
preserve order of pushed parameters in update-resolv-conf
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/update-resolv-conf | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9bf7738..a55e74e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ openvpn (2.4.6-1) UNRELEASED; urgency=medium * debian/watch: - Use secure URI. * Remove obsolete debian/openvpn.lintian-overrides. + * Fix "preserve order of pushed parameters in update-resolv-conf" + (Closes: #807808). Thanks to Thibaut Chèze. -- Jörg Frings-Fürst <debian@jff.email> Sun, 29 Jul 2018 13:59:15 +0200 diff --git a/debian/control b/debian/control index 41a7788..7fa8fcd 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,8 @@ Depends: lsb-base (>= 3.0-6) Suggests: openssl, - resolvconf + resolvconf, + coreutils Recommends: easy-rsa Description: virtual private network daemon OpenVPN is an application to securely tunnel IP networks over a diff --git a/debian/update-resolv-conf b/debian/update-resolv-conf index fc2f031..5bebaa4 100644 --- a/debian/update-resolv-conf +++ b/debian/update-resolv-conf @@ -30,7 +30,8 @@ case "$script_type" in up) NMSRVRS="" SRCHS="" - for optionvarname in ${!foreign_option_*} ; do + foreign_options=$(printf '%s\n' ${!foreign_option_*} | sort -t _ -k 3 -g) + for optionvarname in ${foreign_options} ; do option="${!optionvarname}" echo "$option" split_into_parts $option |