From 55b02088b726b7a32b021c8fe7fb0604e9f11a9cc1f46e6ae4982fcc79b64bc2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 21 Jun 2010 16:02:26 +0000 Subject: [PATCH] Accepting request 41743 from net-snmp:factory Copy from net-snmp:factory/net-snmp based on submit request 41743 from user leonardocf OBS-URL: https://build.opensuse.org/request/show/41743 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=30 --- net-snmp-5.5.0-rpmdb-h-detect.patch | 12 +++++++++ net-snmp-5.5.0-upstream-20100428.patch.bz2 | 3 --- net-snmp-5.5.0-upstream-20100602.patch.bz2 | 3 +++ net-snmp-5.5.0-use-lmsensors-v3.patch | 17 ------------- net-snmp.changes | 15 +++++++++++ net-snmp.spec | 29 +++++++++++----------- 6 files changed, 45 insertions(+), 34 deletions(-) create mode 100644 net-snmp-5.5.0-rpmdb-h-detect.patch delete mode 100644 net-snmp-5.5.0-upstream-20100428.patch.bz2 create mode 100644 net-snmp-5.5.0-upstream-20100602.patch.bz2 delete mode 100644 net-snmp-5.5.0-use-lmsensors-v3.patch diff --git a/net-snmp-5.5.0-rpmdb-h-detect.patch b/net-snmp-5.5.0-rpmdb-h-detect.patch new file mode 100644 index 0000000..9342150 --- /dev/null +++ b/net-snmp-5.5.0-rpmdb-h-detect.patch @@ -0,0 +1,12 @@ +Index: net-snmp-5.5/agent/mibgroup/host/hr_swinst.c +=================================================================== +--- net-snmp-5.5.orig/agent/mibgroup/host/hr_swinst.c ++++ net-snmp-5.5/agent/mibgroup/host/hr_swinst.c +@@ -53,6 +53,7 @@ + #include + #endif + ++#define HAVE_RPM_RPMDB_H 1 + #ifdef HAVE_RPM_RPMDB_H + #include + #endif diff --git a/net-snmp-5.5.0-upstream-20100428.patch.bz2 b/net-snmp-5.5.0-upstream-20100428.patch.bz2 deleted file mode 100644 index d12f79d..0000000 --- a/net-snmp-5.5.0-upstream-20100428.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1087517eea0b114eff794bab3cd393d1f616f7be3118df92a5c62083d64223df -size 170985 diff --git a/net-snmp-5.5.0-upstream-20100602.patch.bz2 b/net-snmp-5.5.0-upstream-20100602.patch.bz2 new file mode 100644 index 0000000..ef761b6 --- /dev/null +++ b/net-snmp-5.5.0-upstream-20100602.patch.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:414ad3ebdf6abfc69d39e648f07a27d0558b38305922c29e19ca48f9c5ce2d29 +size 248726 diff --git a/net-snmp-5.5.0-use-lmsensors-v3.patch b/net-snmp-5.5.0-use-lmsensors-v3.patch deleted file mode 100644 index 4d062e6..0000000 --- a/net-snmp-5.5.0-use-lmsensors-v3.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - agent/mibgroup/hardware/sensors.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: net-snmp-5.5/agent/mibgroup/hardware/sensors.h -=================================================================== ---- net-snmp-5.5.orig/agent/mibgroup/hardware/sensors.h -+++ net-snmp-5.5/agent/mibgroup/hardware/sensors.h -@@ -7,7 +7,7 @@ config_require(hardware/sensors/picld_se - config_require(hardware/sensors/kstat_sensors) - # endif - #else --config_require(hardware/sensors/lmsensors_v2) -+config_require(hardware/sensors/lmsensors_v3) - #endif - - /* config_require(hardware/sensors/dummy_sensors) */ diff --git a/net-snmp.changes b/net-snmp.changes index c017ced..d9122c7 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jun 3 11:43:52 UTC 2010 - lchiquitto@novell.com + +- update upstream patches from branch V5-5-patches to 20100602: + fixed potential buffer overflow in parsing OIDs in config files + +------------------------------------------------------------------- +Mon May 31 13:48:27 UTC 2010 - lchiquitto@novell.com + +- update upstream patches from branch V5-5-patches to 20100531 +- add net-snmp-5.5.0-rpmdb-h-detect.patch: + workaround for autoconf failing to detect rpm/rpmdb.h +- remove patches that are no longer needed: + net-snmp-5.5.0-use-lmsensors-v3.patch + ------------------------------------------------------------------- Fri Apr 30 16:01:08 UTC 2010 - lchiquitto@novell.com diff --git a/net-snmp.spec b/net-snmp.spec index e7b15ec..3bc019d 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -17,24 +17,23 @@ # norootforbuild - -Name: net-snmp -Version: 5.5 -Release: 6 -License: BSD3c(or similar) ; MIT License (or similar) -Group: Productivity/Networking/Other -# %define pkg_name net-snmp %ifnarch s390 s390x -%define with_sensors 1 +%define netsnmp_with_sensors 1 %endif +%define netsnmp_check 1 %define netsnmp_logfile /var/log/net-snmpd.log %define netsnmp_agentx_socket_dir_fhs /var/run/agentx %define netsnmp_agentx_socket_dir_rfc /var/agentx -# + +Name: net-snmp +Version: 5.5 +Release: 7 +License: BSD3c(or similar) ; MIT License (or similar) +Group: Productivity/Networking/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel rpm-devel tcpd-devel -%if 0%{?with_sensors} +%if 0%{?netsnmp_with_sensors} BuildRequires: libsensors4-devel %endif Requires: perl-TermReadKey logrotate @@ -59,7 +58,7 @@ Source6: test_installed Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf -Patch0: net-snmp-5.5.0-upstream-20100428.patch.bz2 +Patch0: net-snmp-5.5.0-upstream-20100602.patch.bz2 # unused patch atm Patch1: net-snmp-5.5.0-socket-path.patch Patch2: net-snmp-5.5.0-testing-empty-arptable.patch @@ -68,7 +67,7 @@ Patch4: net-snmp-5.5.0-vendorperl.patch Patch5: net-snmp-5.5.0-net-snmp-config-headercheck.patch Patch6: net-snmp-5.5.0-perl-tk-warning.patch Patch7: net-snmp-5.5.0-velocity-mib.patch -Patch8: net-snmp-5.5.0-use-lmsensors-v3.patch +Patch8: net-snmp-5.5.0-rpmdb-h-detect.patch # Summary: SNMP Daemon @@ -134,7 +133,7 @@ Requires: %{library_name} = %{version} # for mib2c Requires: perl-SNMP = %{version} Requires: libopenssl-devel rpm-devel tcpd-devel perl zlib-devel -%if 0%{?with_sensors} +%if 0%{?netsnmp_with_sensors} Requires: libsensors4-devel %endif # @@ -227,7 +226,7 @@ export CFLAGS="$CFLAGS -fstack-protector-all" ucd-snmp/diskio \ etherlike-mib rmon-mib \ velocity \ -%if 0%{?with_sensors} +%if 0%{?netsnmp_with_sensors} ucd-snmp/lmsensorsMib \ %endif smux \ @@ -250,6 +249,7 @@ export CFLAGS="$CFLAGS -fstack-protector-all" %{__make} all %check +%if 0%{?netsnmp_check} %ifnarch %arm ulimit -c unlimited %{__make} test ||: @@ -257,6 +257,7 @@ ulimit -c unlimited %endif %{__make} perlmodules ||: LD_RUN_PATH="$PWD/snmplib/.libs" LD_LIBRARY_PATH="${PWD}/snmplib/.libs:${PWD}/agent/.libs:${PWD}/agent/helpers/.libs" %{__make} perltest ||: +%endif %install %makeinstall INSTALL_PREFIX=%{buildroot}