From 2955f5cceef6b6cd81ce59a37a96c558d5bfd02c Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Thu, 14 May 2020 02:02:36 +0000 Subject: [PATCH] Revert "Fix libsnmp-base compilation failure" This reverts commit d808ebeb25e4f7f143eed7e61583473c799a2af5. --- .../0009-fix-compilation-in-buster-env.patch | 20 ------------------- src/snmpd/patch-5.7.3+dfsg/series | 1 - 2 files changed, 21 deletions(-) delete mode 100644 src/snmpd/patch-5.7.3+dfsg/0009-fix-compilation-in-buster-env.patch diff --git a/src/snmpd/patch-5.7.3+dfsg/0009-fix-compilation-in-buster-env.patch b/src/snmpd/patch-5.7.3+dfsg/0009-fix-compilation-in-buster-env.patch deleted file mode 100644 index 2023356ac308..000000000000 --- a/src/snmpd/patch-5.7.3+dfsg/0009-fix-compilation-in-buster-env.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c -index 671e542..5185f9a 100644 ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -437,14 +437,10 @@ netsnmp_mysql_init(void) - return -1; - } - --#ifdef HAVE_BROKEN_LIBMYSQLCLIENT -- my_init(); --#else -+#ifndef HAVE_BROKEN_LIBMYSQLCLIENT - MY_INIT("snmptrapd"); - #endif - -- /** load .my.cnf values */ -- load_defaults ("my", _sql.groups, ¬_argc, ¬_argv); - for(i=0; i < not_argc; ++i) { - if (NULL == not_argv[i]) - continue; diff --git a/src/snmpd/patch-5.7.3+dfsg/series b/src/snmpd/patch-5.7.3+dfsg/series index 1e652a4432bd..31b251845dea 100644 --- a/src/snmpd/patch-5.7.3+dfsg/series +++ b/src/snmpd/patch-5.7.3+dfsg/series @@ -3,4 +3,3 @@ 0006-From-Jiri-Cervenka-snmpd-Fixed-agentx-crashing-and-or-freezing-on-timeout.patch 0007-Linux-VRF-5.7.3-Support.patch 0008-Enable-macro-DEB_BUILD_ARCH_OS-in-order-to-build-ipv.patch -0009-fix-compilation-in-buster-env.patch