diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2010-11-21 02:48:14 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2010-11-21 02:48:14 +0000 |
| commit | 647f205ac57a2a43988bc824da04572748ae5a68 (patch) | |
| tree | 170b6c5d21f883c20662b7409f9df9c12b63a9aa /shells | |
| parent | - Update to 0.1401 (diff) | |
This patch hopefully fixes bash freezing on amd64 when using host-based
completions. Tons of thanks to Raphael Kubo da Costa for identifying the
fix and providing us with a patch, and to ehaupt for testing!
PR: ports/150322
Submitted by: Raphael Kubo da Costa <kubito@gmail.com>
Reviewed by: ehaupt
Notes
Notes:
svn path=/head/; revision=264859
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash-completion/Makefile | 6 | ||||
| -rw-r--r-- | shells/bash-completion/distinfo | 1 | ||||
| -rw-r--r-- | shells/bash-completion/files/patch-do_not_hang_on_avahi_daemon | 21 |
3 files changed, 22 insertions, 6 deletions
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 80521ad6dfb4..30a76582b441 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -7,7 +7,7 @@ PORTNAME= bash-completion PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= shells MASTER_SITES= http://bash-completion.alioth.debian.org/files/ @@ -25,10 +25,6 @@ GNU_CONFIGURE= yes .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" -BROKEN= Hostname completion on amd64 causes bash to freeze. Use shells/bash-completion-classic instead -.endif - post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \ s|/etc/bash_completion|${PREFIX}&|g; \ diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo index 963f9b288a63..fece586321b8 100644 --- a/shells/bash-completion/distinfo +++ b/shells/bash-completion/distinfo @@ -1,3 +1,2 @@ -MD5 (bash-completion-1.2.tar.bz2) = 88c022a98a02a02293716f840eadd884 SHA256 (bash-completion-1.2.tar.bz2) = dd09a86134204e4c6b860bfbd5ee8ac46c6b32a54478b967dcf81e8a7839d354 SIZE (bash-completion-1.2.tar.bz2) = 197574 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 new file mode 100644 index 000000000000..413fad67b02a --- /dev/null +++ b/shells/bash-completion/files/patch-do_not_hang_on_avahi_daemon @@ -0,0 +1,21 @@ +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 | \ |