From f65cfba6e6123e62ed5f88ed1bc442274b9900b5116d02e297d6cb913d3e4a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Thu, 1 Feb 2018 14:18:02 +0000 Subject: [PATCH] Accepting request 569248 from openSUSE:Factory:Staging:O - Properly conditionalize the py2 build - Add patch from Fedora to support natively systemd: * net-snmp-5.7.2-systemd.patch - Drop the check phase as whole 90% of the tests fail it makes more sense to run them somewhere localy - Take systemd service files from fedora to replace sysV scripts - Also convert the sysconfig files to match fedora ones, they get bit more terse but it works seamlessly with systemd - Format with spec-cleaner - Drop sle11 support as it fails to build anyway for ages - Rename python packages to be python-%{name} with obsoletes * Use new singlespec macros * Add patch converting the py files to python3/2 compat mode net-snmp-python3.patch - Run full autoreconf instead of partial - Build with threads by building few targets first OBS-URL: https://build.opensuse.org/request/show/569248 OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-snmp?expand=0&rev=7 --- net-snmp-5.7.2-systemd.patch | 1650 ++++++++++++++++++++++++++++++++++ net-snmp-python3.patch | 505 +++++++++++ net-snmp-tmpfs.conf | 1 + net-snmp.changes | 32 + net-snmp.spec | 290 +++--- net-snmp.sysconfig | 60 -- rc.snmpd | 194 ---- rc.snmptrapd | 129 --- snmpd.service | 13 + snmpd.sysconfig | 9 + snmptrapd.service | 13 + snmptrapd.sysconfig | 9 + 12 files changed, 2369 insertions(+), 536 deletions(-) create mode 100644 net-snmp-5.7.2-systemd.patch create mode 100644 net-snmp-python3.patch create mode 100644 net-snmp-tmpfs.conf delete mode 100644 net-snmp.sysconfig delete mode 100644 rc.snmpd delete mode 100644 rc.snmptrapd create mode 100644 snmpd.service create mode 100644 snmpd.sysconfig create mode 100644 snmptrapd.service create mode 100644 snmptrapd.sysconfig diff --git a/net-snmp-5.7.2-systemd.patch b/net-snmp-5.7.2-systemd.patch new file mode 100644 index 0000000..419a6e2 --- /dev/null +++ b/net-snmp-5.7.2-systemd.patch @@ -0,0 +1,1650 @@ +718183 - Provide native systemd unit file + +Gathered from following upstream git commits and backported to 5.7. + +commit 19499c3c90bf9d7b2b9e5d08baa26cc6bba28a11 +Author: Jan Safranek +Date: Mon Aug 8 15:48:54 2011 +0200 + + CHANGES: snmpd: integrated with systemd, see README.systemd for details. + + It brings sd-daemon.c and .h directly downloaded from systemd. I've made very + few changes to it to match our NETSNMP_NO_SYSTEMD and include paths. + +commit fef6cddfdb94da1a6b1fb768af62918b80f11fd3 +Author: Jan Safranek +Date: Mon Aug 8 15:48:54 2011 +0200 + + CHANGES: snmptrapd: integrate systemd notification support. + +commit 0641e43c694c485cbbffef0556efc4641bd3ff50 +Author: Jan Safranek +Date: Mon Aug 8 15:48:54 2011 +0200 + + Add sd_find_inet_socket() and sd_find_inet_unisx() helpers into + system-specific code. This will help us to find various sockets + created by systemd much easier. + +commit 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 +Author: Jan Safranek +Date: Mon Aug 8 15:48:54 2011 +0200 + + Check sockets created by systemd when opening new server sockets. + + systemd can pass sockets to our daemons during startup using LISTEN_FDS + environment variable. So check this variable when opening new listening + socket - maybe system has already opened the socket for us. + +commit bf108d7f1354f6276fc43c129963f2c49b9fc242 +Author: Jan Safranek +Date: Mon Aug 8 15:48:54 2011 +0200 + + Added sample systemd service files. + +commit 884ec488a6596380ba283d707827dd926a52e0b2 +Author: Jan Safranek +Date: Mon Aug 8 15:48:55 2011 +0200 + + Run autoheader+autoconf. + +commit 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 +Author: Jan Safranek +Date: Tue Aug 9 10:53:43 2011 +0200 + + Update systemd documentation and samples. + + - add socket unit for snmpd to paralelize boot + - update WantedBy in socket units as recommended by http://0pointer.de/blog/projects/socket-activation.html + - rephrase README.systemd + +diff -up net-snmp-5.7.3/agent/snmpd.c.MPGqYh net-snmp-5.7.3/agent/snmpd.c +--- net-snmp-5.7.3/agent/snmpd.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/agent/snmpd.c 2015-02-17 13:34:05.736221851 +0100 +@@ -164,6 +164,10 @@ typedef long fd_mask; + + #endif + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + netsnmp_feature_want(logging_file) + netsnmp_feature_want(logging_stdio) + netsnmp_feature_want(logging_syslog) +@@ -443,18 +447,26 @@ main(int argc, char *argv[]) + int agent_mode = -1; + char *pid_file = NULL; + char option_compatability[] = "-Le"; ++ int prepared_sockets = 0; + #if HAVE_GETPID + int fd; + FILE *PID; + #endif + + #ifndef WIN32 ++#ifndef NETSNMP_NO_SYSYSTEMD ++ /* check if systemd has sockets for us and don't close them */ ++ prepared_sockets = netsnmp_sd_listen_fds(0); ++#endif /* NETSNMP_NO_SYSYSTEMD */ ++ + /* + * close all non-standard file descriptors we may have + * inherited from the shell. + */ +- for (i = getdtablesize() - 1; i > 2; --i) { +- (void) close(i); ++ if (!prepared_sockets) { ++ for (i = getdtablesize() - 1; i > 2; --i) { ++ (void) close(i); ++ } + } + #endif /* #WIN32 */ + +@@ -1107,6 +1119,19 @@ main(int argc, char *argv[]) + netsnmp_addrcache_initialise(); + + /* ++ * Let systemd know we're up. ++ */ ++#ifndef NETSNMP_NO_SYSTEMD ++ netsnmp_sd_notify(1, "READY=1\n"); ++ if (prepared_sockets) ++ /* ++ * Clear the environment variable, we already processed all the sockets ++ * by now. ++ */ ++ netsnmp_sd_listen_fds(1); ++#endif ++ ++ /* + * Forever monitor the dest_port for incoming PDUs. + */ + DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n")); +diff -up net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh net-snmp-5.7.3/apps/snmptrapd.c +--- net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/apps/snmptrapd.c 2015-02-17 13:34:05.736221851 +0100 +@@ -125,6 +125,10 @@ SOFTWARE. + + #include + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + #ifndef BSD4_3 + #define BSD4_2 + #endif +@@ -657,15 +661,22 @@ main(int argc, char *argv[]) + int agentx_subagent = 1; + #endif + netsnmp_trapd_handler *traph; ++ int prepared_sockets = 0; + + + #ifndef WIN32 ++#ifndef NETSNMP_NO_SYSTEMD ++ /* check if systemd has sockets for us and don't close them */ ++ prepared_sockets = netsnmp_sd_listen_fds(0); ++#endif + /* + * close all non-standard file descriptors we may have + * inherited from the shell. + */ +- for (i = getdtablesize() - 1; i > 2; --i) { +- (void) close(i); ++ if (!prepared_sockets) { ++ for (i = getdtablesize() - 1; i > 2; --i) { ++ (void) close(i); ++ } + } + #endif /* #WIN32 */ + +@@ -1318,6 +1329,19 @@ main(int argc, char *argv[]) + #endif + #endif + ++ /* ++ * Let systemd know we're up. ++ */ ++#ifndef NETSNMP_NO_SYSTEMD ++ netsnmp_sd_notify(1, "READY=1\n"); ++ if (prepared_sockets) ++ /* ++ * Clear the environment variable, we already processed all the sockets ++ * by now. ++ */ ++ netsnmp_sd_listen_fds(1); ++#endif ++ + #ifdef WIN32SERVICE + trapd_status = SNMPTRAPD_RUNNING; + #endif +diff -up net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh net-snmp-5.7.3/configure.d/config_modules_lib +--- net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/configure.d/config_modules_lib 2015-02-17 13:34:05.737221850 +0100 +@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" + other_ftobjs_list="$other_ftobjs_list winpipe.ft" + fi + ++# Linux systemd ++if test "x$with_systemd" == "xyes"; then ++ other_src_list="$other_src_list sd-daemon.c" ++ other_objs_list="$other_objs_list sd-daemon.o" ++ other_lobjs_list="$other_lobjs_list sd-daemon.lo" ++ other_ftobjs_list="$other_ftobjs_list sd-daemon.ft" ++fi ++ + AC_SUBST(other_src_list) + AC_SUBST(other_objs_list) + AC_SUBST(other_lobjs_list) +diff -up net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh net-snmp-5.7.3/configure.d/config_project_with_enable +--- net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/configure.d/config_project_with_enable 2015-02-17 13:34:05.737221850 +0100 +@@ -690,6 +690,15 @@ if test "x$with_dummy_values" != "xyes"; + data for]) + fi + ++NETSNMP_ARG_WITH(systemd, ++[ --with-systemd Provide systemd support. See README.systemd ++ for details.]) ++# Define unless specifically suppressed (i.e., option defaults to false). ++if test "x$with_systemd" != "xyes"; then ++ AC_DEFINE(NETSNMP_NO_SYSTEMD, 1, ++ [If you don't want to integrate with systemd.]) ++fi ++ + NETSNMP_ARG_ENABLE(set-support, + [ --disable-set-support Do not allow SNMP set requests.]) + if test "x$enable_set_support" = "xno"; then +diff -up net-snmp-5.7.3/configure.MPGqYh net-snmp-5.7.3/configure +--- net-snmp-5.7.3/configure.MPGqYh 2014-12-08 21:23:37.000000000 +0100 ++++ net-snmp-5.7.3/configure 2015-02-17 13:34:05.744221845 +0100 +@@ -951,6 +951,8 @@ with_kmem_usage + enable_kmem_usage + with_dummy_values + enable_dummy_values ++with_systemd ++enable_systemd + enable_set_support + with_set_support + with_sys_contact +@@ -1867,6 +1869,8 @@ Configuring the agent: + This is technically not compliant with the + SNMP specifications, but was how the agent + operated for versions < 4.0. ++ --with-systemd Provide systemd support. See README.systemd ++ for details. + --with-sys-contact="who@where" Default system contact. + (Default: LOGIN@DOMAINNAME) + --with-sys-location="location" Default system location. +@@ -4398,6 +4402,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE + + fi + ++ ++# Check whether --with-systemd was given. ++if test "${with_systemd+set}" = set; then : ++ withval=$with_systemd; ++fi ++ ++ # Check whether --enable-systemd was given. ++if test "${enable_systemd+set}" = set; then : ++ enableval=$enable_systemd; as_fn_error $? "Invalid option. Use --with-systemd/--without-systemd instead" "$LINENO" 5 ++fi ++ ++# Define unless specifically suppressed (i.e., option defaults to false). ++if test "x$with_systemd" != "xyes"; then ++ ++$as_echo "#define NETSNMP_NO_SYSTEMD 1" >>confdefs.h ++ ++fi ++ + # Check whether --enable-set-support was given. + if test "${enable_set_support+set}" = set; then : + enableval=$enable_set_support; +@@ -18639,6 +18661,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" + other_ftobjs_list="$other_ftobjs_list winpipe.ft" + fi + ++# Linux systemd ++if test "x$with_systemd" == "xyes"; then ++ other_src_list="$other_src_list sd-daemon.c" ++ other_objs_list="$other_objs_list sd-daemon.o" ++ other_lobjs_list="$other_lobjs_list sd-daemon.lo" ++ other_ftobjs_list="$other_ftobjs_list sd-daemon.ft" ++fi ++ + + + +diff -up net-snmp-5.7.3/dist/snmpd.service.MPGqYh net-snmp-5.7.3/dist/snmpd.service +--- net-snmp-5.7.3/dist/snmpd.service.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmpd.service 2015-02-17 13:34:05.745221844 +0100 +@@ -0,0 +1,18 @@ ++# ++# SNMP agent service file for systemd ++# ++# ++# The service should be enabled, i.e. snmpd should start during machine boot. ++# Socket activation shall not be used. See README.systemd for details. ++ ++[Unit] ++Description=Simple Network Management Protocol (SNMP) daemon. ++After=syslog.target network.target ++ ++[Service] ++# Type=notify is also supported. It should be set when snmpd.socket is not used. ++Type=simple ++ExecStart=/usr/sbin/snmpd -f ++ ++[Install] ++WantedBy=multi-user.target +diff -up net-snmp-5.7.3/dist/snmpd.socket.MPGqYh net-snmp-5.7.3/dist/snmpd.socket +--- net-snmp-5.7.3/dist/snmpd.socket.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmpd.socket 2015-02-17 13:34:05.745221844 +0100 +@@ -0,0 +1,17 @@ ++[Unit] ++Description=Socket listening for SNMP and AgentX messages ++ ++[Socket] ++ListenDatagram=0.0.0.0:161 ++# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. ++# It must match listening addresses/ports defined in snmpd.service ++# or snmpd.conf. ++# ListenStream=0.0.0.0:161 ++# ListenDatagram=[::]:161 ++# ListenStream=[::]:161 ++# ++# Uncomment AgentX socket if snmpd.conf enables AgentX protocol. ++# ListenStream=/var/agentx/master ++ ++[Install] ++WantedBy=sockets.target +diff -up net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh net-snmp-5.7.3/dist/snmptrapd.service +--- net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmptrapd.service 2015-02-17 13:34:05.745221844 +0100 +@@ -0,0 +1,16 @@ ++# ++# SNMP trap-processing service file for systemd ++# ++ ++[Unit] ++Description=Simple Network Management Protocol (SNMP) Trap daemon. ++After=syslog.target network.target ++ ++[Service] ++# Type=notify is also supported. It should be set when snmptrapd.socket is not ++# used. ++Type=simple ++ExecStart=/usr/sbin/snmptrapd -f ++ ++[Install] ++WantedBy=multi-user.target +diff -up net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh net-snmp-5.7.3/dist/snmptrapd.socket +--- net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh 2015-02-17 13:34:05.745221844 +0100 ++++ net-snmp-5.7.3/dist/snmptrapd.socket 2015-02-17 13:34:05.745221844 +0100 +@@ -0,0 +1,14 @@ ++[Unit] ++Description=Socket listening for SNMP trap messages ++ ++[Socket] ++ListenDatagram=0.0.0.0:162 ++# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. ++# It must match listening addresses/ports defined in snmptrapd.service ++# or snmptrapd.conf. ++# ListenStream=0.0.0.0:162 ++# ListenDatagram=[::]:162 ++# ListenStream=[::]:162 ++ ++[Install] ++WantedBy=sockets.target +diff -up net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h +--- net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh 2015-02-17 13:34:05.746221843 +0100 ++++ net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h 2015-02-17 13:34:05.746221843 +0100 +@@ -0,0 +1,286 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++#ifndef SNMPD_SD_DAEMON_H ++#define SNMPD_SD_DAEMON_H ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ Reference implementation of a few systemd related interfaces for ++ writing daemons. These interfaces are trivial to implement. To ++ simplify porting we provide this reference implementation. ++ Applications are welcome to reimplement the algorithms described ++ here if they do not want to include these two source files. ++ ++ The following functionality is provided: ++ ++ - Support for logging with log levels on stderr ++ - File descriptor passing for socket-based activation ++ - Daemon startup and status notification ++ - Detection of systemd boots ++ ++ You may compile this with -DDISABLE_SYSTEMD to disable systemd ++ support. This makes all those calls NOPs that are directly related to ++ systemd (i.e. only sd_is_xxx() will stay useful). ++ ++ Since this is drop-in code we don't want any of our symbols to be ++ exported in any case. Hence we declare hidden visibility for all of ++ them. ++ ++ You may find an up-to-date version of these source files online: ++ ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c ++ ++ This should compile on non-Linux systems, too, but with the ++ exception of the sd_is_xxx() calls all functions will become NOPs. ++ ++ See sd-daemon(7) for more information. ++*/ ++ ++#ifndef _sd_printf_attr_ ++#if __GNUC__ >= 4 ++#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) ++#else ++#define _sd_printf_attr_(a,b) ++#endif ++#endif ++ ++/* ++ Log levels for usage on stderr: ++ ++ fprintf(stderr, SD_NOTICE "Hello World!\n"); ++ ++ This is similar to printk() usage in the kernel. ++*/ ++#define SD_EMERG "<0>" /* system is unusable */ ++#define SD_ALERT "<1>" /* action must be taken immediately */ ++#define SD_CRIT "<2>" /* critical conditions */ ++#define SD_ERR "<3>" /* error conditions */ ++#define SD_WARNING "<4>" /* warning conditions */ ++#define SD_NOTICE "<5>" /* normal but significant condition */ ++#define SD_INFO "<6>" /* informational */ ++#define SD_DEBUG "<7>" /* debug-level messages */ ++ ++/* The first passed file descriptor is fd 3 */ ++#define SD_LISTEN_FDS_START 3 ++ ++/* ++ Returns how many file descriptors have been passed, or a negative ++ errno code on failure. Optionally, removes the $LISTEN_FDS and ++ $LISTEN_PID file descriptors from the environment (recommended, but ++ problematic in threaded environments). If r is the return value of ++ this function you'll find the file descriptors passed as fds ++ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative ++ errno style error code on failure. This function call ensures that ++ the FD_CLOEXEC flag is set for the passed file descriptors, to make ++ sure they are not passed on to child processes. If FD_CLOEXEC shall ++ not be set, the caller needs to unset it after this call for all file ++ descriptors that are used. ++ ++ See sd_listen_fds(3) for more information. ++*/ ++int netsnmp_sd_listen_fds(int unset_environment); ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a FIFO in the file system stored under the ++ specified path, 0 otherwise. If path is NULL a path name check will ++ not be done and the call only verifies if the file descriptor ++ refers to a FIFO. Returns a negative errno style error code on ++ failure. ++ ++ See sd_is_fifo(3) for more information. ++*/ ++int netsnmp_sd_is_fifo(int fd, const char *path); ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a special character device on the file ++ system stored under the specified path, 0 otherwise. ++ If path is NULL a path name check will not be done and the call ++ only verifies if the file descriptor refers to a special character. ++ Returns a negative errno style error code on failure. ++ ++ See sd_is_special(3) for more information. ++*/ ++int netsnmp_sd_is_special(int fd, const char *path); ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a socket of the specified family (AF_INET, ++ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If ++ family is 0 a socket family check will not be done. If type is 0 a ++ socket type check will not be done and the call only verifies if ++ the file descriptor refers to a socket. If listening is > 0 it is ++ verified that the socket is in listening mode. (i.e. listen() has ++ been called) If listening is == 0 it is verified that the socket is ++ not in listening mode. If listening is < 0 no listening mode check ++ is done. Returns a negative errno style error code on failure. ++ ++ See sd_is_socket(3) for more information. ++*/ ++int netsnmp_sd_is_socket(int fd, int family, int type, int listening); ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an Internet socket, of the specified family ++ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, ++ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version ++ check is not done. If type is 0 a socket type check will not be ++ done. If port is 0 a socket port check will not be done. The ++ listening flag is used the same way as in sd_is_socket(). Returns a ++ negative errno style error code on failure. ++ ++ See sd_is_socket_inet(3) for more information. ++*/ ++int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port); ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an AF_UNIX socket of the specified type ++ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 ++ a socket type check will not be done. If path is NULL a socket path ++ check will not be done. For normal AF_UNIX sockets set length to ++ 0. For abstract namespace sockets set length to the length of the ++ socket name (including the initial 0 byte), and pass the full ++ socket path in path (including the initial 0 byte). The listening ++ flag is used the same way as in sd_is_socket(). Returns a negative ++ errno style error code on failure. ++ ++ See sd_is_socket_unix(3) for more information. ++*/ ++int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length); ++ ++/* ++ Informs systemd about changed daemon state. This takes a number of ++ newline separated environment-style variable assignments in a ++ string. The following variables are known: ++ ++ READY=1 Tells systemd that daemon startup is finished (only ++ relevant for services of Type=notify). The passed ++ argument is a boolean "1" or "0". Since there is ++ little value in signaling non-readiness the only ++ value daemons should send is "READY=1". ++ ++ STATUS=... Passes a single-line status string back to systemd ++ that describes the daemon state. This is free-from ++ and can be used for various purposes: general state ++ feedback, fsck-like programs could pass completion ++ percentages and failing programs could pass a human ++ readable error message. Example: "STATUS=Completed ++ 66% of file system check..." ++ ++ ERRNO=... If a daemon fails, the errno-style error code, ++ formatted as string. Example: "ERRNO=2" for ENOENT. ++ ++ BUSERROR=... If a daemon fails, the D-Bus error-style error ++ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut" ++ ++ MAINPID=... The main pid of a daemon, in case systemd did not ++ fork off the process itself. Example: "MAINPID=4711" ++ ++ Daemons can choose to send additional variables. However, it is ++ recommended to prefix variable names not listed above with X_. ++ ++ Returns a negative errno-style error code on failure. Returns > 0 ++ if systemd could be notified, 0 if it couldn't possibly because ++ systemd is not running. ++ ++ Example: When a daemon finished starting up, it could issue this ++ call to notify systemd about it: ++ ++ sd_notify(0, "READY=1"); ++ ++ See sd_notifyf() for more complete examples. ++ ++ See sd_notify(3) for more information. ++*/ ++int netsnmp_sd_notify(int unset_environment, const char *state); ++ ++/* ++ Similar to sd_notify() but takes a format string. ++ ++ Example 1: A daemon could send the following after initialization: ++ ++ sd_notifyf(0, "READY=1\n" ++ "STATUS=Processing requests...\n" ++ "MAINPID=%lu", ++ (unsigned long) getpid()); ++ ++ Example 2: A daemon could send the following shortly before ++ exiting, on failure: ++ ++ sd_notifyf(0, "STATUS=Failed to start up: %s\n" ++ "ERRNO=%i", ++ strerror(errno), ++ errno); ++ ++ See sd_notifyf(3) for more information. ++*/ ++int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3); ++ ++/* ++ Returns > 0 if the system was booted with systemd. Returns < 0 on ++ error. Returns 0 if the system was not booted with systemd. Note ++ that all of the functions above handle non-systemd boots just ++ fine. You should NOT protect them with a call to this function. Also ++ note that this function checks whether the system, not the user ++ session is controlled by systemd. However the functions above work ++ for both user and system services. ++ ++ See sd_booted(3) for more information. ++*/ ++int netsnmp_sd_booted(void); ++ ++/** ++ * Find an socket with given parameters. See man sd_is_socket_inet for ++ * description of the arguments. ++ * ++ * Returns the file descriptor if it is found, 0 otherwise. ++ */ ++int netsnmp_sd_find_inet_socket(int family, int type, int listening, int port); ++ ++/** ++ * Find an unix socket with given parameters. See man sd_is_socket_unix for ++ * description of the arguments. ++ * ++ * Returns the file descriptor if it is found, 0 otherwise. ++ */ ++int ++netsnmp_sd_find_unix_socket(int type, int listening, const char *path); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* SNMPD_SD_DAEMON_H */ +diff -up net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in +--- net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in 2015-02-17 13:34:05.746221843 +0100 +@@ -1410,6 +1410,9 @@ + /* If you don't have root access don't exit upon kmem errors */ + #undef NETSNMP_NO_ROOT_ACCESS + ++/* If you don't want to integrate with systemd. */ ++#undef NETSNMP_NO_SYSTEMD ++ + /* Define if you want to remove all SET/write access from the code */ + #undef NETSNMP_NO_WRITE_SUPPORT + +diff -up net-snmp-5.7.3/README.systemd.MPGqYh net-snmp-5.7.3/README.systemd +--- net-snmp-5.7.3/README.systemd.MPGqYh 2015-02-17 13:34:05.747221843 +0100 ++++ net-snmp-5.7.3/README.systemd 2015-02-17 13:34:05.747221843 +0100 +@@ -0,0 +1,41 @@ ++README.systemd ++-------------- ++Net-SNMP provides two daemons, which support systemd system manager. ++See http://www.freedesktop.org/wiki/Software/systemd to learn how ++systemd works. Both socket activation and notification is supported by these ++daemons. ++ ++To enable systemd support, the sources must be compiled with ++--with-systemd configure option. ++ ++snmpd - The SNMP agent ++---------------------- ++Socket activation od snmpd daemon is implemented, but it's discouraged. ++The reason is simple - snmpd not only listens and processes SNMP requests ++from network, but also gathers system statistics counters, sends traps and ++communicates with subagents. It even opens few netlink sockets. ++ ++In other words, snmpd should run from system start to properly work. ++This can be done in two ways: ++1) either as snmpd service unit with 'Type=notification' and without a socket ++ unit ++2) or as snmpd service unit with 'Type=simple', appropriate socket socket unit ++ and the snmpd service enabled. This way systemd creates the snmpd listening ++ socket early during boot and passes the sockets to snmpd slightly later ++ (but still during machine boot). This way systemd can paralelize start of ++ services, which depend on snmpd. Admins must adjust the socket file manually, ++ depending if the snmpd support AgentX, IPv6, SMUX etc. ++ ++snmpd should be started with '-f' command line parameter to disable forking - ++systemd does that for us automatically. ++ ++ ++snmptrapd - The trap processing daemon ++-------------------------------------- ++snmptrapd supports full socket activation and also notification (if needed). ++Both 'Type=simple' (with appropriate socket unit) and 'Type=notify' services ++will work. Again, '-f' parameter should be provided on snmptrapd command line. ++ ++If integration with SNMP agent using AgentX protocol is enabled, snmptrapd should ++start during boot and not after first SNMP trap arrives. Same rules as for snmpd ++applies then. +\ No newline at end of file +diff -up net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh net-snmp-5.7.3/snmplib/sd-daemon.c +--- net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh 2015-02-17 13:34:05.747221843 +0100 ++++ net-snmp-5.7.3/snmplib/sd-daemon.c 2015-02-17 13:34:05.747221843 +0100 +@@ -0,0 +1,532 @@ ++/* ++ * Systemd integration parts. ++ * ++ * Most of this file is directly copied from systemd sources. ++ * Changes: ++ * - all functions were renamed to have netsnmp_ prefix ++ * - includes were changed to match Net-SNMP style. ++ * - removed gcc export macros ++ * - removed POSIX message queues ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#ifndef NETSNMP_NO_SYSTEMD ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++int netsnmp_sd_listen_fds(int unset_environment) { ++ ++ int r, fd; ++ const char *e; ++ char *p = NULL; ++ unsigned long l; ++ ++ if (!(e = getenv("LISTEN_PID"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p || l <= 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ /* Is this for us? */ ++ if (getpid() != (pid_t) l) { ++ r = 0; ++ goto finish; ++ } ++ ++ if (!(e = getenv("LISTEN_FDS"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) { ++ int flags; ++ ++ if ((flags = fcntl(fd, F_GETFD)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (flags & FD_CLOEXEC) ++ continue; ++ ++ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ } ++ ++ r = (int) l; ++ ++finish: ++ if (unset_environment) { ++ unsetenv("LISTEN_PID"); ++ unsetenv("LISTEN_FDS"); ++ } ++ ++ return r; ++} ++ ++int netsnmp_sd_is_fifo(int fd, const char *path) { ++ struct stat st_fd; ++ ++ if (fd < 0) ++ return -EINVAL; ++ ++ memset(&st_fd, 0, sizeof(st_fd)); ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISFIFO(st_fd.st_mode)) ++ return 0; ++ ++ if (path) { ++ struct stat st_path; ++ ++ memset(&st_path, 0, sizeof(st_path)); ++ if (stat(path, &st_path) < 0) { ++ ++ if (errno == ENOENT || errno == ENOTDIR) ++ return 0; ++ ++ return -errno; ++ } ++ ++ return ++ st_path.st_dev == st_fd.st_dev && ++ st_path.st_ino == st_fd.st_ino; ++ } ++ ++ return 1; ++} ++ ++int netsnmp_sd_is_special(int fd, const char *path) { ++ struct stat st_fd; ++ ++ if (fd < 0) ++ return -EINVAL; ++ ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode)) ++ return 0; ++ ++ if (path) { ++ struct stat st_path; ++ ++ if (stat(path, &st_path) < 0) { ++ ++ if (errno == ENOENT || errno == ENOTDIR) ++ return 0; ++ ++ return -errno; ++ } ++ ++ if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode)) ++ return ++ st_path.st_dev == st_fd.st_dev && ++ st_path.st_ino == st_fd.st_ino; ++ else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode)) ++ return st_path.st_rdev == st_fd.st_rdev; ++ else ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static int sd_is_socket_internal(int fd, int type, int listening) { ++ struct stat st_fd; ++ ++ if (fd < 0 || type < 0) ++ return -EINVAL; ++ ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISSOCK(st_fd.st_mode)) ++ return 0; ++ ++ if (type != 0) { ++ int other_type = 0; ++ socklen_t l = sizeof(other_type); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(other_type)) ++ return -EINVAL; ++ ++ if (other_type != type) ++ return 0; ++ } ++ ++ if (listening >= 0) { ++ int accepting = 0; ++ socklen_t l = sizeof(accepting); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(accepting)) ++ return -EINVAL; ++ ++ if (!accepting != !listening) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++union sockaddr_union { ++ struct sockaddr sa; ++ struct sockaddr_in in4; ++ struct sockaddr_in6 in6; ++ struct sockaddr_un un; ++ struct sockaddr_storage storage; ++}; ++ ++int netsnmp_sd_is_socket(int fd, int family, int type, int listening) { ++ int r; ++ ++ if (family < 0) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ if (family > 0) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ return sockaddr.sa.sa_family == family; ++ } ++ ++ return 1; ++} ++ ++int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if (family != 0 && family != AF_INET && family != AF_INET6) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_INET && ++ sockaddr.sa.sa_family != AF_INET6) ++ return 0; ++ ++ if (family > 0) ++ if (sockaddr.sa.sa_family != family) ++ return 0; ++ ++ if (port > 0) { ++ if (sockaddr.sa.sa_family == AF_INET) { ++ if (l < sizeof(struct sockaddr_in)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in4.sin_port; ++ } else { ++ if (l < sizeof(struct sockaddr_in6)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in6.sin6_port; ++ } ++ } ++ ++ return 1; ++} ++ ++int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_UNIX) ++ return 0; ++ ++ if (path) { ++ if (length <= 0) ++ length = strlen(path); ++ ++ if (length <= 0) ++ /* Unnamed socket */ ++ return l == offsetof(struct sockaddr_un, sun_path); ++ ++ if (path[0]) ++ /* Normal path socket */ ++ return ++ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) && ++ memcmp(path, sockaddr.un.sun_path, length+1) == 0; ++ else ++ /* Abstract namespace socket */ ++ return ++ (l == offsetof(struct sockaddr_un, sun_path) + length) && ++ memcmp(path, sockaddr.un.sun_path, length) == 0; ++ } ++ ++ return 1; ++} ++ ++int netsnmp_sd_notify(int unset_environment, const char *state) { ++ int fd = -1, r; ++ struct msghdr msghdr; ++ struct iovec iovec; ++ union sockaddr_union sockaddr; ++ const char *e; ++ ++ if (!state) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if (!(e = getenv("NOTIFY_SOCKET"))) ++ return 0; ++ ++ /* Must be an abstract socket, or an absolute path */ ++ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ sockaddr.sa.sa_family = AF_UNIX; ++ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); ++ ++ if (sockaddr.un.sun_path[0] == '@') ++ sockaddr.un.sun_path[0] = 0; ++ ++ memset(&iovec, 0, sizeof(iovec)); ++ iovec.iov_base = (char *)state; ++ iovec.iov_len = strlen(state); ++ ++ memset(&msghdr, 0, sizeof(msghdr)); ++ msghdr.msg_name = &sockaddr; ++ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); ++ ++ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) ++ msghdr.msg_namelen = sizeof(struct sockaddr_un); ++ ++ msghdr.msg_iov = &iovec; ++ msghdr.msg_iovlen = 1; ++ ++ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ r = 1; ++ ++finish: ++ if (unset_environment) ++ unsetenv("NOTIFY_SOCKET"); ++ ++ if (fd >= 0) ++ close(fd); ++ ++ return r; ++} ++ ++int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) { ++ va_list ap; ++ char *p = NULL; ++ int r; ++ ++ va_start(ap, format); ++ r = vasprintf(&p, format, ap); ++ va_end(ap); ++ ++ if (r < 0 || !p) ++ return -ENOMEM; ++ ++ r = netsnmp_sd_notify(unset_environment, p); ++ free(p); ++ ++ return r; ++} ++ ++int netsnmp_sd_booted(void) { ++ struct stat a, b; ++ ++ /* We simply test whether the systemd cgroup hierarchy is ++ * mounted */ ++ ++ if (lstat("/sys/fs/cgroup", &a) < 0) ++ return 0; ++ ++ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) ++ return 0; ++ ++ return a.st_dev != b.st_dev; ++} ++ ++/* End of original sd-daemon.c from systemd sources */ ++ ++int ++netsnmp_sd_find_inet_socket(int family, int type, int listening, int port) ++{ ++ int count, fd; ++ ++ count = netsnmp_sd_listen_fds(0); ++ if (count <= 0) { ++ DEBUGMSGTL(("systemd:find_inet_socket", "No LISTEN_FDS found.\n")); ++ return 0; ++ } ++ DEBUGMSGTL(("systemd:find_inet_socket", "LISTEN_FDS reports %d sockets.\n", ++ count)); ++ ++ for (fd = 3; fd < 3+count; fd++) { ++ int rc = netsnmp_sd_is_socket_inet(fd, family, type, listening, port); ++ if (rc < 0) ++ DEBUGMSGTL(("systemd:find_inet_socket", ++ "sd_is_socket_inet error: %d\n", rc)); ++ if (rc > 0) { ++ DEBUGMSGTL(("systemd:find_inet_socket", ++ "Found the socket in LISTEN_FDS\n")); ++ return fd; ++ } ++ } ++ DEBUGMSGTL(("systemd:find_inet_socket", "Socket not found in LISTEN_FDS\n")); ++ return 0; ++} ++ ++int ++netsnmp_sd_find_unix_socket(int type, int listening, const char *path) ++{ ++ int count, fd; ++ ++ count = netsnmp_sd_listen_fds(0); ++ if (count <= 0) { ++ DEBUGMSGTL(("systemd:find_unix_socket", "No LISTEN_FDS found.\n")); ++ return 0; ++ } ++ DEBUGMSGTL(("systemd:find_unix_socket", "LISTEN_FDS reports %d sockets.\n", ++ count)); ++ ++ for (fd = 3; fd < 3+count; fd++) { ++ int rc = netsnmp_sd_is_socket_unix(fd, type, listening, path, 0); ++ if (rc < 0) ++ DEBUGMSGTL(("systemd:find_unix_socket", ++ "netsnmp_sd_is_socket_unix error: %d\n", rc)); ++ if (rc > 0) { ++ DEBUGMSGTL(("systemd:find_unix_socket", ++ "Found the socket in LISTEN_FDS\n")); ++ return fd; ++ } ++ } ++ DEBUGMSGTL(("systemd:find_unix_socket", "Socket not found in LISTEN_FDS\n")); ++ return 0; ++} ++ ++#endif /* ! NETSNMP_NO_SYSTEMD */ +diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c +--- net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c 2015-02-17 13:34:05.748221842 +0100 +@@ -43,6 +43,10 @@ + #include + #include + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + /* + * needs to be in sync with the definitions in snmplib/snmpUDPDomain.c + * and perl/agent/agent.xs +@@ -149,6 +153,7 @@ netsnmp_tcp_transport(struct sockaddr_in + netsnmp_transport *t = NULL; + netsnmp_udp_addr_pair *addr_pair = NULL; + int rc = 0; ++ int socket_initialized = 0; + + #ifdef NETSNMP_NO_LISTEN_SUPPORT + if (local) +@@ -178,7 +183,19 @@ netsnmp_tcp_transport(struct sockaddr_in + t->domain_length = + sizeof(netsnmp_snmpTCPDomain) / sizeof(netsnmp_snmpTCPDomain[0]); + +- t->sock = socket(PF_INET, SOCK_STREAM, 0); ++#ifndef NETSNMP_NO_SYSTEMD ++ /* ++ * Maybe the socket was already provided by systemd... ++ */ ++ if (local) { ++ t->sock = netsnmp_sd_find_inet_socket(PF_INET, SOCK_STREAM, 1, ++ ntohs(addr->sin_port)); ++ if (t->sock) ++ socket_initialized = 1; ++ } ++#endif ++ if (!socket_initialized) ++ t->sock = socket(PF_INET, SOCK_STREAM, 0); + if (t->sock < 0) { + netsnmp_transport_free(t); + return NULL; +@@ -215,11 +232,13 @@ netsnmp_tcp_transport(struct sockaddr_in + setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, + sizeof(opt)); + +- rc = bind(t->sock, (struct sockaddr *)addr, sizeof(struct sockaddr)); +- if (rc != 0) { +- netsnmp_socketbase_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = bind(t->sock, (struct sockaddr *)addr, sizeof(struct sockaddr)); ++ if (rc != 0) { ++ netsnmp_socketbase_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } + + /* +@@ -235,12 +254,13 @@ netsnmp_tcp_transport(struct sockaddr_in + /* + * Now sit here and wait for connections to arrive. + */ +- +- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); +- if (rc != 0) { +- netsnmp_socketbase_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); ++ if (rc != 0) { ++ netsnmp_socketbase_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } + + /* +diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c +--- net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c 2015-02-17 13:34:05.748221842 +0100 +@@ -49,6 +49,10 @@ + #include + #include + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + #include "inet_ntop.h" + + oid netsnmp_TCPIPv6Domain[] = { TRANSPORT_DOMAIN_TCP_IPV6 }; +@@ -140,6 +144,7 @@ netsnmp_tcp6_transport(struct sockaddr_i + { + netsnmp_transport *t = NULL; + int rc = 0; ++ int socket_initialized = 0; + + #ifdef NETSNMP_NO_LISTEN_SUPPORT + if (local) +@@ -174,7 +179,19 @@ netsnmp_tcp6_transport(struct sockaddr_i + t->domain = netsnmp_TCPIPv6Domain; + t->domain_length = sizeof(netsnmp_TCPIPv6Domain) / sizeof(oid); + +- t->sock = socket(PF_INET6, SOCK_STREAM, 0); ++#ifndef NETSNMP_NO_SYSTEMD ++ /* ++ * Maybe the socket was already provided by systemd... ++ */ ++ if (local) { ++ t->sock = netsnmp_sd_find_inet_socket(PF_INET6, SOCK_STREAM, 1, ++ ntohs(addr->sin6_port)); ++ if (t->sock) ++ socket_initialized = 1; ++ } ++#endif ++ if (!socket_initialized) ++ t->sock = socket(PF_INET6, SOCK_STREAM, 0); + if (t->sock < 0) { + netsnmp_transport_free(t); + return NULL; +@@ -220,12 +237,14 @@ netsnmp_tcp6_transport(struct sockaddr_i + + setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)); + +- rc = bind(t->sock, (struct sockaddr *) addr, +- sizeof(struct sockaddr_in6)); +- if (rc != 0) { +- netsnmp_socketbase_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = bind(t->sock, (struct sockaddr *) addr, ++ sizeof(struct sockaddr_in6)); ++ if (rc != 0) { ++ netsnmp_socketbase_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } + + /* +@@ -242,11 +261,13 @@ netsnmp_tcp6_transport(struct sockaddr_i + * Now sit here and wait for connections to arrive. + */ + +- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); +- if (rc != 0) { +- netsnmp_socketbase_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); ++ if (rc != 0) { ++ netsnmp_socketbase_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } + + /* +diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c +--- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c 2015-02-17 13:36:22.744123462 +0100 +@@ -40,6 +40,10 @@ + + #include + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + #if defined(HAVE_IP_PKTINFO) || defined(HAVE_IP_RECVDSTADDR) + int netsnmp_udpipv4_recvfrom(int s, void *buf, int len, struct sockaddr *from, + socklen_t *fromlen, struct sockaddr *dstip, +@@ -64,6 +68,7 @@ netsnmp_udpipv4base_transport(struct soc + char *client_socket = NULL; + netsnmp_indexed_addr_pair addr_pair; + socklen_t local_addr_len; ++ int socket_initialized = 0; + + #ifdef NETSNMP_NO_LISTEN_SUPPORT + if (local) +@@ -88,7 +93,20 @@ netsnmp_udpipv4base_transport(struct soc + free(str); + } + +- t->sock = socket(PF_INET, SOCK_DGRAM, 0); ++#ifndef NETSNMP_NO_SYSTEMD ++ /* ++ * Maybe the socket was already provided by systemd... ++ */ ++ if (local) { ++ t->sock = netsnmp_sd_find_inet_socket(PF_INET, SOCK_DGRAM, -1, ++ ntohs(addr->sin_port)); ++ if (t->sock) ++ socket_initialized = 1; ++ } ++#endif ++ if (!socket_initialized) ++ t->sock = socket(PF_INET, SOCK_DGRAM, 0); ++ + DEBUGMSGTL(("UDPBase", "openned socket %d as local=%d\n", t->sock, local)); + if (t->sock < 0) { + netsnmp_transport_free(t); +@@ -151,12 +169,14 @@ netsnmp_udpipv4base_transport(struct soc + } + } + #endif /* !defined(WIN32) */ +- rc = bind(t->sock, (struct sockaddr *) addr, +- sizeof(struct sockaddr)); +- if (rc != 0) { +- netsnmp_socketbase_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = bind(t->sock, (struct sockaddr *) addr, ++ sizeof(struct sockaddr)); ++ if (rc != 0) { ++ netsnmp_socketbase_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } + t->data = NULL; + t->data_length = 0; +diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c +--- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c 2015-02-17 13:37:16.256087147 +0100 +@@ -67,6 +67,10 @@ static const struct in6_addr in6addr_any + #include + #include + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + #include "inet_ntop.h" + #include "inet_pton.h" + +@@ -190,6 +194,7 @@ netsnmp_udp6_transport(struct sockaddr_i + { + netsnmp_transport *t = NULL; + int rc = 0; ++ int socket_initialized = 0; + + #ifdef NETSNMP_NO_LISTEN_SUPPORT + if (local) +@@ -217,7 +222,19 @@ netsnmp_udp6_transport(struct sockaddr_i + t->domain_length = + sizeof(netsnmp_UDPIPv6Domain) / sizeof(netsnmp_UDPIPv6Domain[0]); + +- t->sock = socket(PF_INET6, SOCK_DGRAM, 0); ++#ifndef NETSNMP_NO_SYSTEMD ++ /* ++ * Maybe the socket was already provided by systemd... ++ */ ++ if (local) { ++ t->sock = netsnmp_sd_find_inet_socket(PF_INET6, SOCK_DGRAM, -1, ++ ntohs(addr->sin6_port)); ++ if (t->sock) ++ socket_initialized = 1; ++ } ++#endif ++ if (!socket_initialized) ++ t->sock = socket(PF_INET6, SOCK_DGRAM, 0); + if (t->sock < 0) { + netsnmp_transport_free(t); + return NULL; +@@ -242,13 +259,14 @@ netsnmp_udp6_transport(struct sockaddr_i + } + } + #endif +- +- rc = bind(t->sock, (struct sockaddr *) addr, +- sizeof(struct sockaddr_in6)); +- if (rc != 0) { +- netsnmp_socketbase_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = bind(t->sock, (struct sockaddr *) addr, ++ sizeof(struct sockaddr_in6)); ++ if (rc != 0) { ++ netsnmp_socketbase_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } + t->local = (unsigned char*)malloc(18); + if (t->local == NULL) { +diff -up net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c +--- net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 ++++ net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c 2015-02-17 13:34:05.749221841 +0100 +@@ -37,6 +37,10 @@ + #include /* mkdirhier */ + #include + ++#ifndef NETSNMP_NO_SYSTEMD ++#include ++#endif ++ + netsnmp_feature_child_of(transport_unix_socket_all, transport_all) + netsnmp_feature_child_of(unix_socket_paths, transport_unix_socket_all) + +@@ -295,6 +299,7 @@ netsnmp_unix_transport(struct sockaddr_u + netsnmp_transport *t = NULL; + sockaddr_un_pair *sup = NULL; + int rc = 0; ++ int socket_initialized = 0; + + #ifdef NETSNMP_NO_LISTEN_SUPPORT + /* SPECIAL CIRCUMSTANCE: We still want AgentX to be able to operate, +@@ -333,7 +338,18 @@ netsnmp_unix_transport(struct sockaddr_u + t->data_length = sizeof(sockaddr_un_pair); + sup = (sockaddr_un_pair *) t->data; + +- t->sock = socket(PF_UNIX, SOCK_STREAM, 0); ++#ifndef NETSNMP_NO_SYSTEMD ++ /* ++ * Maybe the socket was already provided by systemd... ++ */ ++ if (local) { ++ t->sock = netsnmp_sd_find_unix_socket(SOCK_STREAM, 1, addr->sun_path); ++ if (t->sock) ++ socket_initialized = 1; ++ } ++#endif ++ if (!socket_initialized) ++ t->sock = socket(PF_UNIX, SOCK_STREAM, 0); + if (t->sock < 0) { + netsnmp_transport_free(t); + return NULL; +@@ -357,25 +373,26 @@ netsnmp_unix_transport(struct sockaddr_u + + t->flags |= NETSNMP_TRANSPORT_FLAG_LISTEN; + +- unlink(addr->sun_path); +- rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); +- +- if (rc != 0 && errno == ENOENT && create_path) { +- rc = mkdirhier(addr->sun_path, create_mode, 1); ++ if (!socket_initialized) { ++ unlink(addr->sun_path); ++ rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); ++ if (rc != 0 && errno == ENOENT && create_path) { ++ rc = mkdirhier(addr->sun_path, create_mode, 1); ++ if (rc != 0) { ++ netsnmp_unix_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } ++ rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); ++ } + if (rc != 0) { ++ DEBUGMSGTL(("netsnmp_unix_transport", ++ "couldn't bind \"%s\", errno %d (%s)\n", ++ addr->sun_path, errno, strerror(errno))); + netsnmp_unix_close(t); + netsnmp_transport_free(t); + return NULL; + } +- rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); +- } +- if (rc != 0) { +- DEBUGMSGTL(("netsnmp_unix_transport", +- "couldn't bind \"%s\", errno %d (%s)\n", +- addr->sun_path, errno, strerror(errno))); +- netsnmp_unix_close(t); +- netsnmp_transport_free(t); +- return NULL; + } + + /* +@@ -391,16 +408,17 @@ netsnmp_unix_transport(struct sockaddr_u + * Now sit here and listen for connections to arrive. + */ + +- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); +- if (rc != 0) { +- DEBUGMSGTL(("netsnmp_unix_transport", +- "couldn't listen to \"%s\", errno %d (%s)\n", +- addr->sun_path, errno, strerror(errno))); +- netsnmp_unix_close(t); +- netsnmp_transport_free(t); +- return NULL; ++ if (!socket_initialized) { ++ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); ++ if (rc != 0) { ++ DEBUGMSGTL(("netsnmp_unix_transport", ++ "couldn't listen to \"%s\", errno %d (%s)\n", ++ addr->sun_path, errno, strerror(errno))); ++ netsnmp_unix_close(t); ++ netsnmp_transport_free(t); ++ return NULL; ++ } + } +- + } else { + t->remote = (u_char *)malloc(strlen(addr->sun_path)); + if (t->remote == NULL) { diff --git a/net-snmp-python3.patch b/net-snmp-python3.patch new file mode 100644 index 0000000..4de2dc6 --- /dev/null +++ b/net-snmp-python3.patch @@ -0,0 +1,505 @@ +Index: net-snmp-5.7.3/python/setup.py +=================================================================== +--- net-snmp-5.7.3.orig/python/setup.py ++++ net-snmp-5.7.3/python/setup.py +@@ -9,9 +9,9 @@ intree=0 + + args = sys.argv[:] + for arg in args: +- if string.find(arg,'--basedir=') == 0: +- basedir = string.split(arg,'=')[1] +- sys.argv.remove(arg) ++ if arg.find('--basedir=') == 0: ++ basedir = arg.split('=')[1] ++ sys.argv.remove(arg) + intree=1 + + if intree: +Index: net-snmp-5.7.3/python/netsnmp/client.py +=================================================================== +--- net-snmp-5.7.3.orig/python/netsnmp/client.py ++++ net-snmp-5.7.3/python/netsnmp/client.py +@@ -1,3 +1,4 @@ ++from __future__ import print_function + import client_intf + import string + import re +@@ -35,12 +36,12 @@ def _parse_session_args(kargs): + 'TheirHostname':'', + 'TrustCert':'' + } +- keys = kargs.keys() ++ keys = list(kargs.keys()) + for key in keys: +- if sessArgs.has_key(key): ++ if key in sessArgs: + sessArgs[key] = kargs[key] + else: +- print >>stderr, "ERROR: unknown key", key ++ print("ERROR: unknown key", key, file=stderr) + return sessArgs + + def STR(obj): +@@ -127,7 +128,7 @@ class Session(object): + + sess_args = _parse_session_args(args) + +- for k,v in sess_args.items(): ++ for k,v in list(sess_args.items()): + self.__dict__[k] = v + + +Index: net-snmp-5.7.3/python/netsnmp/tests/test.py +=================================================================== +--- net-snmp-5.7.3.orig/python/netsnmp/tests/test.py ++++ net-snmp-5.7.3/python/netsnmp/tests/test.py +@@ -8,7 +8,7 @@ import time + + class BasicTests(unittest.TestCase): + def testFuncs(self): +- print "" ++ print("") + var = netsnmp.Varbind('sysDescr.0') + var = netsnmp.Varbind('sysDescr','0') + var = netsnmp.Varbind( +@@ -19,67 +19,67 @@ class BasicTests(unittest.TestCase): + + var = netsnmp.Varbind('.1.3.6.1.2.1.1.1','0') + +- print "---v1 GET tests -------------------------------------\n" ++ print("---v1 GET tests -------------------------------------\n") + res = netsnmp.snmpget(var, + Version = 1, + DestHost='localhost', + Community='public') + +- print "v1 snmpget result: ", res, "\n" ++ print("v1 snmpget result: ", res, "\n") + +- print "v1 get var: ", var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print("v1 get var: ", var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v1 GETNEXT tests-------------------------------------\n" ++ print("---v1 GETNEXT tests-------------------------------------\n") + res = netsnmp.snmpgetnext(var, + Version = 1, + DestHost='localhost', + Community='public') + +- print "v1 snmpgetnext result: ", res, "\n" ++ print("v1 snmpgetnext result: ", res, "\n") + +- print "v1 getnext var: ", var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print("v1 getnext var: ", var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v1 SET tests-------------------------------------\n" ++ print("---v1 SET tests-------------------------------------\n") + var = netsnmp.Varbind('sysLocation','0', 'my new location') + res = netsnmp.snmpset(var, + Version = 1, + DestHost='localhost', + Community='public') + +- print "v1 snmpset result: ", res, "\n" ++ print("v1 snmpset result: ", res, "\n") + +- print "v1 set var: ", var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print("v1 set var: ", var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v1 walk tests-------------------------------------\n" ++ print("---v1 walk tests-------------------------------------\n") + vars = netsnmp.VarList(netsnmp.Varbind('system')) + +- print "v1 varlist walk in: " ++ print("v1 varlist walk in: ") + for var in vars: +- print " ",var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(" ",var.tag, var.iid, "=", var.val, '(',var.type,')') + + res = netsnmp.snmpwalk(vars, + Version = 1, + DestHost='localhost', + Community='public') +- print "v1 snmpwalk result: ", res, "\n" ++ print("v1 snmpwalk result: ", res, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') + + +- print "---v1 walk 2-------------------------------------\n" ++ print("---v1 walk 2-------------------------------------\n") + +- print "v1 varbind walk in: " ++ print("v1 varbind walk in: ") + var = netsnmp.Varbind('system') + res = netsnmp.snmpwalk(var, + Version = 1, + DestHost='localhost', + Community='public') +- print "v1 snmpwalk result (should be = orig): ", res, "\n" ++ print("v1 snmpwalk result (should be = orig): ", res, "\n") + +- print var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v1 multi-varbind test-------------------------------------\n" ++ print("---v1 multi-varbind test-------------------------------------\n") + sess = netsnmp.Session(Version=1, + DestHost='localhost', + Community='public') +@@ -88,16 +88,16 @@ class BasicTests(unittest.TestCase): + netsnmp.Varbind('sysContact', 0), + netsnmp.Varbind('sysLocation', 0)) + vals = sess.get(vars) +- print "v1 sess.get result: ", vals, "\n" ++ print("v1 sess.get result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') + + vals = sess.getnext(vars) +- print "v1 sess.getnext result: ", vals, "\n" ++ print("v1 sess.getnext result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') + + vars = netsnmp.VarList(netsnmp.Varbind('sysUpTime'), + netsnmp.Varbind('sysORLastChange'), +@@ -106,28 +106,28 @@ class BasicTests(unittest.TestCase): + netsnmp.Varbind('sysORUpTime')) + + vals = sess.getbulk(2, 8, vars) +- print "v1 sess.getbulk result: ", vals, "\n" ++ print("v1 sess.getbulk result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v1 set2-------------------------------------\n" ++ print("---v1 set2-------------------------------------\n") + + vars = netsnmp.VarList( + netsnmp.Varbind('sysLocation', '0', 'my newer location')) + res = sess.set(vars) +- print "v1 sess.set result: ", res, "\n" ++ print("v1 sess.set result: ", res, "\n") + +- print "---v1 walk3-------------------------------------\n" ++ print("---v1 walk3-------------------------------------\n") + vars = netsnmp.VarList(netsnmp.Varbind('system')) + + vals = sess.walk(vars) +- print "v1 sess.walk result: ", vals, "\n" ++ print("v1 sess.walk result: ", vals, "\n") + + for var in vars: +- print " ",var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(" ",var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v2c get-------------------------------------\n" ++ print("---v2c get-------------------------------------\n") + + sess = netsnmp.Session(Version=2, + DestHost='localhost', +@@ -140,22 +140,22 @@ class BasicTests(unittest.TestCase): + netsnmp.Varbind('sysContact', 0), + netsnmp.Varbind('sysLocation', 0)) + vals = sess.get(vars) +- print "v2 sess.get result: ", vals, "\n" ++ print("v2 sess.get result: ", vals, "\n") + +- print "---v2c getnext-------------------------------------\n" ++ print("---v2c getnext-------------------------------------\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + + vals = sess.getnext(vars) +- print "v2 sess.getnext result: ", vals, "\n" ++ print("v2 sess.getnext result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + +- print "---v2c getbulk-------------------------------------\n" ++ print("---v2c getbulk-------------------------------------\n") + + vars = netsnmp.VarList(netsnmp.Varbind('sysUpTime'), + netsnmp.Varbind('sysORLastChange'), +@@ -164,30 +164,30 @@ class BasicTests(unittest.TestCase): + netsnmp.Varbind('sysORUpTime')) + + vals = sess.getbulk(2, 8, vars) +- print "v2 sess.getbulk result: ", vals, "\n" ++ print("v2 sess.getbulk result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + +- print "---v2c set-------------------------------------\n" ++ print("---v2c set-------------------------------------\n") + + vars = netsnmp.VarList( + netsnmp.Varbind('sysLocation','0','my even newer location')) + + res = sess.set(vars) +- print "v2 sess.set result: ", res, "\n" ++ print("v2 sess.set result: ", res, "\n") + +- print "---v2c walk-------------------------------------\n" ++ print("---v2c walk-------------------------------------\n") + vars = netsnmp.VarList(netsnmp.Varbind('system')) + + vals = sess.walk(vars) +- print "v2 sess.walk result: ", vals, "\n" ++ print("v2 sess.walk result: ", vals, "\n") + + for var in vars: +- print " ",var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(" ",var.tag, var.iid, "=", var.val, '(',var.type,')') + +- print "---v3 setup-------------------------------------\n" ++ print("---v3 setup-------------------------------------\n") + sess = netsnmp.Session(Version=3, + DestHost='localhost', + SecLevel='authPriv', +@@ -200,22 +200,22 @@ class BasicTests(unittest.TestCase): + vars = netsnmp.VarList(netsnmp.Varbind('sysUpTime', 0), + netsnmp.Varbind('sysContact', 0), + netsnmp.Varbind('sysLocation', 0)) +- print "---v3 get-------------------------------------\n" ++ print("---v3 get-------------------------------------\n") + vals = sess.get(vars) +- print "v3 sess.get result: ", vals, "\n" ++ print("v3 sess.get result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + +- print "---v3 getnext-------------------------------------\n" ++ print("---v3 getnext-------------------------------------\n") + + vals = sess.getnext(vars) +- print "v3 sess.getnext result: ", vals, "\n" ++ print("v3 sess.getnext result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + + vars = netsnmp.VarList(netsnmp.Varbind('sysUpTime'), + netsnmp.Varbind('sysORLastChange'), +@@ -224,37 +224,37 @@ class BasicTests(unittest.TestCase): + netsnmp.Varbind('sysORUpTime')) + + vals = sess.getbulk(2, 8, vars) +- print "v3 sess.getbulk result: ", vals, "\n" ++ print("v3 sess.getbulk result: ", vals, "\n") + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + +- print "---v3 set-------------------------------------\n" ++ print("---v3 set-------------------------------------\n") + + vars = netsnmp.VarList( + netsnmp.Varbind('sysLocation','0', 'my final destination')) + res = sess.set(vars) +- print "v3 sess.set result: ", res, "\n" ++ print("v3 sess.set result: ", res, "\n") + +- print "---v3 walk-------------------------------------\n" ++ print("---v3 walk-------------------------------------\n") + vars = netsnmp.VarList(netsnmp.Varbind('system')) + + vals = sess.walk(vars) +- print "v3 sess.walk result: ", vals, "\n" ++ print("v3 sess.walk result: ", vals, "\n") + + for var in vars: +- print " ",var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print(" ",var.tag, var.iid, "=", var.val, '(',var.type,')') + + + class SetTests(unittest.TestCase): + def testFuncs(self): +- print "\n-------------- SET Test Start ----------------------------\n" ++ print("\n-------------- SET Test Start ----------------------------\n") + + var = netsnmp.Varbind('sysUpTime','0') + res = netsnmp.snmpget(var, Version = 1, DestHost='localhost', + Community='public') +- print "uptime = ", res[0] ++ print("uptime = ", res[0]) + + + var = netsnmp.Varbind('versionRestartAgent','0', 1) +@@ -264,19 +264,19 @@ class SetTests(unittest.TestCase): + var = netsnmp.Varbind('sysUpTime','0') + res = netsnmp.snmpget(var, Version = 1, DestHost='localhost', + Community='public') +- print "uptime = ", res[0] ++ print("uptime = ", res[0]) + + var = netsnmp.Varbind('nsCacheEntry') + res = netsnmp.snmpgetnext(var, Version = 1, DestHost='localhost', + Community='public') +- print "var = ", var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print("var = ", var.tag, var.iid, "=", var.val, '(',var.type,')') + + var.val = 65 + res = netsnmp.snmpset(var, Version = 1, DestHost='localhost', + Community='public') + res = netsnmp.snmpget(var, Version = 1, DestHost='localhost', + Community='public') +- print "var = ", var.tag, var.iid, "=", var.val, '(',var.type,')' ++ print("var = ", var.tag, var.iid, "=", var.val, '(',var.type,')') + + sess = netsnmp.Session(Version = 1, DestHost='localhost', + Community='public') +@@ -286,7 +286,7 @@ class SetTests(unittest.TestCase): + netsnmp.Varbind('.1.3.6.1.6.3.12.1.2.1.9.116.101.115.116','', 4)) + res = sess.set(vars) + +- print "res = ", res ++ print("res = ", res) + + vars = netsnmp.VarList(netsnmp.Varbind('snmpTargetAddrTDomain'), + netsnmp.Varbind('snmpTargetAddrTAddress'), +@@ -295,14 +295,14 @@ class SetTests(unittest.TestCase): + res = sess.getnext(vars) + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + + vars = netsnmp.VarList(netsnmp.Varbind('.1.3.6.1.6.3.12.1.2.1.9.116.101.115.116','', 6)) + + res = sess.set(vars) + +- print "res = ", res ++ print("res = ", res) + + vars = netsnmp.VarList(netsnmp.Varbind('snmpTargetAddrTDomain'), + netsnmp.Varbind('snmpTargetAddrTAddress'), +@@ -311,10 +311,10 @@ class SetTests(unittest.TestCase): + res = sess.getnext(vars) + + for var in vars: +- print var.tag, var.iid, "=", var.val, '(',var.type,')' +- print "\n" ++ print(var.tag, var.iid, "=", var.val, '(',var.type,')') ++ print("\n") + +- print "\n-------------- SET Test End ----------------------------\n" ++ print("\n-------------- SET Test End ----------------------------\n") + + + if __name__=='__main__': +Index: net-snmp-5.7.3/python/netsnmp/client_intf.c +=================================================================== +--- net-snmp-5.7.3.orig/python/netsnmp/client_intf.c ++++ net-snmp-5.7.3/python/netsnmp/client_intf.c +@@ -979,7 +979,11 @@ py_netsnmp_attr_string(PyObject *obj, ch + PyObject *attr = PyObject_GetAttrString(obj, attr_name); + if (attr) { + int retval; ++#if PY_MAJOR_VERSION >= 3 ++ retval = PyBytes_AsStringAndSize(attr, val, len); ++#else + retval = PyString_AsStringAndSize(attr, val, len); ++#endif + Py_DECREF(attr); + return retval; + } +@@ -996,7 +1000,11 @@ py_netsnmp_attr_long(PyObject *obj, char + if (obj && attr_name && PyObject_HasAttrString(obj, attr_name)) { + PyObject *attr = PyObject_GetAttrString(obj, attr_name); + if (attr) { ++#if PY_MAJOR_VERSION >= 3 ++ val = PyLong_AsLong(attr); ++#else + val = PyInt_AsLong(attr); ++#endif + Py_DECREF(attr); + } + } +@@ -1079,11 +1087,19 @@ __py_netsnmp_update_session_errors(PyObj + + py_netsnmp_attr_set_string(session, "ErrorStr", err_str, STRLEN(err_str)); + ++#if PY_MAJOR_VERSION >= 3 ++ tmp_for_conversion = PyLong_FromLong(err_num); ++#else + tmp_for_conversion = PyInt_FromLong(err_num); ++#endif + PyObject_SetAttrString(session, "ErrorNum", tmp_for_conversion); + Py_DECREF(tmp_for_conversion); + ++#if PY_MAJOR_VERSION >= 3 ++ tmp_for_conversion = PyLong_FromLong(err_ind); ++#else + tmp_for_conversion = PyInt_FromLong(err_ind); ++#endif + PyObject_SetAttrString(session, "ErrorInd", tmp_for_conversion); + Py_DECREF(tmp_for_conversion); + } +@@ -2607,13 +2623,28 @@ static PyMethodDef ClientMethods[] = { + {NULL, NULL, 0, NULL} /* Sentinel */ + }; + ++#if PY_MAJOR_VERSION >= 3 ++static struct PyModuleDef ClientModuleDef = { ++ PyModuleDef_HEAD_INIT, ++ "client_intf", ++ NULL, ++ -1, ++ ClientMethods, ++ NULL, ++ NULL, ++ NULL, ++ NULL ++}; ++ ++PyMODINIT_FUNC ++PyInit_client_intf(void) ++{ ++ return PyModule_Create(&ClientModuleDef); ++} ++#else + PyMODINIT_FUNC + initclient_intf(void) + { + (void) Py_InitModule("client_intf", ClientMethods); + } +- +- +- +- +- ++#endif diff --git a/net-snmp-tmpfs.conf b/net-snmp-tmpfs.conf new file mode 100644 index 0000000..cb45a78 --- /dev/null +++ b/net-snmp-tmpfs.conf @@ -0,0 +1 @@ +d /var/run/net-snmp 0755 root root diff --git a/net-snmp.changes b/net-snmp.changes index 46c3c76..7be61ea 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Jan 24 14:07:16 UTC 2018 - tchvatal@suse.com + +- Properly conditionalize the py2 build + +------------------------------------------------------------------- +Wed Jan 24 13:09:36 UTC 2018 - tchvatal@suse.com + +- Add patch from Fedora to support natively systemd: + * net-snmp-5.7.2-systemd.patch +- Drop the check phase as whole 90% of the tests fail it makes + more sense to run them somewhere localy + +------------------------------------------------------------------- +Mon Jan 22 12:24:33 UTC 2018 - tchvatal@suse.com + +- Take systemd service files from fedora to replace sysV scripts +- Also convert the sysconfig files to match fedora ones, they + get bit more terse but it works seamlessly with systemd + +------------------------------------------------------------------- +Fri Jan 19 17:36:38 UTC 2018 - tchvatal@suse.com + +- Format with spec-cleaner +- Drop sle11 support as it fails to build anyway for ages +- Rename python packages to be python-%{name} with obsoletes + * Use new singlespec macros + * Add patch converting the py files to python3/2 compat mode + net-snmp-python3.patch +- Run full autoreconf instead of partial +- Build with threads by building few targets first + ------------------------------------------------------------------- Mon Dec 11 17:14:43 UTC 2017 - dimstar@opensuse.org diff --git a/net-snmp.spec b/net-snmp.spec index 424632c..a6c20ea 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -1,7 +1,7 @@ # # spec file for package net-snmp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,58 +16,38 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define netsnmp_logfile %{_localstatedir}/log/net-snmpd.log +%define netsnmp_agentx_socket_dir_fhs %{_rundir}/agentx +%define netsnmp_agentx_socket_dir_rfc %{_localstatedir}/agentx +# Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - -# compatibility for SLES11 <=SP1 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - -%define pkg_name net-snmp %ifnarch s390 s390x %define netsnmp_with_sensors 1 %endif -%define netsnmp_check 1 -%define netsnmp_logfile /var/log/net-snmpd.log -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif -%define netsnmp_agentx_socket_dir_fhs %{_rundir}/agentx -%define netsnmp_agentx_socket_dir_rfc /var/agentx - +%define libname libsnmp30 +%bcond_without python2 Name: net-snmp Version: 5.7.3 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: openssl-devel -BuildRequires: procps -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: rpm-devel -BuildRequires: tcpd-devel -%if 0%{?netsnmp_with_sensors} -BuildRequires: libsensors4-devel -%endif -Requires: logrotate -Requires: perl-SNMP = %{version} -Requires: perl-TermReadKey -PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig +Summary: SNMP Daemon +License: BSD-3-Clause AND MIT +Group: Productivity/Networking/Other Url: http://sourceforge.net/projects/net-snmp -#Source: http://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/%{pkg_name}-%{version}.tar.gz -Source: %{pkg_name}-%{version}.tar.gz -Source1: rc.snmpd +Source: http://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/%{name}-%{version}.tar.gz +Source1: snmpd.service Source2: snmpd.conf Source3: README.SUSE -Source4: rc.snmptrapd +Source4: snmptrapd.service Source5: net-snmp.logrotate Source6: test_installed -Source7: net-snmp.sysconfig -Source8: net-snmp-rpmlintrc -Source9: baselibs.conf +Source10: snmpd.sysconfig +Source11: snmptrapd.sysconfig +Source20: net-snmp-tmpfs.conf +Source98: net-snmp-rpmlintrc +Source99: baselibs.conf Patch1: net-snmp-5.7.3-socket-path.patch Patch2: net-snmp-5.7.3-testing-empty-arptable.patch Patch3: net-snmp-5.7.3-pie.patch @@ -82,10 +62,27 @@ Patch11: net-snmp-5.7.3-Remove-U64-typedef.patch Patch12: net-snmp-5.7.3-Fix-Makefile.PL.patch Patch13: net-snmp-5.7.3-build-with-openssl-1.1.patch Patch14: net-snmp-5.7.3-modern-rpm-api.patch -# -Summary: SNMP Daemon -License: BSD-3-Clause and MIT -Group: Productivity/Networking/Other +Patch15: net-snmp-python3.patch +Patch16: net-snmp-5.7.2-systemd.patch +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: procps +BuildRequires: python-rpm-macros +BuildRequires: rpm-devel +BuildRequires: systemd-rpm-macros +BuildRequires: tcpd-devel +Requires: logrotate +Requires: perl-SNMP = %{version} +Requires: perl-TermReadKey +Requires(post): %fillup_prereq +%if 0%{?netsnmp_with_sensors} +BuildRequires: libsensors4-devel +%endif +%{?systemd_requires} %description Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c @@ -103,18 +100,14 @@ This package was originally based on the CMU 2.1.2.1 snmp code. It was renamed from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to net-snmp in November 2000. - -%define library_name libsnmp30 - -%package -n libsnmp30 +%package -n %{libname} +Summary: Shared Libraries from net-snmp +License: BSD-3-Clause AND MIT +Group: Productivity/Networking/Other Requires: perl-base = %{perl_version} Requires: snmp-mibs = %{version} -# -Summary: Shared Libraries from net-snmp -License: BSD-3-Clause and MIT -Group: Productivity/Networking/Other -%description -n libsnmp30 +%description -n %{libname} Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: @@ -129,7 +122,10 @@ and SNMP v3 using both IPv4 and IPv6. The suite includes: This package holds the shared libraries from the net-snmp package. %package devel -Requires: %{library_name} = %{version} +Summary: Development files from net-snmp +License: BSD-3-Clause AND MIT +Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version} # for mib2c Requires: perl Requires: perl-SNMP = %{version} @@ -140,10 +136,6 @@ Requires: pkgconfig(libssl) %if 0%{?netsnmp_with_sensors} Requires: libsensors4-devel %endif -# -Summary: Development files from net-snmp -License: BSD-3-Clause and MIT -Group: Development/Libraries/C and C++ %description devel Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c @@ -160,11 +152,9 @@ and SNMP v3 using both IPv4 and IPv6. The suite includes: This package holds the development headers, libraries and API documentation from the net-snmp package. - %package -n snmp-mibs -# Summary: MIB files from net-snmp -License: BSD-3-Clause and MIT +License: BSD-3-Clause AND MIT Group: Productivity/Networking/Other %description -n snmp-mibs @@ -181,46 +171,44 @@ and SNMP v3 using both IPv4 and IPv6. The suite includes: This package holds the MIB files from the net-snmp package. - %package -n perl-SNMP -Requires: %{pkg_name} = %{version} -Requires: perl-base = %{perl_version} -# Summary: Perl5 SNMP Extension Module License: GPL-2.0+ Group: Development/Libraries/Perl +Requires: %{name} = %{version} +Requires: perl-base = %{perl_version} %description -n perl-SNMP The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library. - -%package python +%package -n python2-%{name} Summary: The Python 'netsnmp' module for the Net-SNMP -License: BSD-3-Clause and MIT +License: BSD-3-Clause AND MIT Group: Development/Libraries/Python +Requires: %{libname} = %{version} +Provides: %{name}-python = %{version} +Obsoletes: %{name}-python < %{version} +Provides: python-%{name} = %{version} -%description python +%description -n python2-%{name} The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3, SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the Net-SNMP toolkit library. +%package -n python3-%{name} +Summary: The Python 3 'netsnmp' module for the Net-SNMP +License: BSD-3-Clause AND MIT +Group: Development/Libraries/Python +Requires: %{libname} = %{version} + +%description -n python3-%{name} +The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3, +SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the +Net-SNMP toolkit library. %prep -%setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 +%setup -q +%autopatch -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ @@ -232,14 +220,16 @@ MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ MIBS="$MIBS ucd-snmp/lmsensorsMib" %endif -autoreconf +autoreconf -fvi %configure \ --with-sys-contact="root@localhost" \ --with-sys-location="unknown" \ --with-mib-modules="$MIBS" \ - --with-cflags="%{optflags} -fstack-protector-all" \ - --with-persistent-directory="/var/lib/net-snmp" \ + --with-cflags="%{optflags}" \ + --with-ldflags="-Wl,-z,relro -Wl,-z,now" \ + --with-persistent-directory="%{_localstatedir}/lib/net-snmp" \ --with-agentx-socket="%{netsnmp_agentx_socket_dir_fhs}/master" \ + --with-temp-file-pattern=/var/run/net-snmp/snmp-tmp-XXXXXX \ --with-logfile="%{netsnmp_logfile}" \ --with-libwrap="%{_prefix}" \ --with-perl-modules="INSTALLDIRS=vendor" \ @@ -252,84 +242,78 @@ autoreconf --enable-ipv6 \ --enable-ucd-snmp-compatibility \ --with-security-modules=tsm \ - --with-transports=TLSTCP,DTLSUDP + --with-transports=TLSTCP,DTLSUDP \ + --with-systemd -# Parallel building is disabled because dependencies between the Perl -# module and libnetsnmp are not correctly defined. -make #%{?_smp_mflags} +# Parallel build deps not properly stated +make -j1 pushd python -%{__python} setup.py --basedir="../" build +%python_exec setup.py build --basedir="../" popd -%check -%if 0%{?netsnmp_check} -%ifnarch %arm -ulimit -c unlimited -%{__make} test ||: -%{__make} test TESTOPTS='-P tcp' ||: -%endif -%{__make} perlmodules ||: -LD_RUN_PATH="$PWD/snmplib/.libs" LD_LIBRARY_PATH="${PWD}/snmplib/.libs:${PWD}/agent/.libs:${PWD}/agent/helpers/.libs" %{__make} perltest ||: -%endif - %install -%makeinstall INSTALL_PREFIX=%{buildroot} -%{__install} -Dd %{buildroot}/var/log %{buildroot}/var/lib/net-snmp %{buildroot}/usr/lib/net-snmp/agents %{buildroot}%{netsnmp_agentx_socket_dir_fhs} -%{__install} -D -m 0755 %{SOURCE1} %{buildroot}/etc/init.d/snmpd -%{__install} -D -m 0755 %{SOURCE4} %{buildroot}/etc/init.d/snmptrapd -%{__install} -D -m 0600 %{SOURCE2} %{buildroot}/etc/snmp/snmpd.conf -%{__install} -m 0644 %{SOURCE3} . -%{__install} -m 0644 %{SOURCE4} . -%{__install} -D -m 0644 %{SOURCE5} %{buildroot}/etc/logrotate.d/net-snmp -%{__install} -m 0744 %{SOURCE6} testing/ -%{__ln_s} -f /etc/init.d/snmpd %{buildroot}%{_sbindir}/rcsnmpd -%{__ln_s} -f /etc/init.d/snmptrapd %{buildroot}%{_sbindir}/rcsnmptrapd -%{__install} -m 0644 /dev/null %{buildroot}%{netsnmp_logfile} +%make_install INSTALL_PREFIX=%{buildroot} +install -Dd %{buildroot}%{_localstatedir}/log %{buildroot}%{_localstatedir}/lib/net-snmp %{buildroot}%{_libexecdir}/net-snmp/agents %{buildroot}%{netsnmp_agentx_socket_dir_fhs} +install -D -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/snmpd.service +install -D -m 0755 %{SOURCE4} %{buildroot}%{_unitdir}/snmptrapd.service +install -D -m 0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/snmp/snmpd.conf +install -m 0644 %{SOURCE3} . +install -m 0644 %{SOURCE4} . +install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/net-snmp +install -m 0744 %{SOURCE6} testing/ +ln -sf service %{buildroot}%{_sbindir}/rcsnmpd +ln -sf service %{buildroot}%{_sbindir}/rcsnmptrapd +install -m 0644 /dev/null %{buildroot}%{netsnmp_logfile} pushd perl %perl_make_install %perl_process_packlist - %{__rm} -f %{buildroot}/%{perl_vendorarch}/Bundle/Makefile.subs.pl + rm -f %{buildroot}/%{perl_vendorarch}/Bundle/Makefile.subs.pl popd pushd python -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install popd -%{__grep} -a -v "^#define PACKAGE" %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h > \ +grep -a -v "^#define PACKAGE" %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h > \ %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h.new -%{__mv} %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h{.new,} -%{__install} -D -m 0644 %{S:7} \ - %{buildroot}%{_fillupdir}/sysconfig.%{pkg_name} +mv %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h{.new,} +install -D -m 0644 %{SOURCE10} %{buildroot}%{_fillupdir}/sysconfig.snmpd +install -D -m 0644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.snmptrapd +# tmpfiles +install -m 755 -d $RPM_BUILD_ROOT/%{_tmpfilesdir} +install -m 644 %SOURCE20 $RPM_BUILD_ROOT/%{_tmpfilesdir}/net-snmp.conf # -%{__ln_s} -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc} +ln -s -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc} # -rm -f "%buildroot/%_libdir"/*.la +find %{buildroot} -type f -name "*.la" -delete -print -%preun -%stop_on_removal snmpd -%stop_on_removal snmptrapd +%pre +%service_add_pre snmpd.service snmptrapd.service %post /sbin/chkconfig -c snmpd 2> /dev/null && FIRST_ARG=2 -%{fillup_only} +%fillup_only snmpd +%fillup_only snmptrapd +%tmpfiles_create %{_tmpfilesdir}/net-snmp.conf +%service_add_post snmpd.service snmptrapd.service + +%preun +%service_del_preun snmpd.service snmptrapd.service %postun -%restart_on_update snmpd -%restart_on_update snmptrapd -%{insserv_cleanup} +%service_del_postun snmpd.service snmptrapd.service -%post -n %{library_name} -p /sbin/ldconfig - -%postun -n %{library_name} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AGENT.txt COPYING EXAMPLE.conf EXAMPLE.conf.def %doc FAQ NEWS TODO CHANGES %doc README README.agent-mibs README.agentx README.krb5 README.snmpv3 README.thread -%dir /etc/snmp -%config(noreplace) /etc/snmp/snmpd.conf -%config /etc/init.d/snmpd -%config /etc/init.d/snmptrapd +%dir %{_sysconfdir}/snmp +%config(noreplace) %{_sysconfdir}/snmp/snmpd.conf +%{_unitdir}/snmpd.service +%{_unitdir}/snmptrapd.service +%{_tmpfilesdir}/net-snmp.conf %{_bindir}/encode_keychange %{_bindir}/fixproc %{_bindir}/ipf-mod.pl @@ -359,32 +343,31 @@ rm -f "%buildroot/%_libdir"/*.la %{_bindir}/net-snmp-cert %{_bindir}/agentxtrap %{_bindir}/snmp-bridge-mib -%dir %{_prefix}/lib/net-snmp -%dir %{_prefix}/lib/net-snmp/agents +%dir %{_libexecdir}/net-snmp +%dir %{_libexecdir}/net-snmp/agents %{_mandir}/man[158]/* %{_sbindir}/* -/var/lib/net-snmp +%{_localstatedir}/lib/net-snmp %dir %ghost %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs} %ghost %{netsnmp_logfile} -%config(noreplace) /etc/logrotate.d/net-snmp -%{_fillupdir}/sysconfig.%{pkg_name} +%config(noreplace) %{_sysconfdir}/logrotate.d/net-snmp +%{_fillupdir}/sysconfig.snmpd +%{_fillupdir}/sysconfig.snmptrapd %{netsnmp_agentx_socket_dir_rfc} %{_datadir}/snmp/snmpconf-data/ %{_datadir}/snmp/snmp_perl.pl %{_datadir}/snmp/snmp_perl_trapd.pl %files -n snmp-mibs -%defattr(-,root,root) %dir %{_datadir}/snmp %{_datadir}/snmp/mibs/ -%files -n %{library_name} -%defattr(-,root,root) +%files -n %{libname} +%license COPYING %{_libdir}/libsnmp*.so.* %{_libdir}/libnetsnmp*.so.* %files devel -%defattr(-,root,root) %doc ChangeLog PORTING %{_mandir}/man3/* %{_includedir}/ucd-snmp @@ -396,20 +379,21 @@ rm -f "%buildroot/%_libdir"/*.la %{_datadir}/snmp/mib2c* %files -n perl-SNMP -%defattr(-,root,root) %{perl_vendorarch}/auto/SNMP %{perl_vendorarch}/auto/NetSNMP %{perl_vendorarch}/auto/Bundle %{perl_vendorarch}/SNMP.pm %{perl_vendorarch}/NetSNMP %{_bindir}/tkmib -%if 0%{?suse_version} <= 1130 -/var/adm/perl-modules/net-snmp + +%if %{with python2} +%files -n python2-%{name} +%doc README +%{python2_sitearch}/* %endif -%files python -%defattr(-,root,root) +%files -n python3-%{name} %doc README -%{python_sitearch}/* +%{python3_sitearch}/* %changelog diff --git a/net-snmp.sysconfig b/net-snmp.sysconfig deleted file mode 100644 index 6617366..0000000 --- a/net-snmp.sysconfig +++ /dev/null @@ -1,60 +0,0 @@ -## Path: System/Net-SNMP -## Description: Log level of the snmp server. -## Type: string(!,a,c,e,w,n,i,d,0,1,2,3,4,5,6,7) -## Default: n -# -# Defines the log level for snmpd and snmptrapd. -# -# The default is "n" (5, LOG_NOTICE) -# -SNMPD_LOGLEVEL="n" - -## Path: System/Net-SNMP -## Description: En-/Disables SNMP SMUX support. -## Type: yesno -## Default: yes -# -# Setting this to "no" prevents snmpd from binding to TCP port 199. -# -# The default is "yes" to provide backward compatibility. -# -SNMPD_USE_SMUX="yes" - -## Path: System/Net-SNMP -## Description: Connection logging. -## Type: yesno -## Default: yes -# -# If this setting is "yes" and $SNMPD_LOGLEVEL is set to "i" (LOG_INFO) -# or "d" (LOG_DEBUG), snmpd will log all successful connections. -# -# Setting it to "no" will prevent this kind of log regardless of the -# configured log level. -# -# The default is "yes" to provide backward compatibility. -# -SNMPD_LOG_SUCCESSFUL_CONNECTIONS="yes" - -## Path: System/Net-SNMP -## Description: Log Destination -## Type: string(F,S) -## Default: S -# -# Defines the log destination for snmpd and snmptrapd. -# -# By setting it to "F", snmpd will write log messages into '/var/log/net-snmpd.log'. -# -# The default is "S" to log messages through the syslog service. -# -SNMPD_LOGDEST="S" - -## Path: System/Net-SNMP -## Description: Listening IP addresses -## Type: string -## Default: "" (empty - listen on all interfaces) -# -# Defines the IP address(es) that snmpd and snmptrapd binds to. -# If no address is defined the daemon will listen on all interfaces. -# -SNMPD_LISTEN="" - diff --git a/rc.snmpd b/rc.snmpd deleted file mode 100644 index 9c992e0..0000000 --- a/rc.snmpd +++ /dev/null @@ -1,194 +0,0 @@ -#! /bin/sh -# Copyright (c) 1996-2011 SuSE GmbH Nuernberg, Germany. All rights reserved. -# -# Author: Christopher Mahmood, Remo Behn -# -# /etc/init.d/snmpd -# -### BEGIN INIT INFO -# Provides: net-snmp snmp snmpd -# Required-Start: $remote_fs -# Should-Start: $syslog $network -# Required-Stop: $remote_fs -# Should-Stop: $syslog $network -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Description: Net-SNMP agent -# Short-Description: Net-SNMP agent -### END INIT INFO - -SNMPD=/usr/sbin/snmpd -AGENTDIR=/usr/lib/net-snmp/agents -SNMPDCONF=/etc/snmp/snmpd.conf -SNMPD_PID=/var/run/snmpd.pid - -test -x $SNMPD || exit 5 - -# Check for existence of needed config file and read it -SNMPD_CONFIG=/etc/sysconfig/net-snmp -test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG not existing"; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } - -# Read config -. $SNMPD_CONFIG - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -. /etc/rc.status - -# First reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - insufficient privilege -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signalling is not supported) are -# considered a success. - -# check whether to enable agentx support and get list of installed -# agents -get_agents() -{ - agents= - agentargs='' - for agent in $AGENTDIR/*; do - test -x $agent || continue - agents="$agents $agent" - agentargs="-x /var/run/agentx/master" - done -} - -case "$1" in - start) - echo -n "Starting snmpd" - # - # log destination "F" for file. - # do not even try to start if the log file is (2GB-1MB) big. - # the snmpd doesnt handle LFS properly - # - if [ ${SNMPD_LOGDEST:-F} = "F" ]; then - SNMPD_LOGTARGET="${SNMPD_LOGTARGET:-/var/log/net-snmpd.log}" - if [ -e "$SNMPD_LOGTARGET" ] ; then - SNMPD_SIZE_LOGFILE="$(stat -c "%s" $SNMPD_LOGTARGET)" - SNMPD_SIZE_MAX="1073741824" - if [ $SNMPD_SIZE_LOGFILE -gt $SNMPD_SIZE_MAX ] ; then - echo -e "\n\"$SNMPD_LOGTARGET\" is too large. Running 'logrotate' for net-snmp." >&2 - /usr/sbin/logrotate /etc/logrotate.d/net-snmp - fi - fi - fi - # - # log destination "S" for syslog. - # define syslog facility to 'd' for LOG_DAEMON. - # - if [ ${SNMPD_LOGDEST:-F} = "S" ]; then - SNMPD_LOGTARGET="d" - fi - get_agents - # Don't add -c /etc/snmp/snmpd.conf, as it is loaded by default. - if [ $SNMPDCONF = "/etc/snmp/snmpd.conf" ]; then - SNMPDCONF="" - else - SNMPDCONF="-c $SNMPDCONF" - fi - case "${SNMPD_USE_SMUX:-yes}" in - [Nn][Oo]) - SNMPDNOSMUX="-I -smux" - ;; - esac - case "${SNMPD_LOG_SUCCESSFUL_CONNECTIONS:-yes}" in - [Nn][Oo]) - SNMPDNOTCPWRAPPERLOG="--dontLogTCPWrappersConnects" - ;; - esac - # /var/run can now be mounted as tmpfs - if [ ! -d /var/run/agentx ]; then - mkdir -m 0700 /var/run/agentx - fi - startproc $SNMPD $SNMPDCONF -r -A -L${SNMPD_LOGDEST:-F} ${SNMPD_LOGLEVEL:-n} $SNMPD_LOGTARGET -p $SNMPD_PID $agentargs $SNMPDNOSMUX $SNMPDNOTCPWRAPPERLOG $SNMPD_LISTEN - rc_status -v - rc_reset - - # start all agents - if test -n "$agents"; then - usleep 300000 - for agent in $agents; do - echo -en "\tStarting `basename $agent`" - startproc -t1 $agent - rc_status -v ; rc_reset - done - fi - ;; - stop) - echo -n "Shutting down snmpd:" - killproc -TERM $SNMPD - rc_status -v ; rc_reset - # we also need to make sure all agents die - get_agents - if test -n "$agents"; then - for agent in $AGENTDIR/*; do - test -x $agent || continue - echo -ne "\tShutting down `basename $agent`:" - killproc $agent - rc_status -v ; rc_reset - done - fi - ;; - try-restart) - $0 status >/dev/null && $0 restart - rc_status - ;; - restart) - $0 stop - $0 start - rc_status - ;; - force-reload) - echo -n "Reload service snmpd:" - killproc -HUP $SNMPD - rc_status -v - ;; - reload) - echo -n "Reload service snmpd:" - killproc -HUP $SNMPD - rc_status -v - ;; - status) - echo -n "Checking for service snmpd:" - checkproc $SNMPD - rc_status -v - get_agents - if test -n "$agents"; then - echo -e "Checking for agents:" - - for agent in $agents; do - echo -en "\t`basename $agent`" - checkproc $agent - rc_status -v - done - fi - ;; - *) - echo "Usage: $0 {start|stop|try-restart|restart|force-reload|reload|status}" - exit 1 - ;; -esac -rc_exit - diff --git a/rc.snmptrapd b/rc.snmptrapd deleted file mode 100644 index 6a0d22a..0000000 --- a/rc.snmptrapd +++ /dev/null @@ -1,129 +0,0 @@ -#! /bin/sh -# Copyright (c) 1996-2011 SuSE GmbH Nuernberg, Germany. All rights reserved. -# -# Author: Christopher Mahmood -# -# /etc/init.d/snmptrapd -# -### BEGIN INIT INFO -# Provides: snmptrapd -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Description: Receive and log SNMP trap messages -# Short-Description: Receive and log SNMP trap messages -### END INIT INFO - -SNMPTRAPD=/usr/sbin/snmptrapd -SNMPTRAPD_CONF="/etc/snmp/snmptrapd.conf" -SNMPTRAPD_LOGTARGET="/var/log/net-snmpd.log" -SNMPTRAPD_PID="/var/run/snmptrapd.pid" - -test -x $SNMPTRAPD || { echo "$SNMPTRAPD not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# Check for existence of needed config file and read it -SNMPD_CONFIG=/etc/sysconfig/net-snmp -test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG doesn't exist."; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } - -# Read config -. $SNMPD_CONFIG - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -. /etc/rc.status - -# First reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - insufficient privilege -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signalling is not supported) are -# considered a success. -if [ $SNMPTRAPD_CONF = "/etc/snmp/snmptrapd.conf" ]; then - SNMPTRAPD_CONF="" -else - SNMPTRAPD_CONF="-c $SNMPTRAPD_CONF" -fi -# -# If log destination is set to "F" define a log file. -# -if [ ${SNMPD_LOGDEST:-S} = "F" ]; then - SNMPTRAPD_LOGTARGET="${SNMPTRAPD_LOGTARGET:-/var/log/net-snmpd.log}" -fi -# -# If log destionation is set to "S" use syslog LOG_DAEMON facility. -# -if [ ${SNMPD_LOGDEST:-S} = "S" ]; then - SNMPTRAPD_LOGTARGET="d" -fi - -case "$1" in - start) - echo -n "Starting snmptrapd: " - startproc $SNMPTRAPD $SNMPTRAPD_CONF -A -L${SNMPD_LOGDEST:-S} ${SNMPD_LOGLEVEL:-n} $SNMPTRAPD_LOGTARGET -p $SNMPTRAPD_PID $SNMPD_LISTEN - - rc_status -v - ;; - stop) - echo -n "Shutting down snmptrapd: " - killproc -TERM $SNMPTRAPD - if [ -f "$SNMPTAPDD_LOGFILE" ]; then - DATE=$(date +"%Y%m%d") - /bin/mv "$SNMPTAPDD_LOGFILE" "$SNMPTAPDD_LOGFILE-$DATE" - test -x /usr/bin/bzip2 && /usr/bin/bzip2 "$SNMPTAPDD_LOGFILE-$DATE" - fi - rc_status -v - ;; - try-restart) - $0 status >/dev/null && $0 restart - rc_status - ;; - restart) - $0 stop - $0 start - rc_status - ;; - force-reload) - echo -n "Reload service snmptrapd: " - killproc -HUP $SNMPTRAPD - rc_status -v - ;; - reload) - echo -n "Reload service snmptrapd: " - killproc -HUP $SNMPTRAPD - rc_status -v - ;; - status) - echo -n "Checking for service snmptrapd: " - checkproc $SNMPTRAPD - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|try-restart|restart|force-reload|reload|status}" - exit 1 - ;; -esac -rc_exit - diff --git a/snmpd.service b/snmpd.service new file mode 100644 index 0000000..d554880 --- /dev/null +++ b/snmpd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) Daemon. +After=syslog.target network.target + +[Service] +Type=notify +Environment=OPTIONS="-LS0-6d" +EnvironmentFile=-/etc/sysconfig/snmpd +ExecStart=/usr/sbin/snmpd $OPTIONS -f +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/snmpd.sysconfig b/snmpd.sysconfig new file mode 100644 index 0000000..c528e4d --- /dev/null +++ b/snmpd.sysconfig @@ -0,0 +1,9 @@ +## Path: System/Net-SNMP +## Description: snmpd command line options +## Type: string +## Default: "" +# +# '-f' is implicitly added by snmptrapd systemd unit file +# OPTIONS="-L60-6d" +# +OPTIONS="" diff --git a/snmptrapd.service b/snmptrapd.service new file mode 100644 index 0000000..4c4734e --- /dev/null +++ b/snmptrapd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) Trap Daemon. +After=syslog.target network.target + +[Service] +Type=notify +Environment=OPTIONS="-Lsd" +EnvironmentFile=-/etc/sysconfig/snmptrapd +ExecStart=/usr/sbin/snmptrapd $OPTIONS -f +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/snmptrapd.sysconfig b/snmptrapd.sysconfig new file mode 100644 index 0000000..833c182 --- /dev/null +++ b/snmptrapd.sysconfig @@ -0,0 +1,9 @@ +## Path: System/Net-SNMP +## Description: snmptrapd command line options +## Type: string +## Default: "" +# +# '-f' is implicitly added by snmptrapd systemd unit file +# OPTIONS="-Lsd" +# +OPTIONS=""