<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c7516c0339d1a3ec94b50fbe54122280cb095f0c">https://github.com/macports/macports-ports/commit/c7516c0339d1a3ec94b50fbe54122280cb095f0c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c7516c0339d bash-completion: update to 2.11
</span>c7516c0339d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c7516c0339d1a3ec94b50fbe54122280cb095f0c
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Tue Nov 24 13:20:35 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> bash-completion: update to 2.11
</span>---
sysutils/bash-completion/Portfile | 12 +++++----
.../files/patch-fix-quote-readline-by-ref.diff | 23 +++++++++--------
sysutils/bash-completion/files/patch-vpnc.diff | 14 +++++-----
.../files/patch-xine-add-more-formats.diff | 30 ++++++++++++++++++++++
.../files/patch-xpdf-support-compressed-pdf.diff | 21 +++++++++++++++
5 files changed, 77 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/bash-completion/Portfile b/sysutils/bash-completion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa6537ac759..65f3b2d0b70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/bash-completion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/bash-completion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup scop bash-completion 2.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup scop bash-completion 2.11
</span> epoch 1
categories sysutils
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,15 +18,17 @@ long_description \
</span> github.tarball_from releases
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8976d7e0b0b54b0e9494a55788a6272d4350a3a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 123c17998e34b937ce57bb1b111cd817bc369309e9a8047c0bcf06ead4a3ec92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 310764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c38855cb1e3379c815d5491234ee589b91c44e3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 311004
</span>
depends_run port:bash
patchfiles patch-vpnc.diff \
patch-fix-quote-readline-by-ref.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-remove-pkgutil.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-pkgutil.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xine-add-more-formats.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xpdf-support-compressed-pdf.diff
</span>
post-patch {
reinplace "s:/etc/bash_completion:${prefix}/etc/bash_completion:g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff b/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ba22651e3e3..c2515aad372 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,16 +6,26 @@ Subject: fix _quote_readline_by_ref to:
</span> - replace double escaping to single (eg for completing file/paths with
spaces)
Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739835
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739835
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/739835
</span> Forwarded: yes, <5328F418.100@canonical.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+From: G. Branden Robinson <g.branden.robinson@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Revert "double escaping" hunk of patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - That portion fixed no cited bug.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - It broke extremely common command-substitution cases, e.g.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "grep pattern $(<TAB>)", producing:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bash: unexpected EOF while looking for matching `)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bash: syntax error: unexpected end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742466
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/742466
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ---
bash_completion | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--- bash_completion
+++ bash_completion
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -526,13 +526,24 @@ __ltrim_colon_completions()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -526,9 +526,15 @@
</span> # @param $2 Name of variable to return result to
_quote_readline_by_ref()
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,12 +42,3 @@ Forwarded: yes, <5328F418.100@canonical.com>
</span> else
printf -v $2 %q "$1"
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Replace double escaping ( \\ ) by single ( \ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This happens always when argument is already escaped at cmdline,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # and passed to this function as e.g.: file\ with\ spaces
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If result becomes quoted like this: $'string', re-evaluate in order to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # drop the additional quoting. See also: http://www.mail-archive.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bash-completion-devel@lists.alioth.debian.org/msg01942.html
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/bash-completion/files/patch-vpnc.diff b/sysutils/bash-completion/files/patch-vpnc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 17851940377..33a9783bd54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/bash-completion/files/patch-vpnc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/bash-completion/files/patch-vpnc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- completions/vpnc 2017-09-22 07:25:24.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ completions/vpnc 2018-03-27 12:54:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- completions/vpnc 2020-07-25 07:49:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ completions/vpnc 2020-11-24 13:09:36.274875288 -0500
</span> @@ -68,7 +68,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span> # config name, /etc/vpnc/<name>.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- local -a configs=( /etc/vpnc/*.conf )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local IFS=$' \t\n' reset=$(shopt -p nullglob)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shopt -s nullglob
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- local -a configs=(/etc/vpnc/*.conf)
</span> + local -a configs=( @@PREFIX@@/etc/vpnc/*.conf )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configs=( "${configs[@]##*/}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configs=( "${configs[@]%.conf}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configs=("${configs[@]##*/}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configs=("${configs[@]%.conf}")
</span> $reset
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/bash-completion/files/patch-xine-add-more-formats.diff b/sysutils/bash-completion/files/patch-xine-add-more-formats.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4b9c99a8cef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/bash-completion/files/patch-xine-add-more-formats.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: j^ (j) <https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/311525/comments/2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Add oga and ogx formats
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: vendor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/311525
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/496162
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bash_completion | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ completions/mplayer | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bash_completion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bash_completion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1967,13 +1967,13 @@ _install_xspec '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.texi*' makeinfo texi2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi xetex xelatex luatex lualatex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.mp3' mpg123 mpg321 madplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine fbxine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine fbxine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmvx]|OG[AGMVX]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(avi|asf|wmv)' aviplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(og[ag]|m3u|flac|spx)' ogg123
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_install_xspec '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_install_xspec '!*.@(mp3|og[ag]|pls|m3u)' gqmpeg freeamp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.fig' xfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(mid?(i)|cmf)' playmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/bash-completion/files/patch-xpdf-support-compressed-pdf.diff b/sysutils/bash-completion/files/patch-xpdf-support-compressed-pdf.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f4a190c6fa6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/bash-completion/files/patch-xpdf-support-compressed-pdf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Alfredo Finelli <0x4146@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: xpdf in Debian also supports compressed PDFs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702498
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/702498
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bash_completion | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bash_completion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bash_completion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1958,7 +1958,8 @@ _install_xspec '!*.@(gif|jp?(e)g?(2)|j2[ck]|jp[2f]|tif?(f)|png|p[bgp]m|bmp|x[bp]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_install_xspec '!*.[pf]df' acroread gpdf xpdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_install_xspec '!*.[pf]df' acroread gpdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_install_xspec '!*.@(pdf|fdf)?(.@(gz|GZ|bz2|BZ2|Z))' xpdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(?(e)ps|pdf)' kpdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.@(okular|@(?(e|x)ps|?(E|X)PS|[pf]df|[PF]DF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM)?(.?(gz|GZ|bz2|BZ2|xz|XZ)))' okular
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _install_xspec '!*.pdf' epdfview pdfunite
</span></pre><pre style='margin:0'>
</pre>