Skip to contentSkip to conversation

ipset: fix syntax error in bash completion and hyphen used as minus sign in manpage

PATCH In review Neutron Soutmun 2 participants 4 messages May 11, 2013 – May 12, 2013 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipset: fix syntax error in bash completion and hyphen used as minus sign in manpage

Hello,

I have prepared the Debian package for new 6.19 release,
The Lintian (Debian packaging tool) has warned about the syntax error in ipset bash completion script and also the hyphen used as minus sign in manpage.

The syntax error is shown as below.

$ bash ipset_bash_completion
ipset_bash_completion: line 680: syntax error near unexpected token `('                                                                     
ipset_bash_completion: line 680: `
@(create|n|add|del|test|destroy|x|list|save|restore|flush|rename|e|swap|w|help|version))'

Therefore, the patches was included in debian package and push to github which prepared for the pull-request.

Please consider to merge them.

Best regards,
Neutron Soutmun

The following changes since commit 85196765617c27d69155618d113addbc418679ad:

ipset 6.19 released (2013-05-09 17:33:39 +0200)

are available in the git repository at:

git://github.com/neutronth/ipset.git debian-fix

for you to fetch changes up to 77124447af920585d53dd3e28e2a41e5418f1d3d:

Fix hyphen used as minus sign in manpage (2013-05-11 07:58:22 +0700)

----------------------------------------------------------------
Neutron Soutmun (2):
Set extglob shell option in global scoped
Fix hyphen used as minus sign in manpage

 src/ipset.8                                       |    2 +-
 utils/ipset_bash_completion/ipset_bash_completion |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
src/ipset.8 +1 -1
index 6e627a2..7bb55e1 100644
@@ -278,7 +278,7 @@ ipset create test hash:ip timeout 300
 .IP
 ipset add test 192.168.0.1 timeout 60
 .IP
-ipset -exist add test 192.168.0.1 timeout 600
+ipset \-exist add test 192.168.0.1 timeout 600
 .PP 
 .SS nomatch
 The \fBhash\fR set types which can store \fBnet\fR type of data (i.e. hash:*net*)
utils/ipset_bash_completion/ipset_bash_completion +2 -1
index cc7ea7b..69ba635 100644
@@ -47,6 +47,8 @@
 #
 # -----------------------------------------------------------------
 
+shopt -s extglob
+
 # -----------------------------------------------------------------
 # Functions
 # -----------------------------------------------------------------
@@ -537,7 +539,6 @@ done < "${_IPSET_IPLIST_FILE}"
 # -----------------------------------------------------------------
 
 _ipset_complete() {
-shopt -s extglob
 local cur prev cword words ips_version
 local str_action str_setname str_type str_filename
 local str_glob str_regex str_prefix str_suffix
#1 lore raw

I forgot one thing,

Debian lintian still warns about syntax error unless set the #!/usr/bin/env bash

commit cf145e19be6d27cb212f95ad6f384f
d3fad7bc6b

---
 utils/ipset_bash_completion/ipset_bash_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/utils/ipset_bash_completion/ipset_bash_completion index 69ba635..8a0b91d 100644

utils/ipset_bash_completion/ipset_bash_completion +1 -1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 

# ----------------------------------------------------------------- # Programmable completion code for ipset (netfilter.org) --
1.7.10.4

#2 lore raw
In reply to Neutron Soutmun

Hi,

Quoted 4 lines · Neutron Soutmun

I have prepared the Debian package for new 6.19 release,
The Lintian (Debian packaging tool) has warned about the syntax error in ipset bash completion script and also the hyphen used as minus sign in manpage.

Could you send the two things separated into two patches: one for the manpage and one for the bash completion tool? The latter must be updated at its source first at github (author is Cc-d).

Best regards,
Jozsef

Quoted 65 lines

The syntax error is shown as below.

$ bash ipset_bash_completion
ipset_bash_completion: line 680: syntax error near unexpected token `('                                                                     
ipset_bash_completion: line 680: `
@(create|n|add|del|test|destroy|x|list|save|restore|flush|rename|e|swap|w|help|version))'

Therefore, the patches was included in debian package and push to github which prepared for the pull-request.

Please consider to merge them.

Best regards,
Neutron Soutmun

The following changes since commit 85196765617c27d69155618d113addbc418679ad:

ipset 6.19 released (2013-05-09 17:33:39 +0200)

are available in the git repository at:

git://github.com/neutronth/ipset.git debian-fix

for you to fetch changes up to 77124447af920585d53dd3e28e2a41e5418f1d3d:

Fix hyphen used as minus sign in manpage (2013-05-11 07:58:22 +0700)

----------------------------------------------------------------
Neutron Soutmun (2):
Set extglob shell option in global scoped
Fix hyphen used as minus sign in manpage

 src/ipset.8                                       |    2 +-
 utils/ipset_bash_completion/ipset_bash_completion |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
src/ipset.8 +1 -1
index 6e627a2..7bb55e1 100644
@@ -278,7 +278,7 @@ ipset create test hash:ip timeout 300
 .IP
 ipset add test 192.168.0.1 timeout 60
 .IP
-ipset -exist add test 192.168.0.1 timeout 600
+ipset \-exist add test 192.168.0.1 timeout 600
 .PP 
 .SS nomatch
 The \fBhash\fR set types which can store \fBnet\fR type of data (i.e. hash:*net*)
utils/ipset_bash_completion/ipset_bash_completion +2 -0
index cc7ea7b..69ba635 100644
@@ -47,6 +47,8 @@
 #
 # -----------------------------------------------------------------
 
+shopt -s extglob
+
 # -----------------------------------------------------------------
 # Functions
 # -----------------------------------------------------------------

utils/ipset_bash_completion/ipset_bash_completion done < "${_IPSET_IPLIST_FILE}" · line 544

Quoted 7 lines
utils/ipset_bash_completion/ipset_bash_completion +0 -1
@@ -537,7 +539,6 @@ done < "${_IPSET_IPLIST_FILE}"
 # -----------------------------------------------------------------
 
 _ipset_complete() {
-shopt -s extglob
 local cur prev cword words ips_version
 local str_action str_setname str_type str_filename
 local str_glob str_regex str_prefix str_suffix

-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary
#3 lore raw
Quoted 3 lines · Jozsef Kadlecsik

Could you send the two things separated into two patches: one for the manpage and one for the bash completion tool? The latter must be updated at its source first at github (author is Cc-d).

Already sent in two separated patches. Please review again.

Best regards,
Neutron Soutmun