diff options
Diffstat (limited to 'net-analyzer/net-snmp/files')
5 files changed, 85 insertions, 27 deletions
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch deleted file mode 100644 index 72127d053c0a..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 9f4af8c42d515e6b214738cc97212dfbe7f749cf -Author: Andreas Hasenack <ahasenack2@users.sourceforge.net> -Date: Tue Feb 5 18:21:40 2019 -0800 - - apps/snmptrapd_sql: Fix build against MySQL 8 - - See also https://sourceforge.net/p/net-snmp/bugs/2922/. - - [bvanassche: changed 'int' into 'char'] - -diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c -index 6126ca916..32a3b1799 100644 ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -199,7 +199,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 my_bool _no_v3; -+static char _no_v3; - - static void _sql_process_queue(u_int dontcare, void *meeither); - diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch new file mode 100644 index 000000000000..94811747d2b4 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch @@ -0,0 +1,30 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,8 @@ + + AC_MSG_CACHE_INIT() + ++PKG_PROG_PKG_CONFIG ++ + # + # save the configure arguments + # +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -516,6 +516,8 @@ + # mysql + ## + if test "x$with_mysql" = "xyes" ; then ++ PKG_CHECK_MODULES([MYSQL],[mysqlclient],[MYSQL_INCLUDES="$MYSQL_CFLAGS"],) ++ if test -x "$MYSQL_LIBS"; then + AC_PATH_PROGS(MYSQLCONFIG,mysql_config) + test -x "$MYSQLCONFIG" \ + || AC_MSG_ERROR([Could not find mysql_config and was specifically asked to use MySQL support]) +@@ -523,6 +525,7 @@ + MYSQL_INCLUDES=`$MYSQLCONFIG --include` + _libs="${LIBS}" + _cppflags="${CPPFLAGS}" ++ fi + LIBS="${LIBS} ${MYSQL_LIBS}" + CPPFLAGS="${CPPFLAGS} ${MYSQL_INCLUDES}" + AC_CHECK_HEADER(mysql.h,, diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch new file mode 100644 index 000000000000..73d420531bb3 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch @@ -0,0 +1,37 @@ +--- a/net-snmp-config.in ++++ b/net-snmp-config.in +@@ -193,10 +193,10 @@ + #################################################### client lib + --libs) + # use this one == --netsnmp-libs + --external-libs +- echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS ++ echo $NSC_SNMPLIBS $NSC_LIBS + ;; + --netsnmp-libs) +- echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS ++ echo $NSC_BASE_SNMP_LIBS + ;; + --external-libs) + echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ +@@ -210,10 +210,10 @@ + ;; + --agent-libs) + # use this one == --netsnmp-agent-libs + --external-libs +- echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS ++ echo $NSC_AGENTLIBS $NSC_LIBS + ;; + --netsnmp-agent-libs) +- echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS ++ echo $NSC_BASE_AGENT_LIBS + ;; + --external-agent-libs) + echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS +@@ -660,7 +660,7 @@ + echo "Ack. Can't create $tmpfile." + exit 1 + fi +- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags" ++ cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $ldflags $NSC_LDFLAGS $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS" + echo "running: $cmd" + echo `$cmd` + result=$? diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch index fd53973c2bec..acda136a22cd 100644 --- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch +++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch @@ -1,16 +1,20 @@ --- a/netsnmp-agent.pc.in +++ b/netsnmp-agent.pc.in -@@ -9,4 +9,4 @@ +@@ -8,5 +8,5 @@ + URL: http://www.net-snmp.org Version: @PACKAGE_VERSION@ Cflags: -I${includedir} - Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp +-Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp -Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ++Libs: -lnetsnmpmibs -lnetsnmpagent -lnetsnmp +Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ --- a/netsnmp.pc.in +++ b/netsnmp.pc.in -@@ -9,4 +9,4 @@ +@@ -8,5 +8,5 @@ + URL: http://www.net-snmp.org Version: @PACKAGE_VERSION@ Cflags: -I${includedir} - Libs: -L${libdir} -lnetsnmp +-Libs: -L${libdir} -lnetsnmp -Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ ++Libs: -lnetsnmp +Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch new file mode 100644 index 000000000000..1c6a3fd1eaf3 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch @@ -0,0 +1,10 @@ +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL +@@ -3,6 +3,7 @@ + use ExtUtils::MakeMaker; + use Config; + require 5; ++use lib '.'; + use MakefileSubs; + + # Prevent that MakeMaker complains about unknown parameter names. |