abiword: Mark gconv dependencies only for glibc
PATCH 1/10 abiword: Mark gconv dependencies only for glibc
glibc-gconv-* packages are specific to glibc
--- meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +4 -2
@@ -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 = " \
Signature · 1 line
2.12.0
PATCH 2/10 netcat-openbsd: Fix build and whitelist
pkgconfig is used so we need to inherit pkgconfig
secondly, base64 support is added for it to work
with musl
--- ...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
meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file +379 -0
@@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 <sys/types.h> ++#include <sys/param.h> ++#include <sys/socket.h> ++ ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#include <arpa/nameser.h> ++ ++#include <ctype.h> ++#include <resolv.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#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,
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +15 -7
@@ -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/"
meta-networking/recipes-support/netcat/netcat.inc +1 -1
@@ -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"
Signature · 1 line
2.12.0
Re: [meta-networking][PATCH 02/10] netcat-openbsd: Fix build and whitelist
Quoted 20 lines · Khem Raj
pkgconfig is used so we need to inherit pkgconfig
secondly, base64 support is added for it to work
with muslSigned-off-by Khem Raj <[email protected]>--- ...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.patchmeta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file +2
-0@@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]>
...
Quoted 33 lines
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +5
-4@@ -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}
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb do_configure[noexec] = "1" · line 34
Quoted 10 lines
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +8
-1quilt 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
Doesn't work here:
http://errors.yoctoproject.org/Errors/Details/138495/
Quoted 34 lines
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +2
-2} +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/"meta-networking/recipes-support/netcat/netcat.inc +1
-1@@ -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"Signature · 7 lines
2.12.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-networking][PATCH 02/10] netcat-openbsd: Fix build and whitelist
Quoted 6 lines · Martin Jansa
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb do_configure[noexec] = "1" · line 34
Quoted 3 lines
meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +3
-0+ fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcatDoesn't work here:
http://errors.yoctoproject.org/Errors/Details/138495/
weird.
works here.
PATCH 3/10 xfce4-mount-plugin: Fix build with musl
In reply to 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
meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch new file +85 -0
@@ -0,0 +1,85 @@ +From 09e325f8296eb9e63dc57ed137f4a9940f164563 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 <config.h> + #endif +- ++#if HAVE_FSTAB_H + #include <fstab.h> ++#endif + #include <glib.h> + #include <stdio.h> + #include <string.h> +@@ -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 +
meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb +2 -0
@@ -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"
Signature · 1 line
2.12.0
PATCH 4/10 log4cpp: Upgrade to 1.1.2 rc5
In reply to Khem RajFixes build with musl
---
.../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%)meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb renamed from meta-oe/recipes-support/log4cpp/log4cpp_1.1.1.bb +4 -5
@@ -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 \ "
Signature · 1 line
2.12.0
PATCH 5/10 ctdb: Fix build with musl
In reply to Khem RajFixes
| ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include <rpc/rpc.h>
--- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +3 -0
@@ -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"
Signature · 1 line
2.12.0
PATCH 6/10 libndp: Include sys/select.h in ndptool.c
In reply to Khem RajFixes build with musl
--- ...-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
meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 33150de2d77ffb645da1a043933b12ddc0143cea Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 21 Mar 2017 18:59:03 -0700 +Subject: [PATCH] include sys/select.h for fd_* definitions + +Signed-off-by: Khem Raj <[email protected]> +--- + 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 <string.h> + #include <signal.h> + #include <getopt.h> ++#include <sys/select.h> + #include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-- +2.12.0 +
meta-oe/recipes-connectivity/libndp/libndp_1.6.bb +3 -1
@@ -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"
Signature · 1 line
2.12.0
Re: [meta-oe][PATCH 06/10] libndp: Include sys/select.h in ndptool.c (backport to Morty)
This is also failing in Yocto 2.2 Morty.
And the fix is just a cherry-pick away:
git cherry-pick 9cd2b3fe97b2b041d293941207c54909f0206f3d
Could someone with the proper rights, do the backport to Morty?
Signature · 3 lines
Thanks, Javier Viguera
PATCH 7/10 libedit: Update to 20160618-3.1 release
In reply to Khem Rajfix build with musl
---
.../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%)meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch new file +17 -0
@@ -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 <[email protected]> + +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 <stdc-predef.h> + /* 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
meta-oe/recipes-devtools/libedit/libedit_20160903-3.1.bb renamed from meta-oe/recipes-devtools/libedit/libedit_20160618-3.1.bb +5 -4
@@ -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"
Signature · 1 line
2.12.0
PATCH v2 8/10 atop: Fix build with musl
In reply to Khem Raj--- .../atop/0001-include-missing-header-files.patch | 97 ++++++++++++++++++++++ meta-oe/recipes-support/atop/atop_2.2.3.bb | 1 + 2 files changed, 98 insertions(+) create mode 100644 meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch new file +97 -0
@@ -0,0 +1,97 @@ +From 7b651793269b6b86f12c43c30b751b86def27222 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 18 Mar 2017 17:56:40 -0700 +Subject: [PATCH] include missing header files + +fixes build with musl + +Signed-off-by: Khem Raj <[email protected]> +--- + deviate.c | 1 + + procdbase.c | 2 +- + showgeneric.c | 2 +- + showlinux.c | 2 +- + showprocs.c | 2 +- + showsys.c | 2 +- + 6 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/deviate.c b/deviate.c +index 7cf1b49..8e615af 100644 +--- a/deviate.c ++++ b/deviate.c +@@ -178,6 +178,7 @@ static const char rcsid[] = "$Id: deviate.c,v 1.45 2010/10/23 14:02:03 gerlof Ex + #include <stdio.h> + #include <errno.h> + #include <fcntl.h> ++#include <stdlib.h> + #include <unistd.h> + #include <limits.h> + #include <memory.h> +diff --git a/procdbase.c b/procdbase.c +index 9cab347..0487d26 100644 +--- a/procdbase.c ++++ b/procdbase.c +@@ -67,7 +67,7 @@ static const char rcsid[] = "$Id: procdbase.c,v 1.8 2010/04/23 12:19:35 gerlof E + #include <fcntl.h> + #include <unistd.h> + #include <string.h> +-#include <malloc.h> ++#include <stdlib.h> + + #include "atop.h" + #include "photoproc.h" +diff --git a/showgeneric.c b/showgeneric.c +index 775afa8..3d5be0e 100644 +--- a/showgeneric.c ++++ b/showgeneric.c +@@ -268,7 +268,7 @@ static const char rcsid[] = "$Id: showgeneric.c,v 1.71 2010/10/25 19:08:32 gerlo + #include <errno.h> + #include <fcntl.h> + #include <string.h> +-#include <termio.h> ++#include <termios.h> + #include <unistd.h> + #include <stdarg.h> + #include <curses.h> +diff --git a/showlinux.c b/showlinux.c +index 6e60754..aba2ee6 100644 +--- a/showlinux.c ++++ b/showlinux.c +@@ -274,7 +274,7 @@ static const char rcsid[] = "$Id: showlinux.c,v 1.70 2010/10/23 14:04:12 gerlof + #include <string.h> + #include <errno.h> + #include <fcntl.h> +-#include <termio.h> ++#include <termios.h> + #include <unistd.h> + #include <stdarg.h> + #include <curses.h> +diff --git a/showprocs.c b/showprocs.c +index 5194524..f0169ad 100644 +--- a/showprocs.c ++++ b/showprocs.c +@@ -94,7 +94,7 @@ static const char rcsid[] = "$Id: showprocs.c,v 1.15 2011/09/05 11:44:16 gerlof + #include <string.h> + #include <errno.h> + #include <fcntl.h> +-#include <termio.h> ++#include <termios.h> + #include <unistd.h> + #include <stdarg.h> + #include <curses.h> +diff --git a/showsys.c b/showsys.c +index 26331be..5a05fe5 100644 +--- a/showsys.c ++++ b/showsys.c +@@ -80,7 +80,7 @@ static const char rcsid[] = "XXXXXX"; + #include <string.h> + #include <errno.h> + #include <fcntl.h> +-#include <termio.h> ++#include <termios.h> + #include <unistd.h> + #include <stdarg.h> + #include <curses.h> +-- +2.12.0 +
meta-oe/recipes-support/atop/atop_2.2.3.bb +1 -0
@@ -20,6 +20,7 @@ ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}" SRC_URI = " \ http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ + file://0001-include-missing-header-files.patch \ file://remove-bashisms.patch \ file://fix-permissions.patch \ file://sysvinit-implement-status.patch \
Signature · 1 line
2.12.0
PATCH 9/10 python-slip-dbus: Update SRC_URI to github
In reply to Khem Raj--- meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb +1 -1
@@ -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
Signature · 1 line
2.12.0
PATCH 10/10 alsa-equal: Update SRC_URI to something valid
In reply to Khem Rajwww.thedigitalmachine.net has disappeared
--- meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb +2 -2
@@ -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 \
Signature · 1 line
2.12.0