Merge pull request #134 from madrisan/fedora38

packages: add latest versions

.github/workflows/build-checks.yml

@@ -16,12 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         container:
-          - 'alpine:3.16'
           - 'alpine:3.17'
-          - 'debian:10'
+          - 'alpine:3.18'
           - 'debian:11'
-          - 'fedora:36'
+          - 'debian:12'
           - 'fedora:37'
+          - 'fedora:38'
           - 'ubuntu:20.04'
           - 'ubuntu:22.04'
 

README.md

@@ -113,14 +113,14 @@ This package is known to compile with:
 * gcc 4.1 (RHEL 5 / CentOS 5),
 * gcc 4.4 (RHEL6 / CentOS 6),
 * gcc 4.8 (RHEL7 / CentOS 7),
-* gcc 3.x, 5.1, 5.3, 6.3, 7-12 (openmamba GNU/Linux, Debian 8+, Fedora 25+),
-* clang 3.7, 3.8, 4.9, 5, 6, 7, 8, 10-15 (openmamba GNU/Linux, Fedora 25+),
+* gcc 3.x, 5.1, 5.3, 6.3, 7-13 (openmamba GNU/Linux, Debian 8+, Fedora 25+),
+* clang 3.7, 3.8, 4.9, 5, 6, 7, 8, 10-16 (openmamba GNU/Linux, Fedora 25+),
 
 List of the Linux kernels that have been successfully tested:
 * 2.6.18, 2.6.32,
 * 3.10, 3.14, 3.18,
 * 4.2, 4.4, 4,9, 4.14, 4.15, 4.16, 4.19
-* 5.6, 5.7, 5.8, 5.12-5.18, 6.1
+* 5.6, 5.7, 5.8, 5.12-5.18, 6.1-6.4
 
 The Nagios Plugins Linux are regularly tested on
  * Alpine Linux (musl libc),
@@ -132,17 +132,17 @@ The `.apk`, `.rpm` and `.deb` packages for Alpine, CentOS/RHEL, Debian, and Fedo
 
 Command              | Distribution
 -------------------- | ------------
-Alpine 3.15          | `make -C packages alpine-3.15`
 Alpine 3.16          | `make -C packages alpine-3.16`
 Alpine 3.17          | `make -C packages alpine-3.17`
+Alpine 3.18          | `make -C packages alpine-3.18`
 CentOS Stream 8      | `make -C packages centos-stream-8`
 CentOS Stream 9      | `make -C packages centos-stream-9`
-Debian 9 (Stretch)   | `make -C packages debian-stretch`
 Debian 10 (Buster)   | `make -C packages debian-buster`
 Debian 11 (Bullseye) | `make -C packages debian-bullseye`
-Fedora 35            | `make -C packages fedora-35`
+Debian 12 (Bookworm) | `make -C packages debian-bookworm`
 Fedora 36            | `make -C packages fedora-36`
 Fedora 37            | `make -C packages fedora-37`
+Fedora 38            | `make -C packages fedora-38`
 Fedora Rawhide       | `make -C packages fedora-rawhide`
 Rocky Linux 8        | `make -C packages rockylinux-8`
 Rocky Linux 9        | `make -C packages rockylinux-9`

configure.ac

@@ -337,7 +337,7 @@ AC_CHECK_DECLS([CPU_ALLOC], [], [],
 
 dnl Check for libcurl
 AC_ARG_ENABLE([libcurl],
-  AS_HELP_STRING([--disable-libcurl], [Disable libcurl]))
+  AS_HELP_STRING([--enable-libcurl], [Enable libcurl]))
 AS_IF([test "x$enable_libcurl" = "xyes"], [
   LIBCURL_CHECK_CONFIG([], [7.40.0], [],
     [AC_MSG_ERROR([Missing required libcurl >= 7.40.0])])
@@ -366,7 +366,7 @@ AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"])
 
 dnl Check for libvarlink
 AC_ARG_ENABLE([libvarlink],
-  AS_HELP_STRING([--disable-libvarlink], [Disable libvarlink]))
+  AS_HELP_STRING([--enable-libvarlink], [Enable libvarlink]))
 AS_IF([test "x$enable_libvarlink" = "xyes"], [
   PKG_CHECK_EXISTS([libvarlink],
     [PKG_CHECK_MODULES(LIBVARLINK, [libvarlink >= 18],

debian/rules

@@ -6,4 +6,4 @@ NP_LIBEXEC:=/usr/lib/nagios/plugins
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libexecdir=${NP_LIBEXEC}
+	dh_auto_configure -- --libexecdir=${NP_LIBEXEC} --enable-libcurl

packages/Makefile.am

@@ -33,26 +33,26 @@ MULTIBUILD_OPTS = \
 	--pckver $(PACKAGE_VERSION)
 
 TARGETS_ALPINE = \
-	alpine-3.15 \
 	alpine-3.16 \
-	alpine-3.17
-alpine-latest: alpine-3.17
+	alpine-3.17 \
+	alpine-3.18
+alpine-latest: alpine-3.18
 
 TARGETS_CENTOS_STREAM = \
 	centos-stream-8 centos-stream-9
 centos-stream-latest: centos-stream-9
 
 TARGETS_DEBIAN = \
-	debian-stretch debian-buster debian-bullseye
-debian-9: debian-stretch
+	debian-buster debian-bullseye debian-bookworm
 debian-10: debian-buster
 debian-11: debian-bullseye
-debian-latest: debian-bullseye
+debian-12: debian-bookworm
+debian-latest: debian-bookworm
 
 TARGETS_FEDORA = \
-	fedora-35 fedora-36 fedora-37 \
+	fedora-36 fedora-37 fedora-38 \
 	fedora-rawhide
-fedora-latest: fedora-37
+fedora-latest: fedora-38
 
 TARGETS_ROCKY = \
 	rockylinux-8 \

packages/multibuild.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Multi-platform build system
-# Copyright (C) 2016-2020 Davide Madrisan <[email protected]>
+# Copyright (C) 2016-2023 Davide Madrisan <[email protected]>
 
 PROGNAME="${0##*/}"
 PROGPATH="${0%/*}"
@@ -33,9 +33,11 @@ Where:
    -u|--uid    : user ID of the user 'developer' used for building the software
 
 Supported distributions:
-   CentOS 5/6/7/8
-   Debian 9/10/11
-   Fedora 33/34/35/rawhide
+   CentOS 5-8
+   CentOS Stream 8, 9
+   Debian 9-12
+   Fedora 33-38/rawhide
+   Rocky Linux 8, 9
 
 Example:
        $0 -s $PROGPATH/../../nagios-plugins-linux:/shared:rw \\
@@ -50,7 +52,7 @@ __EOF
 help () {
    cat <<__EOF
 $PROGNAME v$REVISION - containerized software build checker
-Copyright (C) 2016-2021 Davide Madrisan <[email protected]>
+Copyright (C) 2016-2023 Davide Madrisan <[email protected]>
 
 __EOF