commit: a9975628bcccb54eece19a8990e5982fa2a56572 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 1 03:35:35 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 1 03:35:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9975628
net-analyzer/net-snmp: fix modern C issue Closes: https://bugs.gentoo.org/920231 Signed-off-by: Sam James <sam <AT> gentoo.org> .../net-snmp/files/net-snmp-5.9.4-c99.patch | 30 +++ net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild | 241 +++++++++++++++++++++ 2 files changed, 271 insertions(+) diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch new file mode 100644 index 000000000000..fd8f16c7b6e2 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch @@ -0,0 +1,30 @@ +https://github.com/net-snmp/net-snmp/issues/815 +https://github.com/net-snmp/net-snmp/commit/d30d63523bfd9ccc85175e484fea821815273237 + +From d30d63523bfd9ccc85175e484fea821815273237 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche <[email protected]> +Date: Wed, 15 May 2024 10:08:04 -0600 +Subject: [PATCH] snmptrapd: Fix compilation against recent versions of the + MySQL library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the following build error: + +snmptrapd_sql.c:541:50: error: assignment to ‘_Bool *’ from incompatible pointer type ‘char *’ [-Wincompatible-pointer-types] +541 | _tbind[TBIND_v3_SECURITY_ENGINE].is_null = &_no_v3; + +Fixes: https://github.com/net-snmp/net-snmp/issues/815 +--- a/apps/snmptrapd_sql.c ++++ b/apps/snmptrapd_sql.c +@@ -201,7 +201,7 @@ typedef struct sql_buf_t { + * static bind structures, plus 2 static buffers to bind to. + */ + static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX]; +-static char _no_v3; ++static typeof(*((MYSQL_BIND*)NULL)->is_null) _no_v3; + + static void _sql_process_queue(u_int dontcare, void *meeither); + + diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild new file mode 100644 index 000000000000..bf9f27337a9c --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=yes +DISTUTILS_SINGLE_IMPL=yes +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{10..11} ) +WANT_AUTOMAKE=none + +inherit autotools distutils-r1 libtool perl-module systemd + +DESCRIPTION="Software for generating and retrieving SNMP data" +HOMEPAGE="https://www.net-snmp.org/"; +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"; + inherit git-r3 +else + # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"; + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"; + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0/40" +IUSE=" + X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql + netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib +" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" +RESTRICT="test" + +COMMON_DEPEND=" + virtual/libcrypt:= + bzip2? ( app-arch/bzip2 ) + elf? ( dev-libs/elfutils ) + lm-sensors? ( sys-apps/lm-sensors ) + mysql? ( dev-db/mysql-connector-c:0= ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + pci? ( sys-apps/pciutils ) + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:= ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + ssl? ( + >=dev-libs/openssl-0.9.6d:0= + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) +" +BDEPEND="doc? ( app-text/doxygen )" +DEPEND=" + ${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/Tk ) + !minimal? ( + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/JSON + dev-perl/Mail-Sender + dev-perl/TermReadKey + virtual/perl-Term-ReadLine + ) + ) + selinux? ( sec-policy/selinux-snmp ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.8-pcap.patch + "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch + "${FILESDIR}"/${PN}-5.9-MakeMaker.patch + # https://github.com/net-snmp/net-snmp/pull/493 + "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch + "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch + "${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch + "${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch + "${FILESDIR}"/${PN}-5.9.4-c99.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_unpack() { + default + + [[ ${PV} == 9999 ]] && git-r3_src_unpack +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die + eapply "${WORKDIR}"/patches/*.patch + + default + + eautoconf + elibtoolize +} + +src_configure() { + # keep this in the same line, configure.ac arguments are passed down to config.h + local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use smux && mibs="${mibs} smux" + + # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) + use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + + export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind) + + econf \ + $(use_enable !ssl internal-md5) \ + $(use_enable ipv6) \ + $(use_enable mfd-rewrites) \ + $(use_enable perl embedded-perl) \ + $(use_enable ucd-compat ucd-snmp-compatibility) \ + $(use_with bzip2) \ + $(use_with elf) \ + $(use_with kmem kmem-usage) \ + $(use_with mysql) \ + $(use_with netlink nl) \ + $(use_with pcap) \ + $(use_with pci) \ + $(use_with pcre) \ + $(use_with perl perl-modules INSTALLDIRS=vendor) \ + $(use_with python python-modules) \ + $(use_with rpm) \ + $(use_with ssl openssl) \ + $(use_with tcpd libwrap) \ + $(use_with zlib) \ + --enable-shared \ + --with-default-snmp-version="3" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + emake sedscript + + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all + done + + use doc && emake docsdox +} + +src_install() { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + use python && python_optimize + + if use perl ; then + perl_delete_localpod + if ! use X; then + rm "${D}"/usr/bin/tkmib || die + fi + else + rm -f \ + "${D}"/usr/bin/fixproc \ + "${D}"/usr/bin/ipf-mod.pl \ + "${D}"/usr/bin/mib2c \ + "${D}"/usr/bin/net-snmp-cert \ + "${D}"/usr/bin/snmp-bridge-mib \ + "${D}"/usr/bin/snmpcheck \ + "${D}"/usr/bin/snmpconf \ + "${D}"/usr/bin/tkmib \ + "${D}"/usr/bin/traptoemail \ + "${D}"/usr/share/snmp/mib2c.perl.conf \ + "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ + || die + fi + + dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO + newdoc EXAMPLE.conf.def EXAMPLE.conf + + if use doc; then + docinto html + dodoc -r docs/html/* + fi + + keepdir /var/lib/net-snmp + + newinitd "${FILESDIR}"/snmpd.init.2 snmpd + newconfd "${FILESDIR}"/snmpd.conf snmpd + + newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd + newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd + + systemd_dounit "${FILESDIR}"/snmpd.service + systemd_dounit "${FILESDIR}"/snmptrapd.service + + insinto /etc/snmp + newins "${S}"/EXAMPLE.conf snmpd.conf.example + + # Remove everything not required for an agent. + # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. + if use minimal; then + rm -rf \ + "${D}"/**/*.pl \ + "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ + "${D}"/usr/share/snmp/*.conf \ + "${D}"/usr/share/snmp/snmpconf-data \ + || die + fi + + find "${ED}" -name '*.la' -delete || die +}
