[Bash-completion-commits] [debian] 14/19: ifconfig_locale.patch: _mac_addresses() didn't consider locale awareness of ifconfig, thanks to Thilo Six (Closes: #704832)

[David Paleino]

This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to branch master
in repository debian.

commit 8c08da0c432fe230323ffa85914a7c2161b5360c
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 19 11:25:55 2014 +0100

    ifconfig_locale.patch: _mac_addresses() didn't consider locale awareness of ifconfig, thanks to Thilo Six (Closes: #704832)
---
 debian/changelog                        |  4 +++-
 debian/patches/10-ifconfig_locale.patch | 22 ++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 73074ac..83b52c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,11 +30,13 @@ bash-completion (1:2.1-3) UNRELEASED; urgency=medium
       thanks to Luca Capello (Closes: #697513)
     - aptitude_safe-upgrade.patch: safe-upgrade supports package names,
       thanks to Nicolas Le Cam (Closes: #673235)
+    - ifconfig_locale.patch: _mac_addresses() didn't consider locale
+      awareness of ifconfig, thanks to Thilo Six (Closes: #704832)
   * debian/extra/debhelper/dh_bash-completion: fix installation process
     when more than one "proper snippet" is being installed, thanks to
     Jean-Michel Vourgère (Closes: #680852)
 
- -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 11:20:26 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 11:24:59 +0100
 
 bash-completion (1:2.1-2) unstable; urgency=low
 
diff --git a/debian/patches/10-ifconfig_locale.patch b/debian/patches/10-ifconfig_locale.patch
new file mode 100644
index 0000000..a18ec26
--- /dev/null
+++ b/debian/patches/10-ifconfig_locale.patch
@@ -0,0 +1,22 @@
+From: Thilo Six <T.Six at gmx.de>
+Subject: use explicit C locale for ifconfig
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704832
+Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=a9db458
+Forwarded: not-needed
+
+---
+ bash_completion |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- bash-completion.orig/bash_completion
++++ bash-completion/bash_completion
+@@ -836,7 +836,8 @@ _mac_addresses()
+     # - ifconfig on Linux: HWaddr or ether
+     # - ifconfig on FreeBSD: ether
+     # - ip link: link/ether
+-    COMPREPLY+=( $( { ifconfig -a || ip link show; } 2>/dev/null | sed -ne \
++    COMPREPLY+=( $( \
++        { LC_ALL=C ifconfig -a || ip link show; } 2>/dev/null | sed -ne \
+         "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]].*/\1/p" -ne \
+         "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]]*$/\1/p" -ne \
+         "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($re\)[[:space:]].*|\2|p" -ne \
diff --git a/debian/patches/series b/debian/patches/series
index 0e1cc0d..c9c3c79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 07-dpkg_support_raw-extract_vextract.patch
 08-dpkg_fix_-W_option.patch
 09-aptitude_safe-upgrade.patch
+10-ifconfig_locale.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/debian.git