From 0d07f7faec1e81b73de1dca8335cd39b85641123 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 2 May 2020 12:03:29 +0100 Subject: [PATCH] fix autocompletion --- ...th-to-openconnect-in-bash-completion.patch | 28 +++++++++++++++++++ openconnect.spec | 9 ++++-- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 0001-Fix-path-to-openconnect-in-bash-completion.patch diff --git a/0001-Fix-path-to-openconnect-in-bash-completion.patch b/0001-Fix-path-to-openconnect-in-bash-completion.patch new file mode 100644 index 0000000..2150991 --- /dev/null +++ b/0001-Fix-path-to-openconnect-in-bash-completion.patch @@ -0,0 +1,28 @@ +From 7eba845059e8e373c59391b0520678ea833c6c76 Mon Sep 17 00:00:00 2001 +From: David Woodhouse +Date: Sat, 2 May 2020 09:25:29 +0100 +Subject: [PATCH] Fix path to openconnect in bash completion + +Oops, that wasn't supposed to get committed like that. + +Signed-off-by: David Woodhouse +--- + bash/openconnect.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bash/openconnect.bash b/bash/openconnect.bash +index 5ca05934..a235dfc0 100644 +--- a/bash/openconnect.bash ++++ b/bash/openconnect.bash +@@ -79,7 +79,7 @@ _complete_openconnect () { + #_get_comp_words_by_ref-n =: -w COMP_WORDS -i COMP_CWORD cur + COMP_WORDS[0]="--autocomplete" + local IFS=$'\n' +- COMPREPLY=( $(COMP_CWORD=$COMP_CWORD /home/dwmw/git/openconnect/gtls-ibm/openconnect "${COMP_WORDS[@]}") ) ++ COMPREPLY=( $(COMP_CWORD=$COMP_CWORD openconnect "${COMP_WORDS[@]}") ) + local FILTERPAT="${COMPREPLY[1]}" + local PREFIX="${COMPREPLY[2]}" + local COMP_WORD=${cur#${PREFIX}} +-- +2.17.1 + diff --git a/openconnect.spec b/openconnect.spec index f4b49cc..8c7ade6 100644 --- a/openconnect.spec +++ b/openconnect.spec @@ -40,7 +40,7 @@ Name: openconnect Version: 8.09 -Release: 1%{?relsuffix}%{?dist} +Release: 2%{?relsuffix}%{?dist} Summary: Open client for Cisco AnyConnect VPN, Juniper Network Connect/Pulse, PAN GlobalProtect License: LGPLv2+ @@ -51,7 +51,7 @@ Source1: ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}%{?gitsuf %endif Source2: gpgkey-BE07D9FD54809AB2C4B0FF5F63762CDA67E2F359.asc Source3: macros.gpg - +Patch1: 0001-Fix-path-to-openconnect-in-bash-completion.patch BuildRequires: pkgconfig(libxml-2.0) pkgconfig(libpcsclite) krb5-devel gnupg2 BuildRequires: autoconf automake libtool gettext pkgconfig(liblz4) @@ -113,7 +113,7 @@ for NetworkManager etc. %gpg_verify %endif -%autosetup -n openconnect-%{version}%{?gitsuffix} +%autosetup -n openconnect-%{version}%{?gitsuffix} -p1 %build %configure --with-vpnc-script=/etc/vpnc/vpnc-script \ @@ -156,6 +156,9 @@ make VERBOSE=1 check %{_libdir}/pkgconfig/openconnect.pc %changelog +* Sat May 2 2020 David Woodhouse - 8.09-2 +- Fix path to openconnect in bash completion script + * Wed Apr 29 2020 David Woodhouse - 8.09-1 - Update to 8.09 release