diff --git a/baselibs.conf b/baselibs.conf index f6d2438..93fa734 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,6 +2,3 @@ libsnmp15 arch ppc package net-snmp-devel requires -net-snmp- requires "libsnmp15- = " -arch sparcv9 package net-snmp-devel - requires -net-snmp- - requires "libsnmp15- = " diff --git a/net-snmp-5.5.0_autoconf.patch b/net-snmp-5.5.0_autoconf.patch new file mode 100644 index 0000000..3b6514a --- /dev/null +++ b/net-snmp-5.5.0_autoconf.patch @@ -0,0 +1,52 @@ +Index: configure.d/config_os_progs +=================================================================== +--- configure.d/config_os_progs ++++ configure.d/config_os_progs +@@ -153,7 +153,7 @@ AC_SUBST(NON_GNU_VPATH) + + # What system are we building for + # +-AC_CANONICAL_TARGET ++AC_CANONICAL_TARGET([]) + changequote(, ) + PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'` + changequote([, ]) +Index: configure.d/config_os_libs +=================================================================== +--- configure.d/config_os_libs ++++ configure.d/config_os_libs +@@ -235,8 +235,6 @@ if test "$with_libwrap" != "no"; then + _wraplibs="$_wraplibs -lwrap"], + [AC_MSG_RESULT([no]) + # Linux RedHat 6.1 won't link libwrap without libnsl +- AC_CHECK_FUNC(yp_get_default_domain, , +- AC_CHECK_LIB(nsl, yp_get_default_domain)) + AC_MSG_CHECKING([for TCP wrappers library -lwrap linked with -lnsl]) + AC_TRY_LINK( + [#include +Index: configure.d/config_os_misc4 +=================================================================== +--- configure.d/config_os_misc4 ++++ configure.d/config_os_misc4 +@@ -205,7 +205,7 @@ fi + # + # used in agent only + # +-AC_CACHE_CHECK([whether TCP timers depend on \`hz'], ++AC_CACHE_CHECK([whether TCP timers depend on hz], + ac_cv_TCPTV_NEEDS_HZ, + [AC_EGREP_CPP(hz, + [ +Index: configure.d/config_project_manual +=================================================================== +--- configure.d/config_project_manual ++++ configure.d/config_project_manual +@@ -35,7 +35,7 @@ fi + + ME=`$WHOAMI` + if test -f /etc/resolv.conf; then +- LOC=`cat /etc/resolv.conf | $GREP '^domain' | tail -1 | awk '{print $NF}'` ++ LOC=`cat /etc/resolv.conf | $GREP '^domain' | tail -n 1 | awk '{print $NF}'` + else + LOC="@no.where" + fi diff --git a/net-snmp-5.5.0_use_lmsensors_v3.patch b/net-snmp-5.5.0_use_lmsensors_v3.patch new file mode 100644 index 0000000..aa52f75 --- /dev/null +++ b/net-snmp-5.5.0_use_lmsensors_v3.patch @@ -0,0 +1,15 @@ +--- + agent/mibgroup/hardware/sensors.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- agent/mibgroup/hardware/sensors.h.orig ++++ 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 96fa238..0d4d205 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Feb 3 11:03:39 CET 2010 - jdelvare@suse.de + +- build for libsensors4 instead of libsensors3 + +------------------------------------------------------------------- +Mon Feb 1 12:06:49 UTC 2010 - jengelh@medozas.de + +- remove sparcv9-specific baselib exceptions (not needed) + +------------------------------------------------------------------- +Tue Jan 19 12:01:54 UTC 2010 - lchiquitto@novell.com + +- remove net-snmp-5.4.1.2-rmon-mib-revised_3.patch from sources + (upstream since 5.5) +- refresh net-snmp-5.5.0_autoconf.patch +- spec file cleanup: update package description + ------------------------------------------------------------------- Tue Dec 22 09:41:44 UTC 2009 - lchiquitto@novell.com diff --git a/net-snmp.spec b/net-snmp.spec index 1c9d433..105ba13 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -20,7 +20,7 @@ Name: net-snmp Version: 5.5 -Release: 1 +Release: 2 # License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other @@ -41,7 +41,7 @@ Group: Productivity/Networking/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel rpm-devel tcpd-devel %if 0%{?with_sensors} -BuildRequires: libsensors3-devel +BuildRequires: libsensors4-devel %endif Requires: perl-TermReadKey logrotate Requires: perl-SNMP = %{version} @@ -66,7 +66,7 @@ Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf Patch: net-snmp-5.4.2_audit.patch -#Patch1: net-snmp-5.4.2_autoconf.patch +Patch1: net-snmp-5.5.0_autoconf.patch # unused patch atm Patch2: net-snmp-5.2.1-socket_path.diff Patch3: net-snmp-5.4.rc2-versinfo.diff @@ -79,16 +79,25 @@ Patch9: net-snmp-5.4.2_perl_tk_warning.patch Patch10: net-snmp-5.4.2_snmpconf-selinux.patch Patch11: net-snmp-5.4.2_velocity-mib.patch Patch12: net-snmp-5.4.2.1-rpm4.7.patch +Patch13: net-snmp-5.5.0_use_lmsensors_v3.patch # Summary: SNMP Daemon %description -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: +- An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +- Command-line applications to retrieve and manipulate information from + SNMP-capable devices +- A daemon application for receiving SNMP notifications +- A library for developing new SNMP applications, with C and Perl APIs +- A graphical MIB browser. + +This package was originally based on the CMU 2.1.2.1 snmp code. It was +renamed from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp +to net-snmp in November 2000. Authors: @@ -107,16 +116,20 @@ Requires: snmp-mibs = %{version} Summary: Shared Libraries from net-snmp %description -n libsnmp15 -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: + +* An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +* Command-line applications to retrieve and manipulate information from + SNMP-capable devices +* A daemon application for receiving SNMP notifications +* A library for developing new SNMP applications, with C and Perl APIs +* A graphical MIB browser. This package holds the shared libraries from the net-snmp package. - Authors: -------- Wes Hardaker @@ -134,18 +147,25 @@ Requires: %{library_name} = %{version} Requires: perl-SNMP = %{version} Requires: libopenssl-devel rpm-devel tcpd-devel perl zlib-devel %if 0%{?with_sensors} -Requires: libsensors3-devel +Requires: libsensors4-devel %endif # -Summary: SNMP Daemon +Summary: Development files from net-snmp %description devel -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: +* An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +* Command-line applications to retrieve and manipulate information from + SNMP-capable devices +* A daemon application for receiving SNMP notifications +* A library for developing new SNMP applications, with C and Perl APIs +* A graphical MIB browser. + +This package holds the development headers, libraries and API documentation +from the net-snmp package. Authors: @@ -159,16 +179,20 @@ Group: Productivity/Networking/Other Summary: MIB files from net-snmp %description -n snmp-mibs -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: + +- An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +- Command-line applications to retrieve and manipulate information from + SNMP-capable devices +- A daemon application for receiving SNMP notifications +- A library for developing new SNMP applications, with C and Perl APIs +- A graphical MIB browser. This package holds the MIB files from the net-snmp package. - Authors: -------- Wes Hardaker @@ -185,7 +209,6 @@ Summary: Perl5 SNMP Extension Module The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library. - Authors: -------- G.S. Marzot @@ -193,7 +216,7 @@ Authors: %prep %setup -q -n %{pkg_name}-%{version} %patch -#%patch1 +%patch1 %patch2 %patch3 %patch4 @@ -205,6 +228,7 @@ Authors: %patch10 %patch11 %patch12 +%patch13 find -name "CVS" -type d | xargs -r %{__rm} -rfv find -name ".cvsignore" | xargs -r %{__rm} -fv @@ -225,7 +249,7 @@ export CFLAGS="$CFLAGS -fstack-protector-all" etherlike-mib rmon-mib \ velocity \ %if 0%{?with_sensors} - ucd-snmp/lmSensors \ + ucd-snmp/lmsensorsMib \ %endif smux \ ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \