summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDavid Paleino <dapal@debian.org>2014-03-19 11:25:55 +0100
committerDavid Paleino <dapal@debian.org>2014-03-19 11:25:55 +0100
commit8c08da0c432fe230323ffa85914a7c2161b5360c (patch)
tree00c604589209b761e3892c8dd80fc1196fd8b0bf /debian/patches
parentdcec90789b1399977709221ce03982ace72c92d9 (diff)
downloadbash-completion-8c08da0c432fe230323ffa85914a7c2161b5360c.tar.gz
ifconfig_locale.patch: _mac_addresses() didn't consider locale awareness of ifconfig, thanks to Thilo Six (Closes: #704832)
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/10-ifconfig_locale.patch22
-rw-r--r--debian/patches/series1
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/10-ifconfig_locale.patch b/debian/patches/10-ifconfig_locale.patch
new file mode 100644
index 00000000..a18ec268
--- /dev/null
+++ b/debian/patches/10-ifconfig_locale.patch
@@ -0,0 +1,22 @@
+From: Thilo Six <T.Six@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 0e1cc0d0..c9c3c797 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