packages: net-snmp/net-snmp-rpm-implicit-libs.patch, net-snmp/net-snmp-use-...

Wed Mar 16 17:26:49 CET 2011

Author: arekm                        Date: Wed Mar 16 16:26:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.6.1

---- Files affected:
packages/net-snmp:
   net-snmp-rpm-implicit-libs.patch (1.4 -> 1.5) , net-snmp-use-rpm-hrmib.patch (1.6 -> 1.7) , net-snmp.spec (1.171 -> 1.172) , net-snmp-nodebug.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/net-snmp/net-snmp-rpm-implicit-libs.patch
diff -u packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.4 packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.5

--- packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.4	Wed May 12 14:48:37 2010
+++ packages/net-snmp/net-snmp-rpm-implicit-libs.patch	Wed Mar 16 17:26:43 2011
@@ -1,5 +1,5 @@
---- net-snmp-5.5/configure.d/config_os_libs~	2009-07-11 23:04:37.000000000 +0200
-+++ net-snmp-5.5/configure.d/config_os_libs	2010-05-12 14:24:23.649259395 +0200
+--- net-snmp-5.5/configure.d/config_os_libs1~	2009-07-11 23:04:37.000000000 +0200
++++ net-snmp-5.5/configure.d/config_os_libs1	2010-05-12 14:24:23.649259395 +0200
 @@ -310,18 +310,6 @@
      NETSNMP_SEARCH_LIBS(BZ2_bzread, bz2,,, $LMIBLIBS, _rpmlibs)
    fi

================================================================
Index: packages/net-snmp/net-snmp-use-rpm-hrmib.patch
diff -u packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.6 packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.7
--- packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.6	Thu Dec 16 00:12:26 2010
+++ packages/net-snmp/net-snmp-use-rpm-hrmib.patch	Wed Mar 16 17:26:43 2011
@@ -11,8 +11,8 @@
  void
  init_hr_swinst(void)
  {
---- net-snmp-5.6/configure.d/config_os_libs.orig	2010-10-24 10:37:25.527741043 +0200
-+++ net-snmp-5.6/configure.d/config_os_libs	2010-10-24 10:40:56.519744396 +0200
+--- net-snmp-5.6/configure.d/config_os_libs1.orig	2010-10-24 10:37:25.527741043 +0200
++++ net-snmp-5.6/configure.d/config_os_libs1	2010-10-24 10:40:56.519744396 +0200
 @@ -425,20 +425,34 @@
  #   RPM checks
  #
@@ -75,22 +75,22 @@
  ##
 --- net-snmp-5.5/configure.d/config_os_functions~	2009-07-26 20:20:55.000000000 +0200
 +++ net-snmp-5.5/configure.d/config_os_functions	2010-05-12 14:35:39.421276242 +0200
-@@ -67,15 +67,6 @@
+@@ -114,15 +114,6 @@
  #           (Agent)
  ##
  
 -#       rpmGetPath check needs clean LIBS environment   (Linux)
 -#
--if test "x$with_rpm" != "xno" && \
--        echo " $module_list " | $GREP " host/hr_swinst " > /dev/null; then
+-if test "x$with_rpm" != "xno"; then
 -    OLDLIBS=$LIBS
 -    LIBS=$LMIBLIBS
 -    AC_CHECK_FUNCS(rpmGetPath)
 -    LIBS=$OLDLIBS
 -fi
- 
+-
  #       statfs( char *, struct fs_data* )               (Ultrix)
  #
+ AC_MSG_CHECKING([[for two-argument statfs with struct fs_data (Ultrix)]])
 --- net-snmp-5.6/agent/mibgroup/host/data_access/swinst_pkginfo.c~	2010-01-26 23:24:14.000000000 +0200
 +++ net-snmp-5.6/agent/mibgroup/host/data_access/swinst_pkginfo.c	2010-12-16 00:13:22.027247692 +0200
 @@ -52,6 +52,8 @@

================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.171 packages/net-snmp/net-snmp.spec:1.172
--- packages/net-snmp/net-snmp.spec:1.171	Fri Jan 28 00:00:07 2011
+++ packages/net-snmp/net-snmp.spec	Wed Mar 16 17:26:43 2011
@@ -28,12 +28,12 @@
 Summary(ru.UTF-8):	Набор утилит для протокола SNMP от UC-Davis
 Summary(uk.UTF-8):	Набір утиліт для протоколу SNMP від UC-Davis
 Name:		net-snmp
-Version:	5.6
-Release:	4
+Version:	5.6.1
+Release:	1
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5:	89b3a7a77e68daef925abee43a3f7018
+# Source0-md5:	b4e30ead5783b0bb1d280172c6095ea4
 Source1:	%{name}d.init
 Source2:	%{name}d.conf
 Source3:	%{name}d.sysconfig
@@ -56,7 +56,6 @@
 Patch11:	%{name}-defaultconfig.patch
 Patch12:	%{name}-use-rpm-hrmib.patch
 Patch13:	%{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch14:	%{name}-nodebug.patch
 URL:		http://www.net-snmp.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -431,7 +430,6 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 %build
 %{__libtoolize}
@@ -468,6 +466,7 @@
 	--with-logfile=%{logfile} \
 	--with-zlib=%{_prefix} \
 	--with-bzip2=%{_prefix} \
+	--with-nl \
 	--with%{!?with_perl:out}-perl-modules \
 	--with%{!?with_python:out}-python-modules \
 	--enable-local-smux \
@@ -480,6 +479,7 @@
 	--with-persistent-directory="/var/lib/net-snmp" \
 	--enable-ucd-snmp-compatibility \
 	--enable-ipv6 \
+	%{!?debug:--disable-debugging} \
 	--with%{!?with_rpm:out}-rpm
 
 %{__make} -j1
@@ -805,6 +805,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172  2011/03/16 16:26:43  arekm
+- up to 5.6.1
+
 Revision 1.171  2011/01/27 23:00:07  glen
 - upstart hook
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-rpm-implicit-libs.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-use-rpm-hrmib.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.171&r2=1.172&f=u

