rpms/net-snmp
8
0
Fork 0
Code Issues Pull Requests Releases Activity

Using mariadb-connector-c package (#1339272)

Browse Source
This commit is contained in:
Josef Ridky 2017-12-14 06:17:43 +01:00
parent 6abaaecb39
commit 7d2e1491d1
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net-snmp-5.7.3-mariadb-connector-c.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urNp old/apps/snmptrapd_sql.c new/apps/snmptrapd_sql.c
--- old/apps/snmptrapd_sql.c 2017-12-13 22:40:04.963569347 +0100
+++ new/apps/snmptrapd_sql.c 2017-12-13 22:44:38.640761652 +0100
@@ -50,8 +50,6 @@
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
-#include <my_global.h>
-#include <my_sys.h>
#include <mysql.h>
#include <errmsg.h>
#include <mysql_version.h>

6
net-snmp.spec
View File

@ -61,6 +61,8 @@ Patch17: net-snmp-5.7.3-mariadb102.patch
# (rebased on 5.7.3) # (rebased on 5.7.3)
Patch18: 0001-Link-libnetsnmptrapd-against-MYSQL_LIBS.patch Patch18: 0001-Link-libnetsnmptrapd-against-MYSQL_LIBS.patch
Patch19: net-snmp-5.7.3-mariadb-connector-c.patch
# This patch fix issue with new OpenSLL library in rawhide (f26+) # This patch fix issue with new OpenSLL library in rawhide (f26+)
# !!!WARNING!!! DO NOT USE IT FOR OLDER FEDORA RELEASES (>f26) # !!!WARNING!!! DO NOT USE IT FOR OLDER FEDORA RELEASES (>f26)
Patch100: net-snmp-5.7.3-openssl.patch Patch100: net-snmp-5.7.3-openssl.patch
@ -86,7 +88,7 @@ BuildRequires: libselinux-devel, elfutils-libelf-devel, rpm-devel
BuildRequires: perl-devel, perl(ExtUtils::Embed), procps BuildRequires: perl-devel, perl(ExtUtils::Embed), procps
BuildRequires: python2-devel, python2-setuptools BuildRequires: python2-devel, python2-setuptools
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: mysql-devel BuildRequires: mariadb-connector-c-devel
# for netstat, needed by 'make test' # for netstat, needed by 'make test'
BuildRequires: net-tools BuildRequires: net-tools
# for make test # for make test
@ -241,6 +243,7 @@ cp %{SOURCE12} .
%patch16 -p1 -b .strtok-r %patch16 -p1 -b .strtok-r
%patch17 -p1 -b .mariadb102 %patch17 -p1 -b .mariadb102
%patch18 -p1 -b .perlfix %patch18 -p1 -b .perlfix
%patch19 -p1 -b .mariadb-connector-c
%patch100 -p1 -b .openssl %patch100 -p1 -b .openssl
%patch101 -p1 -b .modern-rpm-api %patch101 -p1 -b .modern-rpm-api
@ -549,6 +552,7 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Wed Dec 13 2017 Josef Ridky <jridky@redhat.com> - 1:5.7.3-28 * Wed Dec 13 2017 Josef Ridky <jridky@redhat.com> - 1:5.7.3-28
- remove tcp_wrapper (#1518768) - remove tcp_wrapper (#1518768)
- use mariadb-connector instead of mysql-devel (#1339272)
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:5.7.3-27 * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:5.7.3-27
- Add Provides for the old name without %%_isa - Add Provides for the old name without %%_isa