Update of Suricata + HPFeeds support

.gitignore

@@ -2,6 +2,10 @@
 *.lo
 *.in
 *.[ch]e
+*.log
+*.rule
+*.rules
+*.yaml
 Makefile
 .deps/
 .libs/
@@ -31,6 +35,10 @@ libhtp/stamp-h1
 libhtp/test/TAGS
 libtool
 ltmain.sh
+src/*.diff
+src/*.patch
+src/*.rej
+src/*.orig
 src/TAGS
 src/suricata
 stamp-h1

.travis.yml

@@ -1,12 +1,169 @@
+sudo: false
 language: c
-compiler:
-  - gcc
-  - clang
-# Change this to your needs
-script: sh autogen.sh && ./configure --enable-nfqueue --enable-unittests && make && make check
+
+addons:
+  apt:
+    # Define the required packages without libjansson so we can do a
+    # build without libjansson.
+    packages-without-jansson: &packages-without-jansson
+      - libpcre3
+      - libpcre3-dbg
+      - libpcre3-dev
+      - build-essential
+      - autoconf
+      - automake
+      - libtool
+      - libpcap-dev
+      - libnet1-dev
+      - libyaml-0-2
+      - libyaml-dev
+      - zlib1g
+      - zlib1g-dev
+      - libcap-ng-dev
+      - libcap-ng0
+      - make
+      - libmagic-dev
+      - libnetfilter-queue-dev
+      - libnetfilter-queue1
+      - libnfnetlink-dev
+      - libnfnetlink0
+      - libhiredis-dev
+      - libjansson-dev
+    # Now define the default set of packages which is those above, and
+    # libjansson.
+    packages: &packages
+      - *packages-without-jansson
+      - libjansson-dev
+
+# Define the default CFLAGS used by all builds as a YAML anchor.
+default-cflags: &default-cflags
+  CFLAGS="-Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-function"
+
+matrix:
+  include:
+    # Linux, gcc, coccinelle.
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,cocci"
+        - *default-cflags
+      addons:
+        apt:
+          sources:
+            - sourceline: ppa:npalix/coccinelle
+          packages:
+            - *packages
+            - coccinelle
+    # Linux, gcc, -DNDEBUG.
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,ndebug"
+        - *default-cflags
+        - EXTRA_CFLAGS="-DNDEBUG"
+    # Linux, clang. For this build we'll also enable -Wshadow.
+    - os: linux
+      compiler: clang
+      env:
+        - NAME="linux,clang"
+        - *default-cflags
+        - EXTRA_CFLAGS="-Wshadow"
+    # Linux, gcc, profiling.
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,profiling"
+        - *default-cflags
+        - ARGS="--enable-profiling"
+    # Linux, gcc, debug.
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,debug"
+        - *default-cflags
+        - ARGS="--enable-debug"
+        - ENABLE_DEBUG="yes"
+    # Linux, gcc, no jansson.
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,no-json"
+        - *default-cflags
+      addons:
+        apt:
+          packages:
+            - *packages-without-jansson
+    # OSX 10.12, XCode 8.1
+    - os: osx
+      compiler: gcc
+      osx_image: xcode8.1
+      sudo: true
+      env:
+        - NAME="osx,gcc"
+        - *default-cflags
+
+script:
+  - sh ./autogen.sh
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}"
+        ./configure --enable-nfqueue --enable-unittests --enable-hiredis ${ARGS}
+    fi
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}"
+        ./configure --enable-unittests --enable-hiredis --enable-ipfw \
+            --enable-lua --with-libpcre-includes=/usr/local/include \
+            --with-libpcre-includes=/usr/local/include \
+            --with-libpcre-libraries=/usr/local/lib \
+            --with-libnss-includes=/usr/local/opt/nss/include/nss \
+            --with-libnss-libraries=/usr/local/opt/nss/lib \
+            --with-libnspr-includes=/usr/local/opt/nspr/include/nspr \
+            --with-libnspr-libraries=/usr/local/opt/nspr/lib
+    fi
+  # With debug enabled too much output is generated for Travis, so
+  # redirect stderr to a file.
+  - |
+    # Linux container builds have 2 cores, make use of them.
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        j="-j 2"
+    fi
+    if [[ "$ENABLE_DEBUG" == "yes" ]]; then
+        make ${j} check 2> stderr.log
+    else
+        make ${j} check
+    fi
+
 before_install:
-  - sudo add-apt-repository -y ppa:npalix/coccinelle
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libpcre3 libpcre3-dbg libpcre3-dev build-essential autoconf automake libtool libpcap-dev libnet1-dev libyaml-0-2 libyaml-dev zlib1g zlib1g-dev libcap-ng-dev libcap-ng0 make libmagic-dev libnetfilter-queue-dev libnetfilter-queue1 libnfnetlink-dev libnfnetlink0 coccinelle
-  - ./qa/travis-libhtp.sh
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        brew update
+
+        # Unlink and install each dependency to avoid errors where a
+        # formula might already be installed but is not the current
+        # version.
+        packages=""
+        packages="$packages pkg-config"
+        packages="$packages libmagic"
+        packages="$packages libyaml"
+        packages="$packages nss"
+        packages="$packages nspr"
+        packages="$packages jansson"
+        packages="$packages libnet"
+        packages="$packages lua"
+        packages="$packages pcre"
+        packages="$packages hiredis"
+        for package in $packages; do
+            if brew ls $package --versions > /dev/null; then
+                brew unlink $package
+            fi
+        done
 
+        # Now install.
+        brew install $packages
+
+        # Now relink, becuase if a newer version of a package wasn't
+        # installed above, it will remain unlinked.
+        brew link $packages
+    fi
+  - ./qa/travis-libhtp.sh

COPYING

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.