bump patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1562 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-10-17 05:31:09 +00:00
parent fb070df65b
commit 79a12a36fd
7 changed files with 1663 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c
--- snmplib.orig/snmpUDPDomain.c 2007-10-11 22:46:30.000000000 +0200
+++ snmplib/snmpUDPDomain.c 2009-07-10 23:41:37.000000000 +0200
@@ -104,12 +110,12 @@
char tmp[64];
to = (struct sockaddr_in *) &(addr_pair->remote_addr);
if (to == NULL) {
- sprintf(tmp, "UDP: [%s]->unknown",
+ sprintf(tmp, "UDP: unknown->[%s]",
inet_ntoa(addr_pair->local_addr));
} else {
- sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr));
- sprintf(tmp + strlen(tmp), "[%s]:%hd",
+ sprintf(tmp, "UDP: [%s]:%hu->",
inet_ntoa(to->sin_addr), ntohs(to->sin_port));
+ sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr));
}
return strdup(tmp);
}

View File

@@ -0,0 +1,56 @@
From: Gordon Malm <gengor@gentoo.org>
Detect lm_sensors version and build accordingly.
--- a/agent/mibgroup/hardware/sensors.h
+++ b/agent/mibgroup/hardware/sensors.h
@@ -1,13 +1,21 @@
config_require(hardware/sensors/hw_sensors)
#if defined(solaris)
+
# if defined(HAVE_PICL_H)
config_require(hardware/sensors/picld_sensors)
# else
config_require(hardware/sensors/kstat_sensors)
# endif
+
#else
+
+# if defined(HAVE_LMSENSORS_V2)
+config_require(hardware/sensors/lmsensors_v2)
+# else
config_require(hardware/sensors/lmsensors_v3)
+# endif
+
#endif
//config_require(hardware/sensors/dummy_sensors)
--- a/configure.in
+++ b/configure.in
@@ -1909,6 +1909,25 @@ done
AC_MSG_RESULT([$new_module_list.])
+echo " $new_module_list " | $GREP "ucd-snmp/lmsensorsMib" > /dev/null
+if test $? -eq 0 ; then
+ case $target_os in
+ linux*)
+ AC_CHECK_HEADER(sensors/sensors.h,,[AC_MSG_ERROR([asked to use lm_sensors but I couldn't find sensors/sensors.h])])
+
+ AC_MSG_CHECKING([lm_sensors version])
+ AC_EGREP_CPP(lmsensors_v2,[
+#include <sensors/sensors.h>
+#if SENSORS_API_VERSION < 0x400
+lmsensors_v2
+#endif
+ ], [AC_DEFINE([HAVE_LMSENSORS_V2], [1], [Define if lm_sensors version 2.x])]
+ have_lmsensors_ver="2.x", have_lmsensors_ver="3.x or higher")
+ AC_MSG_RESULT([$have_lmsensors_ver])
+ ;;
+ esac
+fi
+
#---------------------
# loop over module list
#

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,47 @@
#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init,v 1.1 2009/10/16 08:51:05 gengor Exp $
opts="${opts} reload"
depend() {
use logger
need net
}
SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
checkconfig() {
if [ ! -e /etc/snmp/snmpd.conf ] ; then
eerror "${SVCNAME} requires an /etc/snmp/snmpd.conf configuration file"
return 1
fi
}
start() {
checkconfig || return 1
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \
-- -p ${SNMPD_PIDFILE} ${SNMPD_FLAGS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --quiet --pidfile ${SNMPD_PIDFILE}
eend $?
}
reload() {
checkconfig || return 1
if [ ! -f ${SNMPD_PIDFILE} ]; then
eerror "Cannot reload configuration, ${SVCNAME} is not running"
eend 1
return 1
fi
ebegin "Reloading ${SVCNAME} configuration"
kill -HUP $(< ${SNMPD_PIDFILE}) &>/dev/null
eend $?
}

View File

@@ -0,0 +1,24 @@
#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init,v 1.1 2009/10/16 08:51:05 gengor Exp $
depend() {
use logger
need net
}
SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --quiet --exec /usr/sbin/snmptrapd \
-- -p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --quiet --pidfile ${SNMPTRAPD_PIDFILE}
eend $?
}