From patchwork Thu Aug 31 23:26:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111455 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp216388qge; Thu, 31 Aug 2017 16:27:06 -0700 (PDT) X-Received: by 10.99.109.70 with SMTP id i67mr106158pgc.365.1504222026599; Thu, 31 Aug 2017 16:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504222026; cv=none; d=google.com; s=arc-20160816; b=VMEl6bwDmo6t9bqecw9kHo8U5YGrRTIixZkLDXRHZffCYPlTWDuyofOy0gD2C7F/B1 /u4vTA3WHefq3pPF/y+llkKYpDx3BqE0E3Onme5pzTwD4T9JGOzObIeey412EKd9cDgh Dl0cYtkzF6ob2DL8v6THASvLzR/bWVwGX/8gDgFyqWS53wGF+bMdkIJKdtvnShfSWTed uWtkzpu1w1NEz+aevH9sWcQ/t/oEnEMH2RVcq+DIHLvnxJ3aena0hIoz6uaCNcUM+L5c /W/J2OiUmbzNv1l8rhZU/AZ6EI0m2dxtDlg5e8JYxPvRn7JevTbmfmpQdfwpqJ4+N09A ceIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=EbIZuCYBju5x6pIRYVsWB1OJTwmWkPfr+yDAybNDivc=; b=aR1K+IZUr1lQUoInrCk6STMIid6kGWBYAFFk5LV4Ob17P4YnEOz6uYa/vqQzTt5weR HpIum3+SmPLLXBfXRkmYH+HShVWQsUnKx5EFslD+Qfwga1G7apE7Gw2D3QpWGQez13s7 1qtgxSEMK4hgH6ayVnZpaoiVGD5X7NO9nC3CXBHQwrz/pv4zdLsjNcKopFuWi34U1JIy DgPB7b78OM2LwfKN71jbodzCXbldt/NCJwhAG/dfL/3qPI4xdgECPvHOuu3AzwqucEtN YUWpKVBoLb3A9sfl95kKdMOo8T2zsfuXMQA5m2gZH1oy8kreuzf+2xBvhDig+YLzbBvO fAOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ohX288+y; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p64si659667pfa.396.2017.08.31.16.27.05; Thu, 31 Aug 2017 16:27:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ohX288+y; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3F31578474; Thu, 31 Aug 2017 23:27:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 1148378449 for ; Thu, 31 Aug 2017 23:27:00 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id r133so655780pgr.2 for ; Thu, 31 Aug 2017 16:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vrsOLPSsjzzLrY5vOur8UJStj6znfVEuDBr690di4Xo=; b=ohX288+ydEAk9eh75s0/NhPlDKfvtgcOUTCz6qWrW+ovrSfhCuBkm8YRgdVBzEg9B0 nZfIb4Gu7bPUgXU9cZaFb3nFZk+RbrRUlYifqTg9NdEs9VNCfLQ1TRZZQDbWBMi7qMBW DkxVXJBF3yZctZqeyTbTofWs/RG4j6rRz1RQKAvPXtkk130cbsk0THlAhxNeq4K/QT2o zUXIGpjdPJPSpPjR+O8DVC4mDsW0/I0sYseMGobXTuem1K/f/yEc9GCMjcAkLVWxQsVS OVlqLrbjIi7b+ngi5oiw8VP06AtpAhmHtb3lt83SmifjWPjy3xqbWis+5mH3oV4nGWzZ TZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vrsOLPSsjzzLrY5vOur8UJStj6znfVEuDBr690di4Xo=; b=QZTFSKTJ4utok7D7x/aiPPI+GhCjPdZFXSpCMwVURhjoKBsMEZCxOG+wI5YmRnby+v rY6Ytv+Z4zPATdIFHAw1C3K4IkixN0grJP+wudtfVZ3jIpSWRqr/3NVaH7y01uLNk6W/ 0LGqhQWf2xC/VvTo74fnldv67qjcXM6OOp4D1OH6/FGoShGfxjbBtvQ/oO1FZeiYPkuF vRjrS/Ac6e3l0oP+ehOICWY7mHmENk4dB+CFQ5au0dzqteWnTc2p/Me7ACRkZjPMBJsj DeobQ8Xx9kTjS3NU7t8wLMDJjHx93Css3S8Nyb1LHIeTpTi7VCSuBAzxNSq+lES+CMFb SR4w== X-Gm-Message-State: AHPjjUhP12LGYKCbWyOlFMLcOHhl21EF4M6ur+aeJGM/ujKDPx/o9Iag TbNWLhTVDzhGoiVV X-Google-Smtp-Source: ADKCNb6IfA2xk0VwkoeXh9EQfA4CM8v6P3srOZ2frCrm5veOJbe9Ws9xHcCq9s6+j5Jy0MXeLnVW6g== X-Received: by 10.98.158.12 with SMTP id s12mr123629pfd.246.1504222021818; Thu, 31 Aug 2017 16:27:01 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::2e06]) by smtp.gmail.com with ESMTPSA id 16sm888569pge.33.2017.08.31.16.27.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:27:01 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 Aug 2017 16:26:42 -0700 Message-Id: <20170831232645.6125-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [oe] [meta-networking][PATCH 1/4] ndisc6: Fix build with clang and update to latest on git X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Change recipe to git Pass PERL variable to configure Add patches to fix VLAIS Signed-off-by: Khem Raj --- .../0001-replace-VLAIS-with-malloc-free-pair.patch | 124 +++++++++++++++++++++ .../ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch | 30 +++++ .../ndisc6/{ndisc6_1.0.3.bb => ndisc6_git.bb} | 21 ++-- 3 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch rename meta-networking/recipes-support/ndisc6/{ndisc6_1.0.3.bb => ndisc6_git.bb} (87%) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch new file mode 100644 index 000000000..dc58b5b79 --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch @@ -0,0 +1,124 @@ +From 3a7d5396e633e6c02a4583be7faf3d79d0d33748 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 11:14:41 -0700 +Subject: [PATCH 1/2] replace VLAIS with malloc/free pair + +Makes it compatible with non-gnu compilers + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/trace-icmp.c | 7 +++++-- + src/trace-tcp.c | 14 ++++++++++---- + src/trace-udp.c | 7 +++++-- + 3 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/trace-icmp.c b/src/trace-icmp.c +index 842938e..c76cb54 100644 +--- a/src/trace-icmp.c ++++ b/src/trace-icmp.c +@@ -43,16 +43,19 @@ send_echo_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct icmp6_hdr ih; +- uint8_t payload[plen - sizeof (struct icmp6_hdr)]; ++ uint8_t *payload; + } packet; + memset (&packet, 0, plen); ++ packet.payload = malloc(plen - sizeof (struct icmp6_hdr)); + + packet.ih.icmp6_type = ICMP6_ECHO_REQUEST; + packet.ih.icmp6_id = htons (getpid ()); + packet.ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff)); + (void)port; + +- return send_payload (fd, &packet.ih, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet.ih, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 940f918..62d22ff 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -54,10 +54,11 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct tcphdr th; +- uint8_t payload[plen - sizeof (struct tcphdr)]; ++ uint8_t *payload; + } packet; + + memset (&packet, 0, sizeof (packet)); ++ packet.payload = malloc(plen - sizeof (struct tcphdr)); + packet.th.th_sport = sport; + packet.th.th_dport = port; + packet.th.th_seq = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); +@@ -65,7 +66,9 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + packet.th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0); + packet.th.th_win = htons (TCP_WINDOW); + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +@@ -131,10 +134,11 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct tcphdr th; +- uint8_t payload[plen - sizeof (struct tcphdr)]; ++ uint8_t *payload; + } packet; + + memset (&packet, 0, sizeof (packet)); ++ packet.payload = malloc(plen - sizeof (struct tcphdr)); + packet.th.th_sport = sport; + packet.th.th_dport = port; + packet.th.th_ack = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); +@@ -142,7 +146,9 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + packet.th.th_flags = TH_ACK; + packet.th.th_win = htons (TCP_WINDOW); + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +diff --git a/src/trace-udp.c b/src/trace-udp.c +index 4adde6b..a6cbb07 100644 +--- a/src/trace-udp.c ++++ b/src/trace-udp.c +@@ -46,9 +46,10 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct udphdr uh; +- uint8_t payload[plen - sizeof (struct udphdr)]; ++ uint8_t *payload; + } packet; + memset (&packet, 0, plen); ++ packet.payload = malloc(plen - sizeof (struct udphdr)); + + (void)n; + packet.uh.uh_sport = sport; +@@ -61,7 +62,9 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + /*if (plen > sizeof (struct udphdr)) + packet.payload[0] = (uint8_t)ttl;*/ + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch new file mode 100644 index 000000000..3cc2ba80c --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch @@ -0,0 +1,30 @@ +From 2a50154fbce38fd36be7e14f5cd4a8b03c65c72f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 11:15:37 -0700 +Subject: [PATCH 2/2] Do not undef _GNU_SOURCE + +There are functions from tcp.h which are under _GNU_SOURCE +in musl + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/trace-tcp.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 62d22ff..380008e 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -21,7 +21,6 @@ + # include + #endif + +-#undef _GNU_SOURCE + #define _DEFAULT_SOURCE 1 + + #include +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb similarity index 87% rename from meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb rename to meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 6bc0531b9..1ff2df731 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -10,15 +10,27 @@ RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" RDEPENDS_${PN}-misc += "perl" -SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ -" +PV = "1.0.4+git${SRCPV}" +SRCREV = "4c794b5512d23c649def1f94a684225dcbb6ac3e" +SRC_URI = "git://git.remlab.net/git/ndisc6.git \ + file://0001-replace-VLAIS-with-malloc-free-pair.patch \ + file://0002-Do-not-undef-_GNU_SOURCE.patch \ + " SRC_URI[md5sum] = "21afdaa3a5a5c1ce50eb7f2b7d795989" SRC_URI[sha256sum] = "0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +S = "${WORKDIR}/git" + inherit autotools gettext +EXTRA_OECONF += "PERL=${USRBINPATH}/perl" + +do_configure_prepend() { + ${S}/autogen.sh +} + ALLOW_EMPTY_${PN} = "1" # Split into seperate packages since we normal don't want them all @@ -49,11 +61,6 @@ or IPv4." DESCRITPION_${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ servers through slateless IPv6 autoconfiguration." -# We do not run perl during the build, but only use it on the target. -do_configure_prepend() { - export PERL="/usr/bin/perl" -} - do_install_append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it