packages: net-snmp/net-snmp-acfix.patch, net-snmp/net-snmp-config-noflags.p...
arekm
arekm at pld-linux.org
Wed May 12 14:48:43 CEST 2010
Author: arekm Date: Wed May 12 12:48:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- partial update to 5.5
---- Files affected:
packages/net-snmp:
net-snmp-acfix.patch (1.13 -> 1.14) , net-snmp-config-noflags.patch (1.4 -> 1.5) , net-snmp-link.patch (1.10 -> 1.11) , net-snmp-lm_sensors_3.patch (1.1 -> 1.2) , net-snmp-loadave-writable.patch (1.6 -> 1.7) , net-snmp-rpm-implicit-libs.patch (1.3 -> 1.4) , net-snmp-use-rpm-hrmib.patch (1.2 -> 1.3) , net-snmp.spec (1.159 -> 1.160) , net-snmp-netlink.patch (1.10 -> NONE) (REMOVED), net-snmp-snmpnetstat-getbulk.patch (1.7 -> NONE) (REMOVED), net-snmp-src-dst-confusion.patch (1.1 -> NONE) (REMOVED), net-snmp-subcontainer.patch (1.1 -> NONE) (REMOVED), vmstat-vserver-noise.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/net-snmp/net-snmp-acfix.patch
diff -u packages/net-snmp/net-snmp-acfix.patch:1.13 packages/net-snmp/net-snmp-acfix.patch:1.14
--- packages/net-snmp/net-snmp-acfix.patch:1.13 Wed Nov 14 20:33:50 2007
+++ packages/net-snmp/net-snmp-acfix.patch Wed May 12 14:48:37 2010
@@ -1,5 +1,5 @@
---- net-snmp-5.4.1/configure.in 2007-09-08 16:13:11.531748373 +0200
-+++ net-snmp-5.4.1-ac/configure.in 2007-11-14 20:58:16.361317122 +0200
+--- net-snmp-5.4.1/configure.ac 2007-09-08 16:13:11.531748373 +0200
++++ net-snmp-5.4.1-ac/configure.ac 2007-11-14 20:58:16.361317122 +0200
@@ -1726,16 +1726,18 @@
rebuilt_new_with_security=
already_checked_krb5=no
================================================================
Index: packages/net-snmp/net-snmp-config-noflags.patch
diff -u packages/net-snmp/net-snmp-config-noflags.patch:1.4 packages/net-snmp/net-snmp-config-noflags.patch:1.5
--- packages/net-snmp/net-snmp-config-noflags.patch:1.4 Sat Feb 26 16:21:20 2005
+++ packages/net-snmp/net-snmp-config-noflags.patch Wed May 12 14:48:37 2010
@@ -1,14 +1,14 @@
--- 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
-@@ -31,7 +31,7 @@
- exec_prefix=@exec_prefix@
+@@ -46,7 +46,7 @@
includedir=@includedir@
libdir=@libdir@
+ datarootdir=@datarootdir@
-NSC_LDFLAGS="@LDFLAGS@"
+NSC_LDFLAGS=""
NSC_INCLUDEDIR=${includedir}
NSC_LIBDIR=-L${libdir}
- NSC_LIBS="@LIBS@ @WRAPLIBS@"
+ NSC_LIBS="@LIBS@"
@@ -89,10 +89,10 @@
;;
#################################################### compile
================================================================
Index: packages/net-snmp/net-snmp-link.patch
diff -u packages/net-snmp/net-snmp-link.patch:1.10 packages/net-snmp/net-snmp-link.patch:1.11
--- packages/net-snmp/net-snmp-link.patch:1.10 Sat Sep 8 23:01:02 2007
+++ packages/net-snmp/net-snmp-link.patch Wed May 12 14:48:37 2010
@@ -20,7 +20,7 @@
$(RANLIB) $(AGENTLIB)
libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
-- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS)
+- $(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)
$(RANLIB) $(MIBLIB)
================================================================
Index: packages/net-snmp/net-snmp-lm_sensors_3.patch
diff -u packages/net-snmp/net-snmp-lm_sensors_3.patch:1.1 packages/net-snmp/net-snmp-lm_sensors_3.patch:1.2
--- packages/net-snmp/net-snmp-lm_sensors_3.patch:1.1 Sat May 3 23:13:01 2008
+++ packages/net-snmp/net-snmp-lm_sensors_3.patch Wed May 12 14:48:37 2010
@@ -2,19 +2,6 @@
Source: upstream, svn diff -r 16736:16739
Reviewed-By: Jan Safranek <jsafrane at redhat.com>
-Index: configure
-===================================================================
---- configure (revision 16736)
-+++ configure (revision 16739)
-@@ -32628,7 +32628,7 @@
- fi
-
- # LM-SENSORS-MIB support
--echo " $module_list " | grep " ucd-snmp/lmSensors " > /dev/null
-+echo " $module_list " | $GREP -i "ucd-snmp/lmsensor" > /dev/null
- if test $? -eq 0 ; then
- { echo "$as_me:$LINENO: checking for sensors support" >&5
- echo $ECHO_N "checking for sensors support... $ECHO_C" >&6; }
Index: include/net-snmp/agent/hardware/sensors.h
===================================================================
--- include/net-snmp/agent/hardware/sensors.h (revision 0)
@@ -68,19 +55,6 @@
+netsnmp_sensor_info *sensor_by_name( char *, int );
+NetsnmpCacheLoad netsnmp_sensor_load;
+NetsnmpCacheFree netsnmp_sensor_free;
-Index: configure.in
-===================================================================
---- configure.in (revision 16736)
-+++ configure.in (revision 16739)
-@@ -2885,7 +2885,7 @@
- fi
-
- # LM-SENSORS-MIB support
--echo " $module_list " | grep " ucd-snmp/lmSensors " > /dev/null
-+echo " $module_list " | $GREP -i "ucd-snmp/lmsensor" > /dev/null
- if test $? -eq 0 ; then
- AC_MSG_CHECKING([for sensors support])
- case $target_os in
Index: agent/mibgroup/ucd-snmp/lmsensorsMib.c
===================================================================
--- agent/mibgroup/ucd-snmp/lmsensorsMib.c (revision 0)
================================================================
Index: packages/net-snmp/net-snmp-loadave-writable.patch
diff -u packages/net-snmp/net-snmp-loadave-writable.patch:1.6 packages/net-snmp/net-snmp-loadave-writable.patch:1.7
--- packages/net-snmp/net-snmp-loadave-writable.patch:1.6 Wed Jan 13 17:32:44 2010
+++ packages/net-snmp/net-snmp-loadave-writable.patch Wed May 12 14:48:37 2010
@@ -1,172 +1,11 @@
-This patch makes "load X Y Z" snmpsettable via snmpset,
-
-it behaves the same as sysName.0, once written in snmpd.conf, it becames
-readonly.
-
-Signed-off-by: Elan Ruusamäe <glen at delfi.ee>
-Upstream-Tracker: https://sourceforge.net/tracker/?func=detail&aid=2931446&group_id=12694&atid=312694
-
---- net-snmp-5.4.2.1/agent/mibgroup/ucd-snmp/loadave.c~ 2009-12-21 21:00:10.094254079 +0200
-+++ net-snmp-5.4.2.1/agent/mibgroup/ucd-snmp/loadave.c 2009-12-21 22:02:45.398903148 +0200
-@@ -135,7 +135,19 @@
- #include "util_funcs.h"
- #include "kernel.h"
-
--double maxload[3];
-+static double maxload[3];
-+static int laConfigSet = 0;
-+
-+static int
-+loadave_store_config(int a, int b, void *c, void *d)
-+{
-+ char line[SNMP_MAXBUF_SMALL];
-+ if (laConfigSet > 0) {
-+ snprintf(line, SNMP_MAXBUF_SMALL, "pload %.02f %.02f %.02f", maxload[0], maxload[1], maxload[2]);
-+ snmpd_store_config(line);
-+ }
-+ return SNMPERR_SUCCESS;
-+}
-
- void
- init_loadave(void)
-@@ -152,7 +164,7 @@
- {ERRORNAME}},
- {LOADAVE, ASN_OCTET_STR, RONLY, var_extensible_loadave, 1,
- {LOADAVE}},
-- {LOADMAXVAL, ASN_OCTET_STR, RONLY, var_extensible_loadave, 1,
-+ {LOADMAXVAL, ASN_OCTET_STR, RWRITE, var_extensible_loadave, 1,
- {LOADMAXVAL}},
- {LOADAVEINT, ASN_INTEGER, RONLY, var_extensible_loadave, 1,
- {LOADAVEINT}},
-@@ -179,9 +191,22 @@
- REGISTER_MIB("ucd-snmp/loadave", extensible_loadave_variables,
- variable2, loadave_variables_oid);
-
-+ laConfigSet = 0;
-+
- snmpd_register_config_handler("load", loadave_parse_config,
- loadave_free_config,
- "max1 [max5] [max15]");
-+
-+ snmpd_register_config_handler("pload",
-+ loadave_parse_config, NULL, NULL);
-+
-+
-+ /*
-+ * we need to be called back later
-+ */
-+ snmp_register_callback(SNMP_CALLBACK_LIBRARY, SNMP_CALLBACK_STORE_DATA,
-+ loadave_store_config, NULL);
-+
- }
-
- void
-@@ -189,6 +214,25 @@
- {
- int i;
-
-+ if (strcmp(token, "pload") == 0) {
-+ if (laConfigSet < 0) {
-+ snmp_log(LOG_WARNING,
-+ "ignoring attempted override of read-only load\n");
-+ return;
-+ } else {
-+ laConfigSet++;
-+ }
-+ } else {
-+ if (laConfigSet > 0) {
-+ snmp_log(LOG_WARNING,
-+ "ignoring attempted override of read-only load\n");
-+ /*
-+ * Fall through and copy in this value.
-+ */
-+ }
-+ laConfigSet = -1;
-+ }
-+
- for (i = 0; i <= 2; i++) {
- if (cptr != NULL)
- maxload[i] = atof(cptr);
-@@ -309,6 +353,71 @@
- return 0;
- }
-
-+static int
-+write_laConfig(int action,
-+ u_char * var_val,
-+ u_char var_val_type,
-+ size_t var_val_len,
-+ u_char * statP, oid * name, size_t name_len)
-+{
-+ static double laConfig = 0;
-+
-+ switch (action) {
-+ case RESERVE1: /* Check values for acceptability */
-+ if (var_val_type != ASN_OCTET_STR) {
-+ DEBUGMSGTL(("ucd-snmp/loadave",
-+ "write to laConfig not ASN_OCTET_STR\n"));
-+ return SNMP_ERR_WRONGTYPE;
-+ }
-+ if (var_val_len > 8 || var_val_len <= 0) {
-+ DEBUGMSGTL(("ucd-snmp/loadave",
-+ "write to laConfig: bad length\n"));
-+ return SNMP_ERR_WRONGLENGTH;
-+ }
-+
-+ if (laConfigSet < 0) {
-+ /*
-+ * The object is set in a read-only configuration file.
-+ */
-+ return SNMP_ERR_NOTWRITABLE;
-+ }
-+ break;
-+
-+ case RESERVE2: /* Allocate memory and similar resources */
-+ {
-+ u_char buf[8];
-+ int old_errno = errno;
-+ double val;
-+ char *endp;
-+
-+ strncpy(buf, var_val, var_val_len);
-+ buf[var_val_len] = '\0';
-+ val = strtod(buf, &endp);
-+
-+ if (errno == ERANGE || *endp != '\0' || val < 0 || val > 65536.00) {
-+ errno = old_errno;
-+ DEBUGMSGTL(("ucd-snmp/loadave",
-+ "write to laConfig: invalid value\n"));
-+ return SNMP_ERR_WRONGVALUE;
-+ }
-+
-+ errno = old_errno;
-+
-+ laConfig = val;
-+ }
-+ break;
-+
-+ case COMMIT:
-+ {
-+ int idx = name[name_len - 1] - 1;
-+ maxload[idx] = laConfig;
-+ laConfigSet = 1;
-+ }
-+ }
-+
-+ return SNMP_ERR_NOERROR;
-+}
-+
- u_char *
- var_extensible_loadave(struct variable * vp,
- oid * name,
-@@ -328,6 +437,10 @@
- case MIBINDEX:
- long_ret = name[*length - 1];
- return ((u_char *) (&long_ret));
-+ case LOADMAXVAL:
-+ /* setup write method, but don't return yet */
-+ *write_method = write_laConfig;
-+ break;
- case ERRORNAME:
- sprintf(errmsg, "Load-%d", ((name[*length - 1] == 1) ? 1 :
- ((name[*length - 1] == 2) ? 5 : 15)));
+--- net-snmp-5.5/agent/mibgroup/ucd-snmp/loadave.c~ 2010-05-12 14:39:47.608334020 +0200
++++ net-snmp-5.5/agent/mibgroup/ucd-snmp/loadave.c 2010-05-12 14:40:38.068953645 +0200
+@@ -166,7 +166,7 @@
+ var_extensible_loadave, 1, {LOADAVE}},
+ {LOADMAXVAL, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+ var_extensible_loadave, 1, {LOADMAXVAL}},
+- {LOADAVEINT, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
++ {LOADAVEINT, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+ var_extensible_loadave, 1, {LOADAVEINT}},
+ #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
+ {LOADAVEFLOAT, ASN_OPAQUE_FLOAT, NETSNMP_OLDAPI_RONLY,
================================================================
Index: packages/net-snmp/net-snmp-rpm-implicit-libs.patch
diff -u packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.3 packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.4
--- packages/net-snmp/net-snmp-rpm-implicit-libs.patch:1.3 Mon Jan 9 01:03:23 2006
+++ packages/net-snmp/net-snmp-rpm-implicit-libs.patch Wed May 12 14:48:37 2010
@@ -1,24 +1,21 @@
-diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
---- net-snmp-5.3.org/configure.in 2005-12-28 18:20:56.000000000 +0100
-+++ net-snmp-5.3/configure.in 2006-01-09 00:57:24.173063750 +0100
-@@ -2396,20 +2396,6 @@
- ])
-
+--- 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
+@@ -310,18 +310,6 @@
+ NETSNMP_SEARCH_LIBS(BZ2_bzread, bz2,,, $LMIBLIBS, _rpmlibs)
+ fi
- # two variants of db1 need checking.
-- AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
-- AC_CHECK_LIB(db, dbopen, [_rpmlibs="-ldb $_rpmlibs"]))
+- NETSNMP_SEARCH_LIBS(dbopen, [db1 db],,, $LMIBLIBS, _rpmlibs)
-
- # two variants of db3 need checking.
-- AC_CHECK_LIB(db-3.1, db_create, [_rpmlibs="-ldb-3.1 $_rpmlibs"],
-- AC_CHECK_LIB(db-3.0, db_create, [_rpmlibs="-ldb-3.0 $_rpmlibs"]))
+- NETSNMP_SEARCH_LIBS(db_create, [db-3.1 db-3.0],,, $LMIBLIBS, _rpmlibs)
-
- # rpm-3.0.5 and later needs popt.
-- AC_CHECK_LIB(popt, poptParseArgvString, [_rpmlibs="-lpopt $_rpmlibs"])
+- NETSNMP_SEARCH_LIBS(poptParseArgvString, popt,,, $LMIBLIBS, _rpmlibs)
-
- # rpm-4.0.x needs rpmio.
-- AC_CHECK_LIB(rpmio, Fopen, [_rpmlibs="-lrpmio $_rpmlibs"],,$_rpmlibs)
+- NETSNMP_SEARCH_LIBS(Fopen, rpmio,,, $LMIBLIBS, _rpmlibs)
-
+ # rpm-4.0.3 librpmdb actually contains what we need.
+ NETSNMP_SEARCH_LIBS(rpmdbOpen, rpmdb,,, $LMIBLIBS, _rpmlibs)
# now check for rpm using the appropriate libraries.
- AC_CHECK_LIB(rpm, rpmGetFilesystemList,[
- AC_DEFINE(HAVE_LIBRPM)
================================================================
Index: packages/net-snmp/net-snmp-use-rpm-hrmib.patch
diff -u packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.2 packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.3
--- packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.2 Thu May 15 12:09:24 2008
+++ packages/net-snmp/net-snmp-use-rpm-hrmib.patch Wed May 12 14:48:37 2010
@@ -11,14 +11,14 @@
void
init_hr_swinst(void)
{
---- net-snmp-5.4.1/configure.in 2008-05-15 13:05:07.559306690 +0300
-+++ net-snmp-5.4.1.hrmib/configure.in 2008-05-15 13:04:24.684830570 +0300
-@@ -2768,25 +2768,41 @@
- fi
- ])
-
+--- 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 @@
+ # RPM checks
+ #
+ ##
-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)
-
@@ -28,82 +28,71 @@
- else
- with_rpm=no
- 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
+-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)
#
- if test "x$with_rpm" != "xno" && \
- echo " $module_list " | grep " host/hr_swinst " > /dev/null; then
-+
- # ARG. RPM is a real pain.
- # FWIW librpm.la, librpmio.la, and libpopt.la have correct dependencies.
- _rpmlibs=""
-@@ -2835,7 +2851,14 @@
- CFLAGS="$CFLAGS -I/usr/include/rpm"
- ],,-lrpm $_rpmlibs)
- ])
-+
-+ OLDLIBS=$LIBS
-+ LIBS=$LMIBLIBS
-+ AC_CHECK_FUNCS(rpmGetPath)
+@@ -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
- fi
++
++ fi
+
+fi # with rpmlib
-
- # libkvm
- AC_CHECK_LIB(kvm, kvm_read, [_libkvm="-lkvm"])
-@@ -3406,12 +3429,6 @@
- # table_array helper support
- AC_CHECK_HEADERS(search.h)
--# RPM subdirectory path (sigh)
--if test "x$with_rpm" != "xno" && \
-- echo " $module_list " | grep " host/hr_swinst " > /dev/null; then
-- AC_CHECK_HEADERS(rpm/rpmdb.h)
--fi
--
- # OpenBSD 2.6 needs netinet/in.h before netinet/in_pcb.h
- AC_MSG_CHECKING([[for netinet/in_pcb.h]])
- AC_CACHE_VAL(cv_have_netinet_in_pcb_h,
-@@ -3633,13 +3650,6 @@
- AC_CHECK_FUNCS(random lrand48 rand)
- AC_CHECK_FUNCS(execv system fork getpid strncasecmp sigalrm)
- AC_CHECK_FUNCS(lseek64 pread64)
+ ##
+ # 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 @@
+ # (Agent)
+ ##
+
+-# rpmGetPath check needs clean LIBS environment (Linux)
+-#
-if test "x$with_rpm" != "xno" && \
-- echo " $module_list " | grep " host/hr_swinst " > /dev/null; then
-- OLDLIBS=$LIBS
-- LIBS=$LMIBLIBS
-- AC_CHECK_FUNCS(rpmGetPath)
-- LIBS=$OLDLIBS
+- echo " $module_list " | $GREP " host/hr_swinst " > /dev/null; then
+- OLDLIBS=$LIBS
+- LIBS=$LMIBLIBS
+- AC_CHECK_FUNCS(rpmGetPath)
+- LIBS=$OLDLIBS
-fi
- AC_CHECK_FUNCS(getloadavg)
- AC_CHECK_FUNCS(getaddrinfo getipnodebyname gai_strerror)
+ # statfs( char *, struct fs_data* ) (Ultrix)
+ #
+
================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.159 packages/net-snmp/net-snmp.spec:1.160
--- packages/net-snmp/net-snmp.spec:1.159 Mon Apr 12 14:31:10 2010
+++ packages/net-snmp/net-snmp.spec Wed May 12 14:48:37 2010
@@ -27,12 +27,12 @@
Summary(ru.UTF-8): Набор утилит для протокола SNMP от UC-Davis
Summary(uk.UTF-8): Набір утиліт для протоколу SNMP від UC-Davis
Name: net-snmp
-Version: 5.4.2.1
-Release: 20
+Version: 5.5
+Release: 0.1
License: BSD-like
Group: Networking/Daemons
Source0: http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 984932520143f0c8bf7b7ce1fc9e1da1
+# Source0-md5: 5b2551e7bd024fbbee84dca22a5f13a1
Source1: %{name}d.init
Source2: %{name}d.conf
Source3: %{name}d.sysconfig
@@ -54,12 +54,8 @@
Patch10: %{name}-lvalue.patch
Patch11: %{name}-defaultconfig.patch
Patch12: %{name}-use-rpm-hrmib.patch
-Patch13: %{name}-snmpnetstat-getbulk.patch
Patch14: %{name}-lm_sensors_3.patch
-Patch15: %{name}-subcontainer.patch
-Patch16: %{name}-netlink.patch
Patch17: %{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch18: %{name}-src-dst-confusion.patch
Patch19: %{name}-loadave-writable.patch
URL: http://www.net-snmp.org/
BuildRequires: autoconf >= 2.61-3
@@ -421,7 +417,6 @@
%prep
%setup -q -a7
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -432,19 +427,17 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+# check me
%patch11 -p1
%patch12 -p1
-%patch13 -p1
+# check me
%patch14 -p0
-%patch15 -p1
-%patch16 -p1
%patch17 -p1
-%patch18 -p3
%patch19 -p1
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
cp -f /usr/share/automake/config.sub .
@@ -804,6 +797,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.160 2010/05/12 12:48:37 arekm
+- partial update to 5.5
+
Revision 1.159 2010/04/12 12:31:10 baggins
- rel 20
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-acfix.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-config-noflags.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-link.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-lm_sensors_3.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-loadave-writable.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.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-use-rpm-hrmib.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.159&r2=1.160&f=u
More information about the pld-cvs-commit
mailing list