From patchwork Sat Jun 17 17:21:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105767 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp171933qgd; Sat, 17 Jun 2017 10:22:21 -0700 (PDT) X-Received: by 10.84.217.197 with SMTP id d5mr19539194plj.282.1497720141054; Sat, 17 Jun 2017 10:22:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720141; cv=none; d=google.com; s=arc-20160816; b=nCxP7zoEib9xJgtRlmDA57U9DzDinv0F5/+u4z//0ikt6KbSuiOk5qWXHZnGtCEbQ2 y7aFsm3uCG8dDYRA6oTV50nOsY/qAPB05+kcpZFV2MCwW8A7M88CxlxJENq/Qg/SYQqo I9/5r9JIG7fS2VENZabX9puzB5FVBE3KOAYL2m/zSkTttTp8GHf+TddUUXekPRzTomBV jrwsPQhYlf4B7aMnv4FpaDV8xcJfKgqi2G3YK9KKcBjtL14b+GMkhSuGYup4wYBCozcQ 25TBjm+oNUokKLOh5vc/fsz7lddLfIA16wI3rnlMoFpi3dbiynyibZUTmTXl/asT8PD1 WYvQ== 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=R1QMXP5uIi52mdt5S+lze3hOOlIesc0AqAL7bxtljdY=; b=tRQwebokwXZVX273ajCMiLG/Otsigu7Zs7eLFXr+x9hzxxVvVgSr4/uuiKYrpufrzS Xn/aXWh7TGb1OvU/1qHAecxuWfXjStixfyOJZGz7HkdCjBHG8iNHDclicYs6YVBp2Fwp M9t1gM/t+1O0j/qyd9VEijI9p5XptM4u7ClBE5FqgRAnYM6UqF6ZzIFs6zx0/Byk0qJ5 z+CrnVKw0d6ZNnSPZr1oZx5zvrlzLAPld/klNYzMfTZ2EwmZhzWTZvun3J8Uh92jnvWJ 6LBHOipF3HVJnKi738vUiFnhStZe4VLblVhbNqW5wec4/UonuMMOseC7TBmTmv2Byvtv kxcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=iaki/jJV; 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 y67si1404478pfy.16.2017.06.17.10.22.20; Sat, 17 Jun 2017 10:22:21 -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.b=iaki/jJV; 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 5B10271C1F; Sat, 17 Jun 2017 17:21:54 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 6D6617197B for ; Sat, 17 Jun 2017 17:21:50 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id e187so1796368pgc.3 for ; Sat, 17 Jun 2017 10:21:52 -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=tViz5b15ihlCYZJkc3GCD3Gr4BR+ZFq8GCFyvKtNiE8=; b=iaki/jJVcn+MjHbcbzw9F3XVGNSZ1I2cvhX0BdNO3BMml157FkksUSW9XxLUS9q7Ii W8kzTYh84bvXtSmFLxwbdZS0Fpyhk0w6qbJveKJ47hxcKS83L2WK4C8QFnY6FhsTYu0K v9C7i00HKUDwU4e/vgRBlYkU5DCa8kmGN+WifO4WxIOgeyyD/OeMDNzcgmYOi5nAAOWM +p/NxBPt0CQ9ERUTSXh37gp02l4G/sXAe6gNcvLOnzpzc5vIeC1pJ4Di83RaE30Z372I w9Vx9aR+L8AyhofdFs1UB8yKBwxALYzk7vNczHUxey2EAn1D578qK7Th7wzAc+ed9Q6F AgYA== 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=tViz5b15ihlCYZJkc3GCD3Gr4BR+ZFq8GCFyvKtNiE8=; b=YX8J/W43nU0VrA+Xc+d/w9EGdducfNeEIf7bPmK5luLY0cDkPS0ueWCc0krz3XlFMJ 01qDec9uk/wU/WAlbJwdk0rto3w8PL5uPu9/aflS+CYHTqg/nr++gbzoqvDAXMCbeGpw Mk6/RD1t97YFsR3WDsRnGJr3AGy1aq6HFduhCfV71LXnKdRkio9N8YMRVqCn67A3xGi8 zoLi3RP0ArtcM6EqSVTstV0vFqC78g4p+7e8Lfkv26h0iMvp1f395cXMfXo0F4xrinRq C6SlmS5bM7LxHVUgwlQCi18JIlKonteD39jYZU+FGfcMTRkHoqa1vvnQ1Z3+1l7p8a8L iVaw== X-Gm-Message-State: AKS2vOxEB1J1bZPLGQNW12G4r5i9ClgvCwc2EvkKJn3gMoW+INQ4qFXp +u9WS3MYZmSXyShQ X-Received: by 10.98.112.137 with SMTP id l131mr17226022pfc.186.1497720111783; Sat, 17 Jun 2017 10:21:51 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:50 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:34 -0700 Message-Id: <20170617172142.1311-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [oe] [meta-filesystems][PATCH 1/9] xfsprogs: Remove .la files in ${libdir} 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 Delete .la files and remove ${libdir} if empty Fix build with musl Signed-off-by: Khem Raj --- ...fine-__-prefixed-version-of-intXY_t-types.patch | 58 ++++++++++++++++++++++ .../recipes-utils/xfsprogs/xfsprogs_4.10.0.bb | 5 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-define-__-prefixed-version-of-intXY_t-types.patch -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-define-__-prefixed-version-of-intXY_t-types.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-define-__-prefixed-version-of-intXY_t-types.patch new file mode 100644 index 000000000..951a1442c --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-define-__-prefixed-version-of-intXY_t-types.patch @@ -0,0 +1,58 @@ +From 2b4714123cdecb558babb76074d0ab945bf5b177 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 18:59:10 -0700 +Subject: [PATCH] define __ prefixed version of intXY_t types + +This is required since musl does not define them +unlike glibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + include/linux.h | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/include/linux.h b/include/linux.h +index 6a676ca..6976d83 100644 +--- a/include/linux.h ++++ b/include/linux.h +@@ -40,6 +40,35 @@ + # undef fsxattr + #endif + ++#ifndef loff_t ++#define loff_t off_t ++#endif ++#ifndef __uint8_t ++#define __uint8_t uint8_t ++#endif ++#ifndef __uint16_t ++#define __uint16_t uint16_t ++#endif ++#ifndef __uint32_t ++#define __uint32_t uint32_t ++#endif ++#ifndef __uint64_t ++#define __uint64_t uint64_t ++#endif ++ ++#ifndef __int8_t ++#define __int8_t int8_t ++#endif ++#ifndef __int16_t ++#define __int16_t int16_t ++#endif ++#ifndef __int32_t ++#define __int32_t int32_t ++#endif ++#ifndef __int64_t ++#define __int64_t int64_t ++#endif ++ + static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p) + { + return ioctl(fd, cmd, p); +-- +2.13.1 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb index f7e10cdfb..a9aee31b7 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8" DEPENDS = "util-linux util-linux-native" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://link_needed_libs.patch \ -" + file://0001-define-__-prefixed-version-of-intXY_t-types.patch \ + " SRC_URI[md5sum] = "ddbb04493addf014db07a7e2b96b2804" SRC_URI[sha256sum] = "d8cb9ab2c686699d37914354ce3992b4aff3677093cbce06ad18bf798da8a8a7" @@ -54,4 +55,6 @@ do_configure_prepend () { do_install_append() { oe_runmake 'DESTDIR=${D}' install install-dev + rm ${D}${libdir}/*.la + rmdir ${D}${libdir} } From patchwork Sat Jun 17 17:21:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105768 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172401qgd; Sat, 17 Jun 2017 10:23:55 -0700 (PDT) X-Received: by 10.84.132.65 with SMTP id 59mr19668980ple.21.1497720235816; Sat, 17 Jun 2017 10:23:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720235; cv=none; d=google.com; s=arc-20160816; b=qKQexf7wmLfGxXTWNdlDddWHD5NHDnxJSiurexCx+1VmmRZth/0jzCX4UYEdWDcTAw Y77zhbwiVFg2beposxSA9u+IBzSbT+WhWVp0DqRq96kEh8QuCLWZKI2BUWL10jgkNlEe 1BHSy7sP2VpZsgXEWcll2sumLWmSTR2tkLHp/zb3EY4nXEzu56YmyVHbkIG83OEqEENg b+CvXCjUXfUSvWhekgtziY3uQjvzbnc/anJT3lu8s9cWijPLQJv25+K78p+OrErdVvrJ 7a9da+vfayTJctaRqADi2HfcxzPKetklWtrarOuV7eDSBo+Pfn3MvfSCIbOOIrzo194N RDyQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jYedpNzJN6an/QGXzjAG4WZPKkNLsj4p4+Qbr2NfnYg=; b=GCWmof071WBpsSOaOH4ivadDMjXqK/Pduo3giauicNuqujunhmUfCbwXHS48znN62N 2I7nIv98/zlHa6ZAnpqNGzxaWEzNE7hftQcYqPLJ9IOsWw5SC4wPEIx56e6bx2dxsngs 5I7FjjGulWrutpi/IOE1I2/AhVSI7h6GWhmnxRRWYLfdaXNrIk4n2GiUGblQO4FOj6tv hzkSwgAws6Y5ODZl51d8aNV69A22oTWma5CVD/7BiKB8aKsS4knc65llxS+iKuupDext 8s2/VQ2BYW9KOc3Yul5g7k3VeD0oRuloFTW4LkG0pKs27fx3Wxcaj4Z+EzsHOeJ3Gos0 Q6Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=UwXLqDlf; 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 x84si4804586pgx.145.2017.06.17.10.23.55; Sat, 17 Jun 2017 10:23:55 -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.b=UwXLqDlf; 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 E012278376; Sat, 17 Jun 2017 17:23:52 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by mail.openembedded.org (Postfix) with ESMTP id A393778371 for ; Sat, 17 Jun 2017 17:21:52 +0000 (UTC) Received: by mail-pf0-f175.google.com with SMTP id 83so35758312pfr.0 for ; Sat, 17 Jun 2017 10:21:54 -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:in-reply-to:references; bh=EQ3/uM9FWtWXvfJJCTZSoPBffCcQOjSV5G+16wuqi64=; b=UwXLqDlfIA0ivLlj6Ym92+S1ZY0PZwRl5l39g02pHcgLxTnm0XK0df5DWgCl6/UCBK e0bGfegLskF7UeapBI/JmYukAIJ3GpHe7pYIuJiIPFZXR3POjsFKzE54iWgUN/jmKPRF 1xZawpr0W7pgk2kQK/cLMwWGGD8/dce8OIWX4ucgDeaVf9fr3/GAT3BCdRFssO5xSUEZ DYZBrkOD3OHXdlpGaBvN45QPH2j3cGpUm4yLd0sJf24eINfOPpqhfFr2VvAbW/TIJMfM W7AIQ3BdgI3XYS564p0MTXOoqtzO2JG1ZSV3vQ7hl/KFo2hanlue2+c4nGiz0sWS92T6 Teow== 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:in-reply-to :references; bh=EQ3/uM9FWtWXvfJJCTZSoPBffCcQOjSV5G+16wuqi64=; b=WCE7SQX0xg+YQDyhzyM4iCiBgHIJfhRtkUDUWZAEvbBpe62fhV6w17M2oRnrsJAiVE Y+dN3u1rGzOEFS9aVLtPMOwviPNYZRB2V3dzncwz8dmg+A5w1Rx1qleC1K6nLM2rNTAB 6xwmWaFM8IhNyMXb293xF2oe+2jpjwetc3PHkSrQ3Y40N8c5veTnuWvf2EP+SXvQejVU zjIEtCvbLSF+awC9ktsEne9JhGc8ANGyM/qiNlKNdZTpUY2QX62kuFVmG8hw3g8aYqeY 2HyRG9rQbEAC1KfE95LhZ2mBAo++31sS/M6iMDyWHkGBfQhukOiCKR28Ui7ZMJAwFGvJ EsnA== X-Gm-Message-State: AKS2vOy0i4zAa2QI/4Drod+21KunvdNAltPrO5Zt03XIdlyTFN18tyDt rXZJ6BeJHoImru8D X-Received: by 10.98.89.79 with SMTP id n76mr17345452pfb.28.1497720113466; Sat, 17 Jun 2017 10:21:53 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:52 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:35 -0700 Message-Id: <20170617172142.1311-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 2/9] freeradius: Upgrade to 3.0.14 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 Fix a cross compile issue where it was looking for samba headers in build host. in src/modules/rlm_mschap/config.log Fix cc1: warning: include location "/usr/include/samba-4.0/" is unsafe for cross-compilation [-Wpoison-system-directories] Signed-off-by: Khem Raj --- ...Use-includedir-instead-of-hardcoding-usr-.patch | 28 ++++++++++++++++++++++ .../{freeradius_3.0.13.bb => freeradius_3.0.14.bb} | 10 ++++---- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch rename meta-networking/recipes-connectivity/freeradius/{freeradius_3.0.13.bb => freeradius_3.0.14.bb} (96%) -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch new file mode 100644 index 000000000..db8caab12 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch @@ -0,0 +1,28 @@ +From 66e8bcdcca8971b5c43c31755d56d7f675d8b5ff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 20:10:49 -0700 +Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include + +OE QA flags it correctly as a voilation of cross compilation +namespace + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/modules/rlm_mschap/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac +=================================================================== +--- freeradius-server-3.0.14.orig/src/modules/rlm_mschap/configure.ac ++++ freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac +@@ -72,7 +72,7 @@ if test x$with_[]modname != xno; then + mod_ldflags="-framework DirectoryService" + fi + +- smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" ++ smart_try_dir="$winbind_include_dir =/usr/include/samba-4.0" + FR_SMART_CHECK_INCLUDE(wbclient.h, [#include + #include ]) + if test "x$ac_cv_header_wbclient_h" != "xyes"; then diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.13.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.14.bb similarity index 96% rename from meta-networking/recipes-connectivity/freeradius/freeradius_3.0.13.bb rename to meta-networking/recipes-connectivity/freeradius/freeradius_3.0.14.bb index 0d39c15f5..6971b0379 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.13.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.14.bb @@ -10,7 +10,8 @@ SUMMARY = "High-performance and highly configurable RADIUS server" HOMEPAGE = "http://www.freeradius.org/" SECTION = "System/Servers" LICENSE = "GPLv2 & LGPLv2+" -DEPENDS = "openssl-native openssl libtool libpcap libtalloc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" +DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" SRC_URI = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${PV}.tar.bz2 \ file://freeradius \ @@ -25,13 +26,12 @@ SRC_URI = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${PV}.tar.b file://freeradius-libtool-do-not-use-jlibtool.patch \ file://freeradius-fix-quoting-for-BUILT_WITH.patch \ file://freeradius-fix-error-for-expansion-of-macro.patch \ + file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " - -LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI[md5sum] = "7f99df26a6ac71b1f7cce5c213e52790" -SRC_URI[sha256sum] = "b3be0d8849878c31af0a5375d20b7b20c9d1c1572e89dc3f22992824cefffb84" +SRC_URI[md5sum] = "7d98dfafffac81f19cadccea5af89cea" +SRC_URI[sha256sum] = "2771f6ecd6c816ac4d52b66bb8ae6781ca20e1e4984c5804fc4e67de3a807c59" PARALLEL_MAKE = "" From patchwork Sat Jun 17 17:21:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105769 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172432qgd; Sat, 17 Jun 2017 10:24:02 -0700 (PDT) X-Received: by 10.98.14.79 with SMTP id w76mr16783821pfi.63.1497720242864; Sat, 17 Jun 2017 10:24:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720242; cv=none; d=google.com; s=arc-20160816; b=rRztRlTQAYyoWngs8XQ3wzrRYGoq1zqLkTQ/fvC4oAzZglULEeypttd/WoZUsw5sn4 h4/pLd44DZlWBd+eho50V0HJYLovUVthYxN7tZxTnu7b+5E2xvqeNWuDGxEueHhg6UYm awlTcXnGQ7VaL9MiwVci3/+wtPlPkeO6uJPIPfm8h6JKpca2tuOCBARs4DD9su7AvGS0 S/mmozD6o10Dx6XgM1YOUvQAwUC5zyDjlCbeXNy5wFLqh9y+aVkvqf+b3volyI/yWjQr oOsx2PRqwpDWy6gEEHgPYjA9Qi+DJyjYY4gM8VWu3EKOSK5AIQ1VEaIrIaomgITpryB7 U2+w== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=HLzkMyuIXrztG9gSxQ7vuAMqxS4oONvfixiPwSaz6sE=; b=dP8J5WHoz7OMifB2Sdj1xQq6idGBTrfQdYRIz58Viqp/eSJPiDH8BJ0EyUaoHWs2t7 uirZzjQLhR86OOJHeVVBvus2oYOsacxG4jxhS/0GONJovnOT+OcZYTlJhYA58sMlwCIv HlLC2liEr8dly1IXiBcWFoS4CE08j8q40nqdXsU/aQeo7AuRAyzW+I8uuLNc9JFG4o00 zKQhVH10r2r+pDKS3Fm1hRZfc1ZsSiwgaLJo3EjtH9uHzi5MUL62n3Ywgo2Tt7Xn/x55 b2ZXavPv5XYl+mBh8rVWY1k6lQNnvk9po4Tkq47Q8nDlNoV3Or0NbG2mK2++Nje/sDy2 JVwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=GfF0oLE7; 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 d32si1721886pld.390.2017.06.17.10.24.02; Sat, 17 Jun 2017 10:24:02 -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.b=GfF0oLE7; 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 3AA017838A; Sat, 17 Jun 2017 17:23:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id DA09671C1F for ; Sat, 17 Jun 2017 17:21:54 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id y7so11054299pfd.3 for ; Sat, 17 Jun 2017 10:21:56 -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:in-reply-to:references; bh=KV2Mi1xUFgdgPWtpBtEW3LrI4dy2CbuJlfuioRZuRzg=; b=GfF0oLE7KqCOpyadxeFLRsevht/KPOmGV+tdLeC1rr0zegAu0KsP6/Vrk5onJP8Bt1 JvfoIavlR0+manJfRe+3U/fl+G4VgoAdQ8Tmdoi0/bCTiRTYJMEtbepGC/KTxsLysXuG MC6tUlZRg5lxUpN2qFjlMyN4AD+71aNO6HGDbckeXycT8M6zYUPF6gC3z9q6QTqWgX5G 1RzL9qvr5K8lnR8EAoHu7WWC4SStuQHeflxZoDbJON/q8jbrc2iKB1QsKPcgnFwQMSNk L1YosA2RGAkzoMwIm26Y5W5V8fiW8a7qtk7MKfQqARZPPC1BtT7AyH/k3Xq5mW4SVxzL DeLg== 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:in-reply-to :references; bh=KV2Mi1xUFgdgPWtpBtEW3LrI4dy2CbuJlfuioRZuRzg=; b=gOD2v+G3beF5jFxLhflpwRtWeG+hi9VXVkk3hZBH/wufWQT/Oa8bIdAL12NIRRsxUX msDS54orpebWSRBG3y4xY0o+StnIdrfZz6Bt1gf/pe5OmWqiu+Ggo2BIU/zZxStomwBO R1/lz8+cNFM6CGZFUuJgdjvHeHnjLcXYg2Z2/ylGKWRiqFPKxX7ojqt2/kNgNru38IhX oQN+7kd08svo2Kd4rIC4+/y9+v/t84CoFJTi/hNLRG7++sCTLWrvzQnTzUxNLB7JB6QD 70NTq41zqr745aBqYT92cFlRapsul0RdTHV68HQA0j2mojQ9Od8hNre+qR071Oqte/os zt6g== X-Gm-Message-State: AKS2vOw+sB98Hym0z79gJdFsJfaTc3Mb6iFWooVdbFBED6blRixbdapl 777eeb2DXsWFUF5V X-Received: by 10.98.71.84 with SMTP id u81mr17130894pfa.102.1497720115176; Sat, 17 Jun 2017 10:21:55 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:53 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:36 -0700 Message-Id: <20170617172142.1311-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/9] ssiapi: Fix build with gcc7 and musl 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 Signed-off-by: Khem Raj --- .../0001-Use-pragma-once-unconditionally.patch | 872 +++++++++++++++++++++ .../0002-Convert-macros-into-functions.patch | 123 +++ ...-canonicalize_file_name-with-realpath-API.patch | 33 + ...ne-Fix-indentation-and-missing-semi-colon.patch | 54 ++ .../ssiapi/0005-engine-Define-SENTINEL.patch | 40 + ...issing-includes-and-use-realpath-instead-.patch | 40 + meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb | 9 +- 7 files changed, 1170 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch new file mode 100644 index 000000000..ef6ae00e3 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch @@ -0,0 +1,872 @@ +From 3100e23c50e38bff0c2ec77bc30049c113c29414 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 20:44:31 -0700 +Subject: [PATCH 1/6] Use pragma once unconditionally + +in OE we do not worry about supporting +gcc 3.4 anyway + +Upstream-Status: Inappropriate[Bumps required gcc to be > 3.4] + +Signed-off-by: Khem Raj +--- + lib/efi/efi.h | 2 -- + lib/engine/ahci.h | 2 -- + lib/engine/ahci_cdrom.h | 2 -- + lib/engine/ahci_disk.h | 2 -- + lib/engine/ahci_multiplier.h | 2 -- + lib/engine/ahci_multiplier_phy.h | 2 -- + lib/engine/ahci_multiplier_port.h | 2 -- + lib/engine/ahci_phy.h | 2 -- + lib/engine/ahci_port.h | 2 -- + lib/engine/ahci_raid_info.h | 2 -- + lib/engine/ahci_tape.h | 2 -- + lib/engine/array.h | 2 -- + lib/engine/block_device.h | 2 -- + lib/engine/cache.h | 2 -- + lib/engine/container.h | 2 -- + lib/engine/context_manager.h | 2 -- + lib/engine/controller.h | 2 -- + lib/engine/enclosure.h | 2 -- + lib/engine/end_device.h | 2 -- + lib/engine/event.h | 2 -- + lib/engine/event_manager.h | 2 -- + lib/engine/exception.h | 2 -- + lib/engine/filesystem.h | 2 -- + lib/engine/isci.h | 2 -- + lib/engine/isci_cdrom.h | 2 -- + lib/engine/isci_disk.h | 2 -- + lib/engine/isci_expander.h | 2 -- + lib/engine/isci_expander_phy.h | 2 -- + lib/engine/isci_expander_port.h | 2 -- + lib/engine/isci_phy.h | 2 -- + lib/engine/isci_port.h | 2 -- + lib/engine/isci_raid_info.h | 2 -- + lib/engine/isci_tape.h | 2 -- + lib/engine/list.h | 2 -- + lib/engine/mdadm_config.h | 2 -- + lib/engine/multimedia_device.h | 2 -- + lib/engine/nondisk_device.h | 2 -- + lib/engine/object.h | 2 -- + lib/engine/pci_header.h | 2 -- + lib/engine/phy.h | 2 -- + lib/engine/port.h | 2 -- + lib/engine/raid_device.h | 2 -- + lib/engine/raid_info.h | 2 -- + lib/engine/remote_port.h | 2 -- + lib/engine/routing_device.h | 2 -- + lib/engine/session.h | 2 -- + lib/engine/session_manager.h | 2 -- + lib/engine/storage_device.h | 2 -- + lib/engine/stream_device.h | 2 -- + lib/engine/string.h | 2 -- + lib/engine/unique_id_manager.h | 2 -- + lib/engine/utils.h | 2 -- + lib/engine/volume.h | 2 -- + lib/log/log.h | 2 -- + lib/mpb/machine_bytes.h | 2 -- + lib/mpb/mpb.h | 2 -- + lib/orom/orom.h | 2 -- + 57 files changed, 114 deletions(-) + +diff --git a/lib/efi/efi.h b/lib/efi/efi.h +index 9e7e41b..804e567 100644 +--- a/lib/efi/efi.h ++++ b/lib/efi/efi.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __EFI_H__INCLUDED__ + #define __EFI_H__INCLUDED__ +diff --git a/lib/engine/ahci.h b/lib/engine/ahci.h +index e883d1a..80a9699 100644 +--- a/lib/engine/ahci.h ++++ b/lib/engine/ahci.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_H__INCLUDED__ + #define __AHCI_H__INCLUDED__ +diff --git a/lib/engine/ahci_cdrom.h b/lib/engine/ahci_cdrom.h +index 442f301..d8ca042 100644 +--- a/lib/engine/ahci_cdrom.h ++++ b/lib/engine/ahci_cdrom.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_CDROM_H__INCLUDED__ + #define __AHCI_CDROM_H__INCLUDED__ +diff --git a/lib/engine/ahci_disk.h b/lib/engine/ahci_disk.h +index 7892a53..1bad9ad 100644 +--- a/lib/engine/ahci_disk.h ++++ b/lib/engine/ahci_disk.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_DISK_H__INCLUDED__ + #define __AHCI_DISK_H__INCLUDED__ +diff --git a/lib/engine/ahci_multiplier.h b/lib/engine/ahci_multiplier.h +index d63e9bc..1029af2 100644 +--- a/lib/engine/ahci_multiplier.h ++++ b/lib/engine/ahci_multiplier.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_MULTIPLIER_H__INCLUDED__ + #define __AHCI_MULTIPLIER_H__INCLUDED__ +diff --git a/lib/engine/ahci_multiplier_phy.h b/lib/engine/ahci_multiplier_phy.h +index 58ecebc..2132c23 100644 +--- a/lib/engine/ahci_multiplier_phy.h ++++ b/lib/engine/ahci_multiplier_phy.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_MULTIPLIER_PHY_H__INCLUDED__ + #define __AHCI_MULTIPLIER_PHY_H__INCLUDED__ +diff --git a/lib/engine/ahci_multiplier_port.h b/lib/engine/ahci_multiplier_port.h +index 5ff4cf7..2402473 100644 +--- a/lib/engine/ahci_multiplier_port.h ++++ b/lib/engine/ahci_multiplier_port.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_MULTIPLIER_PORT_H__INCLUDED__ + #define __AHCI_MULTIPLIER_PORT_H__INCLUDED__ +diff --git a/lib/engine/ahci_phy.h b/lib/engine/ahci_phy.h +index e2254e7..a44dae0 100644 +--- a/lib/engine/ahci_phy.h ++++ b/lib/engine/ahci_phy.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_PHY_H__INCLUDED__ + #define __AHCI_PHY_H__INCLUDED__ +diff --git a/lib/engine/ahci_port.h b/lib/engine/ahci_port.h +index f9e3308..03c109b 100644 +--- a/lib/engine/ahci_port.h ++++ b/lib/engine/ahci_port.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_PORT_H__INCLUDED__ + #define __AHCI_PORT_H__INCLUDED__ +diff --git a/lib/engine/ahci_raid_info.h b/lib/engine/ahci_raid_info.h +index e1c81ae..c70e63e 100644 +--- a/lib/engine/ahci_raid_info.h ++++ b/lib/engine/ahci_raid_info.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_RAID_INFO_H__INCLUDED__ + #define __AHCI_RAID_INFO_H__INCLUDED__ +diff --git a/lib/engine/ahci_tape.h b/lib/engine/ahci_tape.h +index cdd9f13..a91fd2c 100644 +--- a/lib/engine/ahci_tape.h ++++ b/lib/engine/ahci_tape.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __AHCI_TAPE_H__INCLUDED__ + #define __AHCI_TAPE_H__INCLUDED__ +diff --git a/lib/engine/array.h b/lib/engine/array.h +index 36fb4a4..0986ce3 100644 +--- a/lib/engine/array.h ++++ b/lib/engine/array.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ARRAY_H__INCLUDED__ + #define __ARRAY_H__INCLUDED__ +diff --git a/lib/engine/block_device.h b/lib/engine/block_device.h +index 4503914..45dd3db 100644 +--- a/lib/engine/block_device.h ++++ b/lib/engine/block_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __BLOCK_DEVICE_H__INCLUDED__ + #define __BLOCK_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/cache.h b/lib/engine/cache.h +index 72cf521..72da20b 100644 +--- a/lib/engine/cache.h ++++ b/lib/engine/cache.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3,4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __CACHE_H__INCLUDED__ + #define __CACHE_H__INCLUDED__ +diff --git a/lib/engine/container.h b/lib/engine/container.h +index 53867b0..c71180c 100644 +--- a/lib/engine/container.h ++++ b/lib/engine/container.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3,4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __CONTAINER_H__INCLUDED__ + #define __CONTAINER_H__INCLUDED__ +diff --git a/lib/engine/context_manager.h b/lib/engine/context_manager.h +index fe9c256..6b4a2e7 100644 +--- a/lib/engine/context_manager.h ++++ b/lib/engine/context_manager.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3,4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __CONTEXT_H__INCLUDED__ + #define __CONTEXT_H__INCLUDED__ +diff --git a/lib/engine/controller.h b/lib/engine/controller.h +index a2f188a..6bd078f 100644 +--- a/lib/engine/controller.h ++++ b/lib/engine/controller.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __CONTROLLER_H__INCLUDED__ + #define __CONTROLLER_H__INCLUDED__ +diff --git a/lib/engine/enclosure.h b/lib/engine/enclosure.h +index 3faef0c..f4b13cc 100644 +--- a/lib/engine/enclosure.h ++++ b/lib/engine/enclosure.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ENCLOSURE_H__INCLUDED__ + #define __ENCLOSURE_H__INCLUDED__ +diff --git a/lib/engine/end_device.h b/lib/engine/end_device.h +index f147e41..269b236 100644 +--- a/lib/engine/end_device.h ++++ b/lib/engine/end_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __END_DEVICE_H__INCLUDED__ + #define __END_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/event.h b/lib/engine/event.h +index cf9bb4f..11a4926 100644 +--- a/lib/engine/event.h ++++ b/lib/engine/event.h +@@ -12,9 +12,7 @@ Redistribution and use in source and binary forms, with or without modification, + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __EVENT_H__INCLUDED__ + #define __EVENT_H__INCLUDED__ +diff --git a/lib/engine/event_manager.h b/lib/engine/event_manager.h +index 65007b9..a7a8fc3 100644 +--- a/lib/engine/event_manager.h ++++ b/lib/engine/event_manager.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __EVENT_MANAGER_H__INCLUDED__ + #define __EVENT_MANAGER_H__INCLUDED__ +diff --git a/lib/engine/exception.h b/lib/engine/exception.h +index 171e45d..183ebb5 100644 +--- a/lib/engine/exception.h ++++ b/lib/engine/exception.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __EXCEPTION_H__INCLUDED__ + #define __EXCEPTION_H__INCLUDED__ +diff --git a/lib/engine/filesystem.h b/lib/engine/filesystem.h +index 9c2ce39..b49df07 100644 +--- a/lib/engine/filesystem.h ++++ b/lib/engine/filesystem.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __FILESYSTEM_H__INCLUDED__ + #define __FILESYSTEM_H__INCLUDED__ +diff --git a/lib/engine/isci.h b/lib/engine/isci.h +index ea35cd4..0fa602a 100644 +--- a/lib/engine/isci.h ++++ b/lib/engine/isci.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_H__INCLUDED__ + #define __ISCI_H__INCLUDED__ +diff --git a/lib/engine/isci_cdrom.h b/lib/engine/isci_cdrom.h +index 87b7e7b..25637f9 100644 +--- a/lib/engine/isci_cdrom.h ++++ b/lib/engine/isci_cdrom.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_CDROM_H__INCLUDED__ + #define __ISCI_CDROM_H__INCLUDED__ +diff --git a/lib/engine/isci_disk.h b/lib/engine/isci_disk.h +index 596c3cf..8dd0dae 100644 +--- a/lib/engine/isci_disk.h ++++ b/lib/engine/isci_disk.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_DISK_H__INCLUDED__ + #define __ISCI_DISK_H__INCLUDED__ +diff --git a/lib/engine/isci_expander.h b/lib/engine/isci_expander.h +index ca7c2f1..7dc1920 100644 +--- a/lib/engine/isci_expander.h ++++ b/lib/engine/isci_expander.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_EXPANDER_H__INCLUDED__ + #define __ISCI_EXPANDER_H__INCLUDED__ +diff --git a/lib/engine/isci_expander_phy.h b/lib/engine/isci_expander_phy.h +index c9cd770..d3d2832 100644 +--- a/lib/engine/isci_expander_phy.h ++++ b/lib/engine/isci_expander_phy.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_EXPANDER_PHY_H__INCLUDED__ + #define __ISCI_EXPANDER_PHY_H__INCLUDED__ +diff --git a/lib/engine/isci_expander_port.h b/lib/engine/isci_expander_port.h +index e65a124..4fc9310 100644 +--- a/lib/engine/isci_expander_port.h ++++ b/lib/engine/isci_expander_port.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_EXPANDER_PORT_H__INCLUDED__ + #define __ISCI_EXPANDER_PORT_H__INCLUDED__ +diff --git a/lib/engine/isci_phy.h b/lib/engine/isci_phy.h +index 767a5b2..105c697 100644 +--- a/lib/engine/isci_phy.h ++++ b/lib/engine/isci_phy.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_PHY_H__INCLUDED__ + #define __ISCI_PHY_H__INCLUDED__ +diff --git a/lib/engine/isci_port.h b/lib/engine/isci_port.h +index b80be7f..5ccc151 100644 +--- a/lib/engine/isci_port.h ++++ b/lib/engine/isci_port.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_PORT_H__INCLUDED__ + #define __ISCI_PORT_H__INCLUDED__ +diff --git a/lib/engine/isci_raid_info.h b/lib/engine/isci_raid_info.h +index 1df6477..b0b046a 100644 +--- a/lib/engine/isci_raid_info.h ++++ b/lib/engine/isci_raid_info.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_RAID_INFO_H__INCLUDED__ + #define __ISCI_RAID_INFO_H__INCLUDED__ +diff --git a/lib/engine/isci_tape.h b/lib/engine/isci_tape.h +index 985f767..a2cef2d 100644 +--- a/lib/engine/isci_tape.h ++++ b/lib/engine/isci_tape.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ISCI_TAPE_H__INCLUDED__ + #define __ISCI_TAPE_H__INCLUDED__ +diff --git a/lib/engine/list.h b/lib/engine/list.h +index 9a7c3c3..6395830 100644 +--- a/lib/engine/list.h ++++ b/lib/engine/list.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __LIST_H__INCLUDED__ + #define __LIST_H__INCLUDED__ +diff --git a/lib/engine/mdadm_config.h b/lib/engine/mdadm_config.h +index c94020f..e415b4f 100644 +--- a/lib/engine/mdadm_config.h ++++ b/lib/engine/mdadm_config.h +@@ -11,9 +11,7 @@ Redistribution and use in source and binary forms, with or without modification, + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __MDADM_CONFIG_H__INCLUDED__ + #define __MDADM_CONFIG_H__INCLUDED__ +diff --git a/lib/engine/multimedia_device.h b/lib/engine/multimedia_device.h +index 533370e..694e2a5 100644 +--- a/lib/engine/multimedia_device.h ++++ b/lib/engine/multimedia_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __MULTIMEDIA_DEVICE_H__INCLUDED__ + #define __MULTIMEDIA_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/nondisk_device.h b/lib/engine/nondisk_device.h +index 70ebb32..0f00e52 100644 +--- a/lib/engine/nondisk_device.h ++++ b/lib/engine/nondisk_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __CHARACTER_DEVICE_H__INCLUDED__ + #define __CHARACTER_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/object.h b/lib/engine/object.h +index b52d3d3..345d58c 100644 +--- a/lib/engine/object.h ++++ b/lib/engine/object.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __OBJECT_H__INCLUDED__ + #define __OBJECT_H__INCLUDED__ +diff --git a/lib/engine/pci_header.h b/lib/engine/pci_header.h +index 376f296..c5129a0 100644 +--- a/lib/engine/pci_header.h ++++ b/lib/engine/pci_header.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __PCI_HEADER_H__INCLUDED__ + #define __PCI_HEADER_H__INCLUDED__ +diff --git a/lib/engine/phy.h b/lib/engine/phy.h +index f5730a0..c59f7c8 100644 +--- a/lib/engine/phy.h ++++ b/lib/engine/phy.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __PHY_H__INCLUDED__ + #define __PHY_H__INCLUDED__ +diff --git a/lib/engine/port.h b/lib/engine/port.h +index 2f33876..cc48c7c 100644 +--- a/lib/engine/port.h ++++ b/lib/engine/port.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3,4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __PORT_H__INCLUDED__ + #define __PORT_H__INCLUDED__ +diff --git a/lib/engine/raid_device.h b/lib/engine/raid_device.h +index 998e80c..2174162 100644 +--- a/lib/engine/raid_device.h ++++ b/lib/engine/raid_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __RAID_DEVICE_H__INCLUDED__ + #define __RAID_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/raid_info.h b/lib/engine/raid_info.h +index 174698a..302be9b 100644 +--- a/lib/engine/raid_info.h ++++ b/lib/engine/raid_info.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __RAID_INFO_H__INCLUDED__ + #define __RAID_INFO_H__INCLUDED__ +diff --git a/lib/engine/remote_port.h b/lib/engine/remote_port.h +index c086656..4ddfee3 100644 +--- a/lib/engine/remote_port.h ++++ b/lib/engine/remote_port.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __REMOTE_PORT_H__INCLUDED__ + #define __REMOTE_PORT_H__INCLUDED__ +diff --git a/lib/engine/routing_device.h b/lib/engine/routing_device.h +index 5f857a6..284621e 100644 +--- a/lib/engine/routing_device.h ++++ b/lib/engine/routing_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ROUTING_DEVICE_H__INCLUDED__ + #define __ROUTING_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/session.h b/lib/engine/session.h +index a901d1c..3200da1 100644 +--- a/lib/engine/session.h ++++ b/lib/engine/session.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __SESSION_H__INCLUDED__ + #define __SESSION_H__INCLUDED__ +diff --git a/lib/engine/session_manager.h b/lib/engine/session_manager.h +index 7177064..87e16c3 100644 +--- a/lib/engine/session_manager.h ++++ b/lib/engine/session_manager.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __SESSION_MANAGER_H__INCLUDED__ + #define __SESSION_MANAGER_H__INCLUDED__ +diff --git a/lib/engine/storage_device.h b/lib/engine/storage_device.h +index ddeb66f..20bdab2 100644 +--- a/lib/engine/storage_device.h ++++ b/lib/engine/storage_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __STORAGE_DEVICE_H__INCLUDED__ + #define __STORAGE_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/stream_device.h b/lib/engine/stream_device.h +index 9bc111a..b29bd68 100644 +--- a/lib/engine/stream_device.h ++++ b/lib/engine/stream_device.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __STREAM_DEVICE_H__INCLUDED__ + #define __STREAM_DEVICE_H__INCLUDED__ +diff --git a/lib/engine/string.h b/lib/engine/string.h +index 3007dc7..6f348c9 100644 +--- a/lib/engine/string.h ++++ b/lib/engine/string.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __STRING_H__INCLUDED__ + #define __STRING_H__INCLUDED__ +diff --git a/lib/engine/unique_id_manager.h b/lib/engine/unique_id_manager.h +index fe79eac..4a13627 100644 +--- a/lib/engine/unique_id_manager.h ++++ b/lib/engine/unique_id_manager.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __UNIQUE_ID_MANAGER_H__INCLUDED__ + #define __UNIQUE_ID_MANAGER_H__INCLUDED__ +diff --git a/lib/engine/utils.h b/lib/engine/utils.h +index 86c20cf..5525303 100644 +--- a/lib/engine/utils.h ++++ b/lib/engine/utils.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __UTILS_H__INCLUDED__ + #define __UTILS_H__INCLUDED__ +diff --git a/lib/engine/volume.h b/lib/engine/volume.h +index 9a63cbf..3347b31 100644 +--- a/lib/engine/volume.h ++++ b/lib/engine/volume.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + // Forward declarations + class Array; +diff --git a/lib/log/log.h b/lib/log/log.h +index c0bd63e..8b5f171 100644 +--- a/lib/log/log.h ++++ b/lib/log/log.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __LOG_H__INCLUDED__ + #define __LOG_H__INCLUDED__ +diff --git a/lib/mpb/machine_bytes.h b/lib/mpb/machine_bytes.h +index 7fbb0e9..800b120 100644 +--- a/lib/mpb/machine_bytes.h ++++ b/lib/mpb/machine_bytes.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __ENDIAN_H__INCLUDED__ + #define __ENDIAN_H__INCLUDED__ +diff --git a/lib/mpb/mpb.h b/lib/mpb/mpb.h +index 01782af..c42cdfb 100644 +--- a/lib/mpb/mpb.h ++++ b/lib/mpb/mpb.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __MPB_H__INCLUDED__ + #define __MPB_H__INCLUDED__ +diff --git a/lib/orom/orom.h b/lib/orom/orom.h +index f76e3ee..e10311d 100644 +--- a/lib/orom/orom.h ++++ b/lib/orom/orom.h +@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + + + +-#if __GNUC_PREREQ(3, 4) + #pragma once +-#endif /* __GNUC_PREREQ */ + + #ifndef __OROM_H__INCLUDED__ + #define __OROM_H__INCLUDED__ +-- +2.13.1 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch new file mode 100644 index 000000000..351301cdc --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch @@ -0,0 +1,123 @@ +From 1338ee4e69c465f8f381ec3bfe5058080236edba Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 22:08:35 -0700 +Subject: [PATCH 2/6] Convert macros into functions + +This helps in fixing the security format warnings +add -fno-builtin-log + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/engine/Makefile.am | 3 ++- + lib/log/Makefile.am | 2 ++ + lib/log/log.h | 34 +++++++++++++++++++++------------- + src/Makefile.am | 3 ++- + 4 files changed, 27 insertions(+), 15 deletions(-) + +Index: ssiapi.1.0.1/lib/engine/Makefile.am +=================================================================== +--- ssiapi.1.0.1.orig/lib/engine/Makefile.am ++++ ssiapi.1.0.1/lib/engine/Makefile.am +@@ -113,4 +113,5 @@ libengine_la_SOURCES = \ + libengine_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ +- -I$(top_srcdir)/lib ++ -I$(top_srcdir)/lib \ ++ -fno-builtin-log +Index: ssiapi.1.0.1/lib/log/Makefile.am +=================================================================== +--- ssiapi.1.0.1.orig/lib/log/Makefile.am ++++ ssiapi.1.0.1/lib/log/Makefile.am +@@ -5,3 +5,5 @@ noinst_LTLIBRARIES = liblog.la + liblog_la_SOURCES = \ + log.c \ + log.h ++ ++liblog_la_CPPFLAGS = -fno-builtin-log +Index: ssiapi.1.0.1/lib/log/log.h +=================================================================== +--- ssiapi.1.0.1.orig/lib/log/log.h ++++ ssiapi.1.0.1/lib/log/log.h +@@ -23,7 +23,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG + #if defined(__cplusplus) + extern "C" { + #endif /* __cplusplus */ +- ++#include + /* */ + enum log_level { + LOG_FIRST = 0, +@@ -37,26 +37,34 @@ enum log_level { + }; + + /* */ +-#define log(__level, __format, ...) \ +- do { if (log_get_level() >= (enum log_level)(__level)) \ +- __log(__level, __format, ## __VA_ARGS__); \ +- } while (0) +- +-#define dlog(__format, ...) \ +- log(LOG_DEBUG, __format, ## __VA_ARGS__); ++void __log(enum log_level level, const char *format, ...) ++ __attribute__((format(printf, 2, 3))); + + /* */ +-void log_init(enum log_level level, const char *path); ++enum log_level log_get_level(void); + + /* */ +-void log_fini(void); +- ++static inline void log(enum log_level __level, const char* __format, ...) { ++ va_list ap; ++ va_start(ap, __format); ++ do { ++ if (log_get_level() >= (enum log_level)(__level)) ++ __log(__level, __format, ap); ++ } while (0); ++ va_end(ap); ++} ++ ++static inline void dlog(const char* __format, ...) { ++ va_list ap; ++ va_start(ap, __format); ++ log(LOG_DEBUG, __format, ap); ++ va_end(ap); ++} + /* */ +-void __log(enum log_level level, const char *format, ...) +- __attribute__((format(printf, 2, 3))); ++void log_init(enum log_level level, const char *path); + + /* */ +-enum log_level log_get_level(void); ++void log_fini(void); + + /* */ + void log_set_level(enum log_level level); +Index: ssiapi.1.0.1/src/Makefile.am +=================================================================== +--- ssiapi.1.0.1.orig/src/Makefile.am ++++ ssiapi.1.0.1/src/Makefile.am +@@ -7,7 +7,8 @@ lib_LTLIBRARIES = libssi.la + libssi_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ +- -I$(top_srcdir)/lib ++ -I$(top_srcdir)/lib \ ++ -fno-builtin-log + + libssi_la_LDFLAGS = \ + $(SGUTILS_LDFLAGS) \ +Index: ssiapi.1.0.1/lib/efi/Makefile.am +=================================================================== +--- ssiapi.1.0.1.orig/lib/efi/Makefile.am ++++ ssiapi.1.0.1/lib/efi/Makefile.am +@@ -5,3 +5,4 @@ noinst_LTLIBRARIES = libefi.la + libefi_la_SOURCES = \ + efi.cpp \ + efi.h ++libefi_la_CPPFLAGS = -fno-builtin-log diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch new file mode 100644 index 000000000..98cd40c84 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch @@ -0,0 +1,33 @@ +From 781288d6307002cce70ddafb6efb200b7f60294d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 22:12:43 -0700 +Subject: [PATCH 3/6] Replace canonicalize_file_name with realpath() API + +Fixed build on musl where canonicalize_file_name is not implemented + +filesystem.cpp:46:15: error: 'canonicalize_file_name' was not declared in this scope + char *p = canonicalize_file_name(path); + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/engine/filesystem.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/engine/filesystem.cpp b/lib/engine/filesystem.cpp +index b99257e..6064837 100644 +--- a/lib/engine/filesystem.cpp ++++ b/lib/engine/filesystem.cpp +@@ -43,7 +43,7 @@ void CanonicalPath::__canonicalize_path_name(const char *path) + if (path == 0) { + throw E_NULL_POINTER; + } +- char *p = canonicalize_file_name(path); ++ char *p = realpath(path, NULL); + assign(p); + if (p) { + free(p); +-- +2.13.1 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch new file mode 100644 index 000000000..7dce0da40 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch @@ -0,0 +1,54 @@ +From 04e8b99d8195a0e39982ecd27802421610633724 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 22:18:31 -0700 +Subject: [PATCH 4/6] engine: Fix indentation and missing semi-colon + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/engine/mdadm_config.cpp | 5 +++-- + lib/engine/unique_id_manager.cpp | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/lib/engine/mdadm_config.cpp b/lib/engine/mdadm_config.cpp +index 1914ddc..e40c2c7 100644 +--- a/lib/engine/mdadm_config.cpp ++++ b/lib/engine/mdadm_config.cpp +@@ -118,9 +118,10 @@ void check_configuration() + attr >> config; + configOk = correct_config(config); + } catch (Exception ex) { +- if (ex != E_NOT_FOUND) ++ if (ex != E_NOT_FOUND) { + dlog("Warning: mdadm config file cannot be read, new one will be written"); + backup = false; ++ } + } + + if (configOk && monitor_running()) { +@@ -134,7 +135,7 @@ void check_configuration() + dlog("Warning: failed to update mdadm.conf"); + } + if (restart_monitor() == 0) +- dlog("Monitor restarted successfully") ++ dlog("Monitor restarted successfully"); + else + dlog("Error starting Monitor"); + } +diff --git a/lib/engine/unique_id_manager.cpp b/lib/engine/unique_id_manager.cpp +index 99c153c..87d6ddc 100644 +--- a/lib/engine/unique_id_manager.cpp ++++ b/lib/engine/unique_id_manager.cpp +@@ -185,7 +185,7 @@ void UniqueIdManager::refresh() + keyFile >> keyList; + keyList += "\n"; + } catch (...) { +- dlog("ssi.keys file missing") ++ dlog("ssi.keys file missing"); + /* no file? that's ok */ + } + /* process the list to update IdCaches */ +-- +2.13.1 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch new file mode 100644 index 000000000..6f4dbf18e --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch @@ -0,0 +1,40 @@ +From a2e3a2e332c406ea3c56a8d74b61978107df68e6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 22:23:08 -0700 +Subject: [PATCH 5/6] engine: Define SENTINEL + +Fix warnings with gcc7 +test.cpp:12: warning: missing sentinel in function call + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/engine/utils.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/engine/utils.cpp b/lib/engine/utils.cpp +index 44579a1..8812a8c 100644 +--- a/lib/engine/utils.cpp ++++ b/lib/engine/utils.cpp +@@ -35,7 +35,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + #include "filesystem.h" + #include "utils.h" + #include "log/log.h" +- ++#define SENTINEL (const char *)0 + /** + * @brief capture shell output as binary data + * +@@ -139,7 +139,7 @@ int shell(const String &s) + * Before switching into new executable close all non standard + * file handlers.*/ + close_parent_fds(); +- execl("/bin/sh", "sh", "-c", cmd.get(), NULL); ++ execl("/bin/sh", "sh", "-c", cmd.get(), SENTINEL); + /* If we're here then execl failed*/ + exit(-1); + break; +-- +2.13.1 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch new file mode 100644 index 000000000..a7b70e3f4 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch @@ -0,0 +1,40 @@ +From df1d56d6b6a6b15d0137619eb8a4b623de6c9633 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 22:28:59 -0700 +Subject: [PATCH 6/6] tools: Add missing includes and use realpath() instead of + canonicalize_file_name + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + tools/ssieventmonitor.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 0553386..f04b8f0 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -18,7 +18,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + #include + #include + #include +-#include ++#include ++#include ++#include + #include + #include + #include +@@ -99,7 +101,7 @@ static int _exec_ssimsg(void) + int status; + switch (pid) { + case 0: { +- cp = canonicalize_file_name("/proc/self/exe"); ++ cp = realpath("/proc/self/exe", NULL); + if (cp) { + strcpy(buffer, cp); + free(cp); +-- +2.13.1 + diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb index 5b951eb26..f3c1fc43a 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb +++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb @@ -10,7 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0413ff365e0bd733c4869a6797551c6f" DEPENDS += "sg3-utils" -SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz" +SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \ + file://0001-Use-pragma-once-unconditionally.patch \ + file://0002-Convert-macros-into-functions.patch \ + file://0003-Replace-canonicalize_file_name-with-realpath-API.patch \ + file://0004-engine-Fix-indentation-and-missing-semi-colon.patch \ + file://0005-engine-Define-SENTINEL.patch \ + file://0006-tools-Add-missing-includes-and-use-realpath-instead-.patch \ +" SRC_URI[md5sum] = "02f16d7cbd30d28034093212906591f5" SRC_URI[sha256sum] = "e10d283b0f211afb8ebd0bde87c097769613d30a052cdf164753e35e803264c7" From patchwork Sat Jun 17 17:21:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105770 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172486qgd; Sat, 17 Jun 2017 10:24:12 -0700 (PDT) X-Received: by 10.84.229.70 with SMTP id d6mr19633967pln.263.1497720251925; Sat, 17 Jun 2017 10:24:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720251; cv=none; d=google.com; s=arc-20160816; b=vy5bBi3iMzuaQYUg6O7k60sWyz2EBHafP9dOcliOVV7TwWmg7c4fvm/ItsohpsgjAx lS37RZulMZckUtfCYOdCoyyQYo9LMPCZBMM4p8Yzi12q+LKU7qjokysnt2Rg9wujXkHN I01tkszmdpAGcJ0M4XT2lkVQ96NgG+OK+gn7TbiqrKzjElQ6puZAlcWpI/RNpdk5TGpB BH/sihraLIk2OY2DsTCYj2N/lJi21xgcoHAGGMjfeuh1THe+7kF51cdEhGOy89tnzoWS DMCKS7S+nEQgOQvjQwuqmYwoL+/xdQoNQVpK6HwbMr0J3DaoE+WcBepr2f+b2Zpac5AO /bsw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ELkbWLymEpQsjO41KEVmJJqroxXCRd+x8rNCJmjJ8LE=; b=vfxMF1ZPy9AtNbeMIzSC9lGHdJxLAN6kctYu2EOAwqqN89tps1X8T0ce2iVyD9Fli4 4TCbF/8fMzJL0Gwv+bs79t3NhiXPepsgt4TeAz9VodQnY5kS7EfZCgX3AVQIYbN1hEiw BGbKve0tkrEfqgScLd1alSF/EDMzsE4DpYJFTp6/33M7s7k1tIqTYELWdUIcCJ4aQIAb j3XbZG/m43lU/l4SlplHuLwc3WKFweL6pEYmVPI+3FzqHR3toH6NyEveYJLTbxwVkp64 j+ki6uSyU+KSBeQhWci7OXLbtEqEwOZuyzGF+4HANqiTt7LWurTQPciwhRpsziwB+y0T qDaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=A2z0hgUz; 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 u3si4541028pgc.192.2017.06.17.10.24.11; Sat, 17 Jun 2017 10:24:11 -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.b=A2z0hgUz; 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 6588D7838F; Sat, 17 Jun 2017 17:23:56 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by mail.openembedded.org (Postfix) with ESMTP id 8F56378378 for ; Sat, 17 Jun 2017 17:21:55 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id s66so35716816pfs.1 for ; Sat, 17 Jun 2017 10:21:57 -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:in-reply-to:references; bh=QFuVbrC/gINlsxhDHLwAy8SF9qbyu2zuLVaOGNj7yJM=; b=A2z0hgUzCy6inkaUPnr5V+ognvhzFJPYPICg2dNxBC17ewzqecQ5OebkYKkE7NowJH pe4ANQTgcFAYKkNlF7J0ky/xACSysmjaNWMt34Scbnd5/Sgte7FPuL6NNHTzNnak4tbH moTAhY2juwInQdcONargxegg0BAJ3OZ4vIr28dFwfO8Hg69ErDdPIyYYbsG+2jaYZ6Jq HMFmPsumf4FqS3qFCXwbNxlVf/1HmWe5z49Vsv3BvQa52suIRsUNH+qpHyHo4EISRhqY Q3BVLRVVUzYUpv0KrhympzNwKqPVELhcGRbbfjmNj58zqxobHK0ENUxr4kVgdKeuHxZH XEpw== 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:in-reply-to :references; bh=QFuVbrC/gINlsxhDHLwAy8SF9qbyu2zuLVaOGNj7yJM=; b=ZAuvk5a/NkTY8vMZtDAQtJN/rI10ztdIdkHRfbkYyv4/Ae3x60wq+WtZ1+Toz41Sxc oV7MLy8oOaNHe6DxIUQAaOH1Lk/mORrwWl3sC5DERmU5/L/qKQD3wa/q5u8dulY5uYLU R/q3BtcEuVGzIBtTeQyq6oNuiU4jdzi2mqx1KdJlz6CuTHr1J427bVU10DzUYDfiu1ox kjA76CrOM9k4B7EERk1x3YSyBCbzwonH4OBNLAgQc8EBBpeS8tJWMbP9UlAaDiPAb5rE lqXkHdzcqsjLEIS0nixcgCdonEGn1Ibzi2srBvd6lSkxgdkQbR5osdX/Ow67qHIag34e UDrA== X-Gm-Message-State: AKS2vOwXBNgsxz9hqFjOVc0IWgQuzmHjybyp3F3tbn+RZqpjMcosS4Gb UYYrpWgTZ960OP/I X-Received: by 10.98.214.146 with SMTP id a18mr17177510pfl.40.1497720116523; Sat, 17 Jun 2017 10:21:56 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:55 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:37 -0700 Message-Id: <20170617172142.1311-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 4/9] vlan: Fix build with security flags turned on 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 Limit the license checksum to the file header Signed-off-by: Khem Raj --- ...format-and-silence-format-security-warnin.patch | 34 ++++++++++++++++++++++ .../recipes-connectivity/vlan/vlan_1.9.bb | 6 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch b/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch new file mode 100644 index 000000000..ebcfc7c2f --- /dev/null +++ b/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch @@ -0,0 +1,34 @@ +From 400b8f235377f677a7a760f1e3a1cd26d95140bc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 22:58:18 -0700 +Subject: [PATCH] Add printf format and silence format-security warnings + +Fix + +vconfig.c:66:4: error: format not a string literal and no format arguments [-Werror=format-security] + fprintf(stdout,usage); + ^~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + vconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vconfig.c b/vconfig.c +index 5057cfd..83137ba 100644 +--- a/vconfig.c ++++ b/vconfig.c +@@ -63,7 +63,7 @@ static char* usage = + " is OFF.\n"; + + void show_usage() { +- fprintf(stdout,usage); ++ fprintf(stdout, "%s", usage); + } + + int hex_to_bytes(char* bytes, int bytes_length, char* hex_str) { +-- +2.13.1 + diff --git a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index 09c4007ef..3f688b360 100644 --- a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -1,10 +1,12 @@ SUMMARY = "VLAN provides vconfig utility" SECTION = "misc" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://vconfig.c;md5=293ef69c4e88434d37a5ee577a5288cb" +LIC_FILES_CHKSUM = "file://vconfig.c;beginline=1;endline=19;md5=094ca47de36c20c598b15b32c270ce0a" SRC_URI = "http://${BPN}.sourcearchive.com/downloads/${PV}-3ubuntu9/${BPN}_${PV}.orig.tar.gz \ - file://no-HOME-includes.patch" + file://no-HOME-includes.patch \ + file://0001-Add-printf-format-and-silence-format-security-warnin.patch \ +" SRC_URI[md5sum] = "5f0c6060b33956fb16e11a15467dd394" SRC_URI[sha256sum] = "3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb4868842b4cca" From patchwork Sat Jun 17 17:21:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105771 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172546qgd; Sat, 17 Jun 2017 10:24:21 -0700 (PDT) X-Received: by 10.99.123.17 with SMTP id w17mr3174264pgc.100.1497720261566; Sat, 17 Jun 2017 10:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720261; cv=none; d=google.com; s=arc-20160816; b=viUjqxD6eKIWfzbFHC9j/Uj1fGUxqmwWAf8/FIx0k8mQYZz2PgE9w0M5W8i6mBr/bQ tRlBq8BSYalUtdQNUJ8WKxQEV8x/kwZY2K3D2JZVphhdiOiV+5sYElM6mqzWSjSt/WEj gTMMax8C2u2f5uHjKy23jFNaTJIg3k9P8mqbVafktNrrLVqANO6cfGdaJJ8GT3dhBxSl dDd5Jo8b9WyeVspSk5q3mozRQFLyUpSHJKF+1Bhr2c3kq4S0sfN88w2BevLdbKyBCdan dnuOEsIHL8qXUDWip3bK+0lNB1UZVWzcdHSlRGMbMmorp6ZpDM3ZlEKhULTmb9cg1Jgx xObw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dHoh3V5QIUTegGDS8RCeizyu9g903iBIZFhX9ejpIgg=; b=P+I0JIuj9klZOtC5SQotX2yU2z4HqAYbwQid5giQ6Ue3FWNUpKzMRWxJ8QyqZfDhtu mNL+r5Uw1FhrWA/AAnB6d/gbNQihB8NYnkNzDc4WCKgOnPPVuZC+D/+pqJJ5dONEw/c9 d9w6BAK8JcfHiba/ObOGhDEjCdE9luwgLj9JO35NSP9GnIooKYCCy6suImPN52GOvxKy Rp9idRkNtytno1ZC4z5mRky4YTyWqsQDi3LY8cVocAr1VM+NEsAwweBIFjQdK5ixiv6Y rcn7C5ShR3v2RTa4Oc3zqd9QgLT8lLLItViftb4dJQcnZNLnViYxzC6PDi7FyPjTS7rm Gtcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=EWBUCpfD; 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 y7si4595589pgr.175.2017.06.17.10.24.21; Sat, 17 Jun 2017 10:24:21 -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.b=EWBUCpfD; 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 9206378395; Sat, 17 Jun 2017 17:24:06 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 9022C78372 for ; Sat, 17 Jun 2017 17:21:56 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id y7so11054358pfd.3 for ; Sat, 17 Jun 2017 10:21:58 -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:in-reply-to:references; bh=Xpdusrfb+zq7KtG9p71vk9fYJmFg3Ss8dIhtoQ1Lo9U=; b=EWBUCpfDtsHkUefzom+5ny2hL8eBKQ7qU2s1lluNPuAJHIYxwmkWzwPBrqKgWKfd/E FMTRkpvFf4LQZ800PaL1jDuoFKDN4+eO6VORJjYufxbTo9UKwjnR4NEB0QWrmGgF1Fpz X7YwWafVY2cORcpMvpgVsnQ2tzfgnh5Monblp2c+wcFcvDEud8VkAFafLFlmtX1uNH96 sy3oPgNTsYpJpMVSft48xY2IIUVnYA8kqfdmOQzJLB4wh+DBR8yRw0b+emXp9oOyYNrA VgDIYmUWuNopG7N+jzKUFPIFQdbVPNdoIGVr5k4HYWNjZtmF3QVLZvHYbStfEn++SvBq 4qYg== 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:in-reply-to :references; bh=Xpdusrfb+zq7KtG9p71vk9fYJmFg3Ss8dIhtoQ1Lo9U=; b=buaZkHMqq8wtShsSSwt9ToTSOf5eeN3kw28YQFTtw6vfKxIm14TngL+5KevmTTmpUv AYCL0s12y0M1OefOOWZn6gUmBxmUv8Aw+75c3mWKRldKkmDCBipEXMQsfsYXvCQB/mEO 86tOjXdzm24ltH2fwM5c/qgnKKOHoTuzBAV+nVXeF0qk8PI2UcVJlowv8QSOqOjBo6cf lcpZwaNgL2AwDFHTDouq94wRen/C+gt6qYZOj2E4IHDh/6PSNU3WGTBrf53jguodzRsD R1rVbtJUxXPjOsElBddVt3Ir0TOqd0Qiz9tXF4yV3qGo8jMRHHQqy1Hf0OP8gT8zHVVq ZneA== X-Gm-Message-State: AKS2vOzqjpY0csw82EcHvneKagT6skseASSCbU3mZcrxpHeA7fZ9Z+U8 2Imhu4V5f3CKMU5O X-Received: by 10.98.43.7 with SMTP id r7mr13346557pfr.202.1497720117924; Sat, 17 Jun 2017 10:21:57 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:38 -0700 Message-Id: <20170617172142.1311-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 5/9] relayd: Upgrade to latest 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 Fixes build with hardening flags Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/relayd/relayd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 50297f38d..ef28d2c42 100644 --- a/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab DEPENDS = "libubox" -SRC_URI = "git://nbd.name/relayd.git" +SRC_URI = "git://git.openwrt.org/project/relayd.git" -SRCREV = "2970ff60bac6b70ecb682779d5c776dc559dc0b9" +SRCREV = "ad0b25ad74345d367c62311e14b279f5ccb8ef13" PV = "0.0.1+git${SRCPV}" S = "${WORKDIR}/git" From patchwork Sat Jun 17 17:21:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105772 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172589qgd; Sat, 17 Jun 2017 10:24:29 -0700 (PDT) X-Received: by 10.98.55.199 with SMTP id e190mr9315971pfa.15.1497720269128; Sat, 17 Jun 2017 10:24:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720269; cv=none; d=google.com; s=arc-20160816; b=QlJCsXGYSpXO8BDC/gIZ8pvklg9avI3i+t1BZc9yziMRpsJVQzVGU3OYYFGBBj5Lka iWiczKCcvEvbRCMgIjjzKRfPw4nubys9dF+j+ru6cbEep+w2o2kln+Hp5Qa9wytsoc55 Imuupn0cZSc96TA08P68mbn7nVSPmpuz8zCfBEicGEnwv3dHy9leVX8hacQyQ+8s1F86 nqOap+JgdmW+6ani+NvTtzGjpNAPSfLAemWufKJK5aem5E7U3qO1ZqLuzaMQoJvkfPor hxynsHnDj/GprjlojXlVe6+bLa2TUkjyzQiMp4tvQCyqNCJK1uNB2s5haXyTZL67v0tA tfjw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=SBVYonK6u8zBoBKchEb+Rv50PXcuUPaK06/2kx19Uho=; b=x2i6w2CbXTsarEMVJ6Q78JwuT8XpP4r9PdGAhAZ4Eg/AGJAwOemRJPauhr8h6c2loi bIfZKhAsaBXBOtE/cmDXMg80XSz1c0W2W3uz6IMdzPhbfq5LQ2TBBnnF6fs4Q6vvAtpI 56+64GKqMi0ywGzKzBpCR7j05zX0Gm6eBca3hMpfTehRWPY/hNR9dopPpw4fwcj8UR8H GfPlq/+ujK+zOnSSOaPXvblmkch2TdfCVAGiDpWJT58SMZtuZbWBCySYs+jKo7eK8GHt D2qmC7Jdt3sV178dC1CKUKOk2ixdobWw4viHjzJWgbuQOJXsesljOCjtptyIJ4dOlLEO w0nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=OIfE0liT; 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 q4si5035183plk.484.2017.06.17.10.24.28; Sat, 17 Jun 2017 10:24:29 -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.b=OIfE0liT; 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 A27ED7839C; Sat, 17 Jun 2017 17:24:07 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by mail.openembedded.org (Postfix) with ESMTP id 422A678372 for ; Sat, 17 Jun 2017 17:21:58 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id x63so35659708pff.3 for ; Sat, 17 Jun 2017 10:22:00 -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:in-reply-to:references; bh=qcweOcCeQ4wok3GrvsxyGNqXdoTYOIzhqoOk2zQ5JPc=; b=OIfE0liTgopD9tVzMXpf9va1Wt6/SBRZuGnWk+9r8z2uNGOuxgtkISACyiuOaxsV3w RgWplqQeFvrwiwwt/diB3fmtQTQXlNjA8O9JJ7zJyE+wCd8iVm/kTPvusPoF/5DW5k+E m9YeYg+10ZWhPgFKO8fQbTBmpXFH2qYx5mgiT5j8wvyQJZftGHhOcF+5rY6F2NnNi2/x tjSovB3ZKzj993ZyzuCCG5l0Rt4yZziTNX4Z4sSX302G679UnAlzTknso7aEQUv24Swy 6nkmuwVUEse2bXm2DTz9Da4lG8eIVro2VMcs98XPTnGVyE/IkMwrwC6oKDHYIbZDXlEK vIQw== 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:in-reply-to :references; bh=qcweOcCeQ4wok3GrvsxyGNqXdoTYOIzhqoOk2zQ5JPc=; b=n9sEYkULbLNlraMWnxy5+duVV1w8famBpR/4XfAviXg4IMFFUVOlAOZcR1hvEvsxh1 TPC+s2h/ZSJdp9y2jJoEgg/qTp7CF6LxCsYgwWWHVm9eGCok2fjvpM9eoRMWbrEqA3Db OPNQcYvx52LH2l61BeFUSQhmKYJBsFgpI8DbObTqlZi696WkP5A8ldWhHjGg3yryK31F KHONh35grWaFhA2R9iR8pRcN3XCVDA5DMlArs4YvB2jgSQvMnT4t4d+JRFsAgHzslQH+ c7lsBnxE1Rt8hu1gY8LCBu7/TWjPtUX08egRfd2rZQ3Ano+6vwSaHJH4bIfaFndWSB/h d/sw== X-Gm-Message-State: AKS2vOwrIBQPaAPDDa+BQ/uitLIemETMo0CfNLqfAEYA36LAsXm0YIzZ KZb3CsYpWLAkohPV X-Received: by 10.98.141.134 with SMTP id p6mr7160554pfk.68.1497720119406; Sat, 17 Jun 2017 10:21:59 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:58 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:39 -0700 Message-Id: <20170617172142.1311-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 6/9] openocd: Fix build with gcc7 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 Signed-off-by: Khem Raj --- .../openocd/0001-Add-fallthrough-comments.patch | 155 +++++++++++++++++++++ ...orkaround-new-warnings-generated-by-GCC-7.patch | 53 +++++++ ...-missing-break-to-fix-fallthrough-warning.patch | 27 ++++ .../openocd/0004-Fix-overflow-warning.patch | 30 ++++ ...e-the-fall-through-comment-to-right-scope.patch | 27 ++++ meta-oe/recipes-devtools/openocd/openocd_git.bb | 9 +- 6 files changed, 299 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch new file mode 100644 index 000000000..644146c4d --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch @@ -0,0 +1,155 @@ +From 8f85163b030e7b957648f90cd8fa599fb04d5d65 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 23:32:49 -0700 +Subject: [PATCH 1/5] Add fallthrough comments + +Fixes + +src/svf/svf.c:663:7: error: this statement may fall through [-Werror=implicit-fallthrough=] + i = -1; + ~~^~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/flash/mflash.c | 3 ++- + src/flash/nand/mx3.c | 1 + + src/jtag/drivers/ftdi.c | 1 + + src/svf/svf.c | 2 ++ + src/target/arm_adi_v5.c | 9 +++++++++ + src/target/arm_disassembler.c | 1 + + src/target/target.c | 1 + + 7 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/flash/mflash.c b/src/flash/mflash.c +index b69995542..3254a3d56 100644 +--- a/src/flash/mflash.c ++++ b/src/flash/mflash.c +@@ -259,10 +259,11 @@ static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var) + case mg_io_wait_rdy: + if (status & mg_io_rbit_status_ready) + return ERROR_OK; +- ++ /* fallthru */ + case mg_io_wait_drq: + if (status & mg_io_rbit_status_data_req) + return ERROR_OK; ++ /* fallthru */ + + default: + break; +diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c +index b61e47535..0a55929ed 100644 +--- a/src/flash/nand/mx3.c ++++ b/src/flash/nand/mx3.c +@@ -281,6 +281,7 @@ static int imx31_command(struct nand_device *nand, uint8_t command) + * offset == one half of page size + */ + in_sram_address = MX3_NF_MAIN_BUFFER0 + (nand->page_size >> 1); ++ /* fallthru */ + default: + in_sram_address = MX3_NF_MAIN_BUFFER0; + } +diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c +index 00fe37faf..20f17d810 100644 +--- a/src/jtag/drivers/ftdi.c ++++ b/src/jtag/drivers/ftdi.c +@@ -855,6 +855,7 @@ COMMAND_HANDLER(ftdi_handle_set_signal_command) + ftdi_set_signal(sig, *CMD_ARGV[1]); + break; + } ++ /* fallthru */ + default: + LOG_ERROR("unknown signal level '%s', use 0, 1 or z", CMD_ARGV[1]); + return ERROR_COMMAND_SYNTAX_ERROR; +diff --git a/src/svf/svf.c b/src/svf/svf.c +index e7e815c10..7b261cc72 100644 +--- a/src/svf/svf.c ++++ b/src/svf/svf.c +@@ -661,11 +661,13 @@ static int svf_read_command_from_file(FILE *fd) + if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0) + return ERROR_FAIL; + i = -1; ++ /* fallthru */ + case '\r': + slash = 0; + /* Don't save '\r' and '\n' if no data is parsed */ + if (!cmd_pos) + break; ++ /* fallthru */ + default: + /* The parsing code currently expects a space + * before parentheses -- "TDI (123)". Also a +diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c +index eafc2ddc0..d444db2b1 100644 +--- a/src/target/arm_adi_v5.c ++++ b/src/target/arm_adi_v5.c +@@ -346,10 +346,13 @@ static int mem_ap_write(struct adiv5_ap *ap, const uint8_t *buffer, uint32_t siz + case 4: + outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); + outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); ++ /* fallthru */ + case 2: + outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); ++ /* fallthru */ + case 1: + outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); ++ /* fallthru */ + } + } + +@@ -509,20 +512,26 @@ static int mem_ap_read(struct adiv5_ap *ap, uint8_t *buffer, uint32_t size, uint + case 4: + *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); + *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); ++ /* fallthru */ + case 2: + *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); ++ /* fallthru */ + case 1: + *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); ++ /* fallthru */ + } + } else { + switch (this_size) { + case 4: + *buffer++ = *read_ptr >> 8 * (address++ & 3); + *buffer++ = *read_ptr >> 8 * (address++ & 3); ++ /* fallthru */ + case 2: + *buffer++ = *read_ptr >> 8 * (address++ & 3); ++ /* fallthru */ + case 1: + *buffer++ = *read_ptr >> 8 * (address++ & 3); ++ /* fallthru */ + } + } + +diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c +index 5277b94d8..2eb21ea33 100644 +--- a/src/target/arm_disassembler.c ++++ b/src/target/arm_disassembler.c +@@ -3299,6 +3299,7 @@ static int t2ev_data_immed(uint32_t opcode, uint32_t address, + case 0x10: + case 0x12: + is_signed = true; ++ /* fallthru */ + case 0x18: + case 0x1a: + /* signed/unsigned saturated add */ +diff --git a/src/target/target.c b/src/target/target.c +index e04ecc470..597b4b13d 100644 +--- a/src/target/target.c ++++ b/src/target/target.c +@@ -3684,6 +3684,7 @@ COMMAND_HANDLER(handle_bp_command) + addr = 0; + return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); + } ++ /* fallthru */ + + case 4: + hw = BKPT_HARD; +-- +2.13.1 + diff --git a/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch b/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch new file mode 100644 index 000000000..aa99735f6 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch @@ -0,0 +1,53 @@ +From 8daaa8c27794653d02854c5982669a7638473224 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Jun 2017 23:52:46 -0700 +Subject: [PATCH 2/5] Workaround new warnings generated by GCC 7 + +src/flash/nor/xmc4xxx.c: In function 'xmc4xxx_get_info_command': +src/flash/nor/xmc4xxx.c:939:43: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 6 [-Werror=format-truncation=] + snprintf(otp_str, sizeof(otp_str), "- %d\n", i); + ^~ +src/flash/nor/xmc4xxx.c:939:40: note: directive argument in the range [0, 2147483647] + snprintf(otp_str, sizeof(otp_str), "- %d\n", i); + ^~~~~~~~ +src/flash/nor/xmc4xxx.c:939:5: note: 'snprintf' output between 5 and 14 bytes into a destination of size 8 + snprintf(otp_str, sizeof(otp_str), "- %d\n", i); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/flash/nor/xmc4xxx.c | 2 +- + src/target/arm_adi_v5.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c +index 02df46a3f..e6c398ff9 100644 +--- a/src/flash/nor/xmc4xxx.c ++++ b/src/flash/nor/xmc4xxx.c +@@ -931,7 +931,7 @@ static int xmc4xxx_get_info_command(struct flash_bank *bank, char *buf, int buf_ + + /* If OTP Write protection is enabled (User 2), list each + * sector that has it enabled */ +- char otp_str[8]; ++ char otp_str[14]; + if (otp_enabled) { + strcat(prot_str, "\nOTP Protection is enabled for sectors:\n"); + for (int i = 0; i < bank->num_sectors; i++) { +diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c +index d444db2b1..d0d95121f 100644 +--- a/src/target/arm_adi_v5.c ++++ b/src/target/arm_adi_v5.c +@@ -1062,7 +1062,7 @@ static int dap_rom_display(struct command_context *cmd_ctx, + int retval; + uint64_t pid; + uint32_t cid; +- char tabs[7] = ""; ++ char tabs[16] = ""; + + if (depth > 16) { + command_print(cmd_ctx, "\tTables too deep"); +-- +2.13.1 + diff --git a/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch b/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch new file mode 100644 index 000000000..bcfbfc92b --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch @@ -0,0 +1,27 @@ +From 8e5051e83fedb078170565a24d1f5de6c2ce4428 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 00:01:51 -0700 +Subject: [PATCH 3/5] armv7a: Add missing break to fix fallthrough warning + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/target/armv7a.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/target/armv7a.c b/src/target/armv7a.c +index 6021def4e..bad806b3d 100644 +--- a/src/target/armv7a.c ++++ b/src/target/armv7a.c +@@ -355,6 +355,7 @@ int armv7a_mmu_translate_va_pa(struct target *target, uint32_t va, + break; + case 7: + LOG_INFO("inner: Write-Back, no Write-Allocate"); ++ break; + + default: + LOG_INFO("inner: %" PRIx32 " ???", INNER); +-- +2.13.1 + diff --git a/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch b/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch new file mode 100644 index 000000000..bfc5627c1 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch @@ -0,0 +1,30 @@ +From d3ca56370a2be7e737d48bd14d474d790a0ab8ac Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 00:04:00 -0700 +Subject: [PATCH 4/5] Fix overflow warning + +Remove an empty space which makes it fit into 11 byte string + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/target/nds32_cmd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/target/nds32_cmd.c b/src/target/nds32_cmd.c +index edb4872e4..73355073c 100644 +--- a/src/target/nds32_cmd.c ++++ b/src/target/nds32_cmd.c +@@ -821,7 +821,7 @@ static int jim_nds32_bulk_read(Jim_Interp *interp, int argc, Jim_Obj * const *ar + jim_wide i; + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + for (i = 0; i < count; i++) { +- sprintf(data_str, "0x%08" PRIx32 " ", data[i]); ++ sprintf(data_str, "0x%08" PRIx32 "", data[i]); + Jim_AppendStrings(interp, Jim_GetResult(interp), data_str, NULL); + } + +-- +2.13.1 + diff --git a/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch b/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch new file mode 100644 index 000000000..60f75da2c --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch @@ -0,0 +1,27 @@ +From 29dbf92ffdbdda29662b4190a2f8eb09caad8b51 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 00:06:32 -0700 +Subject: [PATCH 5/5] command: Move the fall through comment to right scope + +Signed-off-by: Khem Raj +--- + src/helper/command.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/helper/command.c b/src/helper/command.c +index 5deaee859..287c14857 100644 +--- a/src/helper/command.c ++++ b/src/helper/command.c +@@ -1456,8 +1456,8 @@ COMMAND_HELPER(handle_command_parse_bool, bool *out, const char *label) + LOG_ERROR("%s: argument '%s' is not valid", CMD_NAME, in); + return ERROR_COMMAND_SYNTAX_ERROR; + } +- /* fall through */ + } ++ /* fall through */ + case 0: + LOG_INFO("%s is %s", label, *out ? "enabled" : "disabled"); + break; +-- +2.13.1 + diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 783a6c707..20bc663f9 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -5,8 +5,13 @@ DEPENDS = "libusb-compat libftdi" RDEPENDS_${PN} = "libusb1" SRC_URI = "git://repo.or.cz/openocd.git \ - " -SRCREV = "cb317eabf2d162365467aeb89b564828e5e6d6f3" + file://0001-Add-fallthrough-comments.patch \ + file://0002-Workaround-new-warnings-generated-by-GCC-7.patch \ + file://0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch \ + file://0004-Fix-overflow-warning.patch \ + file://0005-command-Move-the-fall-through-comment-to-right-scope.patch \ +" +SRCREV = "1025be363e2bf42f1613083223a2322cc3a9bd4c" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" From patchwork Sat Jun 17 17:21:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105773 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172629qgd; Sat, 17 Jun 2017 10:24:37 -0700 (PDT) X-Received: by 10.84.205.70 with SMTP id o6mr20136595plh.32.1497720277875; Sat, 17 Jun 2017 10:24:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720277; cv=none; d=google.com; s=arc-20160816; b=UYr5AbplzJjT+H02R8O5dHwEzKi6CxHwmG9j2QxeDCUhnQCiB0Dqyfyxi+qiWxnueO 9L3OB0fReGRjrBM4l3VoeUPtIrW+pOtRB9tLapdc12bKpldx9r2HG6PrmDSKjTqiSFC2 DZdrpS2gi33am1p0h3L7J2eViJGGtNdgUNbBuulCDHNK7fUapyAITpuVIwYQyW0jB28C pIEe0Pwdt3rw5jlqwpdor4tay0gQpkezjEt+KT4MjJToEjgw0yg7ZcCrH8dOkvT+45S4 gRVZsYrAufa//d98CYbLdPO3rJwFzla0hkt8IaFrgv6A3HfEKCq+OFpTk+CNIZ/MSYha qFhQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=EOCwuVVvSPbE6S8EEPt4s5PAzwL7KN5MvSEzvOPyVzo=; b=IxZxxA3nrn63TFB/NYzq6xJLBVfgAd34mGkZ2pWbjSLkwyBu317tCfMeJCWirRBxdV IOY6gHdp9RCCigV7HrGSq5Shpo6rSJG9AGFQYorlrCCb4AQIgNl9D5GiwMfVnRoWRgmn HWrX6fpd/MGtZ6+c+KA1r1FPmOS0lxm3mN1h86js+7nECVN0Vt5uhXPD+FvQ14bDLaIQ K7LMBRERIgGgY0N0R3aR2Y5u1qNXlqREl7j5wAU0AJBT0JaUFan4gbsGRwUmwfrZO4Vp qBcncAI05nhVQV4lclBpvjJCFIOac3ONC6GhD4RTRTBtr2tcd7/aYLYH1Gny82Xw04XA KZOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=hK43TZHJ; 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 r13si5240568plj.189.2017.06.17.10.24.37; Sat, 17 Jun 2017 10:24:37 -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.b=hK43TZHJ; 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 B1F87783A1; Sat, 17 Jun 2017 17:24:08 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id 335A878372 for ; Sat, 17 Jun 2017 17:21:59 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id y7so11054443pfd.3 for ; Sat, 17 Jun 2017 10:22:01 -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:in-reply-to:references; bh=I/TEG/28lrzCq+4KDovylwWlQeprOfKgMOUOFM3aPRY=; b=hK43TZHJn/T0Q8kcHen9gCXRe6KRKdYPvHhT6VALDFVzFYzXaMchFjYBtQjufR0rhJ pCavEgmCFGahsqIq4y8EcSQIpDxmrf45AKdi1TcM0/ZkNgnQZrBM4c7qPnPkFsKDgIPM 3biAelM5n8G1C9OHF7c9aDyBHrRkg6fdM6nYkj/jOvz+jNk2wrgQ9EZa2mb0EfEXRc9z 1FGu8ChlgqbAwMPEQZm6lhhRIEx9b1pG7dm6y4EIOrtNbsIOJbH72Wwh/jCnUsv9d0mO IvF+fG1A+1uz0/g0+EHjgQ5fibn6N2dOkUm81hJfgDRG5c/P4EzvzFzKNndwfgHUnBGf ccpw== 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:in-reply-to :references; bh=I/TEG/28lrzCq+4KDovylwWlQeprOfKgMOUOFM3aPRY=; b=BabF+pUldmRO3ld4VzhUD3Xoq1jF2DdQE6eM9dmEC/OAD+dt94slmDExU+vWni84BI P4BshHm0m9uALzi+2Vq4qV59uKWRZyPn7ffhPonXtXrDGMtJOvLkNrvpySVDyqFoJFXI oF0QOJRp8Yoe9+zBRzeGa9+hpFwOmR2dMdW2jl9Xb9Ru5r/kNuzRAEeU9vLBR0bextnu DDWuSIRo8F8ai8+xKmeGUeC3jYf/zl/eVRT8yCom9o3xGa3JogHk87PQuzBpTIdB+KCF qC92amoJ4+DyDcuIHmuCA/VIt73C4i0ZrI6aizC4i/d5KwaLDZWK/noYSJeDP9B979bt M/NA== X-Gm-Message-State: AKS2vOxKkEaQgjm86zQ8NYJ7niFhaKrkCigqpsNMKvO69B6bBR7e/UZo QVL9EpUHl5kQedvd X-Received: by 10.84.254.11 with SMTP id b11mr19803296plm.209.1497720120964; Sat, 17 Jun 2017 10:22:00 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.21.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:21:59 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:40 -0700 Message-Id: <20170617172142.1311-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 7/9] tiobench: Fix build with hardening flags 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 Signed-off-by: Khem Raj --- .../0001-Specify-printf-formats.patch | 49 ++++++++++++++++++++++ .../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch b/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch new file mode 100644 index 000000000..cfd34f02a --- /dev/null +++ b/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch @@ -0,0 +1,49 @@ +From b08e61ef64eece23ce8ffa2784cd3c4f70b6169e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 08:08:56 -0700 +Subject: [PATCH] Specify printf formats + +Fixes +tiotest.c:555:4: error: format not a string literal and no format arguments [-Werror=format-security] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + tiotest.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tiotest.c b/tiotest.c +index 6b3d0c3..3e6166a 100644 +--- a/tiotest.c ++++ b/tiotest.c +@@ -91,7 +91,7 @@ inline void checkIntZero(int value, char *mess) + { + if (value <= 0) + { +- printf(mess); ++ printf("%s",mess); + printf("Try 'tiotest -h' for more information.\n"); + exit(1); + } +@@ -101,7 +101,7 @@ inline void checkLong(long value, char *mess) + { + if (value < 0) + { +- printf(mess); ++ printf("%s", mess); + printf("Try 'tiotest -h' for more information\n"); + exit(1); + } +@@ -552,7 +552,7 @@ void do_test( ThreadTest *test, int testCase, int sequential, + if(args.debugLevel > 4) + { + printf("Created %d threads\n", i); +- fprintf(stderr, debugMessage); ++ fprintf(stderr, "%s", debugMessage); + fflush(stderr); + } + +-- +2.13.1 + diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb index 35af35fd3..427ce67d6 100644 --- a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb +++ b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb @@ -10,6 +10,7 @@ SRC_URI = "\ file://tiobench-makefile.patch \ file://avoid-glibc-clashes.patch \ file://0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch \ + file://0001-Specify-printf-formats.patch \ " SRC_URI[md5sum] = "bf485bf820e693c79e6bd2a38702a128" SRC_URI[sha256sum] = "8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc" From patchwork Sat Jun 17 17:21:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 105774 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172671qgd; Sat, 17 Jun 2017 10:24:46 -0700 (PDT) X-Received: by 10.98.207.68 with SMTP id b65mr17166403pfg.6.1497720286860; Sat, 17 Jun 2017 10:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720286; cv=none; d=google.com; s=arc-20160816; b=rGHWPSKK7P/IeapKxTtRDnFaiE0Cmj4rR2jBsbiAZzNqwpRwpZV82ZSQ6QDqklp989 jd0k2o/AIBKEfWZhqtwEDIw4IEg8rJGoqmG9YHsuW0O0o7KX7Mr5/FK8VmNSELdAXtS+ o0sXnBHATwXoMtvkCJO+YWoqrMATyi0ie3fZgaAA1nhuU+JckQpEWAej2+HMasULzypw VVL90vVFIyV6u9ZrOWSBhNUmFhhpaMfj+nS1f42GDQy7yWcKtFCyAYl7NP94m4BRGrkJ REGFVxCu2toJieJbFE8/ehwHEs1cHv7jbc39/6acCpBBo1DkvpQ+I4FrxJ5WWr4WMt9/ FgHA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=P4TL7PWGI4SaYSd4Pl/oLjHC7sC7F02pgjtTtQXDaow=; b=HF3Il2YXub6T6lOETMZAXLCT6jRToVLXBWocWOeBUI1jZ6zdS/kFwalWtwaUrKp3Si 2YfTzretyxnbXMAYBSpH8Q7+LmIv29GEqix8cqUcZCHnVGFzKZDbtKPKfo3J3V/9Kzik Y7iqkW+vNlWrb4KQx1CE8UAEnkW9biGAVkYgV2cor2/CgSmSJdcz5AwqLpK7i9QGWgQ0 39QwpAeuXoKEzGcEFVwdnNlnt3aXqEm4bxxj1gIdihRJHDZLn9n7dLYG74O7miy0vHsm gg6DBBjrRpf5gQXNiXu/EVPNwHpbjYFnKS4mbje7e2FD89aydkGp/B3oq9YeWSqHLa2j tShQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=PegNzir3; 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 r85si4446005pfk.368.2017.06.17.10.24.46; Sat, 17 Jun 2017 10:24:46 -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.b=PegNzir3; 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 F0C4B783AA; Sat, 17 Jun 2017 17:24:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id A2D0B78372 for ; Sat, 17 Jun 2017 17:22:01 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id j186so10554714pge.1 for ; Sat, 17 Jun 2017 10:22:03 -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:in-reply-to:references; bh=DByymthtvthqDS5Qs7cFtJ+qhviif1+GSeNdl8HDJvA=; b=PegNzir3kwpzBGIDUjv9I5t1/a6u00xIK75vM3CtiEmA1Xa6bGr67ueKOFMRsaUl/w BUV/vywG99j2tBCWScNK4Qw6zlS2vU58k6kbqMZsWJmrH2CJhb7E9vRWL1Z9gdtaDsRO I1vfhjwSHHUNx61pzLWel8q7/Hp8lveQcEASA/QfS9zUKd6/sXj9sHtiP3kRzngtju9O Ffh1aThvJKX3FH/SdZ5xp/AuXOssDrWNfe/o/E0Fr/3quiM2o4EUPa4CzrNP6ZU2rFx2 vYI1QejoL6m2g97a4ZaDBrFEHy1ZTpRmCbwxcXFrDiJ+0n3w6qXwS6P13VPmybPV5jBa iVZQ== 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:in-reply-to :references; bh=DByymthtvthqDS5Qs7cFtJ+qhviif1+GSeNdl8HDJvA=; b=jHjmxNpUyu1xKaSMgzce1i8mq+469g/6uyzbfBWf9n+sq8R3PH7wHDA3+4jRcp2LEj gtCBjiCafswz2cOxn29a6ckUir90VLoV7Otro5VXz6dp2nyfuKV78zh5f9WhEWFqd+Oq UyhdRio93ZbBGqss76eXyCkPRHeoARkcl7dMUe4JeK2TH3mV/whH6PZT3/WVx9LpzmOa i9ORzq6tyy5tZSYhqIbo4U4ptlaVCuS2CO6pkB57vd5fM7JWix2UU7i+uBBV1cbNhT3o 7YeyZ3Fos12HCPzXdxDrwP5VrGsvuUIZK3zXCTxoL7T7wy+t5QbImuVH2tJfjt+ysuLs e/uQ== X-Gm-Message-State: AKS2vOwq3zG5+r/qJWZrAKhwx/nphU3ngEIRkDCOIBx3AEv07hJIBi3x eyakK1CGcszEtyk6 X-Received: by 10.84.137.129 with SMTP id 1mr19676856pln.37.1497720122694; Sat, 17 Jun 2017 10:22:02 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.22.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:22:01 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:41 -0700 Message-Id: <20170617172142.1311-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 8/9] relayd: Fix build with hardening flags and glibc 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 Signed-off-by: Khem Raj --- .../0001-rtnl_flush-Error-on-failed-write.patch | 34 ++++++++++++++++++++++ .../recipes-connectivity/relayd/relayd_git.bb | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch b/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch new file mode 100644 index 000000000..eaaf30460 --- /dev/null +++ b/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch @@ -0,0 +1,34 @@ +From 2fa326b26dc479942367dc4283e2f87372403988 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 09:32:04 -0700 +Subject: [PATCH] rtnl_flush: Error on failed write() + +Fixes +route.c:45:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] +| write(fd, "-1", 2); +| ^~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + route.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/route.c b/route.c +index c552d1f..fc5c31e 100644 +--- a/route.c ++++ b/route.c +@@ -42,7 +42,8 @@ static void rtnl_flush(void) + if (fd < 0) + return; + +- write(fd, "-1", 2); ++ if (write(fd, "-1", 2) < 0 ) ++ perror("write"); + close(fd); + } + +-- +2.13.1 + diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-networking/recipes-connectivity/relayd/relayd_git.bb index ef28d2c42..98dc41a09 100644 --- a/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab DEPENDS = "libubox" -SRC_URI = "git://git.openwrt.org/project/relayd.git" +SRC_URI = "git://git.openwrt.org/project/relayd.git \ + file://0001-rtnl_flush-Error-on-failed-write.patch \ +" SRCREV = "ad0b25ad74345d367c62311e14b279f5ccb8ef13" PV = "0.0.1+git${SRCPV}" From patchwork Sat Jun 17 17:21: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: 105775 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp172704qgd; Sat, 17 Jun 2017 10:24:54 -0700 (PDT) X-Received: by 10.84.132.65 with SMTP id 59mr19672073ple.21.1497720294261; Sat, 17 Jun 2017 10:24:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720294; cv=none; d=google.com; s=arc-20160816; b=QxP9canVnvQn8q7NNkbMktv+Ftvr4+UsU8Qc0gMtmMv1gCe4r/pIzwBqzcbraOMYFU 1yGNymB0/yfq2kv0+nvJVDAa4okQUcCWmeEXjKABZmucGNsuSCG6IKsXV7mIzL28Ydlt GxR22JOOBikbeQZCmIRvCaN/efjygwBvYv3+qwQ5GjGjqbAfgdyFcVTfhJ6/sfr49VoT n1a/49IsfnoNJ1b/uPi669VoRf0y+RE04cge+CVjkNmRxVzywkB+iDuOc/RQblHNqb6D jC48FXxW3b+IPtQjN0hmwGbGKk5MsKseX/RbH/ujvQgtA3BsNj/I8P8YElsvoJ///JMt EvTg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=0axBiaY5IjwZN51aRN3/wk5nYnEdsVFbw2+vn3KOtK0=; b=ICCarF7Tpj458X74DOsZi0pP4I+URKPXmpnyr4fqF708X601el1jaPrqhQe7mulYQ8 wTuLkxbc3+K6LySOPNJXQKtfV5tnpRt4cUxnwPcS/g7D+OFzC7mp4BX2+TxWLkv/tw5r V+vSNFEgx0hH2+BqjCI/oOkTHmZUmCj4tlFWgmHvgJScnjxjJiyrKJx/OFz3qWAhPZjk aGUK2qxWkgbxJ7HwhxgEwH95OkKpoGHxSlBzsAtq8PmLXjm93sgs84VX2wciHjo8MMqU 3F+niFBLK+SV8NpgHFZT6G06EJlSDn5KVQ5ZkQJARTbXtSp06zuboRDNjhVC0blsb9Jv kXCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=UbA91ahR; 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 f11si4520323pgn.50.2017.06.17.10.24.53; Sat, 17 Jun 2017 10:24:54 -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.b=UbA91ahR; 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 0D063783B0; Sat, 17 Jun 2017 17:24:11 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by mail.openembedded.org (Postfix) with ESMTP id D150C78372 for ; Sat, 17 Jun 2017 17:22:03 +0000 (UTC) Received: by mail-pf0-f179.google.com with SMTP id s66so35717578pfs.1 for ; Sat, 17 Jun 2017 10:22:05 -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:in-reply-to:references; bh=+hPzj89FeTbqabNRH2myY/YsmLug1ZqLn34XFqBPdsQ=; b=UbA91ahRcnYwU1h03pcfjvq+nXz1B6JF4yuex2iHfvLbpIKi5XOGzG/pRNdYX0PLek gS/0q9qc8dDBWNgKwOG+i34SgBm+LHBO1QsYsJRvHdxksfl4CgcGUXAbFFzcIDFnnk53 67Db3fb+bl6xuzMX5qmYMTwWIh5ZyWcTpL+6sTUa/h0cQugGARCC643I4iZWEyZZsN04 YrBXalRPIYKBzU4XMbyhhpiJBFi231PUL0t0u12yXeEKjR85fokwowokR6r9SA6QOAzV 79GeXlHLHuWkcft88uYHcZKTu2ZydEyDI5x5SvizM6EIKkYN1TuRw0Zu3tdtivCXRaq5 bEDg== 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:in-reply-to :references; bh=+hPzj89FeTbqabNRH2myY/YsmLug1ZqLn34XFqBPdsQ=; b=m4QPBsLmaGqwGoybHCG9SAl38IlhS9/crxnmfLPJH9G5S4f9T6APmAWqL2pz4MXiYK 8GGYu+ujjUtp7C+G9dOSjXk8tL20Ia3NhCGzM7ZVqykVh3kQYy43FicTJ6pYXNkNihYG LqzJhn8oH0l/XtYDSAFYAx9v5nvTz2mV4ihPXKOM9RyXWftDaNVztK6MJ7d+ceciH762 26OUCmA1P2B/GwxQHqdaIt0Agg89bx3hT8i1nFUZQRU8SA3pbO4s0Clft+hbty8EA6iB wvtA7USSrtQKk8OvLk0V5lGyqjRHZ/wTJQxM0dBBL/nHLva8nPf9SPdiWTELvDUlwMxP Uh3w== X-Gm-Message-State: AKS2vOzxwdazrSN6sHP8S7Vwo45+pUn/B0Zlz+Dhb0sxlb3N72lNDIgi FAB7AHQdzIGsuqCq X-Received: by 10.84.178.101 with SMTP id y92mr19807228plb.116.1497720124289; Sat, 17 Jun 2017 10:22:04 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id o12sm12201226pfi.9.2017.06.17.10.22.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jun 2017 10:22:03 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 17 Jun 2017 10:21:42 -0700 Message-Id: <20170617172142.1311-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170617172142.1311-1-raj.khem@gmail.com> References: <20170617172142.1311-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 9/9] ruli: Fix build with hardening flags 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 Signed-off-by: Khem Raj --- .../0001-Fix-build-with-format-string-checks.patch | 33 ++++++++++++++++++++++ meta-networking/recipes-support/ruli/ruli_0.36.bb | 6 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch -- 2.13.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/ruli/files/0001-Fix-build-with-format-string-checks.patch b/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch new file mode 100644 index 000000000..f8eb3ae67 --- /dev/null +++ b/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch @@ -0,0 +1,33 @@ +From 40848547abf592c8d29b85ef1346001514944435 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 10:14:20 -0700 +Subject: [PATCH] Fix build with format string checks + +Fixes +| ruli_addr.c:418:5: error: format not a string literal and no format arguments [-Werror=format-security] +| return fprintf(out, inet_ntoa(addr->ipv4)); +| ^~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/ruli_addr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ruli_addr.c b/src/ruli_addr.c +index 00d5d0d..f1eabae 100644 +--- a/src/ruli_addr.c ++++ b/src/ruli_addr.c +@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli_addr *addr, int family) + { + switch (family) { + case PF_INET: +- return fprintf(out, inet_ntoa(addr->ipv4)); ++ return fprintf(out, "%s", inet_ntoa(addr->ipv4)); + + case PF_INET6: + return ruli_inet6_print(out, &addr->ipv6); +-- +2.13.1 + diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb index a455e1f9b..b41313090 100644 --- a/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "liboop" -SRC_URI += "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz \ - file://Makefile.patch" +SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz \ + file://Makefile.patch \ + file://0001-Fix-build-with-format-string-checks.patch \ + " SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468" SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a3999dbfa"