rpms
/
net-snmp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-diff systemd patch

This commit is contained in:
Jan Safranek 2011-10-04 09:20:23 +02:00
parent 663453bdc1
commit 236dda1ab3
2 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
net-snmp-5.7-systemd.patch → net-snmp-5.7.1-systemd.patch
View File

@ -57,9 +57,10 @@ Date: Tue Aug 9 10:53:43 2011 +0200
- update WantedBy in socket units as recommended by http://0pointer.de/blog/projects/socket-activation.html - update WantedBy in socket units as recommended by http://0pointer.de/blog/projects/socket-activation.html
- rephrase README.systemd - rephrase README.systemd
diff -up net-snmp-5.7/agent/snmpd.c.systemd net-snmp-5.7/agent/snmpd.c
--- net-snmp-5.7/agent/snmpd.c.systemd 2011-07-02 00:35:46.000000000 +0200 diff -up net-snmp-5.7.1/agent/snmpd.c.systemd net-snmp-5.7.1/agent/snmpd.c
+++ net-snmp-5.7/agent/snmpd.c 2011-08-09 11:17:20.408939973 +0200 --- net-snmp-5.7.1/agent/snmpd.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7.1/agent/snmpd.c 2011-10-04 09:13:55.051789141 +0200
@@ -164,6 +164,10 @@ typedef long fd_mask; @@ -164,6 +164,10 @@ typedef long fd_mask;
#endif #endif
@ -101,7 +102,7 @@ diff -up net-snmp-5.7/agent/snmpd.c.systemd net-snmp-5.7/agent/snmpd.c
} }
#endif /* #WIN32 */ #endif /* #WIN32 */
@@ -1093,6 +1105,19 @@ main(int argc, char *argv[]) @@ -1097,6 +1109,19 @@ main(int argc, char *argv[])
netsnmp_addrcache_initialise(); netsnmp_addrcache_initialise();
/* /*
@ -121,9 +122,9 @@ diff -up net-snmp-5.7/agent/snmpd.c.systemd net-snmp-5.7/agent/snmpd.c
* Forever monitor the dest_port for incoming PDUs. * Forever monitor the dest_port for incoming PDUs.
*/ */
DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n")); DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n"));
diff -up net-snmp-5.7/apps/snmptrapd.c.systemd net-snmp-5.7/apps/snmptrapd.c diff -up net-snmp-5.7.1/apps/snmptrapd.c.systemd net-snmp-5.7.1/apps/snmptrapd.c
--- net-snmp-5.7/apps/snmptrapd.c.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/apps/snmptrapd.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/apps/snmptrapd.c 2011-08-09 11:17:20.414939863 +0200 +++ net-snmp-5.7.1/apps/snmptrapd.c 2011-10-04 09:13:55.052789127 +0200
@@ -125,6 +125,10 @@ SOFTWARE. @@ -125,6 +125,10 @@ SOFTWARE.
#include <net-snmp/net-snmp-features.h> #include <net-snmp/net-snmp-features.h>
@ -135,7 +136,7 @@ diff -up net-snmp-5.7/apps/snmptrapd.c.systemd net-snmp-5.7/apps/snmptrapd.c
#ifndef BSD4_3 #ifndef BSD4_3
#define BSD4_2 #define BSD4_2
#endif #endif
@@ -591,15 +595,22 @@ main(int argc, char *argv[]) @@ -587,15 +591,22 @@ main(int argc, char *argv[])
int agentx_subagent = 1; int agentx_subagent = 1;
#endif #endif
netsnmp_trapd_handler *traph; netsnmp_trapd_handler *traph;
@ -160,7 +161,7 @@ diff -up net-snmp-5.7/apps/snmptrapd.c.systemd net-snmp-5.7/apps/snmptrapd.c
} }
#endif /* #WIN32 */ #endif /* #WIN32 */
@@ -1248,6 +1259,19 @@ main(int argc, char *argv[]) @@ -1244,6 +1255,19 @@ main(int argc, char *argv[])
#endif #endif
#endif #endif
@ -180,9 +181,9 @@ diff -up net-snmp-5.7/apps/snmptrapd.c.systemd net-snmp-5.7/apps/snmptrapd.c
#ifdef WIN32SERVICE #ifdef WIN32SERVICE
trapd_status = SNMPTRAPD_RUNNING; trapd_status = SNMPTRAPD_RUNNING;
#endif #endif
diff -up net-snmp-5.7/configure.d/config_modules_lib.systemd net-snmp-5.7/configure.d/config_modules_lib diff -up net-snmp-5.7.1/configure.d/config_modules_lib.systemd net-snmp-5.7.1/configure.d/config_modules_lib
--- net-snmp-5.7/configure.d/config_modules_lib.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/configure.d/config_modules_lib.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/configure.d/config_modules_lib 2011-08-09 11:17:20.409939955 +0200 +++ net-snmp-5.7.1/configure.d/config_modules_lib 2011-10-04 09:13:55.053789113 +0200
@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" @@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32"
other_ftobjs_list="$other_ftobjs_list winpipe.ft" other_ftobjs_list="$other_ftobjs_list winpipe.ft"
fi fi
@ -198,9 +199,9 @@ diff -up net-snmp-5.7/configure.d/config_modules_lib.systemd net-snmp-5.7/config
AC_SUBST(other_src_list) AC_SUBST(other_src_list)
AC_SUBST(other_objs_list) AC_SUBST(other_objs_list)
AC_SUBST(other_lobjs_list) AC_SUBST(other_lobjs_list)
diff -up net-snmp-5.7/configure.d/config_project_with_enable.systemd net-snmp-5.7/configure.d/config_project_with_enable diff -up net-snmp-5.7.1/configure.d/config_project_with_enable.systemd net-snmp-5.7.1/configure.d/config_project_with_enable
--- net-snmp-5.7/configure.d/config_project_with_enable.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/configure.d/config_project_with_enable.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/configure.d/config_project_with_enable 2011-08-09 11:17:20.411939919 +0200 +++ net-snmp-5.7.1/configure.d/config_project_with_enable 2011-10-04 09:13:55.054789098 +0200
@@ -672,6 +672,15 @@ if test "x$with_dummy_values" != "xyes"; @@ -672,6 +672,15 @@ if test "x$with_dummy_values" != "xyes";
data for]) data for])
fi fi
@ -217,9 +218,9 @@ diff -up net-snmp-5.7/configure.d/config_project_with_enable.systemd net-snmp-5.
NETSNMP_ARG_ENABLE(set-support, NETSNMP_ARG_ENABLE(set-support,
[ --disable-set-support Do not allow SNMP set requests.]) [ --disable-set-support Do not allow SNMP set requests.])
if test "x$enable_set_support" = "xno"; then if test "x$enable_set_support" = "xno"; then
diff -up net-snmp-5.7/configure.systemd net-snmp-5.7/configure diff -up net-snmp-5.7.1/configure.systemd net-snmp-5.7.1/configure
--- net-snmp-5.7/configure.systemd 2011-07-02 00:36:41.000000000 +0200 --- net-snmp-5.7.1/configure.systemd 2011-09-28 06:54:21.000000000 +0200
+++ net-snmp-5.7/configure 2011-08-09 11:17:20.434939500 +0200 +++ net-snmp-5.7.1/configure 2011-10-04 09:13:55.066788919 +0200
@@ -950,6 +950,8 @@ with_kmem_usage @@ -950,6 +950,8 @@ with_kmem_usage
enable_kmem_usage enable_kmem_usage
with_dummy_values with_dummy_values
@ -263,7 +264,7 @@ diff -up net-snmp-5.7/configure.systemd net-snmp-5.7/configure
# Check whether --enable-set-support was given. # Check whether --enable-set-support was given.
if test "${enable_set_support+set}" = set; then : if test "${enable_set_support+set}" = set; then :
enableval=$enable_set_support; enableval=$enable_set_support;
@@ -18176,6 +18198,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" @@ -18196,6 +18218,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32"
other_ftobjs_list="$other_ftobjs_list winpipe.ft" other_ftobjs_list="$other_ftobjs_list winpipe.ft"
fi fi
@ -278,9 +279,9 @@ diff -up net-snmp-5.7/configure.systemd net-snmp-5.7/configure
diff -up net-snmp-5.7/dist/snmpd.service.systemd net-snmp-5.7/dist/snmpd.service diff -up net-snmp-5.7.1/dist/snmpd.service.systemd net-snmp-5.7.1/dist/snmpd.service
--- net-snmp-5.7/dist/snmpd.service.systemd 2011-08-09 11:17:20.426939647 +0200 --- net-snmp-5.7.1/dist/snmpd.service.systemd 2011-10-04 09:13:55.070788861 +0200
+++ net-snmp-5.7/dist/snmpd.service 2011-08-09 11:17:20.443939338 +0200 +++ net-snmp-5.7.1/dist/snmpd.service 2011-10-04 09:13:55.070788861 +0200
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+# +#
+# SNMP agent service file for systemd +# SNMP agent service file for systemd
@ -300,9 +301,9 @@ diff -up net-snmp-5.7/dist/snmpd.service.systemd net-snmp-5.7/dist/snmpd.service
+ +
+[Install] +[Install]
+WantedBy=multi-user.target +WantedBy=multi-user.target
diff -up net-snmp-5.7/dist/snmpd.socket.systemd net-snmp-5.7/dist/snmpd.socket diff -up net-snmp-5.7.1/dist/snmpd.socket.systemd net-snmp-5.7.1/dist/snmpd.socket
--- net-snmp-5.7/dist/snmpd.socket.systemd 2011-08-09 11:17:20.444939320 +0200 --- net-snmp-5.7.1/dist/snmpd.socket.systemd 2011-10-04 09:13:55.071788846 +0200
+++ net-snmp-5.7/dist/snmpd.socket 2011-08-09 11:17:20.444939320 +0200 +++ net-snmp-5.7.1/dist/snmpd.socket 2011-10-04 09:13:55.071788846 +0200
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+[Unit] +[Unit]
+Description=Socket listening for SNMP and AgentX messages +Description=Socket listening for SNMP and AgentX messages
@ -321,9 +322,9 @@ diff -up net-snmp-5.7/dist/snmpd.socket.systemd net-snmp-5.7/dist/snmpd.socket
+ +
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
diff -up net-snmp-5.7/dist/snmptrapd.service.systemd net-snmp-5.7/dist/snmptrapd.service diff -up net-snmp-5.7.1/dist/snmptrapd.service.systemd net-snmp-5.7.1/dist/snmptrapd.service
--- net-snmp-5.7/dist/snmptrapd.service.systemd 2011-08-09 11:17:20.427939629 +0200 --- net-snmp-5.7.1/dist/snmptrapd.service.systemd 2011-10-04 09:13:55.071788846 +0200
+++ net-snmp-5.7/dist/snmptrapd.service 2011-08-09 11:17:20.445939302 +0200 +++ net-snmp-5.7.1/dist/snmptrapd.service 2011-10-04 09:13:55.071788846 +0200
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+# +#
+# SNMP trap-processing service file for systemd +# SNMP trap-processing service file for systemd
@ -341,9 +342,9 @@ diff -up net-snmp-5.7/dist/snmptrapd.service.systemd net-snmp-5.7/dist/snmptrapd
+ +
+[Install] +[Install]
+WantedBy=multi-user.target +WantedBy=multi-user.target
diff -up net-snmp-5.7/dist/snmptrapd.socket.systemd net-snmp-5.7/dist/snmptrapd.socket diff -up net-snmp-5.7.1/dist/snmptrapd.socket.systemd net-snmp-5.7.1/dist/snmptrapd.socket
--- net-snmp-5.7/dist/snmptrapd.socket.systemd 2011-08-09 11:17:20.428939611 +0200 --- net-snmp-5.7.1/dist/snmptrapd.socket.systemd 2011-10-04 09:13:55.072788831 +0200
+++ net-snmp-5.7/dist/snmptrapd.socket 2011-08-09 11:17:20.446939284 +0200 +++ net-snmp-5.7.1/dist/snmptrapd.socket 2011-10-04 09:13:55.072788831 +0200
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+[Unit] +[Unit]
+Description=Socket listening for SNMP trap messages +Description=Socket listening for SNMP trap messages
@ -359,9 +360,9 @@ diff -up net-snmp-5.7/dist/snmptrapd.socket.systemd net-snmp-5.7/dist/snmptrapd.
+ +
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
diff -up net-snmp-5.7/include/net-snmp/library/sd-daemon.h.systemd net-snmp-5.7/include/net-snmp/library/sd-daemon.h diff -up net-snmp-5.7.1/include/net-snmp/library/sd-daemon.h.systemd net-snmp-5.7.1/include/net-snmp/library/sd-daemon.h
--- net-snmp-5.7/include/net-snmp/library/sd-daemon.h.systemd 2011-08-09 11:17:20.413939881 +0200 --- net-snmp-5.7.1/include/net-snmp/library/sd-daemon.h.systemd 2011-10-04 09:13:55.072788831 +0200
+++ net-snmp-5.7/include/net-snmp/library/sd-daemon.h 2011-08-09 11:17:20.415939845 +0200 +++ net-snmp-5.7.1/include/net-snmp/library/sd-daemon.h 2011-10-04 09:13:55.072788831 +0200
@@ -0,0 +1,286 @@ @@ -0,0 +1,286 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ +
@ -649,10 +650,10 @@ diff -up net-snmp-5.7/include/net-snmp/library/sd-daemon.h.systemd net-snmp-5.7/
+#endif +#endif
+ +
+#endif /* SNMPD_SD_DAEMON_H */ +#endif /* SNMPD_SD_DAEMON_H */
diff -up net-snmp-5.7/include/net-snmp/net-snmp-config.h.in.systemd net-snmp-5.7/include/net-snmp/net-snmp-config.h.in diff -up net-snmp-5.7.1/include/net-snmp/net-snmp-config.h.in.systemd net-snmp-5.7.1/include/net-snmp/net-snmp-config.h.in
--- net-snmp-5.7/include/net-snmp/net-snmp-config.h.in.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/include/net-snmp/net-snmp-config.h.in.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/include/net-snmp/net-snmp-config.h.in 2011-08-09 11:17:20.440939392 +0200 +++ net-snmp-5.7.1/include/net-snmp/net-snmp-config.h.in 2011-10-04 09:13:55.074788801 +0200
@@ -1341,6 +1341,9 @@ @@ -1350,6 +1350,9 @@
/* If you don't have root access don't exit upon kmem errors */ /* If you don't have root access don't exit upon kmem errors */
#undef NETSNMP_NO_ROOT_ACCESS #undef NETSNMP_NO_ROOT_ACCESS
@ -662,9 +663,9 @@ diff -up net-snmp-5.7/include/net-snmp/net-snmp-config.h.in.systemd net-snmp-5.7
/* Define if you want to remove all SET/write access from the code */ /* Define if you want to remove all SET/write access from the code */
#undef NETSNMP_NO_WRITE_SUPPORT #undef NETSNMP_NO_WRITE_SUPPORT
diff -up net-snmp-5.7/README.systemd.systemd net-snmp-5.7/README.systemd diff -up net-snmp-5.7.1/README.systemd.systemd net-snmp-5.7.1/README.systemd
--- net-snmp-5.7/README.systemd.systemd 2011-08-09 11:17:20.407939991 +0200 --- net-snmp-5.7.1/README.systemd.systemd 2011-10-04 09:13:55.075788786 +0200
+++ net-snmp-5.7/README.systemd 2011-08-09 11:17:20.441939374 +0200 +++ net-snmp-5.7.1/README.systemd 2011-10-04 09:13:55.075788786 +0200
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+README.systemd +README.systemd
+-------------- +--------------
@ -708,9 +709,9 @@ diff -up net-snmp-5.7/README.systemd.systemd net-snmp-5.7/README.systemd
+start during boot and not after first SNMP trap arrives. Same rules as for snmpd +start during boot and not after first SNMP trap arrives. Same rules as for snmpd
+applies then. +applies then.
\ No newline at end of file \ No newline at end of file
diff -up net-snmp-5.7/snmplib/sd-daemon.c.systemd net-snmp-5.7/snmplib/sd-daemon.c diff -up net-snmp-5.7.1/snmplib/sd-daemon.c.systemd net-snmp-5.7.1/snmplib/sd-daemon.c
--- net-snmp-5.7/snmplib/sd-daemon.c.systemd 2011-08-09 11:17:20.413939881 +0200 --- net-snmp-5.7.1/snmplib/sd-daemon.c.systemd 2011-10-04 09:13:55.076788771 +0200
+++ net-snmp-5.7/snmplib/sd-daemon.c 2011-08-09 11:17:20.417939809 +0200 +++ net-snmp-5.7.1/snmplib/sd-daemon.c 2011-10-04 09:13:55.076788771 +0200
@@ -0,0 +1,532 @@ @@ -0,0 +1,532 @@
+/* +/*
+ * Systemd integration parts. + * Systemd integration parts.
@ -1244,9 +1245,9 @@ diff -up net-snmp-5.7/snmplib/sd-daemon.c.systemd net-snmp-5.7/snmplib/sd-daemon
+} +}
+ +
+#endif /* ! NETSNMP_NO_SYSTEMD */ +#endif /* ! NETSNMP_NO_SYSTEMD */
diff -up net-snmp-5.7/snmplib/transports/snmpTCPDomain.c.systemd net-snmp-5.7/snmplib/transports/snmpTCPDomain.c diff -up net-snmp-5.7.1/snmplib/transports/snmpTCPDomain.c.systemd net-snmp-5.7.1/snmplib/transports/snmpTCPDomain.c
--- net-snmp-5.7/snmplib/transports/snmpTCPDomain.c.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/snmplib/transports/snmpTCPDomain.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/snmplib/transports/snmpTCPDomain.c 2011-08-09 11:17:20.418939791 +0200 +++ net-snmp-5.7.1/snmplib/transports/snmpTCPDomain.c 2011-10-04 09:13:55.077788756 +0200
@@ -42,6 +42,10 @@ @@ -42,6 +42,10 @@
#include <net-snmp/library/snmpSocketBaseDomain.h> #include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/snmpTCPBaseDomain.h> #include <net-snmp/library/snmpTCPBaseDomain.h>
@ -1326,9 +1327,9 @@ diff -up net-snmp-5.7/snmplib/transports/snmpTCPDomain.c.systemd net-snmp-5.7/sn
} }
/* /*
diff -up net-snmp-5.7/snmplib/transports/snmpTCPIPv6Domain.c.systemd net-snmp-5.7/snmplib/transports/snmpTCPIPv6Domain.c diff -up net-snmp-5.7.1/snmplib/transports/snmpTCPIPv6Domain.c.systemd net-snmp-5.7.1/snmplib/transports/snmpTCPIPv6Domain.c
--- net-snmp-5.7/snmplib/transports/snmpTCPIPv6Domain.c.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/snmplib/transports/snmpTCPIPv6Domain.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/snmplib/transports/snmpTCPIPv6Domain.c 2011-08-09 11:17:20.421939737 +0200 +++ net-snmp-5.7.1/snmplib/transports/snmpTCPIPv6Domain.c 2011-10-04 09:13:55.078788741 +0200
@@ -48,6 +48,10 @@ @@ -48,6 +48,10 @@
#include <net-snmp/library/snmpSocketBaseDomain.h> #include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/snmpTCPBaseDomain.h> #include <net-snmp/library/snmpTCPBaseDomain.h>
@ -1409,9 +1410,9 @@ diff -up net-snmp-5.7/snmplib/transports/snmpTCPIPv6Domain.c.systemd net-snmp-5.
} }
/* /*
diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c diff -up net-snmp-5.7.1/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snmp-5.7.1/snmplib/transports/snmpUDPIPv4BaseDomain.c
--- net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c 2011-08-09 11:17:20.422939719 +0200 +++ net-snmp-5.7.1/snmplib/transports/snmpUDPIPv4BaseDomain.c 2011-10-04 09:13:55.079788726 +0200
@@ -40,6 +40,10 @@ @@ -40,6 +40,10 @@
#include <net-snmp/library/snmpSocketBaseDomain.h> #include <net-snmp/library/snmpSocketBaseDomain.h>
@ -1421,9 +1422,9 @@ diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snm
+#endif +#endif
+ +
#if (defined(linux) && defined(IP_PKTINFO)) \ #if (defined(linux) && defined(IP_PKTINFO)) \
|| defined(IP_RECVDSTADDR) && !defined(_MSC_VER) || defined(IP_RECVDSTADDR) && HAVE_STRUCT_MSGHDR_MSG_CONTROL \
&& HAVE_STRUCT_MSGHDR_MSG_FLAGS
@@ -67,6 +71,7 @@ netsnmp_udpipv4base_transport(struct soc @@ -68,6 +72,7 @@ netsnmp_udpipv4base_transport(struct soc
char *client_socket = NULL; char *client_socket = NULL;
netsnmp_indexed_addr_pair addr_pair; netsnmp_indexed_addr_pair addr_pair;
socklen_t local_addr_len; socklen_t local_addr_len;
@ -1431,7 +1432,7 @@ diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snm
#ifdef NETSNMP_NO_LISTEN_SUPPORT #ifdef NETSNMP_NO_LISTEN_SUPPORT
if (local) if (local)
@@ -89,7 +94,19 @@ netsnmp_udpipv4base_transport(struct soc @@ -90,7 +95,19 @@ netsnmp_udpipv4base_transport(struct soc
str)); str));
free(str); free(str);
@ -1452,7 +1453,7 @@ diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snm
DEBUGMSGTL(("UDPBase", "openned socket %d as local=%d\n", t->sock, local)); DEBUGMSGTL(("UDPBase", "openned socket %d as local=%d\n", t->sock, local));
if (t->sock < 0) { if (t->sock < 0) {
netsnmp_transport_free(t); netsnmp_transport_free(t);
@@ -128,12 +145,14 @@ netsnmp_udpipv4base_transport(struct soc @@ -129,12 +146,14 @@ netsnmp_udpipv4base_transport(struct soc
DEBUGMSGTL(("netsnmp_udpbase", "set IP_PKTINFO\n")); DEBUGMSGTL(("netsnmp_udpbase", "set IP_PKTINFO\n"));
} }
#endif #endif
@ -1473,9 +1474,9 @@ diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-snm
} }
t->data = NULL; t->data = NULL;
t->data_length = 0; t->data_length = 0;
diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp-5.7/snmplib/transports/snmpUDPIPv6Domain.c diff -up net-snmp-5.7.1/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp-5.7.1/snmplib/transports/snmpUDPIPv6Domain.c
--- net-snmp-5.7/snmplib/transports/snmpUDPIPv6Domain.c.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/snmplib/transports/snmpUDPIPv6Domain.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/snmplib/transports/snmpUDPIPv6Domain.c 2011-08-09 11:17:20.423939701 +0200 +++ net-snmp-5.7.1/snmplib/transports/snmpUDPIPv6Domain.c 2011-10-04 09:13:55.080788711 +0200
@@ -66,6 +66,10 @@ static const struct in6_addr in6addr_any @@ -66,6 +66,10 @@ static const struct in6_addr in6addr_any
#include <net-snmp/library/snmp_transport.h> #include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmpSocketBaseDomain.h> #include <net-snmp/library/snmpSocketBaseDomain.h>
@ -1538,9 +1539,9 @@ diff -up net-snmp-5.7/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp-5.
} }
t->local = (unsigned char*)malloc(18); t->local = (unsigned char*)malloc(18);
if (t->local == NULL) { if (t->local == NULL) {
diff -up net-snmp-5.7/snmplib/transports/snmpUnixDomain.c.systemd net-snmp-5.7/snmplib/transports/snmpUnixDomain.c diff -up net-snmp-5.7.1/snmplib/transports/snmpUnixDomain.c.systemd net-snmp-5.7.1/snmplib/transports/snmpUnixDomain.c
--- net-snmp-5.7/snmplib/transports/snmpUnixDomain.c.systemd 2011-07-02 00:35:46.000000000 +0200 --- net-snmp-5.7.1/snmplib/transports/snmpUnixDomain.c.systemd 2011-09-28 06:53:47.000000000 +0200
+++ net-snmp-5.7/snmplib/transports/snmpUnixDomain.c 2011-08-09 11:17:20.425939665 +0200 +++ net-snmp-5.7.1/snmplib/transports/snmpUnixDomain.c 2011-10-04 09:13:55.082788683 +0200
@@ -36,6 +36,10 @@ @@ -36,6 +36,10 @@
#include <net-snmp/library/snmpSocketBaseDomain.h> #include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/system.h> /* mkdirhier */ #include <net-snmp/library/system.h> /* mkdirhier */

2
net-snmp.spec
View File

@ -37,7 +37,7 @@ Patch5: net-snmp-5.5-apsl-copying.patch
Patch6: net-snmp-5.5-perl-linking.patch Patch6: net-snmp-5.5-perl-linking.patch
Patch7: net-snmp-5.6-test-debug.patch Patch7: net-snmp-5.6-test-debug.patch
Patch8: net-snmp-5.6.1-mysql.patch Patch8: net-snmp-5.6.1-mysql.patch
Patch9: net-snmp-5.7-systemd.patch Patch9: net-snmp-5.7.1-systemd.patch
Requires(post): chkconfig Requires(post): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig