summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Viguera <javier.viguera@digi.com>2013-09-05 14:49:01 +0000
committerEric Bénard <eric@eukrea.com>2013-10-10 21:30:38 +0200
commit44754206632dd5b0725aeb43e99e4ff9e0245dca (patch)
tree79777bbc9483ddbce4bef18f1401292864b7b65d
parent70bc5626b3e6c6bc90b8845f8e7e48f45bf57174 (diff)
downloadmeta-openembedded-44754206632dd5b0725aeb43e99e4ff9e0245dca.tar.gz
net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos
Use patch from master branch to fix: snmpd.c:459: undefined reference to `netsnmp_sd_listen_fds' Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r--meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch b/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
index 18955f29e..e19153bbc 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
@@ -7,12 +7,14 @@ fef6cddfdb94da1a6b1fb768af62918b80f11fd3
70641e43c694c485cbbffef0556efc4641bd3ff50 70641e43c694c485cbbffef0556efc4641bd3ff50
876530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved) 876530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved)
9bf108d7f1354f6276fc43c129963f2c49b9fc242 9bf108d7f1354f6276fc43c129963f2c49b9fc242
103692875172352f72cf3afd0d35f355e83d7e421b
1074412748067c685e1d8ab6ed3bcc3ca9c2774844 1174412748067c685e1d8ab6ed3bcc3ca9c2774844
1186132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 1286132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0
1263557cf8986a33dba1d4429b583a901361052c4f 1363557cf8986a33dba1d4429b583a901361052c4f
13 14
14Upstream-Status: Backport 15Upstream-Status: Backport
15 16
17Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com>
16diff --git a/README.systemd b/README.systemd 18diff --git a/README.systemd b/README.systemd
17new file mode 100644 19new file mode 100644
18index 0000000..f731851 20index 0000000..f731851
@@ -89,10 +91,10 @@ index b177d5b..08bdfc7 100644
89 #endif 91 #endif
90 92
91 #ifndef WIN32 93 #ifndef WIN32
92+#ifndef NETSNMP_NO_SYSYSTEMD 94+#ifndef NETSNMP_NO_SYSTEMD
93+ /* check if systemd has sockets for us and don't close them */ 95+ /* check if systemd has sockets for us and don't close them */
94+ prepared_sockets = netsnmp_sd_listen_fds(0); 96+ prepared_sockets = netsnmp_sd_listen_fds(0);
95+#endif /* NETSNMP_NO_SYSYSTEMD */ 97+#endif /* NETSNMP_NO_SYSTEMD */
96+ 98+
97 /* 99 /*
98 * close all non-standard file descriptors we may have 100 * close all non-standard file descriptors we may have