Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ include(GNUInstallDirs)
include(ExternalProject)
include(cmake/FindJournald.cmake)
include(cmake/FindMonkey.cmake)
include(cmake/FindNetsnmp.cmake)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Verify macOS support status for the SNMP plugin.

The inclusion of cmake/FindNetsnmp.cmake enables Net-SNMP discovery during configuration. While Windows support is explicitly disabled (cmake/windows-setup.cmake:84), the past review comments requested confirmation of macOS compatibility.

Please confirm whether macOS support is:

  1. Intended and tested (Net-SNMP is available via Homebrew)
  2. Disabled via cmake/macos-setup.cmake (similar to Windows)
  3. Left to fail at build-time if dependencies are missing

🏁 Script executed:

#!/bin/bash
# Check if macOS-specific SNMP configuration exists
echo "=== Checking for macOS-specific SNMP handling ==="
if [ -f "cmake/macos-setup.cmake" ]; then
    echo "Found cmake/macos-setup.cmake, checking for SNMP references:"
    rg -n "SNMP|snmp" cmake/macos-setup.cmake || echo "No SNMP configuration found in macOS setup"
else
    echo "No cmake/macos-setup.cmake found"
fi

echo ""
echo "=== Checking plugin registration for platform conditionals ==="
rg -n -A2 -B2 "REGISTER_IN_PLUGIN.*in_snmp" plugins/CMakeLists.txt

Length of output: 390


🏁 Script executed:

#!/bin/bash
# Examine FindNetsnmp.cmake for platform-specific handling
echo "=== FindNetsnmp.cmake content ==="
cat cmake/FindNetsnmp.cmake

echo ""
echo "=== Checking plugins/in_snmp/CMakeLists.txt ==="
cat plugins/in_snmp/CMakeLists.txt

echo ""
echo "=== Checking windows-setup.cmake for SNMP handling ==="
rg -n -A3 -B3 "SNMP|snmp" cmake/windows-setup.cmake || echo "No SNMP references found"

Length of output: 2098


🏁 Script executed:

#!/bin/bash
# Find how FLB_IN_SNMP is used in the build system
echo "=== FLB_IN_SNMP usage throughout CMakeLists.txt files ==="
rg -n "FLB_IN_SNMP" --type cmake

echo ""
echo "=== Check plugins/CMakeLists.txt around REGISTER_IN_PLUGIN(in_snmp) for conditionals ==="
rg -n -B10 "REGISTER_IN_PLUGIN.*in_snmp" plugins/CMakeLists.txt | head -30

echo ""
echo "=== Check if NETSNMP_FOUND is verified before using in_snmp plugin ==="
rg -n "NETSNMP_FOUND" --type cmake

echo ""
echo "=== Check main CMakeLists.txt for in_snmp conditionals ==="
rg -n "in_snmp\|IN_SNMP" CMakeLists.txt

Length of output: 855


🏁 Script executed:

#!/bin/bash
# Find how in_snmp plugin directory is included in the build
echo "=== Search for add_subdirectory calls for in_snmp ==="
rg -n "add_subdirectory.*in_snmp" --type cmake

echo ""
echo "=== Check plugins/CMakeLists.txt for how FLB_IN_* flags gate plugin inclusion ==="
rg -n -B2 "add_subdirectory" plugins/CMakeLists.txt | head -50

echo ""
echo "=== Search for how FLB_IN_SNMP actually gates plugin building ==="
rg -n "FLB_IN_SNMP" . --type cmake -A2 -B2

Length of output: 1753


🏁 Script executed:

#!/bin/bash
# Find REGISTER_IN_PLUGIN macro definition
echo "=== Search for REGISTER_IN_PLUGIN macro definition ==="
rg -n "macro.*REGISTER_IN_PLUGIN\|function.*REGISTER_IN_PLUGIN" --type cmake

echo ""
echo "=== Check where FindNetsnmp.cmake is included ==="
rg -n "FindNetsnmp\|find_package.*NETSNMP\|include.*FindNetsnmp" --type cmake

