Merge pull request #73 from salcock/master

Update master to 1.0.6 pre-release

Author: salcock

.github/workflows/deb-build.yaml

@@ -0,0 +1,54 @@
+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:jessie"
+           - "debian:stretch"
+           - "debian:buster"
+           - "ubuntu:xenial"
+           - "ubuntu:bionic"
+           - "ubuntu:eoan"
+           - "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 }}/openli
+          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 }}/OpenLI
+          license: GPL-3.0
+          username: salcock
+          api_key: ${{ secrets.BINTRAY_API_KEY }}
+

.github/workflows/rpm-build.yaml

@@ -0,0 +1,54 @@
+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:30"
+          - "fedora:31"
+          - "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 }}/openli
+          username: salcock
+          api_key: ${{ secrets.CLOUDSMITH_API_KEY }}
+      - name: Publish packages to bintray
+        uses: wanduow/action-bintray-upload-rpm-packages@v1
+        with:
+          path: packages/
+          repo: ${{ secrets.BINTRAY_OWNER }}/OpenLI-rpm
+          license: GPL-3.0
+          username: salcock
+          api_key: ${{ secrets.BINTRAY_API_KEY }}
+
+

.gitlab-ci.yml

@@ -14,7 +14,8 @@ contributed something back to the OpenLI project already.
 In no particular order, we would like to thank the following people:
 
  * Tyler Marriner for adding support for encrypting inter-component
-   communications using TLS.
+   communications using TLS and adding RabbitMQ support to the collector.
+ * Neil Tapp for pointing out many bugs and logging inaccuracies.
 
 Apologies to anyone that has made a contribution but we've forgotten to
 mention you here -- if this has happened to you, please get in touch with the

AUTHORS

@@ -1,6 +1,6 @@
 OpenLI -- open source ETSI-compliant Lawful Intercept software
 
-Version: 1.0.5
+Version: 1.0.6
 
 ---------------------------------------------------------------------------
 
@@ -37,13 +37,13 @@ quality of OpenLI for all of our users.
 
 ## Dependencies
 
-* [libtrace 4.0.5 or later](http://research.wand.net.nz/software/libtrace.php)
+* [libtrace 4.0.14 or later](http://research.wand.net.nz/software/libtrace.php)
   (packages for Debian / Ubuntu are available
-  [from WAND](http://packages.wand.net.nz) as well).
+  [from WAND](https://cloudsmith.io/~wand/repos/libtrace/packages/) as well).
 
-* [libwandder 1.1.0 or later](https://github.com/wanduow/libwandder/)
+* [libwandder 2.0.0 or later](https://github.com/wanduow/libwandder/)
   (packages for Debian / Ubuntu are available
-  [from WAND](http://packages.wand.net.nz) as well).
+  [from WAND](https://cloudsmith.io/~wand/repos/libwandder/packages/) as well).
 
 * libyaml -- Debian / Ubuntu users can install the libyaml-dev package.
   Required for all components.