packages: net-snmp/net-snmp-config-noflags.patch, net-snmp/net-snmp-link.pa...
qboosh
qboosh at pld-linux.org
Sun Oct 24 22:33:06 CEST 2010
Author: qboosh Date: Sun Oct 24 20:33:06 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.6
- updated config-noflags,link,use-rpm-hrmib patches
- removed obsolete missing-bcast,lm_sensors_3,tcp-pid,loadave-writable patches
- added nodebug patch (fixes build with --disable-debugging)
---- Files affected:
packages/net-snmp:
net-snmp-config-noflags.patch (1.5 -> 1.6) , net-snmp-link.patch (1.12 -> 1.13) , net-snmp-use-rpm-hrmib.patch (1.3 -> 1.4) , net-snmp.spec (1.166 -> 1.167) , net-snmp-5.5-missing-bcast.patch (1.1 -> NONE) (REMOVED), net-snmp-5.5-tcp-pid.patch (1.1 -> NONE) (REMOVED), net-snmp-lm_sensors_3.patch (1.3 -> NONE) (REMOVED), net-snmp-loadave-writable.patch (1.8 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/net-snmp/net-snmp-config-noflags.patch
diff -u packages/net-snmp/net-snmp-config-noflags.patch:1.5 packages/net-snmp/net-snmp-config-noflags.patch:1.6
--- packages/net-snmp/net-snmp-config-noflags.patch:1.5 Wed May 12 14:48:37 2010
+++ packages/net-snmp/net-snmp-config-noflags.patch Sun Oct 24 22:33:01 2010
@@ -1,15 +1,15 @@
---- net-snmp-5.2.1/net-snmp-config.in.orig 2005-01-05 16:12:52.000000000 +0100
-+++ net-snmp-5.2.1/net-snmp-config.in 2005-02-26 14:58:33.779999232 +0100
+--- net-snmp-5.6/net-snmp-config.in.orig 2010-05-30 22:19:04.000000000 +0200
++++ net-snmp-5.6/net-snmp-config.in 2010-10-24 10:12:12.899734339 +0200
@@ -46,7 +46,7 @@
includedir=@includedir@
libdir=@libdir@
datarootdir=@datarootdir@
-NSC_LDFLAGS="@LDFLAGS@"
+NSC_LDFLAGS=""
+ NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
NSC_INCLUDEDIR=${includedir}
NSC_LIBDIR=-L${libdir}
- NSC_LIBS="@LIBS@"
-@@ -89,10 +89,10 @@
+@@ -124,10 +124,10 @@
;;
#################################################### compile
--base-cflags)
@@ -22,7 +22,7 @@
;;
--srcdir)
echo $NSC_SRCDIR
-@@ -445,7 +445,7 @@
+@@ -585,7 +585,7 @@
echo "Ack. Can't create $tmpfile."
exit 1
fi
================================================================
Index: packages/net-snmp/net-snmp-link.patch
diff -u packages/net-snmp/net-snmp-link.patch:1.12 packages/net-snmp/net-snmp-link.patch:1.13
--- packages/net-snmp/net-snmp-link.patch:1.12 Sun Jun 6 09:33:47 2010
+++ packages/net-snmp/net-snmp-link.patch Sun Oct 24 22:33:01 2010
@@ -1,27 +1,25 @@
---- net-snmp-5.4.1/agent/Makefile.in.orig 2007-07-05 01:26:56.000000000 +0200
-+++ net-snmp-5.4.1/agent/Makefile.in 2007-09-08 16:50:07.310018380 +0200
-@@ -74,8 +74,8 @@
+--- net-snmp-5.6/agent/Makefile.in.orig 2010-06-08 23:05:11.000000000 +0200
++++ net-snmp-5.6/agent/Makefile.in 2010-10-24 10:33:36.007741043 +0200
+@@ -108,7 +108,7 @@
#
# how to build it info
#
-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
--HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS = $(top_builddir)/snmplib/libnetsnmp.la
-+HELPERLIB = $(top_builddir)/agent/helpers/libnetsnmphelpers.la
AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
-@@ -143,11 +143,11 @@
+@@ -249,11 +249,11 @@
libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
-- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
-+ $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
+- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
++ $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
$(RANLIB) $(AGENTLIB)
- libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
-- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
-+ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
+- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
++ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
$(RANLIB) $(MIBLIB)
agentlib: $(AGENTLIB)
@@ -59,9 +57,9 @@
installsubdirlibs:
@if test "$(SUBDIRS)" != ""; then \
---- net-snmp-5.4.1/snmplib/Makefile.in.orig 2007-06-18 23:34:43.000000000 +0200
-+++ net-snmp-5.4.1/snmplib/Makefile.in 2007-09-08 16:48:42.425181069 +0200
-@@ -128,7 +128,6 @@
+--- net-snmp-5.6/snmplib/Makefile.in.orig 2010-05-27 06:06:32.000000000 +0200
++++ net-snmp-5.6/snmplib/Makefile.in 2010-10-24 10:35:59.615743558 +0200
+@@ -134,7 +134,6 @@
# libraries
INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
@@ -69,25 +67,16 @@
#
# Things to build
-@@ -191,10 +190,6 @@
- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
- $(RANLIB) $@
-
--libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
-- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
-- $(RANLIB) $@
--
- #
- # internal test objects
- #
---- net-snmp-5.5/snmplib/Makefile.in~ 2010-06-05 20:17:39.941541617 +0200
-+++ net-snmp-5.5/snmplib/Makefile.in 2010-06-06 09:25:54.332457357 +0200
-@@ -194,7 +194,7 @@
+@@ -200,11 +199,7 @@
# how to build the libraries.
libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
-- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
-+ $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
+- $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
+- $(RANLIB) $@
+-
+-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
+- $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
++ $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
$(RANLIB) $@
#
================================================================
Index: packages/net-snmp/net-snmp-use-rpm-hrmib.patch
diff -u packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.3 packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.4
--- packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.3 Wed May 12 14:48:37 2010
+++ packages/net-snmp/net-snmp-use-rpm-hrmib.patch Sun Oct 24 22:33:01 2010
@@ -11,9 +11,9 @@
void
init_hr_swinst(void)
{
---- net-snmp-5.5/configure.d/config_os_libs~ 2010-05-12 14:31:17.751301337 +0200
-+++ net-snmp-5.5/configure.d/config_os_libs 2010-05-12 14:34:11.694627717 +0200
-@@ -261,20 +261,34 @@
+--- 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
+@@ -425,20 +425,34 @@
# RPM checks
#
##
@@ -28,55 +28,51 @@
- else
- with_rpm=no
- fi
--fi
--
- #
-+# check if we can use rpm hrmib export
-+if test "$with_rpm" != "no" ; then
-+ AC_PATH_PROG([RPM], rpm)
-+ if test -n "$RPM"; then
-+ changequote(, )
-+ RPM_HRMIB_PATH=$($RPM -E %{_hrmib_path} | sed -e 's,/[^/]\+$,,')
-+ changequote([, ])
-+ if test -n "$RPM_HRMIB_PATH"; then
-+ AC_DEFINE_UNQUOTED([RPM_HRMIB_PATH], ["$RPM_HRMIB_PATH"], [Directory where RPM exports packages hrmib information])
-+ fi
-+ fi
-+fi
-+# otherwise try binary linkin
-+if test -z "$RPM_HRMIB_PATH"; then
-+ AC_CHECK_HEADERS(rpm/rpmlib.h rpm/header.h)
-+
-+ AC_CHECK_HEADER(rpm/rpmlib.h,rpmlib_h=yes,rpmlib_h=no)
-+ AC_CHECK_HEADER(rpm/header.h,rpmheader_h=yes,rpmheader_h=no)
-+
-+ if test "x$rpmheader_h" = "xno" -o "x$rpmlib_h" = "xno" ; then
-+ if test "x$with_rpm" = "xyes" ; then
-+ AC_MSG_ERROR([Could not find either the RPM header files needed and was specifically asked to use RPM support])
-+ else
-+ with_rpm=no
-+ fi
-+ fi
++#
++# check if we can use rpm hrmib export
++if test "$with_rpm" != "no" ; then
++ AC_PATH_PROG([RPM], rpm)
++ if test -n "$RPM"; then
++ changequote(, )
++ RPM_HRMIB_PATH=$($RPM -E %{_hrmib_path} | sed -e 's,/[^/]\+$,,')
++ changequote([, ])
++ if test -n "$RPM_HRMIB_PATH"; then
++ AC_DEFINE_UNQUOTED([RPM_HRMIB_PATH], ["$RPM_HRMIB_PATH"], [Directory where RPM exports packages hrmib information])
++ fi
++ fi
+ fi
++# otherwise try binary linkin
++if test -z "$RPM_HRMIB_PATH"; then
++ AC_CHECK_HEADERS(rpm/rpmlib.h rpm/header.h)
+
++ AC_CHECK_HEADER(rpm/rpmlib.h,rpmlib_h=yes,rpmlib_h=no)
++ AC_CHECK_HEADER(rpm/header.h,rpmheader_h=yes,rpmheader_h=no)
++
++ if test "x$rpmheader_h" = "xno" -o "x$rpmlib_h" = "xno" ; then
++ if test "x$with_rpm" = "xyes" ; then
++ AC_MSG_ERROR([Could not find either the RPM header files needed and was specifically asked to use RPM support])
++ else
++ with_rpm=no
++ fi
++ fi
+
+-#
# rpm libraries only needed for the host resources mib software
# installed tables (on linux in particular)
#
-@@ -319,7 +333,14 @@
- LMIBLIBS="$_rpmlibs $LMIBLIBS"
- CFLAGS="$CFLAGS -I/usr/include/rpm"
- ],, $LMIBLIBS, _rpmlibs)
--fi
-+ OLDLIBS=$LIBS
-+ LIBS=$LMIBLIBS
-+ AC_CHECK_FUNCS(rpmGetPath)
-+ LIBS=$OLDLIBS
+@@ -490,6 +504,12 @@
+ AC_DEFINE([_RPM_4_4_COMPAT], [], [Define if you have RPM 4.6 or newer to turn on legacy API]),
+ [[#include <rpm/rpmlib.h>]]
+ )
+
++ OLDLIBS=$LIBS
++ LIBS=$LMIBLIBS
++ AC_CHECK_FUNCS([rpmGetPath])
++ LIBS=$OLDLIBS
+ fi
-+
-+fi # with rpmlib
+ fi
##
- # mysql
--- 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 @@
================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.166 packages/net-snmp/net-snmp.spec:1.167
--- packages/net-snmp/net-snmp.spec:1.166 Mon Aug 30 12:10:12 2010
+++ packages/net-snmp/net-snmp.spec Sun Oct 24 22:33:01 2010
@@ -19,7 +19,7 @@
%undefine with_lm_sensors
%endif
-%define so_version 20
+%define so_version 25
%include /usr/lib/rpm/macros.perl
Summary: A collection of SNMP protocol tools
@@ -29,12 +29,12 @@
Summary(ru.UTF-8): Набор утилит для протокола SNMP от UC-Davis
Summary(uk.UTF-8): Набір утиліт для протоколу SNMP від UC-Davis
Name: net-snmp
-Version: 5.5
-Release: 5
+Version: 5.6
+Release: 1
License: BSD-like
Group: Networking/Daemons
-Source0: http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 5b2551e7bd024fbbee84dca22a5f13a1
+Source0: http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
+# Source0-md5: 89b3a7a77e68daef925abee43a3f7018
Source1: %{name}d.init
Source2: %{name}d.conf
Source3: %{name}d.sysconfig
@@ -56,11 +56,8 @@
Patch10: %{name}-lvalue.patch
Patch11: %{name}-defaultconfig.patch
Patch12: %{name}-use-rpm-hrmib.patch
-Patch13: net-snmp-5.5-missing-bcast.patch
-Patch14: %{name}-lm_sensors_3.patch
-Patch15: net-snmp-5.5-tcp-pid.patch
-Patch17: %{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch19: %{name}-loadave-writable.patch
+Patch13: %{name}-TCP_STATS_CACHE_TIMEOUT.patch
+Patch14: %{name}-nodebug.patch
URL: http://www.net-snmp.org/
BuildRequires: autoconf >= 2.61-3
BuildRequires: automake
@@ -436,9 +433,6 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
-%patch17 -p1
-%patch19 -p1
%build
%{__libtoolize}
@@ -632,11 +626,11 @@
%defattr(644,root,root,755)
%dir %{_sysconfdir}/snmp
%dir %{_datadir}/snmp
-%attr(755,root,root) %{_libdir}/libnetsnmp.so.*.*
-%attr(755,root,root) %{_libdir}/libnetsnmpagent.so.*.*
-%attr(755,root,root) %{_libdir}/libnetsnmphelpers.so.*.*
-%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so.*.*
-%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so.*.*
+%attr(755,root,root) %{_libdir}/libnetsnmp.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnetsnmpagent.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnetsnmphelpers.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnetsnmpmibs.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnetsnmptrapd.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnetsnmp.so.%{so_version}
%attr(755,root,root) %ghost %{_libdir}/libnetsnmpagent.so.%{so_version}
%attr(755,root,root) %ghost %{_libdir}/libnetsnmphelpers.so.%{so_version}
@@ -669,7 +663,11 @@
%if %{with static_libs}
%files static
%defattr(644,root,root,755)
-%{_libdir}/libnet*.a
+%{_libdir}/libnetsnmp.a
+%{_libdir}/libnetsnmpagent.a
+%{_libdir}/libnetsnmphelpers.a
+%{_libdir}/libnetsnmpmibs.a
+%{_libdir}/libnetsnmptrapd.a
%endif
%files compat-devel
@@ -702,6 +700,7 @@
%files utils
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/agentxtrap
%attr(755,root,root) %{_bindir}/encode_keychange
%attr(755,root,root) %{_bindir}/snmpbulkget
%attr(755,root,root) %{_bindir}/snmpbulkwalk
@@ -720,6 +719,7 @@
%attr(755,root,root) %{_bindir}/snmpusm
%attr(755,root,root) %{_bindir}/snmpvacm
%attr(755,root,root) %{_bindir}/snmpwalk
+%{_mandir}/man1/agentxtrap.1*
%{_mandir}/man1/encode_keychange.1*
%{_mandir}/man1/snmpbulkget.1*
%{_mandir}/man1/snmpbulkwalk.1*
@@ -770,9 +770,12 @@
%files utils-perl
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fixproc
+%attr(755,root,root) %{_bindir}/net-snmp-cert
+%attr(755,root,root) %{_bindir}/snmp-bridge-mib
%attr(755,root,root) %{_bindir}/snmpcheck
%attr(755,root,root) %{_bindir}/traptoemail
%{_mandir}/man1/fixproc.1*
+%{_mandir}/man1/snmp-bridge-mib.1*
%{_mandir}/man1/traptoemail.1*
%endif
@@ -804,6 +807,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.167 2010/10/24 20:33:01 qboosh
+- updated to 5.6
+- updated config-noflags,link,use-rpm-hrmib patches
+- removed obsolete missing-bcast,lm_sensors_3,tcp-pid,loadave-writable patches
+- added nodebug patch (fixes build with --disable-debugging)
+
Revision 1.166 2010/08/30 10:10:12 glen
- release 5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-config-noflags.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-link.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-use-rpm-hrmib.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.166&r2=1.167&f=u
More information about the pld-cvs-commit
mailing list