Merge branch '1.1.14-rc'

salcock · salcock · commit 85660b22a422 · 2025-08-19T10:51:34.000+12:00
diff --git a/.github/workflows/compile-test.yaml b/.github/workflows/compile-test.yaml
@@ -64,8 +64,9 @@ jobs:
         arch:
           - amd64
         target:
-          - "rockylinux:9"
-          - "rockylinux:8"
+          - "almalinux:10"
+          - "almalinux:9"
+          - "almalinux:8"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/deb-build.yaml b/.github/workflows/deb-build.yaml
@@ -17,7 +17,7 @@ jobs:
            - amd64
          target:
            - "debian:bookworm"
-           - "debian:bullseye"
+           - "debian:trixie"
            - "ubuntu:jammy"
            - "ubuntu:noble"
 
@@ -52,7 +52,7 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:bullseye"
+           - "debian:trixie"
            - "ubuntu:jammy"
            - "debian:bookworm"
            - "ubuntu:noble"
@@ -96,7 +96,7 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:bullseye"
+           - "debian:trixie"
            - "debian:bookworm"
            - "ubuntu:jammy"
            - "ubuntu:noble"
diff --git a/.github/workflows/rpm-build.yaml b/.github/workflows/rpm-build.yaml
@@ -16,8 +16,9 @@ jobs:
          arch:
            - amd64
          target:
-           - "rockylinux:8"
-           - "rockylinux:9"
+           - "almalinux:8"
+           - "almalinux:9"
+       #    - "almalinux:10"
 
      steps:
       - name: Checkout repo
@@ -49,8 +50,9 @@ jobs:
          arch:
            - amd64
          target:
-           - "rockylinux:8"
-           - "rockylinux:9"
+           - "almalinux:8"
+           - "almalinux:9"
+     #      - "almalinux:10"
      needs: build
      steps:
        - name: Set environment variables for download
@@ -63,6 +65,7 @@ jobs:
          env:
            TARGET: ${{ matrix.target }}
          run: |
+           yum install -y findutils gnupg
            curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandio/cfg/setup/bash.rpm.sh' | bash
            curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandder/cfg/setup/bash.rpm.sh' | bash
            curl -1sLf 'https://dl.cloudsmith.io/public/wand/libtrace/cfg/setup/bash.rpm.sh' | bash
@@ -71,14 +74,13 @@ jobs:
            gpg --import packagecloud-rabbitmq-key.asc
            curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash
            curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | bash
-           if [[ "${TARGET}" =~ rocky* ]]; then
+           if [[ "${TARGET}" =~ alma* ]]; then
                dnf install -y dnf-plugins-core epel-release || true
                dnf config-manager --set-enabled powertools || true
                /usr/bin/crb enable || true
            fi
        - name: Test package install
          run: |
-           yum install -y findutils
            find . -name "*.rpm" | xargs yum install -y
        - name: Test package removal
          run: |
@@ -97,8 +99,9 @@ jobs:
          arch:
            - amd64
          target:
-           - "rockylinux:8"
-           - "rockylinux:9"
+           - "almalinux:8"
+           - "almalinux:9"
+#           - "almalinux:10"
      needs: test
      steps:
        - name: Set environment variables for download
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 OpenLI -- open source ETSI-compliant Lawful Intercept software
 
-Version: 1.1.13
+Version: 1.1.14
 
 ---------------------------------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 # Super primitive configure script
 
-AC_INIT([openli],[1.1.13],[shane@alcock.co.nz])
+AC_INIT([openli],[1.1.14],[shane@alcock.co.nz])
 
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR(src/collector/collector.c)
@@ -60,7 +60,8 @@ fi
 
 AC_CHECK_HEADERS([uthash.h], [uthash_avail=yes; break;])
 AC_CHECK_HEADERS([syslog.h])
-AC_CHECK_HEADER(amqp.h, ampq_h_found=1, amqp_h_found=0)
+AC_CHECK_HEADER(amqp.h, amqp_h_found=1, amqp_h_found=0)
+AC_CHECK_HEADER(rabbitmq-c/tcp_socket.h, [amqp_h_found=1; rabbitmq_include_subdir=1;])
 
 AC_CONFIG_FILES([Makefile src/Makefile extlib/Makefile
                 extlib/libpatricia/Makefile])
@@ -169,6 +170,11 @@ else
                 MEDIATOR_LIBS="$MEDIATOR_LIBS -lrabbitmq"
                 PROVISIONER_LIBS="$PROVISIONER_LIBS -lrabbitmq"
         fi
+
+        if test "$rabbitmq_include_subdir" = 1; then
+            AC_DEFINE(RMQC_HEADER_SUBDIR, 1, [defined to 1 if rabbitmq-c headers are in the rabbitmq-c subdirectory])
+        fi
+
 fi
 
 if test "$libyaml_found" = 0; then
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+openli (1.1.14-1) unstable; urgency=medium
+
+  * Add support for new RabbitMQ header file structure added in
+    rabbitmq-c 0.12.0, so we can build packages for Debian trixie.
+
+ -- Shane Alcock <salcock@searchlight.nz>  Mon, 18 Aug 2025 10:55:35 +1200
+
 openli (1.1.13-1) unstable; urgency=medium
 
   * REST API: added new endpoints for collectors/ and mediators/ to
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: openli
 Section: net
 Priority: optional
 Maintainer: Shane Alcock <salcock@searchlight.nz>
