packages: net-snmp/net-snmp-config-noflags.patch, net-snmp/net-snmp-rpm-imp...
arekm
arekm at pld-linux.org
Sat Jul 30 21:39:45 CEST 2011
Author: arekm Date: Sat Jul 30 19:39:45 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.7
---- Files affected:
packages/net-snmp:
net-snmp-config-noflags.patch (1.6 -> 1.7) , net-snmp-rpm-implicit-libs.patch (1.5 -> 1.6) , net-snmp-use-rpm-hrmib.patch (1.7 -> 1.8) , net-snmp.spec (1.179 -> 1.180)
---- Diffs:
================================================================
Index: packages/net-snmp/net-snmp-config-noflags.patch
diff -u packages/net-snmp/net-snmp-config-noflags.patch:1.6 packages/net-snmp/net-snmp-config-noflags.patch:1.7
--- packages/net-snmp/net-snmp-config-noflags.patch:1.6 Sun Oct 24 22:33:01 2010
+++ packages/net-snmp/net-snmp-config-noflags.patch Sat Jul 30 21:39:39 2011
@@ -6,9 +6,9 @@
datarootdir=@datarootdir@
-NSC_LDFLAGS="@LDFLAGS@"
+NSC_LDFLAGS=""
+
+ NSC_LIBS="@LIBS@"
NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
- NSC_INCLUDEDIR=${includedir}
- NSC_LIBDIR=-L${libdir}
@@ -124,10 +124,10 @@
;;
#################################################### compile
================================================================
Index: packages/net-snmp/net-snmp-rpm-implicit-libs.patch
diff -u packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.5 packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.6
--- packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.5 Wed Mar 16 17:26:43 2011
+++ packages/net-snmp/net-snmp-rpm-implicit-libs.patch Sat Jul 30 21:39:39 2011
@@ -1,20 +1,11 @@
---- 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
+--- net-snmp-5.7/configure.d/config_os_libs1~ 2011-07-02 00:35:46.000000000 +0200
++++ net-snmp-5.7/configure.d/config_os_libs1 2011-07-30 21:24:38.780738542 +0200
+@@ -33,9 +33,6 @@
+ # FWIW librpm.la, librpmio.la, and libpopt.la have correct dependencies.
+ _rpmlibs=""
-- # two variants of db1 need checking.
-- NETSNMP_SEARCH_LIBS(dbopen, [db1 db],,, $LMIBLIBS, _rpmlibs)
--
-- # two variants of db3 need checking.
-- NETSNMP_SEARCH_LIBS(db_create, [db-3.1 db-3.0],,, $LMIBLIBS, _rpmlibs)
--
-- # rpm-3.0.5 and later needs popt.
-- NETSNMP_SEARCH_LIBS(poptParseArgvString, popt,,, $LMIBLIBS, _rpmlibs)
--
- # rpm-4.0.x needs rpmio.
-- NETSNMP_SEARCH_LIBS(Fopen, rpmio,,, $LMIBLIBS, _rpmlibs)
+- NETSNMP_SEARCH_LIBS(rpmGetPath, rpmio,,, $LMIBLIBS, _rpmlibs)
-
# rpm-4.0.3 librpmdb actually contains what we need.
NETSNMP_SEARCH_LIBS(rpmdbOpen, rpmdb,,, $LMIBLIBS, _rpmlibs)
================================================================
Index: packages/net-snmp/net-snmp-use-rpm-hrmib.patch
diff -u packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.7 packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.8
--- packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.7 Wed Mar 16 17:26:43 2011
+++ packages/net-snmp/net-snmp-use-rpm-hrmib.patch Sat Jul 30 21:39:39 2011
@@ -115,12 +115,12 @@
/*
* all platforms use this generic code
*/
-@@ -24,7 +28,7 @@
- config_require(host/data_access/swinst_darwin)
+@@ -29,7 +29,7 @@
+ config_require(host/data_access/swinst_apt)
#elif defined( HAVE_LIBRPM ) && defined( linux )
config_require(host/data_access/swinst_rpm)
--#elif defined( HAVE_PKGLOCS_H ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 )
-+#elif defined( HAVE_PKGLOCS_H ) || defined( RPM_HRMIB_PATH ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 )
+-#elif defined( HAVE_PKGLOCS_H ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 ) || defined( linux )
++#elif defined( HAVE_PKGLOCS_H ) || defined( RPM_HRMIB_PATH ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 ) || defined( linux )
config_require(host/data_access/swinst_pkginfo)
#else
config_warning(This platform does not yet support hrSWInstalledTable rewrites)
================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.179 packages/net-snmp/net-snmp.spec:1.180
--- packages/net-snmp/net-snmp.spec:1.179 Sat Jul 30 15:39:20 2011
+++ packages/net-snmp/net-snmp.spec Sat Jul 30 21:39:39 2011
@@ -19,7 +19,7 @@
%undefine with_lm_sensors
%endif
-%define so_version 25
+%define so_version 30
%include /usr/lib/rpm/macros.perl
Summary: A collection of SNMP protocol tools
Summary(es.UTF-8): Agente SNMP de la UCD
@@ -28,12 +28,12 @@
Summary(ru.UTF-8): Набор утилит для протокола SNMP от UC-Davis
Summary(uk.UTF-8): Набір утиліт для протоколу SNMP від UC-Davis
Name: net-snmp
-Version: 5.6.1.1
-Release: 3
+Version: 5.7
+Release: 1
License: BSD-like
Group: Networking/Daemons
Source0: http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 79e2b9cac947567a01ae2cc67ad8fe53
+# Source0-md5: 1038e960d6d616c64c0979180daf0e19
Source1: %{name}d.init
Source2: %{name}d.conf
Source3: %{name}d.sysconfig
@@ -814,6 +814,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.180 2011/07/30 19:39:39 arekm
+- up to 5.7
+
Revision 1.179 2011/07/30 13:39:20 glen
- upstart: SERVICE=syslog -> SERVICE_syslog=y
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-config-noflags.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-rpm-implicit-libs.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-use-rpm-hrmib.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.179&r2=1.180&f=u
More information about the pld-cvs-commit
mailing list