mdns: Do not include nss.h with musl
PATCH 1/6 mdns: Do not include nss.h with musl
Signed-off-by Khem Raj <[email protected]>
--- ...mdns-Do-not-include-nss.h-when-libc-glibc.patch | 42 ++++++++++++++++++++++ .../recipes-protocols/mdns/mdns_765.50.9.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch new file +42 -0
@@ -0,0 +1,42 @@ +From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 2 Feb 2018 21:54:11 -0800 +Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc + +Provide nss_status macro instead for non-glibc case +where nss.h is absent + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + mDNSPosix/nss_mdns.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +index afadb3c..c469584 100755 +--- a/mDNSPosix/nss_mdns.c ++++ b/mDNSPosix/nss_mdns.c +@@ -378,8 +378,19 @@ init_config (); + + #define ENTNAME hostent + #define DATABASE "hosts" +- ++#ifdef __GLIBC__ + #include <nss.h> ++#else ++enum nss_status ++{ ++ NSS_STATUS_TRYAGAIN = -2, ++ NSS_STATUS_UNAVAIL, ++ NSS_STATUS_NOTFOUND, ++ NSS_STATUS_SUCCESS, ++ NSS_STATUS_RETURN ++}; ++#define NETDB_INTERNAL NULL ++#endif + // For nss_status + #include <netdb.h> + // For hostent +-- +2.16.1 +
meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb +1 -0
@@ -9,6 +9,7 @@ RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ + file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317"
Signature · 1 line
2.16.1
PATCH 2/6 alsa-oss: Upgrade to 1.0.28
Signed-off-by Khem Raj <[email protected]>
---
.../alsa/{alsa-oss-1.0.17 => alsa-oss}/libio.patch | 16 ++++++++--------
.../alsa/{alsa-oss_1.0.17.bb => alsa-oss_1.0.28.bb} | 6 ++----
2 files changed, 10 insertions(+), 12 deletions(-)
rename meta-oe/recipes-multimedia/alsa/{alsa-oss-1.0.17 => alsa-oss}/libio.patch (66%)
rename meta-oe/recipes-multimedia/alsa/{alsa-oss_1.0.17.bb => alsa-oss_1.0.28.bb} (75%)meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch renamed from meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch +8 -8
@@ -1,7 +1,7 @@ -Index: alsa-oss-1.0.15/alsa/stdioemu.c +Index: alsa-oss-1.0.28/alsa/stdioemu.c =================================================================== ---- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200 +--- alsa-oss-1.0.28.orig/alsa/stdioemu.c ++++ alsa-oss-1.0.28/alsa/stdioemu.c @@ -37,7 +37,9 @@ #endif
@@ -12,7 +12,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c struct fd_cookie { int fd; -@@ -99,7 +101,11 @@ +@@ -99,7 +101,11 @@ static FILE *fake_fopen(const char *path if (open_mode && fdc->fd > 0) { result = fopencookie (fdc,"w", fns);
@@ -24,11 +24,11 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c } return result; } -Index: alsa-oss-1.0.15/configure.in +Index: alsa-oss-1.0.28/configure.ac =================================================================== ---- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200 -@@ -33,6 +33,12 @@ +--- alsa-oss-1.0.28.orig/configure.ac ++++ alsa-oss-1.0.28/configure.ac +@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then LIBS="$OLD_LIBS" fi
meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb renamed from meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb +2 -4
@@ -3,11 +3,12 @@ SECTION = "libs/multimedia" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "alsa-lib" -PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ file://libio.patch \ " +SRC_URI[md5sum] = "91f57e8cee1ad4cc956caa8b62ac5d43" +SRC_URI[sha256sum] = "3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5" inherit autotools
@@ -17,6 +18,3 @@ do_configure_prepend () { touch NEWS README AUTHORS ChangeLog sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in } - -SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" -SRC_URI[sha256sum] = "8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca"
Signature · 1 line
2.16.1
PATCH 3/6 mraa: Fix build on musl
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...ian.h-for-be16toh-and-le16toh-declaration.patch | 27 ++++++++++++++++++++++ meta-oe/recipes-extended/mraa/mraa_git.bb | 4 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch
meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 2c85decc3b93bfe7322309d2ca7d6377e746c18f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 5 Feb 2018 09:51:08 -0800 +Subject: [PATCH] include endian.h for be16toh and le16toh declarations + +Upstream-Status: Submitted [https://github.com/intel-iot-devkit/mraa/pull/863] + +Signed-off-by: Khem Raj <[email protected]> +--- + examples/iio_driver.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/iio_driver.c b/examples/iio_driver.c +index c5a0181..568011c 100644 +--- a/examples/iio_driver.c ++++ b/examples/iio_driver.c +@@ -22,6 +22,7 @@ + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include <endian.h> + #include <unistd.h> + #include "mraa/iio.h" + +-- +2.16.1 +
meta-oe/recipes-extended/mraa/mraa_git.bb +3 -1
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f" SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480" PV = "1.7.0-git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch \ + " S = "${WORKDIR}/git"
Signature · 1 line
2.16.1
PATCH v2 4/6 iscsi-initiator-utils: Upgrade to 2.0.876
In reply to Khem RajFix build with musl along the way
Signed-off-by Khem Raj <[email protected]>
---
Changes since V1:
- Rebased on top of master and drop backports
...Check-for-root-peer-user-for-iscsiuio-IPC.patch | 135 ---------------------
...openiscsiusr-Include-limit.h-for-PATH_MAX.patch | 25 ++++
...001-qedi.c-Removed-unused-linux-ethtool.h.patch | 25 ++++
...ude-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch | 25 ++++
...ould-ignore-bogus-iscsid-broadcast-packet.patch | 39 ------
...openiscsiusr-Add-CFLAGS-to-linker-cmdline.patch | 29 +++++
...l-fields-in-iscsiuio-IPC-response-are-set.patch | 34 ------
...rder-the-includes-to-avoid-duplicate-defi.patch | 49 ++++++++
...ot-double-close-IPC-file-stream-to-iscsid.patch | 62 ----------
...04-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch | 28 +++++
...re-strings-from-peer-are-copied-correctly.patch | 78 ------------
...-useless-strcopy-and-validate-CIDR-length.patch | 44 -------
...ck-iscsiuio-ping-data-length-for-validity.patch | 64 ----------
...nitiator-utils-Do-not-clean-kernel-source.patch | 44 -------
...text-add-include-for-NI_MAXHOST-definiton.patch | 35 ------
...2.0.874.bb => iscsi-initiator-utils_2.0.876.bb} | 32 ++---
16 files changed, 191 insertions(+), 557 deletions(-)
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0.874.bb => iscsi-initiator-utils_2.0.876.bb} (78%)meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch deleted +0 -135
@@ -1,135 +0,0 @@ -From eb516ac5f9dddc80564f6becee08a0011e7aa58b Mon Sep 17 00:00:00 2001 -From: Lee Duncan <[email protected]> -Date: Fri, 15 Dec 2017 10:36:11 -0800 -Subject: [PATCH 1/7] Check for root peer user for iscsiuio IPC - -This fixes a possible vulnerability where a non-root -process could connect with iscsiuio. Fouund by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <[email protected]> ---- - iscsiuio/src/unix/Makefile.am | 3 ++- - iscsiuio/src/unix/iscsid_ipc.c | 47 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am -index 71d5463..a989ef0 100644 ---- a/iscsiuio/src/unix/Makefile.am -+++ b/iscsiuio/src/unix/Makefile.am -@@ -20,7 +20,8 @@ iscsiuio_SOURCES = build_date.c \ - nic_utils.c \ - packet.c \ - iscsid_ipc.c \ -- ping.c -+ ping.c \ -+ ${top_srcdir}/../utils/sysdeps/sysdeps.c - - iscsiuio_CFLAGS = $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index a2a59a8..08e49e5 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -37,6 +37,8 @@ - * - */ - -+#define _GNU_SOURCE -+ - #include <errno.h> - #include <pthread.h> - #include <signal.h> -@@ -47,6 +49,8 @@ - #include <sys/socket.h> - #include <sys/time.h> - #include <sys/un.h> -+#include <sys/types.h> -+#include <pwd.h> - - #define PFX "iscsi_ipc " - -@@ -61,6 +65,7 @@ - #include "iscsid_ipc.h" - #include "uip.h" - #include "uip_mgmt_ipc.h" -+#include "sysdeps.h" - - #include "logger.h" - #include "uip.h" -@@ -102,6 +107,7 @@ struct iface_rec_decode { - uint16_t mtu; - }; - -+#define PEERUSER_MAX 64 - - /****************************************************************************** - * iscsid_ipc Constants -@@ -1029,6 +1035,40 @@ static void iscsid_loop_close(void *arg) - LOG_INFO(PFX "iSCSI daemon socket closed"); - } - -+/* -+ * check that the peer user is privilidged -+ * -+ * return 1 if peer is ok else 0 -+ * -+ * XXX: this function is copied from iscsid_ipc.c and should be -+ * moved into a common library -+ */ -+static int -+mgmt_peeruser(int sock, char *user) -+{ -+ struct ucred peercred; -+ socklen_t so_len = sizeof(peercred); -+ struct passwd *pass; -+ -+ errno = 0; -+ if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, -+ &so_len) != 0 || so_len != sizeof(peercred)) { -+ /* We didn't get a valid credentials struct. */ -+ LOG_ERR(PFX "peeruser_unux: error receiving credentials: %m"); -+ return 0; -+ } -+ -+ pass = getpwuid(peercred.uid); -+ if (pass == NULL) { -+ LOG_ERR(PFX "peeruser_unix: unknown local user with uid %d", -+ (int) peercred.uid); -+ return 0; -+ } -+ -+ strlcpy(user, pass->pw_name, PEERUSER_MAX); -+ return 1; -+} -+ - /** - * iscsid_loop() - This is the function which will process the broadcast - * messages from iscsid -@@ -1038,6 +1078,7 @@ static void *iscsid_loop(void *arg) - { - int rc; - sigset_t set; -+ char user[PEERUSER_MAX]; - - pthread_cleanup_push(iscsid_loop_close, arg); - -@@ -1077,6 +1118,12 @@ static void *iscsid_loop(void *arg) - continue; - } - -+ if (!mgmt_peeruser(iscsid_opts.fd, user) || strncmp(user, "root", PEERUSER_MAX)) { -+ close(s2); -+ LOG_ERR(PFX "Access error: non-administrative connection rejected"); -+ break; -+ } -+ - process_iscsid_broadcast(s2); - close(s2); - } --- -1.9.1 -
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch new file +25 -0
@@ -0,0 +1,25 @@ +From cfee58d5863a535b61aa54690ae205b876f57944 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 2 Feb 2018 22:53:29 -0800 +Subject: [PATCH 1/2] libopeniscsiusr: Include limit.h for PATH_MAX + +Signed-off-by: Khem Raj <[email protected]> +--- + libopeniscsiusr/iface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c +index 79898df..a48ef36 100644 +--- a/libopeniscsiusr/iface.c ++++ b/libopeniscsiusr/iface.c +@@ -30,6 +30,7 @@ + #include <netdb.h> + #include <assert.h> + #include <inttypes.h> ++#include <limits.h> + + #include "libopeniscsiusr/libopeniscsiusr.h" + #include "misc.h" +-- +2.16.1 +
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 197713ad7e3e944102bbd792e1ab9ec4a67100c0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 2 Feb 2018 23:25:21 -0800 +Subject: [PATCH 1/4] qedi.c: Removed unused linux/ethtool.h + +Signed-off-by: Khem Raj <[email protected]> +--- + iscsiuio/src/unix/libs/qedi.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c +index b81fecd..24cb89a 100644 +--- a/iscsiuio/src/unix/libs/qedi.c ++++ b/iscsiuio/src/unix/libs/qedi.c +@@ -49,7 +49,6 @@ + #include <arpa/inet.h> + #include <linux/types.h> + #include <linux/sockios.h> +-#include <linux/ethtool.h> + #include <linux/netlink.h> + #include <sys/mman.h> + #include <sys/ioctl.h> +-- +2.16.1 +
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 2b39f85dcf020647544002cb0b0e734748391dfb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 2 Feb 2018 23:27:25 -0800 +Subject: [PATCH 2/4] idbm.c: Include fcnl.h for O_RDWR and O_CREAT definitions + +Signed-off-by: Khem Raj <[email protected]> +--- + usr/idbm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index 5532202..0a51b85 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -27,6 +27,7 @@ + #include <errno.h> + #include <dirent.h> + #include <limits.h> ++#include <fcntl.h> + #include <sys/stat.h> + #include <sys/file.h> + +-- +2.16.1 +
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 035bb16845537351e1bccb16d38981754fd53129 Mon Sep 17 00:00:00 2001 -From: Lee Duncan <[email protected]> -Date: Fri, 15 Dec 2017 10:37:56 -0800 -Subject: [PATCH 2/7] iscsiuio should ignore bogus iscsid broadcast packets - -When iscsiuio is receiving broadcast packets from iscsid, -if the 'payload_len', carried in the packet, is too -large then ignore the packet and print a message. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <[email protected]> ---- - iscsiuio/src/unix/iscsid_ipc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 08e49e5..dfdae63 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -950,6 +950,12 @@ int process_iscsid_broadcast(int s2) - - cmd = data->header.command; - payload_len = data->header.payload_len; -+ if (payload_len > sizeof(data->u)) { -+ LOG_ERR(PFX "Data payload length too large (%d). Corrupt payload?", -+ payload_len); -+ rc = -EINVAL; -+ goto error; -+ } - - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); --- -1.9.1 -
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 29571f71692e28ce9a17d1450097a98492f3b465 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 2 Feb 2018 22:54:04 -0800 +Subject: [PATCH 2/2] libopeniscsiusr: Add CFLAGS to linker cmdline + +This will ensure that -fPIC is passed to linker as +well + +Signed-off-by: Khem Raj <[email protected]> +--- + libopeniscsiusr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index 8b9b523..4f1d0d6 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -49,7 +49,7 @@ LIBADD = + all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc + + $(LIBS): $(OBJS) +- $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) + ln -sf $@ $(DEVLIB) + + $(LIBS_MAJOR): $(LIBS) +-- +2.16.1 +
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 81d3106cf8f09c79fe20ad7d234d7e1dda27bddb Mon Sep 17 00:00:00 2001 -From: Lee Duncan <[email protected]> -Date: Fri, 15 Dec 2017 11:11:17 -0800 -Subject: [PATCH 3/7] Ensure all fields in iscsiuio IPC response are set - -Make sure all fields in the response strcuture are set, -or info from the stack can be leaked to our caller. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <[email protected]> ---- - iscsiuio/src/unix/iscsid_ipc.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index dfdae63..61e96cc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -960,6 +960,8 @@ int process_iscsid_broadcast(int s2) - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); - -+ memset(&rsp, 0, sizeof(rsp)); -+ - switch (cmd) { - case ISCSID_UIP_IPC_GET_IFACE: - size = fread(&data->u.iface_rec, payload_len, 1, fd); --- -1.9.1 -
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch new file +49 -0
49 lines not on this page · raw message
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch deleted +0 -62
62 lines not on this page · raw message
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 6f9c1a04d250388d1574cfaf20a1ff66a64beb48 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 2 Feb 2018 23:42:12 -0800 +Subject: [PATCH 4/4] fwparam_ppc.c: Do not use __compar_fn_t + +__compar_fn_t is not defined in musl + +Signed-off-by: Khem Raj <[email protected]> +--- + utils/fwparam_ibft/fwparam_ppc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c +index c298b8c..391faa2 100644 +--- a/utils/fwparam_ibft/fwparam_ppc.c ++++ b/utils/fwparam_ibft/fwparam_ppc.c +@@ -356,7 +356,7 @@ static int loop_devs(const char *devtree) + * Sort the nics into "natural" order. The proc fs + * device-tree has them in somewhat random, or reversed order. + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), nic_cmp); + + snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); + dev_count = 0; +-- +2.16.1 +
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch deleted +0 -78
78 lines not on this page · raw message
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch deleted +0 -44
44 lines not on this page · raw message
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch deleted +0 -64
64 lines not on this page · raw message
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch deleted +0 -44
44 lines not on this page · raw message
meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 79bea58a554205dd185509fbc4e76b5fc40f9038 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <[email protected]> -Date: Tue, 15 Nov 2016 12:36:45 -0500 -Subject: [PATCH] fw_context: add include for NI_MAXHOST definiton - -This appears to build successfully with gcc 4.x but fails on gcc 5+, though it's -not immediately clear why NI_MAXHOST isn't being defined from the include -chain. Currently engaging with the upstream devs to determine the best course -of action, but this is an adequate workaround. - -Upstream-status: Pending - -Signed-off-by: Joe MacDonald <[email protected]> ---- - include/fw_context.h | 4 + - 1 file changed, 1 insertion(+) - -diff --git a/include/fw_context.h b/include/fw_context.h -index 44053d8..0b05cea 100644 ---- a/include/fw_context.h -+++ b/include/fw_context.h -@@ -21,6 +21,10 @@ - #ifndef FWPARAM_CONTEXT_H_ - #define FWPARAM_CONTEXT_H_ - -+#include <sys/socket.h> -+#ifndef NI_MAXHOST -+#define NI_MAXHOST 1025 -+#endif - #include <netdb.h> - #include <net/if.h> - --- -2.1.4 -
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb renamed from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb +10 -22
@@ -11,26 +11,22 @@ DEPENDS = "openssl flex-native bison-native open-isns util-linux" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRCREV ?= "8db9717e73d32d2c5131da4f9ad86dfd9065f74b" +SRCREV ?= "24580adc4c174bbc5dde3ae7594a46d57635e906" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \ - file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch \ - file://0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch \ - file://0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch \ - file://0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch \ - file://0005-Ensure-strings-from-peer-are-copied-correctly.patch \ - file://0006-Skip-useless-strcopy-and-validate-CIDR-length.patch \ - file://0007-Check-iscsiuio-ping-data-length-for-validity.patch \ + file://0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch \ + file://0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch \ + file://0001-qedi.c-Removed-unused-linux-ethtool.h.patch \ + file://0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch \ + file://0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch \ + file://0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch \ " - S = "${WORKDIR}/git" B = "${WORKDIR}/build"
@@ -39,25 +35,15 @@ inherit update-rc.d systemd autotools EXTRA_OECONF = " \ --target=${TARGET_SYS} \ --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ " EXTRA_OEMAKE = ' \ - CC="${CC}" \ - AR="${AR}" \ - RANLIB="${RANLIB}" \ - CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include -I../../include -I../usr -I../../usr" \ - LDFLAGS="${LDFLAGS}" \ - LD="${LD}" \ OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" \ BASE="${prefix}" \ MANDIR="${mandir}" \ ' -TARGET_CC_ARCH += "${LDFLAGS}" - do_configure () { cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} }
@@ -81,12 +67,14 @@ do_install () { ${D}${localstatedir}/lib/iscsi/isns \ ${D}${localstatedir}/lib/iscsi/slp \ ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}/${mandir}/man8 + ${D}${libdir} \ + ${D}${mandir}/man8 install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ ${S}/utils/iscsi-iname \ ${S}/usr/iscsistart ${D}/${sbindir} + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid
Signature · 1 line
2.16.1
PATCH 5/6 samba: Refresh musl pam patch
In reply to Khem Rajlast update left the musl builds broken since the
patch was not forward ported
Signed-off-by Khem Raj <[email protected]>
---
.../{samba-4.2.7-pam.patch => samba-pam.patch} | 21 +++++++++++----------
.../recipes-connectivity/samba/samba_4.7.0.bb | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
rename meta-networking/recipes-connectivity/samba/samba/{samba-4.2.7-pam.patch => samba-pam.patch} (73%)meta-networking/recipes-connectivity/samba/samba/samba-pam.patch renamed from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +11 -10
@@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj <[email protected]> - -Index: samba-4.4.5/source3/wscript +Index: samba-4.7.0/source3/wscript =================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +--- samba-4.7.0.orig/source3/wscript ++++ samba-4.7.0/source3/wscript +@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1)
@@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; + "or headers not found. Use --without-pam to disable " + "PAM support."); + + else: + Logs.warn("PAM disabled") + use_pam=False
@@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript + conf.undefine('PAM_RHOST') + conf.undefine('PAM_TTY') + conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + #
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +1 -1
@@ -26,7 +26,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ + file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ "
Signature · 1 line
2.16.1
PATCH 6/6 libyui-ncurses: Fix build with musl
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...rc-Replace-using-sys-errno.h-with-errno.h.patch | 59 ++++++++++++++++++++++ .../recipes-graphics/libyui/libyui-ncurses_git.bb | 4 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch
meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch new file +59 -0
@@ -0,0 +1,59 @@ +From 46f016c4b87bb2a594df1c84e4d494bff0cbeaf9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 5 Feb 2018 12:01:25 -0800 +Subject: [PATCH] src: Replace using sys/errno.h with errno.h + +sys/errno.h is no longer the right place for this file + +error: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Werror=cpp] + +Signed-off-by: Khem Raj <[email protected]> +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/63] + src/NCAskForDirectory.cc | 2 +- + src/NCAskForFile.cc | 2 +- + src/NCFileSelection.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc +index 06ec6ac..ed1a30c 100644 +--- a/src/NCAskForDirectory.cc ++++ b/src/NCAskForDirectory.cc +@@ -39,7 +39,7 @@ + #include <sys/types.h> + #include <unistd.h> + #include <dirent.h> +-#include <sys/errno.h> ++#include <errno.h> + + /* + Textdomain "ncurses" +diff --git a/src/NCAskForFile.cc b/src/NCAskForFile.cc +index 31fdb39..63a6679 100644 +--- a/src/NCAskForFile.cc ++++ b/src/NCAskForFile.cc +@@ -39,7 +39,7 @@ + #include <sys/stat.h> + #include <unistd.h> + #include <dirent.h> +-#include <sys/errno.h> ++#include <errno.h> + + /* + Textdomain "ncurses" +diff --git a/src/NCFileSelection.h b/src/NCFileSelection.h +index d42311f..514d020 100644 +--- a/src/NCFileSelection.h ++++ b/src/NCFileSelection.h +@@ -38,7 +38,7 @@ + #include <sys/stat.h> + #include <unistd.h> + #include <dirent.h> +-#include <sys/errno.h> ++#include <errno.h> + + + struct NCFileInfo +-- +2.16.1 +
meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +3 -1
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui-ncurses.git" +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0001-src-Replace-using-sys-errno.h-with-errno.h.patch \ + " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
Signature · 1 line
2.16.1