echo ""
echo "=== Check main CMakeLists.txt for NETSNMP handling ==="
rg -n -B3 -A3 "find_package.*SNMP\|FIND_PACKAGE.*SNMP\|include.*FindNetsnmp" CMakeLists.txt

echo ""
echo "=== Check CMakeLists.txt line 125 context (the line being reviewed) ==="
sed -n '120,130p' CMakeLists.txt

Length of output: 601


🏁 Script executed:

#!/bin/bash
# Final verification: Check if there's any error handling or conditional build for SNMP
echo "=== Check plugins/in_snmp/CMakeLists.txt for NETSNMP_FOUND checks ==="
cat plugins/in_snmp/CMakeLists.txt

echo ""
echo "=== Search for conditional NETSNMP handling in cmake files ==="
rg -n "if.*NETSNMP_FOUND\|if.*NETSNMP_LIBRARY" --type cmake

echo ""
echo "=== Check if main CMakeLists.txt has error handling after FindNetsnmp.cmake ==="
sed -n '125,145p' CMakeLists.txt

echo ""
echo "=== Verify windows-setup.cmake applies before plugin registration ==="
rg -n -A20 "if.*WIN32\|if.*WINDOWS" CMakeLists.txt | head -30

Length of output: 1096


Update FindNetsnmp.cmake to support Homebrew, or explicitly disable SNMP on macOS.

macOS support status remains unresolved. The current implementation will fail to build on macOS with Homebrew-installed Net-SNMP:

  • FindNetsnmp.cmake searches only /usr/lib and /usr/local/lib, missing Homebrew's standard install paths (/usr/local/opt/net-snmp on Intel, /opt/homebrew/opt/net-snmp on Apple Silicon)
  • plugins/in_snmp/CMakeLists.txt unconditionally links against potentially empty ${NETSNMP_LIBRARY} without checking NETSNMP_FOUND
  • in_snmp plugin registration (plugins/CMakeLists.txt:284) is unconditional with no macOS guard, unlike the pattern used for other platform-specific plugins

The Windows disable mechanism (FLB_IN_SNMP=No in cmake/windows-setup.cmake:84) only gates tests, not the actual plugin build. Add equivalent macOS handling or update the SNMP finder to support Homebrew paths.

🤖 Prompt for AI Agents
In CMakeLists.txt around line 125 where FindNetsnmp.cmake is included, the build
will fail on macOS Homebrew installs because the finder only checks /usr/lib and
/usr/local/lib and the in_snmp plugin is unconditionally linked/registered;
update FindNetsnmp.cmake to also probe Homebrew prefixes
(/usr/local/opt/net-snmp and /opt/homebrew/opt/net-snmp) for include and lib
paths and set NETSNMP_FOUND appropriately, modify plugins/in_snmp/CMakeLists.txt
to conditionalize target_link_libraries and add_library calls on NETSNMP_FOUND
(error out or skip if not found), and guard the plugins/CMakeLists.txt in_snmp
registration with a platform or option check (e.g., skip on Apple or when
FLB_IN_SNMP=No) so macOS/Homebrew users can disable the plugin like Windows
does.

include(cmake/macros.cmake)
include(cmake/platform_feature_checks.cmake)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})
Expand Down
79 changes: 79 additions & 0 deletions cmake/FindNetsnmp.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# - Find Net-SNMP
#
# -*- cmake -*-
#
# Find the Net-SNMP module
#
# NETSNMP_INCLUDE_DIR - where to find Net-SNMP.h, etc.
# NETSNMP_LIBRARIES - List of libraries when using Net-SNMP.
# NETSNMP_FOUND - True if Net-SNMP found.

IF (NETSNMP_INCLUDE_DIR)
# Already in cache, be silent
SET(NETSNMP_FIND_QUIETLY TRUE)
ENDIF (NETSNMP_INCLUDE_DIR)

FIND_PATH(NETSNMP_INCLUDE_DIR net-snmp/net-snmp-includes.h
/usr/include
/usr/local/include
/opt/homebrew/include
/opt/local/include
)

