summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@cisco.com>2013-06-04 18:36:28 -0400
committerJoe MacDonald <joe.macdonald@windriver.com>2013-06-10 11:18:38 -0400
commitb57465fc8c023b798b713766ca7d093a6752186b (patch)
treeb0d6f4d6bb221db698fca522cbe10c6355a82ef1
parent72ddf338d848d613855c96259fcf9ffb57e98010 (diff)
downloadmeta-openembedded-b57465fc8c023b798b713766ca7d093a6752186b.tar.gz
net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos
Added Signed-off-by for backport patch refresh. Bumped PR. Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch6
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb2
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
index 18955f29e..e19153bbc 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
+++ b/meta-networking/recipes-protocols/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
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb
index 4c3939a7e..d21995a9e 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.bb
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5
6 6
7DEPENDS = "openssl libnl pciutils" 7DEPENDS = "openssl libnl pciutils"
8 8
9PR = "r1"
10
9SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
10 file://init \ 12 file://init \
11 file://snmpd.conf \ 13 file://snmpd.conf \