Permalink
Browse files

FL-806: net-analyzer/net-snmp unfork

  • Loading branch information...
danielrobbins committed Oct 1, 2013
1 parent e63ce53 commit 8af213256fdca1c899c93717e26702247111018f
@@ -1,2 +0,0 @@
-DIST net-snmp-5.4.3.tar.gz 5199202 SHA256 461a7a72acbe5ad13e39f0bae129b49df541b8ea8f9178d2724de7654d4f1c40 SHA512 23a84e580f1016d862e617339e5f7672c4f41f08a1a2b0accc51c12ff50cfec09d275277fd087ff472c06df4a0d4b96f5b46ac4cfb209db22357d9df54bc6f5f WHIRLPOOL 6d37cc527b17e050bf48a6e984336412e44b169f90e11a50e1deaea778f42d40f9f983e438caf077865a9f8d97ed0871b2bbc107c6238238b9412b1bd0ced8a5
-DIST net-snmp-5.7.1.tar.gz 6110619 SHA256 7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f
@@ -1 +0,0 @@
-rocommunity public
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.8 2006/11/26 21:37:22 cedk Exp $
-
-# Initial (empty) options.
-SNMPD_FLAGS=""
-
-# Enable connection logging.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
-
-# Enable syslog and disable file log.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -Lsd -Lf /dev/null"
-
-# Enable agentx socket as /var/agentx/master
-# *NOTE* Before uncommenting this, make sure
-# the /var/agentx directory exists.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
@@ -1,46 +0,0 @@
-#!/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 -p ${SNMPD_PIDFILE} -- /usr/sbin/snmpd ${SNMPD_OPTS} -p ${SNMPD_PIDFILE}
- 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 $?
-}
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
-
-# extra flags to pass to snmptrapd
-SNMPTRAPD_FLAGS=""
-
-# ignore authentication failure traps
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -a"
-
-# log messages to specified file
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Lf /var/log/snmptrapd.log"
-
-# log messages to syslog with the specified facility
-# where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Ls d"
@@ -1,24 +0,0 @@
-#!/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 $?
-}
@@ -1 +0,0 @@
-rocommunity public
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.8 2006/11/26 21:37:22 cedk Exp $
-
-# Initial (empty) options.
-SNMPD_FLAGS=""
-
-# Enable connection logging.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
-
-# Enable syslog and disable file log.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -Lsd -Lf /dev/null"
-
-# Enable agentx socket as /var/agentx/master
-# *NOTE* Before uncommenting this, make sure
-# the /var/agentx directory exists.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
@@ -1,44 +0,0 @@
-#!/sbin/runscript
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="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 -p ${SNMPD_PIDFILE} -- /usr/sbin/snmpd ${SNMPD_OPTS} -p ${SNMPD_PIDFILE}
- 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 $?
-}
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
-
-# extra flags to pass to snmptrapd
-SNMPTRAPD_FLAGS=""
-
-# ignore authentication failure traps
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -a"
-
-# log messages to specified file
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Lf /var/log/snmptrapd.log"
-
-# log messages to syslog with the specified facility
-# where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Ls d"
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Distributed under the terms of the GNU General Public License v2
-
-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 $?
-}
@@ -1 +0,0 @@
-rocommunity public
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.8 2006/11/26 21:37:22 cedk Exp $
-
-# Initial (empty) options.
-SNMPD_FLAGS=""
-
-# Enable connection logging.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
-
-# Enable syslog and disable file log.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -Lsd -Lf /dev/null"
-
-# Enable agentx socket as /var/agentx/master
-# *NOTE* Before uncommenting this, make sure
-# the /var/agentx directory exists.
-#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
@@ -1,46 +0,0 @@
-#!/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 -p ${SNMPD_PIDFILE} -- /usr/sbin/snmpd ${SNMPD_OPTS} -p ${SNMPD_PIDFILE}
- 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 $?
-}
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
-
-# extra flags to pass to snmptrapd
-SNMPTRAPD_FLAGS=""
-
-# ignore authentication failure traps
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -a"
-
-# log messages to specified file
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Lf /var/log/snmptrapd.log"
-
-# log messages to syslog with the specified facility
-# where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
-#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Ls d"
@@ -1,24 +0,0 @@
-#!/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 $?
-}
@@ -1,12 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=248329
-
---- net-snmp-5.1.2/local/snmpconf.orig 2004-04-20 16:20:51.000000000 +0200
-+++ net-snmp-5.1.2/local/snmpconf 2007-07-09 15:34:48.000000000 +0200
-@@ -585,6 +585,7 @@
- }
- }
- close(O);
-+ system("restorecon $outputf");
- }
- }
-
@@ -1,56 +0,0 @@
-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
- #
Oops, something went wrong.

0 comments on commit 8af2132

Please sign in to comment.