SET(NETSNMP_NAMES netsnmp)
FIND_LIBRARY(NETSNMP_LIBRARY
NAMES ${NETSNMP_NAMES}
PATHS /usr/lib /usr/local/lib /opt/homebrew/lib /opt/local/lib
)

SET(NETSNMPAGENT_NAMES netsnmpagent)
FIND_LIBRARY(NETSNMPAGENT_LIBRARY
NAMES ${NETSNMPAGENT_NAMES}
PATHS /usr/lib /usr/local/lib /opt/homebrew/lib /opt/local/lib
)

SET(NETSNMPHELPERS_NAMES netsnmphelpers)
FIND_LIBRARY(NETSNMPHELPERS_LIBRARY
NAMES ${NETSNMPHELPERS_NAMES}
PATHS /usr/lib /usr/local/lib /opt/homebrew/lib /opt/local/lib
)

SET(NETSNMPMIBS_NAMES netsnmpmibs)
FIND_LIBRARY(NETSNMPMIBS_LIBRARY
NAMES ${NETSNMPMIBS_NAMES}
PATHS /usr/lib /usr/local/lib /opt/homebrew/lib /opt/local/lib
)

SET(NETSNMPTRAPD_NAMES netsnmptrapd)
FIND_LIBRARY(NETSNMPTRAPD_LIBRARY
NAMES ${NETSNMPTRAPD_NAMES}
PATHS /usr/lib /usr/local/lib /opt/homebrew/lib /opt/local/lib
)

SET(NETSNMP_LIBRARIES
${NETSNMP_LIBRARY}
${NETSNMPAGENT_LIBRARY}
${NETSNMPHELPERS_LIBRARY}
${NETSNMPMIBS_LIBRARY}
# ${NETSNMPTRAPD_LIBRARY}
)

# Provide plural form for CMake convention
SET(NETSNMP_INCLUDE_DIRS ${NETSNMP_INCLUDE_DIR})


INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETSNMP
DEFAULT_MSG
NETSNMP_INCLUDE_DIRS
NETSNMP_LIBRARIES
)

