From patchwork Wed Mar 22 18:45:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95813 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381219qgd; Wed, 22 Mar 2017 11:45:55 -0700 (PDT) X-Received: by 10.84.194.1 with SMTP id g1mr57356408pld.98.1490208355622; Wed, 22 Mar 2017 11:45:55 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 123si2753521pgj.217.2017.03.22.11.45.55; Wed, 22 Mar 2017 11:45: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; 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 7995477A90; Wed, 22 Mar 2017 18:45:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 6AAD8602D9 for ; Wed, 22 Mar 2017 18:45:41 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id r137so24340723pfr.3 for ; Wed, 22 Mar 2017 11:45:43 -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=g2akkNSZrUvonduQt7qsCRCxdAb8HLQ9l1eXYkuW9ew=; b=jPQTKfCG5AeAS9KlTby0SKiNk3QJy3H3u0yo0+c3Z8t2qFM1cVJMy4VBj6lv8lCmXW iy4nHmZcMosZig3KVulw/HprjttnHDj7XPYqh2qFF9nh5svlfY4hBFzz1odgJoW46s8V U2mcPTsHKwusE9XVcDadvsakJaH58FfTgOVCQxDgeYmKInrz/i4WfYs+JVxXiHsCt3Mg xfi8cY8tY5NrfaFoo9565UKxt1aMMr7B2y8AhcCRMIKSIYPg+Mq0bPZAlH5hiZEToFfN w9WDAFt2Ue8zFNBnW+zqNWG+Jb7+Topm339n9hzxul/o9T+EnzbSUQoIoIDPy8R7ze8w CYGQ== 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=g2akkNSZrUvonduQt7qsCRCxdAb8HLQ9l1eXYkuW9ew=; b=ZYkJfHuMpcfW6DE+kvS1aaQZT73E/LzFwqrZCFYCv7cXNRqmDU/dHImwsi12sFcOVA gV64ZsORUSN5jDEzTwWBrp3qH/IlBbxo0soEpdU+6GhPhW2CB/gdBli5/QkrdD8zqFUU 38rbPKZjosO1BO4gMFotmrqYTIxhMXvB4ej7suTsbpYFKo35VjGQnH0EkNsQw86JJdy5 FQqvtLlkCLcYdfvq6wVvq01LOKLuAlb/SdNVEthBBlxaW4ZhKA7G2cNwqPGYP75+mJiQ hDgjMMEN/1QkXKoxzPEmE5Q/qF9vkkouJQUUzp8vb6pB2n27YT5BrsEQ8r97vTcyewgK yIhA== X-Gm-Message-State: AFeK/H0h9t3wxqJadwsovmlq9VO/bS/oEcgSEAWQqNx+QQwGyY+SGKNFPLwhapuuk4ta6A== X-Received: by 10.99.123.72 with SMTP id k8mr19926740pgn.139.1490208342718; Wed, 22 Mar 2017 11:45:42 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:24 -0700 Message-Id: <20170322184533.6501-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 Subject: [oe] [meta-gnome][PATCH 01/10] abiword: Mark gconv dependencies only for 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 glibc-gconv-* packages are specific to glibc Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index 48b3c10be..34fc97d4a 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb @@ -19,8 +19,10 @@ DEPENDS = " \ libxslt \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \ " -RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" +RDEPENDS_${PN}_append_libc-glibc = " \ + glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \ +" RCONFLICTS_${PN} = "${PN}-embedded" SRC_URI = " \ From patchwork Wed Mar 22 18:45:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95814 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381346qgd; Wed, 22 Mar 2017 11:46:13 -0700 (PDT) X-Received: by 10.84.217.216 with SMTP id d24mr33781499plj.80.1490208373833; Wed, 22 Mar 2017 11:46:13 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l70si2769310pge.75.2017.03.22.11.46.13; Wed, 22 Mar 2017 11:46:13 -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; 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 63FC677ABF; Wed, 22 Mar 2017 18:46:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by mail.openembedded.org (Postfix) with ESMTP id CA91277980 for ; Wed, 22 Mar 2017 18:45:43 +0000 (UTC) Received: by mail-pf0-f174.google.com with SMTP id 20so47626625pfk.2 for ; Wed, 22 Mar 2017 11:45:45 -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=348BhKU3fyYv1QrOVv9GZpRcd74va1HZqoMl50R1mvI=; b=NjGlWIuibOBmqyqkQF2JUxc30eDtmVM5OGhWERAO0JSFHIOeu9gVWbK7ruBl5jgUIr hYsQTGmcJFdkslLfjCT/l/CfUgaI8KWo6uBo8m2IH89W37xOWHrgnTeOr/+evQqUoIaA vtdaMhwqsl5kAZLp9gS3puCttrzi7b0sV/Gv5+T1EsGEyzpsOU4hb6w71kc7S4utBiS0 RIA9vFsyGaZxvruAHZNPC/BCuiiX7hDN6rJPmn3dIDyPHNfVC21lkO+3wTOONvIXwhpH /NBnbtNFY90R3UyeQtx9bzd1mD65aXbksXzMeBcCgS4B4W2NwEQry9af0yUde92kMEaZ 1KAw== 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=348BhKU3fyYv1QrOVv9GZpRcd74va1HZqoMl50R1mvI=; b=QD5sMFIRpyICAiD2OdiyFJmtvNFXEadxc8D4JUQ1sjTLfCIaR9w0VHK7x/m2jrFRTg 5jim9tKJ/0Idn+6ImIi/Snh+8NANRDZw0vD1iuvJoK1K+HVpyjrNMAJP0C0wYLGYTVtQ F8sWhfzLCP4y5LfNl51mFNOE8ZYQdsAlVD4vCmD5I5QXNAAhEMLRN8iZB66Yxwt8D02X fHcA3U7eRMCgmblPU0Ou34K1uDJHcBe/7gxpOdH9P6dJK5HA81fIgYiXxww40I5A3tyU OYtmw6tqySyr7PeK+pZ4jyK5dmTJs3LHtPApb7rw0VE49Ku13H2XMB2fXSY+H2k6p219 rlzg== X-Gm-Message-State: AFeK/H2Knu5yHjTYJhQkJ977bhZPenBz9OXrx8BC6APfqVotdB/Q9cV6LpPcJbLmSi9yGA== X-Received: by 10.84.214.129 with SMTP id j1mr58112454pli.23.1490208344607; Wed, 22 Mar 2017 11:45:44 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:43 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:25 -0700 Message-Id: <20170322184533.6501-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 02/10] netcat-openbsd: Fix build and whitelist 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 pkgconfig is used so we need to inherit pkgconfig secondly, base64 support is added for it to work with musl Signed-off-by: Khem Raj --- ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 22 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- 3 files changed, 395 insertions(+), 8 deletions(-) create mode 100644 meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file mode 100644 index 000000000..0966b6580 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 11:30:49 -0700 +Subject: [PATCH] bundle own base64 encode/decode functions + +Not all libc implementations provide it. +as an aside libresolv is no longer needed + +Signed-off-by: Khem Raj +--- + Makefile | 4 +- + base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + netcat.c | 2 + + socks.c | 3 + + 4 files changed, 320 insertions(+), 2 deletions(-) + create mode 100644 base64.c + +Index: netcat-openbsd-1.105/Makefile +=================================================================== +--- netcat-openbsd-1.105.orig/Makefile ++++ netcat-openbsd-1.105/Makefile +@@ -1,9 +1,9 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c base64.c + +-LIBS= `pkg-config --libs libbsd` -lresolv ++LIBS= `pkg-config --libs libbsd` + OBJS= $(SRCS:.c=.o) + CFLAGS= -g -O2 + LDFLAGS= -Wl,--no-add-needed +Index: netcat-openbsd-1.105/base64.c +=================================================================== +--- /dev/null ++++ netcat-openbsd-1.105/base64.c +@@ -0,0 +1,313 @@ ++/* ++ * Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#if !defined(LINT) && !defined(CODECENTER) ++static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; ++#endif /* not lint */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define Assert(Cond) if (!(Cond)) abort() ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ size_t i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ Assert(output[3] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++//libresolv_hidden_def (b64_ntop) ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(char const *src, u_char *target, size_t targsize) { ++ int tarindex, state, ch; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = *src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ target[tarindex+1] = ((pos - Base64) & 0x0f) ++ << 4 ; ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ target[tarindex+1] = ((pos - Base64) & 0x03) ++ << 6; ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ default: ++ abort(); ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = *src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = *src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +Index: netcat-openbsd-1.105/netcat.c +=================================================================== +--- netcat-openbsd-1.105.orig/netcat.c ++++ netcat-openbsd-1.105/netcat.c +@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, + socklen_t salen, int ctimeout); + static void quit(); + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int + main(int argc, char *argv[]) + { +Index: netcat-openbsd-1.105/socks.c +=================================================================== +--- netcat-openbsd-1.105.orig/socks.c ++++ netcat-openbsd-1.105/socks.c +@@ -53,6 +53,9 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int remote_connect(const char *, const char *, struct addrinfo); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index bb21e0cfe..bb4e36c0a 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -2,20 +2,21 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch" + ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${PN}-${PV} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" SRC_URI[netcat-patch.md5sum] = "e914f8eb7eda5c75c679dd77787ac76b" SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a2c9d037bbc8f882b363" -S = "${WORKDIR}/${BPN}-${PV}" - EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" do_configure[noexec] = "1" @@ -23,9 +24,18 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} quilt pop -a || true - QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat } +do_unpack[cleandirs] += "${S}" + python do_patch() { bb.build.exec_func('netcat_do_patch', d) bb.build.exec_func('patch_do_patch', d) @@ -42,5 +52,3 @@ do_install() { install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} } ALTERNATIVE_PRIORITY = "60" - -PNBLACKLIST[netcat-openbsd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130673/" diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 91a24a106..15441645b 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -9,7 +9,7 @@ connection you would need and has several interesting built-in \ capabilities." SECTION = "net" -inherit update-alternatives gettext +inherit update-alternatives gettext pkgconfig ALTERNATIVE_${PN} = "nc" From patchwork Wed Mar 22 18:45:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95815 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381382qgd; Wed, 22 Mar 2017 11:46:20 -0700 (PDT) X-Received: by 10.99.3.16 with SMTP id 16mr33773646pgd.41.1490208380419; Wed, 22 Mar 2017 11:46:20 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p10si2743634pge.292.2017.03.22.11.46.20; Wed, 22 Mar 2017 11:46:20 -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; 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 B70E477AD6; Wed, 22 Mar 2017 18:46:11 +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 D6A4A77A8D for ; Wed, 22 Mar 2017 18:45:45 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id n11so16781940pfg.2 for ; Wed, 22 Mar 2017 11:45:47 -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=m2CJ4H6F8olsK1nOsOYVbRbITnMgvqwNDUGF3CZSprk=; b=Q6I4J+TIM2c/QYAvIFBVVyCD9oDbwarr9F3LFChHR0SlUGRKwLlj6u6dhfFcaBPydZ kfwqWWYDhO42XeV/mmhSFa7rUhlnoj+KrZAw9jydYp5TVERLYjuZlzZCuJnqeRaxiJQZ FBV0Gds94IVFrG/1uyFB8xsPZ6Lq5DyUqhAPuneurE49v/F4AqS/Df8FrNJd3uKBGH/W lKuQnFo9ofKTN3Xq7aM374OGD/1OOzT7zPcy+aXW1sj/Gt6RxOLvLaRla/0CEkgGFsOU DOvE6rNQpIa4r09kcDE5lXGzkh4IjORhvJU7pdz4m7EnGWO8Hca3etVJ5jBT2FM6or/V NGmA== 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=m2CJ4H6F8olsK1nOsOYVbRbITnMgvqwNDUGF3CZSprk=; b=YAyVNnwHaiPSSxTYcWCqdQ2z/yvg+F75piaNrWw2gly68pljdQuJD3LR0IHrlGnK51 H70S5LJPZjiBpqsEA5XILg6WFS8PU7F28tDQnNQmPhnMkJsZSboKLDAjR/Yo3dl87clM 9vLx9XJAZNIdNdj18NUwKBr5+At/ThTix6xNshxr6csG9hAD4J7VfqvZ0N2cDgoYZtyT q/RHxLiTJg17rZFoz4l6AgADCd8VkNT3CB06at8aieC3g34JhYDfG8CVIT3KG8QfZQmf PA2ZzT+pZEb5b2vkwxmwg7uXUT3RmVBWWKTM/bzVJLHxsUUGd7e5HcPwRi7OblQUmOz0 MyvQ== X-Gm-Message-State: AFeK/H0T1Zb6l+JCFLUDF2EtZe5mR9dC44ZtPDA3m9qiWRGOZnHZUUxQ9SjaRv0rhpywzA== X-Received: by 10.84.194.1 with SMTP id g1mr57355701pld.98.1490208346167; Wed, 22 Mar 2017 11:45:46 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:26 -0700 Message-Id: <20170322184533.6501-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-xfce][PATCH 03/10] xfce4-mount-plugin: Fix build with 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-check-for-fstab.h-during-configure.patch | 85 ++++++++++++++++++++++ .../mount/xfce4-mount-plugin_0.6.4.bb | 2 + 2 files changed, 87 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch new file mode 100644 index 000000000..dcc2a3719 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch @@ -0,0 +1,85 @@ +From 09e325f8296eb9e63dc57ed137f4a9940f164563 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 17:11:46 -0700 +Subject: [PATCH] check for fstab.h during configure + +fstab.h is not universally available, checking it during +configure creates a knob to disable fstab reads in the +plugin + +Makes it compile/build with musl + +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + panel-plugin/devices.c | 22 ++++++++++++++++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 34d6f7f..52ecc4a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -67,6 +67,7 @@ AC_CHECK_HEADERS([sys/socket.h]) + AC_CHECK_HEADERS([sys/time.h]) + AC_CHECK_HEADERS([unistd.h]) + AC_CHECK_HEADERS([sys/sockio.h]) ++AC_CHECK_HEADERS([fstab.h]) + AC_HEADER_SYS_WAIT + AC_PROG_GCC_TRADITIONAL + AC_TYPE_SIZE_T +diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c +index afa954e..345b603 100644 +--- a/panel-plugin/devices.c ++++ b/panel-plugin/devices.c +@@ -24,8 +24,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + #ifdef HAVE_CONFIG_H + #include + #endif +- ++#if HAVE_FSTAB_H + #include ++#endif + #include + #include + #include +@@ -370,14 +371,15 @@ out: + GPtrArray * + disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) + { +- GPtrArray * pdisks; /* to be returned */ ++ GtkWidget *dialog; + t_disk * pdisk; +- struct fstab *pfstab; ++ GPtrArray * pdisks; /* to be returned */ + gboolean has_valid_mount_device; +- GtkWidget *dialog; + + pdisks = g_ptr_array_new(); ++#if HAVE_FSTAB_H + ++ struct fstab *pfstab; + /* open fstab */ + if (setfsent()!=1) + { +@@ -422,6 +424,18 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) + + endfsent(); /* close file */ + ++#else ++ if (! (*showed_fstab_dialog) ) { ++ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_INFO, GTK_BUTTONS_OK, ++ "Your /etc/fstab could not be read because fstab is not supported. This will severely degrade the plugin's abilities."); ++ /* gtk_dialog_run (GTK_DIALOG (dialog)); */ ++ g_signal_connect (dialog, "response", ++ G_CALLBACK (gtk_widget_destroy), dialog); ++ gtk_widget_show (dialog); ++ *showed_fstab_dialog = TRUE; ++ } ++#endif + return pdisks; + } + +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb index 6dc2c1721..2a646eb86 100644 --- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb @@ -6,5 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin +SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch \ + " SRC_URI[md5sum] = "f5917e9aa2a06bc6a872cc10d2ee4f6f" SRC_URI[sha256sum] = "541d7af84d7d0b00ae547aa1f438e2fac51ee4195c4d0a17173c4f72accb227d" From patchwork Wed Mar 22 18:45:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95816 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381422qgd; Wed, 22 Mar 2017 11:46:29 -0700 (PDT) X-Received: by 10.98.212.81 with SMTP id u17mr48058991pfl.75.1490208389722; Wed, 22 Mar 2017 11:46:29 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 127si2752966pgj.250.2017.03.22.11.46.29; Wed, 22 Mar 2017 11:46: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; 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 BAD7177A9A; Wed, 22 Mar 2017 18:46:20 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 6CAAE77A57 for ; Wed, 22 Mar 2017 18:45:45 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id p189so22610118pfp.0 for ; Wed, 22 Mar 2017 11:45:47 -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=OabSbNa78za5zDBgx7o4gKNNJEwT85/fQlbocAxmjTk=; b=o36Y+nBR/c2KrdWSxcecZpcIpBkRSB+XJ91QqL73g03u9IFiZyIqJiBSjGEHqwBCpx npseRG1hwjC5Ko1JsByakRndsPcs+u9Zf7WMWPc01iIy2fSwpV6Cr1pWBnhXxAWNPtEF 3xa+p3hrxYkjpr+dvhzUCAQdO4fvpbdMICKyWkLCAkVJcZprC/Uu4R/qI6U5cSkI9it3 k9gu0hXVz4bt/W6g8xYNXLyIT8fDTLm0Mm5qNid2Tct/IXeVeA2MWfVoW0yzDE0vdRHp fKmxV4DwlSNpu0ArT3NaPp5ukZwyP1pGljAxV4/s7Ror5AxBnpHxsO6mVDH9zTO9qQ7/ Y9hw== 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=OabSbNa78za5zDBgx7o4gKNNJEwT85/fQlbocAxmjTk=; b=JZL2gwRP8e7rMZB+JSiIItJ1/ZYRqw/hoyL5ql3h4SfskDyvq6jmH2giD6TZ1eVPCl BQY86OBhJkYpxojbv0EpHxDDwYBB+/JNAWZj5wOryFMqayA1Ez/4SynZuGXRX7Taotm4 Xy54tB9zKmaFv35DY6QVtRyv8cKbRIC0+9IUp1z13sx8ilVGxlJSvChk796wxmX5aP5x 8JJ7LCUp/OSdUxTTwk9UbscDHFeQSXDHh06It1dNVgpdKy6LwT3QZjU3OWSgNXz5TCdu a4JiYDKJe6xfWJpajeKhtgNbgEx1UyuF9QkS9qQbyjECGzs7MhpDUu9HHyFrdQ5hRTzM vv+g== X-Gm-Message-State: AFeK/H2/gmUPWJKxDI4Zp5rmlvYcwoPlpnbo3EnMJpHh3WDooY0lnNCd7bIDfnkuOYcdkw== X-Received: by 10.99.101.199 with SMTP id z190mr44426909pgb.219.1490208347549; Wed, 22 Mar 2017 11:45:47 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:46 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:27 -0700 Message-Id: <20170322184533.6501-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/10] log4cpp: Upgrade to 1.1.2 rc5 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 musl Signed-off-by: Khem Raj --- .../log4cpp/{log4cpp_1.1.1.bb => log4cpp_1.1.2.bb} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename meta-oe/recipes-support/log4cpp/{log4cpp_1.1.1.bb => log4cpp_1.1.2.bb} (68%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.1.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb similarity index 68% rename from meta-oe/recipes-support/log4cpp/log4cpp_1.1.1.bb rename to meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb index c7bf288fa..dc52c9ff4 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.1.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb @@ -3,12 +3,12 @@ HOMEPAGE = "http://sourceforge.net/projects/log4cpp/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -SRC_URI[md5sum] = "1e173df8ee97205f412ff84aa93b8fbe" -SRC_URI[sha256sum] = "35abf332630a6809c969276b1d60b90c81a95daf24c86cfd7866ffef72f9bed0" - -SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \ +RC = "rc5" +SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}${RC}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " +SRC_URI[md5sum] = "58b4591a2f3e7ef3d5e3e7cfb3a81a62" +SRC_URI[sha256sum] = "a611d99a20af6676c60219762771c0bfac90f4879bbde70038ece75338b588ec" S = "${WORKDIR}/${BPN}" @@ -19,5 +19,4 @@ EXTRA_OECONF = "\ --enable-dot=no \ --enable-html-docs=no \ --enable-latex-docs=no \ - LDFLAGS=-pthread \ " From patchwork Wed Mar 22 18:45:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95817 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381471qgd; Wed, 22 Mar 2017 11:46:37 -0700 (PDT) X-Received: by 10.84.130.66 with SMTP id 60mr12326588plc.115.1490208397356; Wed, 22 Mar 2017 11:46:37 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t5si1947524pfk.348.2017.03.22.11.46.37; Wed, 22 Mar 2017 11:46: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; 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 D7A2277AF6; Wed, 22 Mar 2017 18:46:21 +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 7F27F77A98 for ; Wed, 22 Mar 2017 18:45:48 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id o126so28156991pfb.1 for ; Wed, 22 Mar 2017 11:45:49 -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=y7Go17F+Ml32SsCxJ/iBBo1KhUx7WX11NOwRyQ0j+dQ=; b=YeHNMYfk63dd0mrj2aX8E5NiwhhcOpkYajaPHcvf9feNF0EWHIVCVlVgWcM17S/WpC 1cxkOG4/jFCSFXRqmu3Ik42nqXCiCKGoP+h1QJ9Y5aiPfgAPJOBLhKJveQXiEjtfZnw5 qMvmGN2IJuNfLL0kxf4A/SBjOQSYy7d6+CTH0qFDB2KL8FDP38JAEv+iijm6VGlfKCRb JDqJ4732MikAUFmDzWQh/G7/D7rObjRejML6xpVVMvixSQRTg+zvwP74JMXjGMoOst5k erhpsHKbRZ88uME2FoamC/z1vLKBBPHINc9/ya2bV/orwiTeaAM9sbxJ8HshjzecgWBh CkNA== 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=y7Go17F+Ml32SsCxJ/iBBo1KhUx7WX11NOwRyQ0j+dQ=; b=NKQw50pHEkTnKNNECUwioWGzTYgY6N8e2To/Agu0Nl5UTJ+pxUnRee01iOVOBL/wi0 XEZHQoT/e7k8DesBrz9mLBFxC5twcppC9fGZcmSOxho6ZLUlA7y/XtmWm2x+WqH7s/l0 bK3eCi0jiwVdXlmCDN6q0bC0Y918WQqMwiCR1x1AMylvsft4wgwwdb4BOg2jzlojmHOj O2JD64qSIAX6Qsky+nHCtXseklRaTAqjrlzkkcG8tEcpn+rj61Jlh3Vj8/ueVGzlb798 K2RKUSQ/CAgiEY8yMhZSsL2+KnuJixZWL1AoYR9bnakdMZyVL0nTLbrul4DnmiNGkOZp MNtQ== X-Gm-Message-State: AFeK/H3yt0CV62OLbI5FRNnTtXzaGiiYywn/0mzdymIr22rZdGEN113uIXOofiTUhKLcdQ== X-Received: by 10.99.230.17 with SMTP id g17mr45086381pgh.84.1490208349558; Wed, 22 Mar 2017 11:45:49 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:28 -0700 Message-Id: <20170322184533.6501-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 05/10] ctdb: Fix build with 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 Fixes | ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include Signed-off-by: Khem Raj --- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 7cea0f681..b5a60645c 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -27,6 +27,9 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" DEPENDS += "popt libtevent libtalloc libldb" +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" From patchwork Wed Mar 22 18:45:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95818 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381520qgd; Wed, 22 Mar 2017 11:46:44 -0700 (PDT) X-Received: by 10.99.42.78 with SMTP id q75mr45519771pgq.144.1490208404836; Wed, 22 Mar 2017 11:46:44 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l70si2770820pge.75.2017.03.22.11.46.44; Wed, 22 Mar 2017 11:46:44 -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; 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 124BC77B07; Wed, 22 Mar 2017 18:46:23 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 176F377A57 for ; Wed, 22 Mar 2017 18:45:49 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 81so23968380pgh.3 for ; Wed, 22 Mar 2017 11:45:51 -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=fh0yCYMUMvNzVsyB4FjZz1CXUVAH20pVSMjhn30wa+Q=; b=p/no+VV6NFMVrApr605N6uXV3CYP52VhUn20mPEiWECAxQKPgHpp14/NxPXs+q2soO WisCSxOxSabpnyQYXf+fO27XOv+SR0dCaKROaWa6AnRcHjqB0u/hIu3gvCTM/c8lr26R 62kJ2LaVQlNJHtxZfxC03HfuBemb61H1HUlxWFm2riOFDU6+kgaupjjVyuyzVgD6VGor sobEpNrQU5OSqGkSM0xnn3M3MqTdOCVkKeD8SBHlBA7XHEnOebmY30MrN5yZg3VC29NP u7OCNPducVoBAC97ucs8Waovp+E75OZvExp4uDNdYHzfhoL2vlGrz6je03fpLMNUm3X9 bCqw== 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=fh0yCYMUMvNzVsyB4FjZz1CXUVAH20pVSMjhn30wa+Q=; b=EuzGRTudVQ096DM075P9pgipywJYt5qzmrur5pkbuPfE6QKupRgB8jbP49Y7kyT7UZ ZvFFKDFb0zb5RsSOytkN5YzyMRMclREIXu/FrrGPQLv8O1vOp8JZGmgUp1RQQ679z4V8 bMxEE5P360/p+vnMF1ZUyBTo2wWJb6uB7OOuVukDVV8BBrosyxfj2IWrk2j1emrGGVRT x/YTwcsaxA1zE/deTFX79xl+sK3kUO+hQlFggA6ztZJ4EUcRIMT3uvcg+XBfJlHc8Vx2 hGFEG2IyesUEna3EjOC/DZT64lFYnqZ6uoNcGNHxxPrtq7HboAD016EvM2AqcQyr44QP EgXQ== X-Gm-Message-State: AFeK/H0Y6s60E2DPQAAZd8YTJSFYMg2NxaCGrVG5ODjaqHUpX3EnePruuuKzAMELalbEsg== X-Received: by 10.98.107.194 with SMTP id g185mr48288122pfc.22.1490208351028; Wed, 22 Mar 2017 11:45:51 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:49 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:29 -0700 Message-Id: <20170322184533.6501-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 06/10] libndp: Include sys/select.h in ndptool.c 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 musl Signed-off-by: Khem Raj --- ...-include-sys-select.h-for-fd_-definitions.patch | 25 ++++++++++++++++++++++ meta-oe/recipes-connectivity/libndp/libndp_1.6.bb | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch b/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch new file mode 100644 index 000000000..bafd916d2 --- /dev/null +++ b/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch @@ -0,0 +1,25 @@ +From 33150de2d77ffb645da1a043933b12ddc0143cea Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 18:59:03 -0700 +Subject: [PATCH] include sys/select.h for fd_* definitions + +Signed-off-by: Khem Raj +--- + utils/ndptool.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/ndptool.c b/utils/ndptool.c +index 1d96f4c..0fd4c4d 100644 +--- a/utils/ndptool.c ++++ b/utils/ndptool.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.12.0 + diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb index a35dff8b7..e06ff7f99 100644 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb @@ -3,7 +3,9 @@ SUMMARY = "Library for IPv6 Neighbor Discovery Protocol" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "http://libndp.org/files/${BPN}-${PV}.tar.gz" +SRC_URI = "http://libndp.org/files/${BPN}-${PV}.tar.gz \ + file://0001-include-sys-select.h-for-fd_-definitions.patch \ + " SRC_URI[md5sum] = "1e54d26bcb4a4110bc3f90c5dd04f1a7" SRC_URI[sha256sum] = "0c7dfa84e013bd5e569ef2c6292a6f72cfaf14f4ff77a77425e52edc33ffac0e" From patchwork Wed Mar 22 18:45:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95819 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381552qgd; Wed, 22 Mar 2017 11:46:52 -0700 (PDT) X-Received: by 10.98.215.70 with SMTP id v6mr48845389pfl.121.1490208412809; Wed, 22 Mar 2017 11:46:52 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l1si2764804plb.136.2017.03.22.11.46.52; Wed, 22 Mar 2017 11:46:52 -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; 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 2B64C77B19; Wed, 22 Mar 2017 18:46:24 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 3C1C877A57 for ; Wed, 22 Mar 2017 18:45:51 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id o126so28157230pfb.1 for ; Wed, 22 Mar 2017 11:45:53 -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=9Nr67ZQvj8XGIySZEyhLrCy5uvPSCmKKQ2+v009ufLg=; b=VyU7L5c6KB9RxmzFYzvXAxukIXlqQyuxKGtHBywQeYnx6mCG+tJorjXPMs14gsRl+i nhS+2rz4gTt3TwI2gqKPsWovLxp2EQieTpUJeEOEZrhlZN9cP52cgJS71ecFGOpUO3Vu 4iiEjSycprqj94laUJR1ZKdcskAjkFE1KZ96bysWB1iX+VQb3cFaI98e2UAsmZBEl2/x VqpMmoPR69c6ZMzNns/n7t43NMuNqULXMvYjqwJy4D4PCmcTHp/ueU8DwwFyDN3g+c84 SXl9RjMOPpKESUgBeNz+cim4XW+wf7enKlRNIjlsS521OGMihOsYF1f9cG2lfXukoCyT /t5A== 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=9Nr67ZQvj8XGIySZEyhLrCy5uvPSCmKKQ2+v009ufLg=; b=ZXw/2XgGE34TKwVU4Q++vjkbUFQSzGiIHiAbuLKFYtoROA9tMDe2KR0ONbRhNdSchC UkIapZel9j3BFBTIEfNuuQ0ZZfkoxEBEUOiL2zyMmjfFGyfVGZUoCTaFQaAIgEIBSfeC 0mb2pChMz/JwktPIxn2gIkgt3Fj6b1KdCg5qUgGFT37pxo7w9vkjqmrM00JIZTDxUeT4 DxMeuCRneAS6ZWpAeMK57MTy1mBdwOY9QOFmnnlwQK8LKAP5rXqpzeJf4LTjWAbpX2Hr GyTr+iDg64s+Uuh8MW+unr1uAE1gMh6ZhnLCg/6bfNVM4NxuAWkGIJG3OOo2Ue7jsiD3 O9NQ== X-Gm-Message-State: AFeK/H3GRRNCVLloGGoS4yvsnFUxtqL5lV5ab3+v2NJIcCOFMS2LR4PGUT+HZcFVGlBftQ== X-Received: by 10.99.142.67 with SMTP id k64mr39983193pge.31.1490208352866; Wed, 22 Mar 2017 11:45:52 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:51 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:30 -0700 Message-Id: <20170322184533.6501-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/10] libedit: Update to 20160618-3.1 release 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 build with musl Signed-off-by: Khem Raj --- .../recipes-devtools/libedit/libedit/stdc-predef.patch | 17 +++++++++++++++++ ...{libedit_20160618-3.1.bb => libedit_20160903-3.1.bb} | 9 +++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch rename meta-oe/recipes-devtools/libedit/{libedit_20160618-3.1.bb => libedit_20160903-3.1.bb} (64%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch b/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch new file mode 100644 index 000000000..c95cdc9d2 --- /dev/null +++ b/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch @@ -0,0 +1,17 @@ +__STDC_ISO_10646__ is defined in stdc-predef.h +therefore include it to see if its there on a platform + +Signed-off-by: Khem Raj + +Index: libedit-20160903-3.1/src/chartype.h +=================================================================== +--- libedit-20160903-3.1.orig/src/chartype.h ++++ libedit-20160903-3.1/src/chartype.h +@@ -29,6 +29,7 @@ + #ifndef _h_chartype_f + #define _h_chartype_f + ++#include + /* Ideally we should also test the value of the define to see if it + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having diff --git a/meta-oe/recipes-devtools/libedit/libedit_20160618-3.1.bb b/meta-oe/recipes-devtools/libedit/libedit_20160903-3.1.bb similarity index 64% rename from meta-oe/recipes-devtools/libedit/libedit_20160618-3.1.bb rename to meta-oe/recipes-devtools/libedit/libedit_20160903-3.1.bb index bda421d81..90b5a1d39 100644 --- a/meta-oe/recipes-devtools/libedit/libedit_20160618-3.1.bb +++ b/meta-oe/recipes-devtools/libedit/libedit_20160903-3.1.bb @@ -12,9 +12,10 @@ inherit autotools # upstream site does not allow wget's User-Agent FETCHCMD_wget += "-U bitbake" -SRC_URI = "http://www.thrysoee.dk/editline/${BPN}-${PV}.tar.gz" +SRC_URI = "http://www.thrysoee.dk/editline/${BPN}-${PV}.tar.gz \ + file://stdc-predef.patch \ + " +SRC_URI[md5sum] = "0467d27684c453a351fbcefebbcb16a3" +SRC_URI[sha256sum] = "0ccbd2e7d46097f136fcb1aaa0d5bc24e23bb73f57d25bee5a852a683eaa7567" S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "b6e60f326a3fce91bea1a6fe4700af58" -SRC_URI[sha256sum] = "b6b159c0c6ec8a7f349ea2a75d8b960efa346c462c1ac4921f1ac0de85a9f5d6" From patchwork Wed Mar 22 18:45:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95821 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381656qgd; Wed, 22 Mar 2017 11:47:10 -0700 (PDT) X-Received: by 10.98.192.151 with SMTP id g23mr47754933pfk.254.1490208430099; Wed, 22 Mar 2017 11:47:10 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n87si1973843pfj.73.2017.03.22.11.47.09; Wed, 22 Mar 2017 11:47:10 -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; 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 8AC2977B2D; Wed, 22 Mar 2017 18:46:26 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id B3D7D77A91 for ; Wed, 22 Mar 2017 18:45:54 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id o126so28157410pfb.1 for ; Wed, 22 Mar 2017 11:45: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=Y5GpKYKnkKkolvga7FWyWUC2Ebne5GQInhJjBQQ/ghk=; b=O//lZb51G9Mt7hqN2sjxLMTTDXvHl2TB/L7O3Q+xuVzF0k18/wcnsmlpw41ZceusBJ yhATS6WHCnzbeHKaGgvwtspaGgcs3SQcfrNpTX70qpb/94WDnvHT3xmosT0yRkq5u2hq oDHiWBZQd4qb3T1MBV7W7CdrICs7LzXoAdRkUt5GTub9CvjO8OibOmZhEyK7ttBMEb36 hf7AEhqxPGNrvTd2sHQ/Hc1NvXISPVvZJykolNmsP5iRORpPQ/oM/7hfM18MQ7V8vLYu Ftm6asHjhpwaiIb2Rknxryyv+gDXaqVyKxDNjneceS0jTmbR3Q+mf+1kFugkzO4eFHIx GWMQ== 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=Y5GpKYKnkKkolvga7FWyWUC2Ebne5GQInhJjBQQ/ghk=; b=qO80mIAb/VYQnP+xXkWj5rAVM+tw6pgf8lIJaLrxt1XeCRq9R0CqmT3QB/4vd0iivW uTNyhWL9pyoQzX13saiovZw+kG92DmC8W8ls/FG2T5IqHkvBUF4cYf6Pq1eGDshFv7P2 2firSKnjs9r9Fn0ToIKti7pxdBSBvLs4K0iadR8XKO3oBQj6OKzixQoU+5Nbc1PsKiRH U/TGkn/JAxc50agDAiU9I+0ybwgWNsQtEnvJ+SeSUb+vnW2rxlHSQ5yjWO7Gq9cbnAFG zU+aQvvuvbXie+eg+ooqwqVPWgdQQm5iXXGaS4UOTHJsSRFZhAl26+3efJ+i+K1fPzTW 6pAw== X-Gm-Message-State: AFeK/H0zRS8H4akDM/7G/qFh7m/FDNlgT4w0Gc1QXAgpe3mFSuqCmez34o7oCACnfFHuMQ== X-Received: by 10.84.224.3 with SMTP id r3mr48432994plj.130.1490208355987; Wed, 22 Mar 2017 11:45:55 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:54 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:32 -0700 Message-Id: <20170322184533.6501-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-python][PATCH 09/10] python-slip-dbus: Update SRC_URI to github 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 --- meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb b/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb index 785cecc35..8081416ee 100644 --- a/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb +++ b/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb @@ -14,7 +14,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRCNAME = "python-slip" -SRC_URI = "https://fedorahosted.org/released/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2" +SRC_URI = "https://github.com/nphilipp/${SRCNAME}/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.bz2" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools From patchwork Wed Mar 22 18:45:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 95822 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp381692qgd; Wed, 22 Mar 2017 11:47:17 -0700 (PDT) X-Received: by 10.99.128.200 with SMTP id j191mr6417028pgd.125.1490208437879; Wed, 22 Mar 2017 11:47:17 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z1si2734680pgc.417.2017.03.22.11.47.17; Wed, 22 Mar 2017 11:47:17 -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; 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 98E4977B31; Wed, 22 Mar 2017 18:46:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id D328977AB3 for ; Wed, 22 Mar 2017 18:45:55 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 79so23299240pgf.0 for ; Wed, 22 Mar 2017 11:45: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=JvCjtiGfS6WB07q7sAr5Jsz5/usFKhdy4veCKrpj0KY=; b=FB0N08A9VFCHJp5P3grvKsW3TiJm1W9N4DIZeDNu64DEAFdY2kVq3g/76EyYS2m44K wnJLLP4juMio/Dw+sVnEBTSL7xPNNtqnt8g21Kcu6N2bx527csBbieIrhfVt1xSlYg3X zEOn0TB3OJVZ4fvYVYgYVDRim9YlQqkf6zg1yUcdLz1IDw/J8C7qGos02/KcgAZn4cR3 pIrWgxnu7+G7cUoXpnX+5g/edzBNRR+t0iWCiXZA8Yhj5dpjB108foBwaT2yk7icSTk0 b33jpyC6lFdgnfeTIO9G7UQ5FZ+5kP2B/orISIwvvIZtWYTnOmpslS8gZWlKUOnTScTf n1wA== 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=JvCjtiGfS6WB07q7sAr5Jsz5/usFKhdy4veCKrpj0KY=; b=PQ88HZi54aJz22y1edvhD7x3FU+AZgBvelnH/72u+bGbZqj1jBEaTSg0Z42vCEJXuD AGtuD3cACispEiEvgzkDr2YQVO5JW8GUebfTcOVKkD26v9zG2OlGyECxSWLkfotTSF4c KZTuRlizb8D7YC0jKM7ZgwUvqomPhRw+uSB45vzVPtbMvzFfcDCJ7/13f7Jct7Lwmfsd OajZF94xn5pham9YIhlNSIeGZ10Do8/EGnsZ05Xbpc+tUwQ8axtNYxBzdGcQs5Lwpp2d uqc6jPJ/jelsfi6xjUhZ4YEzNB+0bwuKEiEBa7e8W9fD3PqiykJ3WJxy/eqplQEdMa+R AnXQ== X-Gm-Message-State: AFeK/H3TSiTTVVPoe922s1XRzSvc8p/CM/exdzOsZYTOes+14Q9IFylPhWHja2agTe8gXQ== X-Received: by 10.98.196.221 with SMTP id h90mr47575400pfk.149.1490208357363; Wed, 22 Mar 2017 11:45:57 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id z4sm5404494pge.49.2017.03.22.11.45.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 11:45:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 Mar 2017 11:45:33 -0700 Message-Id: <20170322184533.6501-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170322184533.6501-1-raj.khem@gmail.com> References: <20170322184533.6501-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 10/10] alsa-equal: Update SRC_URI to something valid 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 www.thedigitalmachine.net has disappeared Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb b/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb index 637d029ba..3bed70e1a 100644 --- a/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb +++ b/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb @@ -1,12 +1,12 @@ DESCRIPTION = "A real-time adjustable equalizer plugin for ALSA" -HOMEPAGE = "http://www.thedigitalmachine.net/alsaequal.html" +HOMEPAGE = "https://web.archive.org/web/20161105202833/http://thedigitalmachine.net/alsaequal.html" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "alsa-lib" SRC_URI = " \ - http://www.thedigitalmachine.net/tools/alsaequal-${PV}.tar.bz2 \ + https://launchpad.net/ubuntu/+archive/primary/+files/alsaequal_${PV}.orig.tar.bz2 \ file://0001-Fix-asneeded.patch \ file://0002-Fix-Eq-CAPS-plugin-name.patch \ file://0003-Fix-mixer.patch \