[net-snmp: 1/2] Update to net-snmp-5.7

[Jan Šafránek]

commit 285ab2f15b2ec9a3e554bac68188ef86767c9cea
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Thu Jul 7 15:03:51 2011 +0200

    Update to net-snmp-5.7

 .gitignore                         |    1 +
 net-snmp-5.5-perl-linking.patch    |   20 +++---
 net-snmp-5.6.1-find-librpm.patch   |   65 --------------------
 net-snmp-5.6.1-rpm-modernize.patch |  114 ------------------------------------
 net-snmp.spec                      |   22 ++++---
 sources                            |    2 +-
 6 files changed, 25 insertions(+), 199 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d221326..600dd69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 net-snmp-5.5.tar.gz
 /net-snmp-5.6.tar.gz
 /net-snmp-5.6.1.tar.gz
+/net-snmp-5.7.tar.gz
diff --git a/net-snmp-5.5-perl-linking.patch b/net-snmp-5.5-perl-linking.patch
index cbf36af..ceb6363 100644
--- a/net-snmp-5.5-perl-linking.patch
+++ b/net-snmp-5.5-perl-linking.patch
@@ -2,15 +2,15 @@
 
 Remove rpath from net-snmp-config --agent-libs output.
 
-diff -up net-snmp-5.5/net-snmp-config.in.jsaf net-snmp-5.5/net-snmp-config.in
---- net-snmp-5.5/net-snmp-config.in.jsaf	2009-04-04 12:07:39.000000000 +0200
-+++ net-snmp-5.5/net-snmp-config.in	2010-08-19 16:08:28.825276858 +0200
+diff -up net-snmp-5.7/net-snmp-config.in.perl-linking net-snmp-5.7/net-snmp-config.in
+--- net-snmp-5.7/net-snmp-config.in.perl-linking	2011-07-02 00:35:46.000000000 +0200
++++ net-snmp-5.7/net-snmp-config.in	2011-07-07 13:30:01.635798817 +0200
 @@ -50,7 +50,7 @@ NSC_LDFLAGS="@LDFLAGS@"
- NSC_INCLUDEDIR=${includedir}
- NSC_LIBDIR=-L${libdir}
+ 
  NSC_LIBS="@LIBS@"
--NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
-+NSC_AGENTLIBS="@AGENTLIBS@"
- NSC_PREFIX=$prefix
- NSC_EXEC_PREFIX=$exec_prefix
- NSC_SRCDIR=@srcdir@
+ NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
+-NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
++NSC_LAGENTLIBS="@LAGENTLIBS@"
+ NSC_LMIBLIBS="@LMIBLIBS@"
+ 
+ NSC_INCLUDEDIR=${includedir}
diff --git a/net-snmp.spec b/net-snmp.spec
index fc4efcb..f68841a 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -10,8 +10,8 @@
 
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
-Version: 5.6.1
-Release: 7%{?dist}
+Version: 5.7
+Release: 1%{?dist}
 Epoch: 1
 
 License: BSD
@@ -34,9 +34,7 @@ Patch4: net-snmp-5.5-include-struct.patch
 Patch5: net-snmp-5.5-apsl-copying.patch
 Patch6: net-snmp-5.5-perl-linking.patch
 Patch7: net-snmp-5.6-test-debug.patch
-Patch8: net-snmp-5.6.1-find-librpm.patch
-Patch9: net-snmp-5.6.1-rpm-modernize.patch
-Patch10: net-snmp-5.6.1-mysql.patch
+Patch8: net-snmp-5.6.1-mysql.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -168,10 +166,12 @@ Net-SNMP toolkit library.
 %patch4 -p1 -b .include-struct
 %patch5 -p1 -b .apsl
 %patch6 -p1 -b .perl-linking
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1 -b .mysql
+# Following patch removes -Wl,-rpath,/usr/lib64/perl5/CORE from 
+# net-snmp-config --agent-libs output. As for Fedora 15, this
+# rpath is needed to link subagents, because libperl.so is in
+# non-default directory - so leave the rpath there.
+#%patch7 -p1
+%patch8 -p1 -b .mysql
 
 %ifarch sparc64
 # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@@ -421,6 +421,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %attr(0644,root,root) %{_mandir}/man1/snmp-bridge-mib.1*
 %{perl_vendorarch}/*SNMP*
 %{perl_vendorarch}/auto/*SNMP*
+%{perl_vendorarch}/auto/Bundle/*SNMP*
 
 %files python
 %defattr(-,root,root,-)
@@ -441,6 +442,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Thu Jul  7 2011 Jan Safranek <jsafrane at redhat.com> - 1:5.7-1
+- updated to net-snmp-5.7
+
 * Wed Mar 23 2011 Jan Safranek <jsafrane at redhat.com> - 1:5.6.1-7
 - Rebuild against newer mysql
 
diff --git a/sources b/sources
index f06411b..29eade4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4e30ead5783b0bb1d280172c6095ea4  net-snmp-5.6.1.tar.gz
+1038e960d6d616c64c0979180daf0e19  net-snmp-5.7.tar.gz