MARK_AS_ADVANCED(
NETSNMP_LIBRARY
NETSNMPAGENT_LIBRARY
NETSNMPHELPERS_LIBRARY
NETSNMPMIBS_LIBRARY
NETSNMPTRAPD_LIBRARY
NETSNMP_INCLUDE_DIR
)
1 change: 1 addition & 0 deletions cmake/plugins_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ DEFINE_OPTION(FLB_IN_PROMETHEUS_SCRAPE "Enable Prometheus Scrape input pl
DEFINE_OPTION(FLB_IN_PROMETHEUS_TEXTFILE "Enable Prometheus textfile input plugin" ON)
DEFINE_OPTION(FLB_IN_RANDOM "Enable random input plugin" ON)
DEFINE_OPTION(FLB_IN_SERIAL "Enable Serial input plugin" ON)
DEFINE_OPTION(FLB_IN_SNMP "Enable SNMP input plugin" ON)
DEFINE_OPTION(FLB_IN_SPLUNK "Enable Splunk HTTP HEC input plugin" ON)
DEFINE_OPTION(FLB_IN_STATSD "Enable StatsD input plugin" ON)
DEFINE_OPTION(FLB_IN_STDIN "Enable Standard input plugin" ON)
Expand Down
1 change: 1 addition & 0 deletions cmake/windows-setup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ if(FLB_WINDOWS_DEFAULTS)
set(FLB_IN_ELASTICSEARCH Yes)
set(FLB_IN_SPLUNK Yes)
set(FLB_IN_PROMETHEUS_REMOTE_WRITE Yes)
set(FLB_IN_SNMP No)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

macOS too?


# OUTPUT plugins
# ==============
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
flex \
bison \
libyaml-dev \
libsnmp-dev \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We presumably will also need this in the various package builds under packaging/distros too.

&& apt-get satisfy -y cmake "cmake (<< 4.0)" \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
yum install -y rpm-build curl ca-certificates gcc gcc-c++ make bash \
wget unzip systemd-devel flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel \
tar gzip

ENV CMAKE_HOME="/opt/cmake"
Expand Down
8 changes: 4 additions & 4 deletions packaging/distros/amazonlinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN yum -y update && \
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
postgresql-devel postgresql-libs glibc-devel \
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel net-snmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
tar gzip && \
yum clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -48,7 +48,7 @@ RUN yum -y update && \
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
postgresql-devel postgresql-libs \
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel net-snmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
tar gzip && \
yum clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -73,7 +73,7 @@ RUN yum -y update && \
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
postgresql-devel postgresql-libs \
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel net-snmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
tar gzip && \
yum clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -100,7 +100,7 @@ RUN yum -y update && \
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
postgresql-devel postgresql-libs \
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel net-snmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
tar gzip && \
yum clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down
16 changes: 8 additions & 8 deletions packaging/distros/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
yum install -y rpm-build curl ca-certificates gcc gcc-c++ make bash \
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel \
tar gzip && \
yum install -y epel-release && \
yum install -y cmake3 && \
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
yum install -y rpm-build curl ca-certificates gcc gcc-c++ make bash \
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel \
tar gzip && \
yum install -y epel-release && \
yum install -y cmake3 && \
Expand Down Expand Up @@ -102,7 +102,7 @@ RUN yum -y update && \
wget unzip systemd-devel wget flex bison \
postgresql-libs postgresql-devel postgresql-server postgresql \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel zlib-devel \
libyaml-devel libsnmp-devel zlib-devel \
tar gzip && \
yum clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down Expand Up @@ -141,7 +141,7 @@ RUN yum -y update && \
wget unzip systemd-devel wget flex bison \
postgresql-libs postgresql-devel postgresql-server postgresql \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel zlib-devel \
libyaml-devel libsnmp-devel zlib-devel \
tar gzip && \
yum clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down Expand Up @@ -175,7 +175,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
wget unzip systemd-devel wget flex bison \
postgresql-libs postgresql-devel postgresql-server postgresql \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel zlib-devel \
libyaml-devel libsnmp-devel zlib-devel \
tar gzip && \
dnf clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down Expand Up @@ -204,7 +204,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
wget unzip systemd-devel wget flex bison \
postgresql-libs postgresql-devel postgresql-server postgresql \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel zlib-devel \
libyaml-devel libsnmp-devel zlib-devel \
tar gzip && \
dnf clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down Expand Up @@ -238,7 +238,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
wget unzip systemd-devel wget flex bison \
postgresql-libs postgresql-devel postgresql-server postgresql \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel zlib-devel \
libyaml-devel libsnmp-devel zlib-devel \
tar gzip && \
dnf clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down Expand Up @@ -267,7 +267,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
wget unzip systemd-devel wget flex bison \
postgresql-libs postgresql-devel postgresql-server postgresql \
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
libyaml-devel zlib-devel \
libyaml-devel libsnmp-devel zlib-devel \
tar gzip && \
dnf clean all && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down
16 changes: 8 additions & 8 deletions packaging/distros/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down Expand Up @@ -59,7 +59,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -83,7 +83,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -109,7 +109,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -133,7 +133,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -159,7 +159,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -183,7 +183,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand All @@ -209,7 +209,7 @@ RUN apt-get -qq update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
tar gzip && \
apt-get install -y --reinstall lsb-base lsb-release && \
mkdir -p "${CMAKE_HOME}" && \
Expand Down
6 changes: 3 additions & 3 deletions packaging/distros/raspbian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apt-get update && \
make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config && \
apt-get install -y --reinstall lsb-base lsb-release

# raspbian/bullseye base image
Expand All @@ -31,7 +31,7 @@ RUN apt-get update && \
cmake make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config && \
apt-get install -y --reinstall lsb-base lsb-release

# raspbian/bookworm base image
Expand All @@ -44,7 +44,7 @@ RUN apt-get update && \
cmake make bash sudo wget unzip dh-make \
libsystemd-dev zlib1g-dev flex bison \
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config && \
apt-get install -y --reinstall lsb-base lsb-release

# Common build for all distributions now
Expand Down
Loading
Loading