From patchwork Sat May 11 01:34:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neutron Soutmun X-Patchwork-Id: 243105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4A1192C00E2 for ; Sat, 11 May 2013 11:35:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756897Ab3EKBfC (ORCPT ); Fri, 10 May 2013 21:35:02 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:54027 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756896Ab3EKBfB (ORCPT ); Fri, 10 May 2013 21:35:01 -0400 Received: by mail-pd0-f174.google.com with SMTP id u10so3132515pdi.5 for ; Fri, 10 May 2013 18:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=/y6qGSFeKJxrJZbIDDbW0sI6RLpfR3reVkmtCv4M8jY=; b=DDELDAea5DCy8CjvUmw1MmkX8Kgi3FB1UNZbB1Ch72pgSmMixLP4J+Sdkkc/XsyPE/ cbf8CUbdixvmmDD+wzbBJIWeMXmpPYSTMlMT/TS7c4Y6ui+mQNFwut/0+zL2GeBIT9uQ ZwOwyrib3p73yRFwSKo0xyLVc/t2sDTbbCazTe3V0yQwfiKHKkBuhPFYRSSHP2Nilio0 8YT3Qg9FT9PPqtbciE4YPzpcM/BlDAnrGPQutzSLuR7zcTpiYO9xtdzmlDQtl5JdrASx S4RpmwyXDnxdXbhq/yzdIVzY7Qm2wf49Nf5wcPWw2O69GZ6U1GCgsRwPTBF7Pc0kp3/H g93w== X-Received: by 10.66.100.231 with SMTP id fb7mr19678678pab.162.1368236100953; Fri, 10 May 2013 18:35:00 -0700 (PDT) Received: from nitrogen.neutroncom.local ([49.49.190.64]) by mx.google.com with ESMTPSA id 7sm4517794pbl.32.2013.05.10.18.34.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 18:35:00 -0700 (PDT) Date: Sat, 11 May 2013 08:34:52 +0700 From: Neutron Soutmun To: kadlec@blackhole.kfki.hu Cc: netfilter-devel@vger.kernel.org Subject: [PATCH] ipset: fix syntax error in bash completion and hyphen used as minus sign in manpage Message-ID: <20130511013452.GA31273@nitrogen.neutroncom.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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(-) diff --git a/src/ipset.8 b/src/ipset.8 index 6e627a2..7bb55e1 100644 --- a/src/ipset.8 +++ b/src/ipset.8 @@ -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*) diff --git a/utils/ipset_bash_completion/ipset_bash_completion b/utils/ipset_bash_completion/ipset_bash_completion index cc7ea7b..69ba635 100644 --- a/utils/ipset_bash_completion/ipset_bash_completion +++ b/utils/ipset_bash_completion/ipset_bash_completion @@ -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