diff options
| author | Gabriel F. T. Gomes <gabriel@inconstante.net.br> | 2023-04-16 18:30:32 -0700 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gabriel@inconstante.net.br> | 2023-04-16 18:54:06 -0700 |
| commit | fffd501c651d81aaf889dccd2edb42227d9bf741 (patch) | |
| tree | 9e2caa9895c9f962a60ff38742ff7314ce9c8c38 | |
| parent | 3ea83fa0468bb5ce2bf8d90ef0529e655153e18b (diff) | |
| download | bash-completion-fffd501c651d81aaf889dccd2edb42227d9bf741.tar.gz | |
Remove downstream patch
As reported in bug #1033847 [1], our first downstream patches causes
long delays in NIS-based systems. Also, the patch doesn't seem to have
any effect on the issues it intended to fix [2,3]. Since they have been
in use since a long time, I'll not try to find what upstream patch fixed
the original problems. Apart from that, upstream has changed a lot since
our last sync (July 2020), and this patch will no longer apply once
upstream releases a new version (supposed to happen when the release
tasks complete [4]).
[1] https://bugs.debian.org/1033847
[2] https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1288314
[3] https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1288031
[4] https://github.com/scop/bash-completion/projects/2
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/00-fix_quote_readline_by_ref.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog index 74755e5b..ef23e874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ bash-completion (1:2.11-7) UNRELEASED; urgency=medium + * Remove downstream patch (Closes: #1033847). + -- Gabriel F. T. Gomes <gabriel@debian.org> Sun, 03 Apr 2022 09:17:08 -0300 bash-completion (1:2.11-6) unstable; urgency=medium diff --git a/debian/patches/00-fix_quote_readline_by_ref.patch b/debian/patches/00-fix_quote_readline_by_ref.patch deleted file mode 100644 index b1eeb112..00000000 --- a/debian/patches/00-fix_quote_readline_by_ref.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: JuanJo Ciarlante <jjo@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/739835 -Forwarded: yes, <5328F418.100@canonical.com> - -From: G. Branden Robinson <g.branden.robinson@gmail.com> -Subject: Revert "double escaping" hunk of patch. - - That portion fixed no cited bug. - - It broke extremely common command-substitution cases, e.g. - "grep pattern $(<TAB>)", producing: - bash: unexpected EOF while looking for matching `)' - bash: syntax error: unexpected end of file -Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742466 -Bug-Debian: https://bugs.debian.org/742466 - ---- - bash_completion | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/bash_completion -+++ b/bash_completion -@@ -526,9 +526,15 @@ - # @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 diff --git a/debian/patches/series b/debian/patches/series index e58441b0..2b5a43e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -00-fix_quote_readline_by_ref.patch 04-xine_add_more_formats.patch 06-xpdf_support_compressed_pdf.patch 07-dpkg_support_raw-extract_vextract.patch |