[118693] trunk/dports/sysutils
raimue at macports.org
raimue at macports.org
Tue Apr 8 03:26:23 PDT 2014
Revision: 118693
https://trac.macports.org/changeset/118693
Author: raimue at macports.org
Date: 2014-04-08 03:26:23 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
sysutils/bash-completion{,-devel}:
Port patches from Debian to fix compatibility problems with bash 4.3, closes #43265
Modified Paths:
--------------
trunk/dports/sysutils/bash-completion/Portfile
trunk/dports/sysutils/bash-completion-devel/Portfile
Added Paths:
-----------
trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff
trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff
trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff
trunk/dports/sysutils/bash-completion-devel/files/patch-compat-dont-return.diff
trunk/dports/sysutils/bash-completion-devel/files/patch-fix-quote-readline-by-ref.diff
trunk/dports/sysutils/bash-completion-devel/files/patch-perldoc-pod.diff
trunk/dports/sysutils/bash-completion-devel/files/patch-words-bad-array-subscript.diff
Modified: trunk/dports/sysutils/bash-completion/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion/Portfile 2014-04-08 09:44:06 UTC (rev 118692)
+++ trunk/dports/sysutils/bash-completion/Portfile 2014-04-08 10:26:23 UTC (rev 118693)
@@ -6,7 +6,7 @@
conflicts bash-completion-devel
epoch 1
version 2.1
-revision 7
+revision 8
categories sysutils
platforms darwin
supported_archs noarch
@@ -28,7 +28,11 @@
patchfiles patch-vpnc.diff \
patch-make.diff \
- patch-_known_hosts_real.diff
+ patch-_known_hosts_real.diff \
+ patch-compat-dont-return.diff \
+ patch-words-bad-array-subscript.diff \
+ patch-fix-quote-readline-by-ref.diff \
+ patch-perldoc-pod.diff
post-patch {
reinplace "s:/etc/bash_completion:${prefix}/etc/bash_completion:g" \
Added: trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,25 @@
+From: Ville Skyttä <ville.skytta at iki.fi>
+Subject: don't return from sourced script
+Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=867282a
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741657
+Forwarded: not-needed
+
+---
+ bash_completion.sh.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- bash_completion.sh.in
++++ bash_completion.sh.in
+@@ -1,5 +1,5 @@
+ # Check for interactive bash and that we haven't already been sourced.
+-[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return
++if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+
+ # Check for recent enough version of bash.
+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+@@ -12,3 +12,5 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4
+ fi
+ fi
+ unset bash bmajor bminor
++
++fi
Added: trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,43 @@
+From: JuanJo Ciarlante <jjo at canonical.com>
+Subject: fix _quote_readline_by_ref to:
+ - avoid escaping 1st '~' (lp: #1288314)
+ - avoid quoting if empty, else expansion without args only shows dirs
+ (lp: #1288031)
+ - replace double escaping to single (eg for completing file/paths with
+ spaces)
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739835
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739835
+Forwarded: yes, <5328F418.100 at canonical.com>
+
+---
+ bash_completion | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- bash_completion
++++ bash_completion
+@@ -536,13 +536,24 @@ __ltrim_colon_completions()
+ # @param $2 Name of variable to return result to
+ _quote_readline_by_ref()
+ {
+- if [[ $1 == \'* ]]; then
++ if [ -z "$1" ]; then
++ # avoid quoting if empty
++ printf -v $2 %s "$1"
++ elif [[ $1 == \'* ]]; then
+ # Leave out first character
+ printf -v $2 %s "${1:1}"
++ elif [[ $1 == ~* ]]; then
++ # avoid escaping first ~
++ printf -v $2 ~%q "${1:1}"
+ else
+ printf -v $2 %q "$1"
+ fi
+
++ # Replace double escaping ( \\ ) by single ( \ )
++ # This happens always when argument is already escaped at cmdline,
++ # and passed to this function as e.g.: file\ with\ spaces
++ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
++
+ # If result becomes quoted like this: $'string', re-evaluate in order to
+ # drop the additional quoting. See also: http://www.mail-archive.com/
+ # bash-completion-devel at lists.alioth.debian.org/msg01942.html
Added: trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,23 @@
+From: Carl Hayter <zengargoyle at gmail.com>
+Subject: perldoc: look for .pod in addition to .pm files
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708173
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708173
+Forwarded: no
+
+---
+ helpers/perl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- helpers/perl
++++ helpers/perl
+@@ -23,8 +23,8 @@ sub print_modules_real {
+ chdir($dir) or return;
+
+ # print each file
+- foreach my $file (glob('*.pm')) {
+- $file =~ s/\.pm$//;
++ foreach my $file (glob('*.{pm,pod}')) {
++ $file =~ s/\.(?:pm|pod)$//;
+ my $module = $base . $file;
+ next if $module !~ /^\Q$word/;
+ next if $seen{$module}++;
Added: trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,22 @@
+From: Barry Warsaw <barry at python.org>
+Subject: Fix bash: words: bad array subscript
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741479
+Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
+Forwarded: yes, <20140312212729.17788.38099.reportbug at samba4.Chuck.local>
+
+---
+ bash_completion | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- bash_completion
++++ bash_completion
+@@ -718,7 +718,7 @@ _init_completion()
+ fi
+ done
+
+- [[ $cword -eq 0 ]] && return 1
++ [[ $cword -le 0 ]] && return 1
+ prev=${words[cword-1]}
+
+ [[ ${split-} ]] && _split_longopt && split=true
Modified: trunk/dports/sysutils/bash-completion-devel/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/Portfile 2014-04-08 09:44:06 UTC (rev 118692)
+++ trunk/dports/sysutils/bash-completion-devel/Portfile 2014-04-08 10:26:23 UTC (rev 118693)
@@ -5,7 +5,7 @@
name bash-completion-devel
conflicts bash-completion
version 2.1
-revision 6
+revision 7
categories sysutils
platforms darwin
supported_archs noarch
@@ -28,7 +28,11 @@
patchfiles patch-vpnc.diff \
patch-make.diff \
- patch-_known_hosts_real.diff
+ patch-_known_hosts_real.diff \
+ patch-compat-dont-return.diff \
+ patch-words-bad-array-subscript.diff \
+ patch-fix-quote-readline-by-ref.diff \
+ patch-perldoc-pod.diff
post-patch {
reinplace "s:/etc/bash_completion:${prefix}/etc/bash_completion:g" \
Added: trunk/dports/sysutils/bash-completion-devel/files/patch-compat-dont-return.diff
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/files/patch-compat-dont-return.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion-devel/files/patch-compat-dont-return.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,25 @@
+From: Ville Skyttä <ville.skytta at iki.fi>
+Subject: don't return from sourced script
+Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=867282a
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741657
+Forwarded: not-needed
+
+---
+ bash_completion.sh.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- bash_completion.sh.in
++++ bash_completion.sh.in
+@@ -1,5 +1,5 @@
+ # Check for interactive bash and that we haven't already been sourced.
+-[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return
++if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+
+ # Check for recent enough version of bash.
+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+@@ -12,3 +12,5 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4
+ fi
+ fi
+ unset bash bmajor bminor
++
++fi
Added: trunk/dports/sysutils/bash-completion-devel/files/patch-fix-quote-readline-by-ref.diff
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/files/patch-fix-quote-readline-by-ref.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion-devel/files/patch-fix-quote-readline-by-ref.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,43 @@
+From: JuanJo Ciarlante <jjo at canonical.com>
+Subject: fix _quote_readline_by_ref to:
+ - avoid escaping 1st '~' (lp: #1288314)
+ - avoid quoting if empty, else expansion without args only shows dirs
+ (lp: #1288031)
+ - replace double escaping to single (eg for completing file/paths with
+ spaces)
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739835
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739835
+Forwarded: yes, <5328F418.100 at canonical.com>
+
+---
+ bash_completion | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- bash_completion
++++ bash_completion
+@@ -536,13 +536,24 @@ __ltrim_colon_completions()
+ # @param $2 Name of variable to return result to
+ _quote_readline_by_ref()
+ {
+- if [[ $1 == \'* ]]; then
++ if [ -z "$1" ]; then
++ # avoid quoting if empty
++ printf -v $2 %s "$1"
++ elif [[ $1 == \'* ]]; then
+ # Leave out first character
+ printf -v $2 %s "${1:1}"
++ elif [[ $1 == ~* ]]; then
++ # avoid escaping first ~
++ printf -v $2 ~%q "${1:1}"
+ else
+ printf -v $2 %q "$1"
+ fi
+
++ # Replace double escaping ( \\ ) by single ( \ )
++ # This happens always when argument is already escaped at cmdline,
++ # and passed to this function as e.g.: file\ with\ spaces
++ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
++
+ # If result becomes quoted like this: $'string', re-evaluate in order to
+ # drop the additional quoting. See also: http://www.mail-archive.com/
+ # bash-completion-devel at lists.alioth.debian.org/msg01942.html
Added: trunk/dports/sysutils/bash-completion-devel/files/patch-perldoc-pod.diff
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/files/patch-perldoc-pod.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion-devel/files/patch-perldoc-pod.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,23 @@
+From: Carl Hayter <zengargoyle at gmail.com>
+Subject: perldoc: look for .pod in addition to .pm files
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708173
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708173
+Forwarded: no
+
+---
+ helpers/perl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- helpers/perl
++++ helpers/perl
+@@ -23,8 +23,8 @@ sub print_modules_real {
+ chdir($dir) or return;
+
+ # print each file
+- foreach my $file (glob('*.pm')) {
+- $file =~ s/\.pm$//;
++ foreach my $file (glob('*.{pm,pod}')) {
++ $file =~ s/\.(?:pm|pod)$//;
+ my $module = $base . $file;
+ next if $module !~ /^\Q$word/;
+ next if $seen{$module}++;
Added: trunk/dports/sysutils/bash-completion-devel/files/patch-words-bad-array-subscript.diff
===================================================================
--- trunk/dports/sysutils/bash-completion-devel/files/patch-words-bad-array-subscript.diff (rev 0)
+++ trunk/dports/sysutils/bash-completion-devel/files/patch-words-bad-array-subscript.diff 2014-04-08 10:26:23 UTC (rev 118693)
@@ -0,0 +1,22 @@
+From: Barry Warsaw <barry at python.org>
+Subject: Fix bash: words: bad array subscript
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741479
+Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
+Forwarded: yes, <20140312212729.17788.38099.reportbug at samba4.Chuck.local>
+
+---
+ bash_completion | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- bash_completion
++++ bash_completion
+@@ -718,7 +718,7 @@ _init_completion()
+ fi
+ done
+
+- [[ $cword -eq 0 ]] && return 1
++ [[ $cword -le 0 ]] && return 1
+ prev=${words[cword-1]}
+
+ [[ ${split-} ]] && _split_longopt && split=true
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140408/8d378233/attachment-0001.html>
More information about the macports-changes
mailing list