Merge branch 'develop'

Conflicts:
	.gitlab-ci.yml

.github/workflows/pkg-build.yaml

@@ -0,0 +1,53 @@
+name: Packaging for Debian and Ubuntu
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+     runs-on: ubuntu-latest
+     container:
+       image: ${{ matrix.target }}
+     strategy:
+       fail-fast: false
+       matrix:
+         arch:
+           - amd64
+         target:
+           - "debian:stretch"
+           - "debian:buster"
+           - "ubuntu:xenial"
+           - "ubuntu:bionic"
+           - "ubuntu:focal"
+
+     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install prereq packages
+        run: ./debpkg-setup.sh
+      - name: Build packages
+        run: ./debpkg-build.sh
+      - name: Store packages
+        run: |
+          export DIRNAME=`echo ${{ matrix.target }} | tr ':' '_'`
+          mkdir -p packages/${DIRNAME}
+          cp ../*.deb packages/${DIRNAME}/
+      - name: Publish packages to cloudsmith
+        uses: wanduow/action-cloudsmith-upload-packages@v1
+        with:
+          path: packages/
+          repo: ${{ secrets.CLOUDSMITH_OWNER }}/libprotoident
+          username: salcock
+          api_key: ${{ secrets.CLOUDSMITH_API_KEY }}
+      - name: Publish packages to bintray
+        uses: wanduow/action-bintray-upload-debian-packages@v1
+        with:
+          path: packages/
+          repo: ${{ secrets.BINTRAY_OWNER }}/libprotoident
+          license: LGPL-3.0
+          username: salcock
+          api_key: ${{ secrets.BINTRAY_API_KEY }}
+
+

.github/workflows/rpm-build.yaml

@@ -0,0 +1,45 @@
+name: Packaging for Centos and Fedora
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.target }}
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - amd64
+        target:
+          - "centos:7"
+          - "centos:8"
+          - "fedora:33"
+          - "fedora:32"
+
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install prereq packages
+        run: ./rpmpkg-setup.sh ${{ matrix.target }}
+      - name: Build packages
+        run: ./rpmpkg-build.sh ${{ matrix.target }}
+      - name: Store packages
+        run: |
+          export DIRNAME=`echo ${{ matrix.target }} | tr ':' '_'`
+          mkdir -p packages/${DIRNAME}
+          cp ~/rpmbuild/RPMS/x86_64/*.rpm packages/${DIRNAME}/
+      - name: Publish packages to cloudsmith
+        uses: wanduow/action-cloudsmith-upload-packages@v1
+        with:
+          path: packages/
+          repo: ${{ secrets.CLOUDSMITH_OWNER }}/libprotoident
+          username: salcock
+          api_key: ${{ secrets.CLOUDSMITH_API_KEY }}
+
+

README

@@ -1,7 +1,7 @@
-libprotoident 2.0.14
+libprotoident 2.0.15
 
 ---------------------------------------------------------------------------
-Copyright (c) 2011-2019 The University of Waikato, Hamilton, New Zealand.
+Copyright (c) 2011-2020 The University of Waikato, Hamilton, New Zealand.
 All rights reserved.
 
 This code has been developed by the University of Waikato WAND

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(libprotoident, 2.0.14, [email protected])
+AC_INIT(libprotoident, 2.0.15, [email protected])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(lib/libprotoident.cc)

debian/changelog

@@ -1,3 +1,11 @@
+libprotoident (2.0.15-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added new API methods: lpi_get_category_by_protocol() and
+    lpi_get_category_by_name().
+  * Improved rules for 6 protocols, including QUIC and Zoom
+  * Added 5 new protocols.
+
 libprotoident (2.0.14-1) unstable; urgency=low
 
   * New upstream release.

debpkg-build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x -e -o pipefail
+
+export DEBEMAIL='[email protected]'
+export DEBFULLNAME='WAND Packaging'
+export DEBIAN_FRONTEND=noninteractive
+
+export SOURCENAME=`echo ${GITHUB_REF##*/} | cut -d '-' -f 1`
+
+mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
+dpkg-buildpackage -b -us -uc -rfakeroot -j4

debpkg-setup.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -x -e -o pipefail
+
+export DEBEMAIL='[email protected]'
+export DEBFULLNAME='WAND Packaging'
+export DEBIAN_FRONTEND=noninteractive
+
+export SOURCENAME=`echo ${GITHUB_REF##*/} | cut -d '-' -f 1`
+
+apt-get update
+apt-get install -y equivs devscripts dpkg-dev quilt curl apt-transport-https \
+    apt-utils ssl-cert ca-certificates gnupg lsb-release debhelper git \
+    pkg-config
+
+curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandio/cfg/setup/bash.deb.sh' | bash
+curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandder/cfg/setup/bash.deb.sh' | bash
+curl -1sLf 'https://dl.cloudsmith.io/public/wand/libtrace/cfg/setup/bash.deb.sh' | bash
+curl -1sLf 'https://dl.cloudsmith.io/public/wand/libflowmanager/cfg/setup/bash.deb.sh' | bash
+
+DISTRO=$(lsb_release -sc)
+
+case ${DISTRO} in
+        jessie | xenial | stretch )
+                curl -1sLf 'https://dl.cloudsmith.io/public/wand/dpdk-wand/cfg/setup/bash.deb.sh' | bash
+        ;;
+esac
+
+apt-get update
+apt-get upgrade -y

lib/Makefile.am

@@ -10,5 +10,5 @@ libprotoident_la_SOURCES=libprotoident.h libprotoident.cc \
 INCLUDES=@ADD_INCLS@
 libprotoident_la_LIBADD = @ADD_LIBS@ tcp/libprotoident_tcp.la \
 	udp/libprotoident_udp.la
-libprotoident_la_LDFLAGS = @ADD_LDFLAGS@ -version-info 3:0:1
+libprotoident_la_LDFLAGS = @ADD_LDFLAGS@ -version-info 4:0:2
 libprotoident_la_CPPFLAGS = -Werror