-Build-Depends: debhelper-compat (= 12), dh-autoreconf, dh-systemd (>=1.5),
+Build-Depends: debhelper-compat (= 12), dh-autoreconf,
  libtrace4-dev (>= 4.0.28), libyaml-dev, uthash-dev, libwandder2-dev (>=2.0.14),
  libjudy-dev, libzmq3-dev, libgoogle-perftools-dev, libosip2-dev (>=5.0.0),
  libssl-dev, librabbitmq-dev, libb64-dev, uuid-dev,
diff --git a/debpkg-setup.sh b/debpkg-setup.sh
@@ -20,17 +20,5 @@ curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandder/cfg/setup/bash.deb.s
 curl -1sLf 'https://dl.cloudsmith.io/public/wand/libtrace/cfg/setup/bash.deb.sh' | bash
 curl -1sLf 'https://dl.cloudsmith.io/public/wand/openli/cfg/setup/bash.deb.sh' | bash
 
-case ${DISTRO} in
-        bullseye | bookworm )
-                sed -i 's/ dh-systemd (>=1.5),//' debian/control
-        ;;
-
-        jammy | noble )
-                sed -i 's/ dh-systemd (>=1.5),//' debian/control
-        ;;
-
-esac
-
-
 apt-get update
 apt-get upgrade -y
diff --git a/rpm/openli.spec b/rpm/openli.spec
@@ -1,5 +1,5 @@
 Name:           openli
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Software for performing ETSI-compliant lawful intercept
 
@@ -310,6 +310,9 @@ fi
 
 
 %changelog
+* Mon Aug 18 2025 Shane Alcock <salcock@searchlight.nz> - 1.1.14-1
+- Updated for 1.1.14 release
+
 * Thu Jun 5 2025 Shane Alcock <salcock@searchlight.nz> - 1.1.13-1
 - Updated for 1.1.13 release
 
diff --git a/rpmpkg-setup.sh b/rpmpkg-setup.sh
@@ -33,6 +33,7 @@ fi
 if [[ "$1" =~ alma* ]]; then
         dnf install -y dnf-plugins-core epel-release || true
         dnf config-manager --set-enabled powertools || true
+        dnf module disable -y mariadb || true
         /usr/bin/crb enable || true
 fi
 
diff --git a/src/collector/collector_base.h b/src/collector/collector_base.h
@@ -33,7 +33,15 @@
 #include <libwandder.h>
 #include <zmq.h>
 #include <Judy.h>
+
+#ifdef RMQC_HEADER_SUBDIR
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
+#else
 #include <amqp.h>
+#include <amqp_tcp_socket.h>
+#endif
+
 #include <uthash.h>
 #include <libtrace.h>
 #include <openssl/evp.h>
diff --git a/src/collector/collector_forwarder.c b/src/collector/collector_forwarder.c
@@ -33,7 +33,6 @@
 #include <assert.h>
 #include <unistd.h>
 #include <sys/timerfd.h>
-#include <amqp_tcp_socket.h>
 
 #include "util.h"
 #include "logger.h"
diff --git a/src/collector/email_worker.c b/src/collector/email_worker.c
@@ -32,7 +32,6 @@
 #include <assert.h>
 #include <unistd.h>
 #include <sys/timerfd.h>
