From 872a16c290d2798a0abfe1c2f135b34c71cd1e5f Mon Sep 17 00:00:00 2001 From: "Gabriel F. T. Gomes" Date: Tue, 18 Dec 2018 21:19:06 -0200 Subject: Remove patch to disable completion with avahi-browse (bug #574950) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Debian patch 03-disable_avahi_browse.patch disables completion with avahi-browse for everyone, even though it can be disabled with environment variables (as a matter of fact, it is disabled by default and can be enabled by setting COMP_KNOWN_HOSTS_WITH_AVAHI). This commit removes the patch from Debian. Thanks to Ville Skyttä for suggesting this. --- debian/changelog | 3 ++ debian/patches/03-disable_avahi_browse.patch | 42 ---------------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 debian/patches/03-disable_avahi_browse.patch diff --git a/debian/changelog b/debian/changelog index 3103db7f..9077474c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ bash-completion (1:2.8-5) UNRELEASED; urgency=medium * Fix COMP_FILEDIR_FALLBACK to address comment #45 on bug #550676 (https://bugs.debian.org/550676#45). (Closes: #550676) * Remove obsolete conffiles from very old versions. (Closes: #645439) + * Remove patch to disable completion with avahi-browse for everyone. + Completion with avahi-browse is still disabled by default. To enable it, + set COMP_KNOWN_HOSTS_WITH_AVAHI to anything. (See #574950) -- Gabriel F. T. Gomes Sat, 17 Nov 2018 23:42:27 -0200 diff --git a/debian/patches/03-disable_avahi_browse.patch b/debian/patches/03-disable_avahi_browse.patch deleted file mode 100644 index 933deea6..00000000 --- a/debian/patches/03-disable_avahi_browse.patch +++ /dev/null @@ -1,42 +0,0 @@ -Description: Disable completions based on avahi-browse -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/510591 -Bug-Debian: https://bugs.debian.org/574950 -Forwarded: no -Origin: vendor -From: Chris Jones ---- - bash_completion | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - ---- bash-completion.orig/bash_completion -+++ bash-completion/bash_completion -@@ -1549,18 +1549,23 @@ _known_hosts_real() - -S "$suffix" -W "$hosts" -- "$cur" ) ) - fi - -+ # This feature is disabled because it does not scale to -+ # larger networks. See: -+ # https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/510591 -+ # https://bugs.debian.org/574950 -+ - # Add hosts reported by avahi-browse, if desired and it's available. -- if [[ ${COMP_KNOWN_HOSTS_WITH_AVAHI:-} ]] && \ -- type avahi-browse &>/dev/null; then -+ #if [[ ${COMP_KNOWN_HOSTS_WITH_AVAHI:-} ]] && \ -+ #type avahi-browse &>/dev/null; then - # The original call to avahi-browse also had "-k", to avoid lookups - # into avahi's services DB. We don't need the name of the service, and - # if it contains ";", it may mistify the result. But on Gentoo (at - # least), -k wasn't available (even if mentioned in the manpage) some - # time ago, so... -- COMPREPLY+=( $( compgen -P "$prefix$user" -S "$suffix" -W \ -- "$( avahi-browse -cpr _workstation._tcp 2>/dev/null | \ -- awk -F';' '/^=/ { print $7 }' | sort -u )" -- "$cur" ) ) -- fi -+ #COMPREPLY+=( $( compgen -P "$prefix$user" -S "$suffix" -W \ -+ # "$( avahi-browse -cpr _workstation._tcp 2>/dev/null | \ -+ # awk -F';' '/^=/ { print $7 }' | sort -u )" -- "$cur" ) ) -+ #fi - - # Add hosts reported by ruptime. - COMPREPLY+=( $( compgen -W \ diff --git a/debian/patches/series b/debian/patches/series index a8d8e0fe..abd3be2c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 00-fix_quote_readline_by_ref.patch 01-apt-get-Complete-install-package-versions.patch 02-dpkg-source-Add-options.patch -03-disable_avahi_browse.patch 04-xine_add_more_formats.patch 05-list-held-packages-in-dpkg.patch 06-xpdf_support_compressed_pdf.patch -- cgit v1.2.1