diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2011-02-12 21:34:23 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2011-02-12 21:34:23 +0000 |
| commit | 9e2ba8ac3146bbc6988f4588c6088b6d797455d0 (patch) | |
| tree | 99ae916db07195b309ed4b9fbc3cbb5612d1a073 /shells/bash-completion/files | |
| parent | Update feh to 1.11.2 (diff) | |
Update to 1.3.
According to the CHANGES file, the avahi-browse error is patched in this
version, though in a manner a bit different from our patch. Please test
on amd64 and let me know if the problem has regressed.
Notes
Notes:
svn path=/head/; revision=269022
Diffstat (limited to 'shells/bash-completion/files')
| -rw-r--r-- | shells/bash-completion/files/patch-contrib_portupgrade | 4 | ||||
| -rw-r--r-- | shells/bash-completion/files/patch-do_not_hang_on_avahi_daemon | 21 |
2 files changed, 2 insertions, 23 deletions
diff --git a/shells/bash-completion/files/patch-contrib_portupgrade b/shells/bash-completion/files/patch-contrib_portupgrade index caa9b91d5800..f03ddce85f7e 100644 --- a/shells/bash-completion/files/patch-contrib_portupgrade +++ b/shells/bash-completion/files/patch-contrib_portupgrade @@ -1,5 +1,5 @@ ---- contrib/portupgrade.orig 2010-09-04 02:35:04.000000000 -0400 -+++ contrib/portupgrade 2010-09-04 02:38:00.000000000 -0400 +--- completions/portupgrade.orig 2010-09-04 02:35:04.000000000 -0400 ++++ completions/portupgrade 2010-09-04 02:38:00.000000000 -0400 @@ -26,11 +26,7 @@ portsdir=${PORTSDIR:-/usr/ports}/ diff --git a/shells/bash-completion/files/patch-do_not_hang_on_avahi_daemon b/shells/bash-completion/files/patch-do_not_hang_on_avahi_daemon deleted file mode 100644 index 413fad67b02a..000000000000 --- a/shells/bash-completion/files/patch-do_not_hang_on_avahi_daemon +++ /dev/null @@ -1,21 +0,0 @@ -This patch is related to PR ports/150322. - -When avahi-daemon is not running, bash-completion will hang for some seconds -waiting for response from it because of the call to avahi-browse. - -The patch was originally obtained in bash-completion's bug tracker, and was -written by Ville Skyttä. - -Reference: https://alioth.debian.org/tracker/?func=detail&atid=413095&aid=312691&group_id=100114 - ---- bash_completion 2010-06-16 12:44:20.000000000 -0300 -+++ bash_completion 2010-11-18 23:33:53.000000000 -0200 -@@ -1315,7 +1315,7 @@ - # 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 isn't available (even if mentioned in the manpage), so... -- if type avahi-browse >&/dev/null; then -+ if type avahi-browse >&/dev/null && PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" avahi-daemon --check &>/dev/null; then - COMPREPLY=( "${COMPREPLY[@]}" $( \ - compgen -P "$prefix$user" -S "$suffix" -W \ - "$( avahi-browse -cpr _workstation._tcp 2>/dev/null | \ |