From 2550a06f11cb5c4f332ebda58218364d74404bbd Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 18 Aug 2021 02:34:20 -0700 Subject: [PATCH] net-snmp: Reenable MIB-II and IF-MIB (#6239) Recently the IF-MIB implementation on the Net-SNMP master branch became dependent on libnl-route-3. An unfortunate side effect is that this broke the build of the fuzz tests. Add the pkg-config package such that the configure script can detect libnl-route-3 and reenable MIB-II and IF-MIB. --- projects/net-snmp/Dockerfile | 2 +- projects/net-snmp/build.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/net-snmp/Dockerfile b/projects/net-snmp/Dockerfile index 4a81ee31e..1893d9bf6 100644 --- a/projects/net-snmp/Dockerfile +++ b/projects/net-snmp/Dockerfile @@ -15,7 +15,7 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder -RUN apt-get update && apt-get install -y pkg-config make autoconf libtool libssl-dev libnl-genl-3-dev libnl-3-dev libnl-route-3-dev +RUN apt-get update && apt-get install -y pkg-config make autoconf libtool libssl-dev libnl-genl-3-dev libnl-3-dev libnl-route-3-dev pkg-config RUN git clone https://github.com/net-snmp/net-snmp net-snmp WORKDIR net-snmp COPY build.sh $SRC/ diff --git a/projects/net-snmp/build.sh b/projects/net-snmp/build.sh index 069b1da64..28bd4e4f3 100755 --- a/projects/net-snmp/build.sh +++ b/projects/net-snmp/build.sh @@ -18,7 +18,8 @@ sed -i 's/#define NETSNMP_SELECT_TIMEVAL ${arg_type}/#define NETSNMP_SELECT_TIMEVAL struct timeval/g' ./configure rm testing/fuzzing/build.sh && echo "echo 0" >> testing/fuzzing/build.sh && chmod +x ./testing/fuzzing/build.sh -./configure --with-nl --with-openssl=/usr --with-defaults --disable-mibs --with-logfile="/dev/null" --with-persistent-directory="/dev/null" --with-out-mib-modules="mibII,if-mib" +./configure --with-openssl=/usr --with-defaults --with-logfile="/dev/null" --with-persistent-directory="/dev/null" + # net-snmp build is not parallel-make safe; do not add -j make