diff options
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/swaks_completion.patch | 57 | ||||
| -rw-r--r-- | debian/patches/update_bts_completion.patch | 116 |
3 files changed, 175 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 6aec33eff..90d273eaa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ further-mitigate-test-suite-hangs.patch update-debian-sections.patch remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch +update_bts_completion.patch +swaks_completion.patch diff --git a/debian/patches/swaks_completion.patch b/debian/patches/swaks_completion.patch new file mode 100644 index 000000000..fbd8fefa9 --- /dev/null +++ b/debian/patches/swaks_completion.patch @@ -0,0 +1,57 @@ +X-Seq: 40302 +Date: Sun, 8 Jan 2017 03:30:49 +0000 +From: Daniel Shahaf <d.s@daniel.shahaf.name> +To: zsh-workers@zsh.org +Subject: _swaks completion +Message-ID: <20170108033049.GA27435@fujitsu.shahaf.local2> +Origin: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=40302 + +This doesn't include all options, only a few options that I've used so +far, but I suppose it'd still be better to commit it than not to. + +diff --git a/Completion/Unix/Command/_swaks b/Completion/Unix/Command/_swaks +new file mode 100644 +index 0000000..7361b08 +--- /dev/null ++++ b/Completion/Unix/Command/_swaks +@@ -0,0 +1,40 @@ ++#compdef swaks ++ ++_arguments \ ++ '(-s --server -p --port)'{-s+,--server=}'[target host[:port\]]:host[\:port]:_hosts' \ ++ '(-p --port)'{-p+,--port=}'[target port number]:port number:(25 465 587)' \ ++ '--copy-routing[derive target host:port from email address domain part]:email address domain part' \ ++ '(-t --to)'{-t+,--to=}':envelope recipient(s):_sequence _email_addresses -c' \ ++ '(-f --from)'{-f+,--from=}':envelope sender:_email_addresses -c' \ ++ '(--ehlo --lhlo -h --helo)'{-h+,--ehlo,--helo,--lhlo}':HELO string:_hosts' \ ++ '(-q --quit-after)'{-q+,--quit-after=}'[stop transaction early]:stop point:(( ++ CONNECT\:banner BANNER\:banner ++ FIRST-HELO\:first\ HELO FIRST-EHLO\:first\ HELO ++ XCLIENT\:XCLIENT ++ TLS\:TLS\ negotiation ++ HELO\:second\ HELO EHLO\:second\ HELO ++ AUTH\:authentication ++ MAIL\:MAIL\ FROM FROM\:MAIL\ FROM ++ RCPT\:RCPT\ TO TO\:RCPT\ TO ++ ))' \ ++ '--protocol=:protocol variant:(( ++ SMTP\:HELO\ 25 ++ SSMTP\:EHLO\ 465 ++ SSMTPA\:EHLO\ 465\ authenticated ++ SMTPS\:HELO\ 465 ++ ESMTP\:EHLO\ 25 ++ ESMTPA\:EHLO\ 25\ authenticated ++ ESMTPS\:EHLO\ STARTTLS\ 25 ++ ESMTPSA\:EHLO\ STARTTLS\ 25\ authenticated ++ ))' \ ++ '-tls[TLS required]' \ ++ '(-tlsos --tls-optional-strict)'{-tlsos,--tls-optional-strict}'[TLS iff offered by target]' \ ++ '(-tlsc --tls-on-connect)'{-tlsc,--tls-on-connect}'[TLS on connect (port 465)]' \ ++ '(-tlsp --tls-protocol)'{-tlsp,--tls-protocol=}':TLS protocol:(sslv2 sslv3 tlsv1 tlsv1_1 tlsv1_2)' \ ++ '-tls-cipher:OpenSSL cipher string: ' \ ++ '--tls-verify[verify TLS certificates]' \ ++ '--tls-ca-path=:OpenSSL CAfile or CAdir:_files' \ ++ '--tls-get-peer-cert=-:file to write (omit for STDOUT)' \ ++ '(-d --data)'{-d+,--data=}'[specify DATA payload]:filename (or string with tokens):_files' \ ++ '*'{-ah,--add-header=}'[add headers]:<Header>\: Value' \ ++ '*'{-h,--header=}'[replace headers]:<Header>\: Value' diff --git a/debian/patches/update_bts_completion.patch b/debian/patches/update_bts_completion.patch new file mode 100644 index 000000000..3474969ca --- /dev/null +++ b/debian/patches/update_bts_completion.patch @@ -0,0 +1,116 @@ +X-Seq: 40303 +From: Daniel Shahaf <d.s@daniel.shahaf.name> +To: zsh-workers@zsh.org +Subject: [PATCH] _bts: Add more subcommands. +Date: Sun, 8 Jan 2017 03:47:24 +0000 +Message-Id: <1483847244-7913-1-git-send-email-danielsh@fujitsu.shahaf.local2> +Origin: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=40303 + +Since 'done' is deprecated, stop offering it but do complete after it. +--- + Completion/Debian/Command/_bts | 64 ++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 58 insertions(+), 6 deletions(-) + +diff --git a/Completion/Debian/Command/_bts b/Completion/Debian/Command/_bts +index f415989..70b95ef 100644 +--- a/Completion/Debian/Command/_bts ++++ b/Completion/Debian/Command/_bts +@@ -22,16 +22,18 @@ compset -N '[,.]' && first=0 + [[ $first -eq 0 ]] || compset -n 2 + + if [[ CURRENT -eq 1 ]]; then +- _wanted cmd expl 'bts command' compadd show bugs close reopen retitle \ ++ _wanted cmd expl 'bts command' compadd show bugs reopen retitle \ + reassign merge unmerge tag tags severity forwarded notforwarded help \ + clone submitter found notfound block unblock user usertag usertags \ + package owner noowner reportspam cache cleancache claim unclaim \ +- subscribe unsubscribe fixed notfixed affects ++ subscribe unsubscribe fixed notfixed affects spamreport status \ ++ select done archive unarchive summary forcemerge limit listcachedbugs \ ++ version + return + fi + + case "$words[1]" in +- (close|unmerge|notforwarded|noowner|reportspam) ++ (unmerge|notforwarded|noowner|reportspam|spamreport|archive|unarchive) + if [[ CURRENT -eq 2 ]]; then + _debbugs_bugnumber + else +@@ -75,7 +77,10 @@ case "$words[1]" in + _wanted sep expl 'separator' compadd -S ' ' , . + fi + ;; +- merge) ++ (status) ++ # TODO: some additional syntaxes aren't being completed. ++ ;& ++ (merge|forcemerge) + _debbugs_bugnumber + if [[ CURRENT -gt 2 ]]; then + _wanted sep expl 'separator' compadd -S ' ' , . +@@ -208,8 +213,10 @@ case "$words[1]" in + ;; + (cleancache) + _alternative \ +- 'package:package:_deb_packages avail' \ +- 'email:email address:_email_addresses -c' \ ++ 'source-packages:source package:_deb_packages -P "src:" source' \ ++ 'package:binary package:_deb_packages avail' \ ++ 'email:email address:_email_addresses -c -P "from:"' \ ++ 'bugnum:bug number:_debbugs_bugnumber' \ + 'all:all:compadd ALL' + ;; + (claim|unclaim) +@@ -232,6 +239,51 @@ case "$words[1]" in + _wanted package expl 'package' _deb_packages avail + fi + ;; ++ (summary) ++ case $CURRENT in ++ (2) _debbugs_bugnumber;; ++ (3) _message -e message-number 'message number';& ++ (4) _wanted sep expl 'separator' compadd -S ' ' , .;; ++ esac ++ ;; ++ (close|done) ++ case $CURRENT in ++ (2) _debbugs_bugnumber;; ++ (3) _message -e version 'version';& ++ (4) _wanted sep expl 'separator' compadd -S ' ' , .;; ++ esac ++ ;; ++ (select) ++ _values -S : -w "select field" \ ++ '*package[binary package]: :_deb_packages avail' \ ++ '*source[source package]: :_deb_packages source' \ ++ '*maintainer:email address of the maintainer:_email_addresses -c' \ ++ '*submitter:email address of the submitter:_email_addresses -c' \ ++ '*severity:severity:(wishlist minor normal important serious grave critical)' \ ++ '*tag[tags applied to the bug]:tags:' \ ++ '*owner:owner:_email_addresses -c' \ ++ '*correspondent:email address of a correspondent:_email_addresses -c' \ ++ '*affects:affected package:_deb_packages avail' \ ++ '*users:namespaces of usertags:_email_addresses -c' \ ++ '*archive:whether to search archived bugs:((0:no 1:yes both:both))' ++ # undocumented: bugs ++ _wanted sep expl 'separator' compadd -S ' ' , . ++ ;; ++ (limit) ++ _values -S : -w "limit field" \ ++ '*submitter[email address of the submitter]:submitter:_email_addresses -c' \ ++ '*date[bug submission timestamp]:unix timestamp' \ ++ '*subject[subject of the bug]:bug subject:' \ ++ '*msgid[message-id of the initial bug report]:message-id:' \ ++ '*package[binary package]: :_deb_packages avail' \ ++ '*source[source package]: :_deb_packages source' \ ++ '*tag[tags applied to the bug]:tags:' \ ++ '*severity:severity:(wishlist minor normal important serious grave critical)' \ ++ '*owner:owner:_email_addresses -c' \ ++ '*affects:affected package:_deb_packages avail' \ ++ '*archive:whether to search archived bugs:((0:no 1:yes both:both))' ++ _wanted sep expl 'separator' compadd -S ' ' , . ++ ;; + help) + ;& + *) _wanted sep expl 'separator' compadd -S ' ' , . |