-#include <amqp_tcp_socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/collector/emailprotocols/imap.c b/src/collector/emailprotocols/imap.c
@@ -222,7 +222,7 @@ static int extract_imap_email_sender(emailsession_t *sess,
     char *end = (char *)(comm->commbuffer + comm->reply_end);
 
     copylen = (end - search) + 1;
-    safecopy = calloc(sizeof(char), copylen);
+    safecopy = calloc(copylen, sizeof(char));
     memcpy(safecopy, search, (end - search));
 
     r = extract_email_sender_from_body(safecopy, &extracted);
diff --git a/src/collector/emailprotocols/pop3.c b/src/collector/emailprotocols/pop3.c
@@ -636,7 +636,7 @@ static int extract_pop3_email_sender(emailsession_t *sess,
     char *end = (char *)(pop3sess->contbuffer + pop3sess->contbufread);
 
     copylen = (end - search) + 1;
-    safecopy = calloc(sizeof(char), copylen);
+    safecopy = calloc(copylen, sizeof(char));
     memcpy(safecopy, search, (end - search));
 
     r = extract_email_sender_from_body(safecopy, &extracted);
diff --git a/src/collector/emailprotocols/smtp.c b/src/collector/emailprotocols/smtp.c
@@ -1012,8 +1012,8 @@ static int parse_mail_content(openli_email_worker_t *state,
 
     len = smtpsess->reply_start - smtpsess->command_start;
 
-    copy = calloc(sizeof(char), len + 1);
-    header = calloc(sizeof(char), len + 1);
+    copy = calloc(len + 1, sizeof(char));
+    header = calloc(len + 1, sizeof(char));
     memcpy(copy, smtpsess->contbuffer + smtpsess->command_start, len);
 
     start = copy;
diff --git a/src/mediator/coll_recv_thread.h b/src/mediator/coll_recv_thread.h
@@ -27,7 +27,6 @@
 #ifndef OPENLI_MEDIATOR_COLL_RECV_THREAD_H
 #define OPENLI_MEDIATOR_COLL_RECV_THREAD_H
 
-#include <amqp.h>
 #include <libtrace/message_queue.h>
 #include "netcomms.h"
 #include "openli_tls.h"
diff --git a/src/mediator/handover.h b/src/mediator/handover.h
@@ -27,10 +27,17 @@
 #ifndef OPENLI_MEDIATOR_HANDOVER_H_
 #define OPENLI_MEDIATOR_HANDOVER_H_
 
+#include "config.h"
+
 #include <libtrace/simple_circular_buffer.h>
 #include <libwandder.h>
 #include <libwandder_etsili.h>
+
+#ifdef RMQC_HEADER_SUBDIR
+#include <rabbitmq-c/amqp.h>
+#else
 #include <amqp.h>
+#endif
 
 #include "export_buffer.h"
 #include "med_epoll.h"
diff --git a/src/mediator/lea_send_thread.h b/src/mediator/lea_send_thread.h
@@ -27,7 +27,6 @@
 #ifndef OPENLI_MEDIATOR_LEA_SEND_THREAD_H
 #define OPENLI_MEDIATOR_LEA_SEND_THREAD_H
 
-#include <amqp.h>
 #include <libtrace/message_queue.h>
 #include "netcomms.h"
 #include "openli_tls.h"
diff --git a/src/mediator/liidmapping.h b/src/mediator/liidmapping.h
@@ -27,8 +27,10 @@
 #ifndef OPENLI_LIID_AGENCY_MAPPING_H_
 #define OPENLI_LIID_AGENCY_MAPPING_H_
 
+#include "config.h"
+
 #include <Judy.h>
-#include <amqp.h>
+#include <uthash.h>
 
 typedef struct liidmapping liid_map_entry_t;
 
diff --git a/src/mediator/mediator.c b/src/mediator/mediator.c
@@ -41,9 +41,6 @@
 #include <assert.h>
 #include <libwandder_etsili.h>
 #include <Judy.h>
-#include <amqp_tcp_socket.h>
-#include <amqp_ssl_socket.h>
-#include <amqp.h>
 
 #include "config.h"
 #include "configparser_mediator.h"
diff --git a/src/mediator/mediator.h b/src/mediator/mediator.h
@@ -31,7 +31,6 @@
 #include <libwandder.h>
 #include <libwandder_etsili.h>
 #include <uthash.h>
-#include <amqp.h>
 #include "netcomms.h"
 #include "export_buffer.h"
 #include "util.h"
diff --git a/src/mediator/mediator_rmq.c b/src/mediator/mediator_rmq.c
@@ -24,9 +24,6 @@
  *
  */
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
-#include <amqp_ssl_socket.h>
 #include "mediator_rmq.h"
 #include <unistd.h>
 #include "logger.h"
@@ -655,7 +652,6 @@ amqp_connection_state_t join_collector_RMQ(coll_recv_t *col) {
     /* Try to connect to RMQ service at col->ipaddr and join the appropiate
      * queue (which should be named after our mediator ID)
      */
-    amqp_set_initialize_ssl_library(0);
     amqp_state = amqp_new_connection();
 
     lock_med_collector_config(conf);    /* LOCK SHARED CONFIGURATION */
diff --git a/src/mediator/mediator_rmq.h b/src/mediator/mediator_rmq.h
@@ -27,6 +27,18 @@
 #ifndef OPENLI_MEDIATOR_RMQ_H_
 #define OPENLI_MEDIATOR_RMQ_H_
 
+#include "config.h"
+
+#ifdef RMQC_HEADER_SUBDIR
+#include <rabbitmq-c/tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/ssl_socket.h>
+#else
+#include <amqp_tcp_socket.h>
+#include <amqp.h>
+#include <amqp_ssl_socket.h>
+#endif
+
 #include "coll_recv_thread.h"
 #include "lea_send_thread.h"
 
diff --git a/src/mediator/pcapthread.c b/src/mediator/pcapthread.c
@@ -25,7 +25,6 @@
  */
 
 #include <unistd.h>
-#include <amqp.h>
 
 #include "logger.h"
 #include "lea_send_thread.h"
diff --git a/src/netcomms.c b/src/netcomms.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
 
 #include "netcomms.h"
 #include "logger.h"
diff --git a/src/netcomms.h b/src/netcomms.h
@@ -32,7 +32,14 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <fcntl.h>
+
+#ifdef RMQC_HEADER_SUBDIR
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
+#else
 #include <amqp.h>
+#include <amqp_tcp_socket.h>
+#endif
 
 #define NETBUF_ALLOC_SIZE (10 * 1024 * 1024)
 
diff --git a/src/openli_tls.h b/src/openli_tls.h
