diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support')
137 files changed, 3399 insertions, 6905 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb b/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.0.bb index 2b8676fef..748d19698 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.0.bb @@ -6,7 +6,7 @@ DEPENDS = "apr expat gdbm" BBCLASSEXTEND = "native nativesdk" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=158aa0b1efe0c12f23d4b007ddb9a5db \ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ @@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "866825c04da827c6e5f53daff5569f42" -SRC_URI[sha256sum] = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19" +SRC_URI[md5sum] = "3b03dbff60728a4f4c33f5d929e8b35a" +SRC_URI[sha256sum] = "483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch index 12371428f..c5e92acee 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch @@ -27,6 +27,8 @@ The same for the following hardcoded types for cross compiling: Change the above correspondingly. Signed-off-by: Dengke Du <dengke.du@windriver.com> + +Upstream-Status: Pending --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.2.bb index 992b561fb..e2eed53c9 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.2.bb @@ -21,8 +21,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ " -SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" -SRC_URI[sha256sum] = "7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a" +SRC_URI[md5sum] = "e81a851967c79b5ce9bfbc909e4bf735" +SRC_URI[sha256sum] = "09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd" inherit autotools-brokensep lib_package binconfig multilib_header ptest diff --git a/import-layers/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/import-layers/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb index bd0cfdfe4..21bbcab3d 100644 --- a/import-layers/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb @@ -19,6 +19,9 @@ inherit autotools CFLAGS += "-fPIC -U__OPTIMIZE__" +RDEPENDS_${PN}-dev = "" +RDEPENDS_${PN}-staticdev = "" + do_install() { install -D -m 0644 ${B}/libargp.a ${D}${libdir}/libargp.a install -D -m 0644 ${S}/argp.h ${D}${includedir}/argp.h diff --git a/import-layers/yocto-poky/meta/recipes-support/aspell/aspell/gcc7.patch b/import-layers/yocto-poky/meta/recipes-support/aspell/aspell/gcc7.patch new file mode 100644 index 000000000..6ffd0772f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/aspell/aspell/gcc7.patch @@ -0,0 +1,40 @@ +From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001 +From: Kevin Atkinson <kevina@gnu.org> +Date: Thu, 29 Dec 2016 00:50:31 -0500 +Subject: [PATCH] Compile Fixes for GCC 7. + +Closes #519. +--- +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport + + modules/filter/tex.cpp | 2 +- + prog/check_funs.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index a979539..19ab63c 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -174,7 +174,7 @@ namespace { + + if (c == '{') { + +- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') ++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') + push_command(Parm); + + top.in_what = Parm; +diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp +index db54f3d..89ee09d 100644 +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); diff --git a/import-layers/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/import-layers/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb index 5a23754b7..19a7155d6 100644 --- a/import-layers/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" PR = "r1" -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ + file://gcc7.patch \ + " SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7" SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.22.0.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb index 58edb6e1b..4a0e41149 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.22.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb @@ -1,12 +1,13 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "aa62aed21b8e03dc44ab81ae49d893ca" -SRC_URI[sha256sum] = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1" +SRC_URI[md5sum] = "79388fbc4dc7f27394556dd389aeb594" +SRC_URI[sha256sum] = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.22.0.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb index 272849e34..1687ae341 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.22.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb @@ -1,4 +1,5 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" @@ -9,8 +10,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-build-Add-with-systemduserunitdir.patch \ " -SRC_URI[md5sum] = "3da5fe62a653e49dad1c47f9a46fee56" -SRC_URI[sha256sum] = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a" +SRC_URI[md5sum] = "61d0a471e693292934a73f288ebff35c" +SRC_URI[sha256sum] = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b" DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.22.0.bb b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb index bc80f9535..d62319c1f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.22.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "c7f2adcf75e4058727174cde970e9129" -SRC_URI[archive.sha256sum] = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6" +SRC_URI[archive.md5sum] = "3747a80089dfa3c0bbcf21adfff9968b" +SRC_URI[archive.sha256sum] = "bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49" BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch index cd4510c0b..e64990ad5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch +++ b/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch @@ -1,6 +1,9 @@ +From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001 +From: Peter Seebach <peter.seebach@windriver.com> +Date: Wed, 11 May 2016 15:16:06 -0500 +Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited + commit c45bae84817a70fef6c2b661a07a492a0d23ae85 -Author: Peter Seebach <peter.seebach@windriver.com> -Date: Wed May 11 15:16:06 2016 -0500 Fix permissions on temporary directory @@ -10,6 +13,13 @@ Date: Wed May 11 15:16:06 2016 -0500 Signed-off-by: Peter Seebach <peter.seebach@windriver.com> +Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ] + +Signed-off-by: Dengke Du <dengke.du@windriver.com> +--- + test/root/permissions.test | 1 + + 1 file changed, 1 insertion(+) + diff --git a/test/root/permissions.test b/test/root/permissions.test index 42615f5..098b52a 100644 --- a/test/root/permissions.test @@ -22,3 +32,6 @@ index 42615f5..098b52a 100644 $ mkdir d $ cd d $ umask 027 +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb b/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb index 306c7b5cd..8f3dc45cf 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb +++ b/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb @@ -43,6 +43,11 @@ do_install_ptest() { tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) mkdir ${D}${PTEST_PATH}/include cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ + # Remove any build host references + sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -i ${D}${PTEST_PATH}/include/builddefs } RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr.inc b/import-layers/yocto-poky/meta/recipes-support/attr/attr.inc index e8b5d054b..24ef5adfd 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/attr.inc +++ b/import-layers/yocto-poky/meta/recipes-support/attr/attr.inc @@ -32,6 +32,12 @@ do_install_ptest() { do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ done sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile + + # Remove any build host references + sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -i ${D}${PTEST_PATH}/include/builddefs } RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/import-layers/yocto-poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch new file mode 100644 index 000000000..dcd6507bc --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch @@ -0,0 +1,69 @@ +From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001 +From: Felix Janda <felix.janda@posteo.de> +Date: Tue, 12 Jan 2016 22:20:33 +0100 +Subject: [PATCH] Use stdint types consistently + +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + include/attributes.h | 6 ++++-- + man/man3/attr_list.3 | 8 ++++---- + 2 files changed, 8 insertions(+), 6 deletions(-) + +Index: attr-2.4.47/include/attributes.h +=================================================================== +--- attr-2.4.47.orig/include/attributes.h ++++ attr-2.4.47/include/attributes.h +@@ -22,6 +22,7 @@ + extern "C" { + #endif + ++#include <stdint.h> + /* + * An almost-IRIX-compatible extended attributes API + * (the IRIX attribute "list" operation is missing, added ATTR_SECURE). +@@ -69,7 +70,7 @@ typedef struct attrlist { + * al_offset[i] entry points to. + */ + typedef struct attrlist_ent { /* data from attr_list() */ +- u_int32_t a_valuelen; /* number bytes in value of attr */ ++ uint32_t a_valuelen; /* number bytes in value of attr */ + char a_name[1]; /* attr name (NULL terminated) */ + } attrlist_ent_t; + +@@ -90,7 +91,7 @@ typedef struct attrlist_ent { /* data fr + * operation on a cursor is to bzero() it. + */ + typedef struct attrlist_cursor { +- u_int32_t opaque[4]; /* an opaque cookie */ ++ uint32_t opaque[4]; /* an opaque cookie */ + } attrlist_cursor_t; + + /* +Index: attr-2.4.47/man/man3/attr_list.3 +=================================================================== +--- attr-2.4.47.orig/man/man3/attr_list.3 ++++ attr-2.4.47/man/man3/attr_list.3 +@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru + .nf + .ft 4 + .ta 9n 22n +-__int32_t al_count; /\(** number of entries in attrlist \(**/ +-__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ +-__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ ++int32_t al_count; /\(** number of entries in attrlist \(**/ ++int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ ++int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ + .ft 1 + .fi + .RE +@@ -113,7 +113,7 @@ include the following members: + .nf + .ft 4 + .ta 9n 22n +-u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/ ++uint32_t a_valuelen; /\(** number bytes in value of attr \(**/ + char a_name[]; /\(** attr name (NULL terminated) \(**/ + .ft 1 + .fi diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb b/import-layers/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb index 556c8e43e..fc88bef83 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb +++ b/import-layers/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb @@ -4,6 +4,9 @@ require attr.inc # future releases of attr, remove this when updating the recipe. SRC_URI += "file://attr-Missing-configure.ac.patch \ file://dont-use-decl-macros.patch \ + file://Remove-the-section-2-man-pages.patch \ + file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \ + file://0001-Use-stdint-types-consistently.patch \ " SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc b/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc index c587b3cac..e6f4c72e8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc +++ b/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc @@ -47,6 +47,3 @@ PACKAGES =+ "lib${BPN}" FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" BBCLASSEXTEND = "native" -# Only append ldflags for target recipe and if USE_NLS is enabled -LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}" -EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch b/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch new file mode 100644 index 000000000..d5ab83d7c --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch @@ -0,0 +1,240 @@ +From 6047c8522b91235ad1e835f44f5e36472d9d49b2 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com> +Date: Wed, 22 Apr 2015 11:46:59 +0200 +Subject: [PATCH 2/2] Remove the attr.5 man page (moved to man-pages) + +Commit dce9b4448c7f2b22bd206cd068fb05cb2f3255b9 from +https://git.savannah.nongnu.org/git/attr.git + +The attr.5 page is part of the extended attribute system call documentation, +which has been moved into the man-pages package. Move the attr.5 page there +as well. + +Upstream-Status: Backport + +[MA: updated to apply directly to v2.4.47] +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + man/Makefile | 2 +- + man/man5/Makefile | 35 ------------- + man/man5/attr.5 | 153 ------------------------------------------------------ + 3 files changed, 1 insertion(+), 189 deletions(-) + delete mode 100644 man/man5/Makefile + delete mode 100644 man/man5/attr.5 + +diff --git a/man/Makefile b/man/Makefile +index 755daed..9301f09 100644 +--- a/man/Makefile ++++ b/man/Makefile +@@ -19,7 +19,7 @@ + TOPDIR = .. + include $(TOPDIR)/include/builddefs + +-SUBDIRS = man1 man3 man5 ++SUBDIRS = man1 man3 + + default : $(SUBDIRS) + +diff --git a/man/man5/Makefile b/man/man5/Makefile +deleted file mode 100644 +index 6b70d3d..0000000 +--- a/man/man5/Makefile ++++ /dev/null +@@ -1,35 +0,0 @@ +-# +-# Copyright (c) 2000, 2002 Silicon Graphics, Inc. All Rights Reserved. +-# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> +-# +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of the GNU General Public License as published by +-# the Free Software Foundation, either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program. If not, see <http://www.gnu.org/licenses/>. +-# +- +-TOPDIR = ../.. +-include $(TOPDIR)/include/builddefs +- +-MAN_SECTION = 5 +- +-MAN_PAGES = $(shell echo *.$(MAN_SECTION)) +-MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) +-LSRCFILES = $(MAN_PAGES) +- +-default : $(MAN_PAGES) +- +-include $(BUILDRULES) +- +-install : default +- $(INSTALL) -m 755 -d $(MAN_DEST) +- $(INSTALL_MAN) +-install-dev install-lib: +diff --git a/man/man5/attr.5 b/man/man5/attr.5 +deleted file mode 100644 +index a02757d..0000000 +--- a/man/man5/attr.5 ++++ /dev/null +@@ -1,153 +0,0 @@ +-.\" Extended attributes manual page +-.\" +-.\" Copyright (C) 2000, 2002, 2007 Andreas Gruenbacher <agruen@suse.de> +-.\" Copyright (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc. +-.\" All rights reserved. +-.\" +-.\" This is free documentation; you can redistribute it and/or +-.\" modify it under the terms of the GNU General Public License as +-.\" published by the Free Software Foundation; either version 2 of +-.\" the License, or (at your option) any later version. +-.\" +-.\" The GNU General Public License's references to "object code" +-.\" and "executables" are to be interpreted as the output of any +-.\" document formatting or typesetting system, including +-.\" intermediate and printed output. +-.\" +-.\" This manual is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public +-.\" License along with this manual. If not, see +-.\" <http://www.gnu.org/licenses/>. +-.\" +-.TH ATTR 5 +-.SH NAME +-attr - Extended attributes +-.SH DESCRIPTION +-Extended attributes are name:value pairs associated permanently with +-files and directories, similar to the environment strings associated +-with a process. +-An attribute may be defined or undefined. +-If it is defined, its value may be empty or non-empty. +-.PP +-Extended attributes are extensions to the normal attributes which are +-associated with all inodes in the system (i.e. the +-.BR stat (2) +-data). +-They are often used to provide additional functionality +-to a filesystem \- for example, additional security features such as +-Access Control Lists (ACLs) may be implemented using extended attributes. +-.PP +-Users with search access to a file or directory may retrieve a list of +-attribute names defined for that file or directory. +-.PP +-Extended attributes are accessed as atomic objects. +-Reading retrieves the whole value of an attribute and stores it in a buffer. +-Writing replaces any previous value with the new value. +-.PP +-Space consumed for extended attributes is counted towards the disk quotas +-of the file owner and file group. +-.PP +-Currently, support for extended attributes is implemented on Linux by the +-ext2, ext3, ext4, XFS, JFS and reiserfs filesystems. +-.SH EXTENDED ATTRIBUTE NAMESPACES +-Attribute names are zero-terminated strings. +-The attribute name is always specified in the fully qualified +-.IR namespace.attribute +-form, eg. +-.IR user.mime_type , +-.IR trusted.md5sum , +-.IR system.posix_acl_access , +-or +-.IR security.selinux . +-.PP +-The namespace mechanism is used to define different classes of extended +-attributes. +-These different classes exist for several reasons, e.g. the permissions +-and capabilities required for manipulating extended attributes of one +-namespace may differ to another. +-.PP +-Currently the +-.IR security , +-.IR system , +-.IR trusted , +-and +-.IR user +-extended attribute classes are defined as described below. Additional +-classes may be added in the future. +-.SS Extended security attributes +-The security attribute namespace is used by kernel security modules, +-such as Security Enhanced Linux. +-Read and write access permissions to security attributes depend on the +-policy implemented for each security attribute by the security module. +-When no security module is loaded, all processes have read access to +-extended security attributes, and write access is limited to processes +-that have the CAP_SYS_ADMIN capability. +-.SS Extended system attributes +-Extended system attributes are used by the kernel to store system +-objects such as Access Control Lists and Capabilities. Read and write +-access permissions to system attributes depend on the policy implemented +-for each system attribute implemented by filesystems in the kernel. +-.SS Trusted extended attributes +-Trusted extended attributes are visible and accessible only to processes that +-have the CAP_SYS_ADMIN capability (the super user usually has this +-capability). +-Attributes in this class are used to implement mechanisms in user +-space (i.e., outside the kernel) which keep information in extended attributes +-to which ordinary processes should not have access. +-.SS Extended user attributes +-Extended user attributes may be assigned to files and directories for +-storing arbitrary additional information such as the mime type, +-character set or encoding of a file. The access permissions for user +-attributes are defined by the file permission bits. +-.PP +-The file permission bits of regular files and directories are +-interpreted differently from the file permission bits of special files +-and symbolic links. For regular files and directories the file +-permission bits define access to the file's contents, while for device special +-files they define access to the device described by the special file. +-The file permissions of symbolic links are not used in access +-checks. These differences would allow users to consume filesystem resources in +-a way not controllable by disk quotas for group or world writable special files and directories. +-.PP +-For this reason, extended user attributes are only allowed for regular files and directories, and access to extended user attributes is restricted to the +-owner and to users with appropriate capabilities for directories with the +-sticky bit set (see the +-.BR chmod (1) +-manual page for an explanation of Sticky Directories). +-.SH FILESYSTEM DIFFERENCES +-The kernel and the filesystem may place limits on the maximum number +-and size of extended attributes that can be associated with a file. +-Some file systems, such as ext2/3 and reiserfs, require the filesystem +-to be mounted with the +-.B user_xattr +-mount option in order for extended user attributes to be used. +-.PP +-In the current ext2, ext3 and ext4 filesystem implementations, each +-extended attribute must fit on a single filesystem block (1024, 2048 +-or 4096 bytes, depending on the block size specified when the +-filesystem was created). +-.PP +-In the XFS and reiserfs filesystem implementations, there is no +-practical limit on the number or size of extended attributes +-associated with a file, and the algorithms used to store extended +-attribute information on disk are scalable. +-.PP +-In the JFS filesystem implementation, names can be up to 255 bytes and +-values up to 65,535 bytes. +-.SH ADDITIONAL NOTES +-Since the filesystems on which extended attributes are stored might also +-be used on architectures with a different byte order and machine word +-size, care should be taken to store attribute values in an architecture +-independent format. +-.SH AUTHORS +-Andreas Gruenbacher, +-.RI < a.gruenbacher@bestbits.at > +-and the SGI XFS development team, +-.RI < linux-xfs@oss.sgi.com >. +-.SH SEE ALSO +-getfattr(1), +-setfattr(1). +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch b/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch new file mode 100644 index 000000000..044c5a037 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch @@ -0,0 +1,666 @@ +From b972600a26f3a930e53e2fce2625266a5d29813e Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com> +Date: Tue, 14 Apr 2015 23:53:11 +0200 +Subject: [PATCH 1/2] Remove the section 2 man pages + +Commit 8d1263bca95722d66a6f8e83450f49d0956ea534 from upstream +https://git.savannah.nongnu.org/git/attr.git/ + +The section 2 man pages have long since been added to the man-pages package +which documents all system calls; they were disabled in attr by default since +January 2014. Get rid of them here. + +Upstream-Status: Backport + +[MA: modified to apply directly to v2.4.47] +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + man/Makefile | 2 +- + man/man2/Makefile | 35 ----------- + man/man2/getxattr.2 | 143 -------------------------------------------- + man/man2/listxattr.2 | 158 ------------------------------------------------- + man/man2/removexattr.2 | 111 ---------------------------------- + man/man2/setxattr.2 | 143 -------------------------------------------- + 6 files changed, 1 insertion(+), 591 deletions(-) + delete mode 100644 man/man2/Makefile + delete mode 100644 man/man2/getxattr.2 + delete mode 100644 man/man2/listxattr.2 + delete mode 100644 man/man2/removexattr.2 + delete mode 100644 man/man2/setxattr.2 + +diff --git a/man/Makefile b/man/Makefile +index 9535426..755daed 100644 +--- a/man/Makefile ++++ b/man/Makefile +@@ -19,7 +19,7 @@ + TOPDIR = .. + include $(TOPDIR)/include/builddefs + +-SUBDIRS = man1 man2 man3 man5 ++SUBDIRS = man1 man3 man5 + + default : $(SUBDIRS) + +diff --git a/man/man2/Makefile b/man/man2/Makefile +deleted file mode 100644 +index d77309d..0000000 +--- a/man/man2/Makefile ++++ /dev/null +@@ -1,35 +0,0 @@ +-# +-# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. +-# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> +-# +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of the GNU General Public License as published by +-# the Free Software Foundation, either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program. If not, see <http://www.gnu.org/licenses/>. +-# +- +-TOPDIR = ../.. +-include $(TOPDIR)/include/builddefs +- +-MAN_SECTION = 2 +- +-MAN_PAGES = $(shell echo *.$(MAN_SECTION)) +-MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) +-LSRCFILES = $(MAN_PAGES) +- +-default install : $(MAN_PAGES) +- +-include $(BUILDRULES) +- +-install-dev : default +- $(INSTALL) -m 755 -d $(MAN_DEST) +- $(INSTALL_MAN) +-install-lib: +diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2 +deleted file mode 100644 +index 405ad89..0000000 +--- a/man/man2/getxattr.2 ++++ /dev/null +@@ -1,143 +0,0 @@ +-.\" +-.\" Extended attributes system calls manual pages +-.\" +-.\" (C) Andreas Gruenbacher, February 2001 +-.\" (C) Silicon Graphics Inc, September 2001 +-.\" +-.\" This is free documentation; you can redistribute it and/or +-.\" modify it under the terms of the GNU General Public License as +-.\" published by the Free Software Foundation; either version 2 of +-.\" the License, or (at your option) any later version. +-.\" +-.\" The GNU General Public License's references to "object code" +-.\" and "executables" are to be interpreted as the output of any +-.\" document formatting or typesetting system, including +-.\" intermediate and printed output. +-.\" +-.\" This manual is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public +-.\" License along with this manual. If not, see +-.\" <http://www.gnu.org/licenses/>. +-.\" +-.TH GETXATTR 2 "Extended Attributes" "Dec 2001" "System calls" +-.SH NAME +-getxattr, lgetxattr, fgetxattr \- retrieve an extended attribute value +-.SH SYNOPSIS +-.fam C +-.nf +-.B #include <sys/types.h> +-.B #include <attr/xattr.h> +-.sp +-.BI "ssize_t getxattr (const char\ *" path ", const char\ *" name ", +-.BI "\t\t\t\t void\ *" value ", size_t " size ); +-.BI "ssize_t lgetxattr (const char\ *" path ", const char\ *" name ", +-.BI "\t\t\t\t void\ *" value ", size_t " size ); +-.BI "ssize_t fgetxattr (int " filedes ", const char\ *" name ", +-.BI "\t\t\t\t void\ *" value ", size_t " size ); +-.fi +-.fam T +-.SH DESCRIPTION +-Extended attributes are +-.IR name :\c +-.I value +-pairs associated with inodes (files, directories, symlinks, etc). +-They are extensions to the normal attributes which are associated +-with all inodes in the system (i.e. the +-.BR stat (2) +-data). +-A complete overview of extended attributes concepts can be found in +-.BR attr (5). +-.PP +-.B getxattr +-retrieves the +-.I value +-of the extended attribute identified by +-.I name +-and associated with the given +-.I path +-in the filesystem. +-The length of the attribute +-.I value +-is returned. +-.PP +-.B lgetxattr +-is identical to +-.BR getxattr , +-except in the case of a symbolic link, where the link itself is +-interrogated, not the file that it refers to. +-.PP +-.B fgetxattr +-is identical to +-.BR getxattr , +-only the open file pointed to by +-.I filedes +-(as returned by +-.BR open (2)) +-is interrogated in place of +-.IR path . +-.PP +-An extended attribute +-.I name +-is a simple NULL-terminated string. +-The name includes a namespace prefix \- there may be several, disjoint +-namespaces associated with an individual inode. +-The value of an extended attribute is a chunk of arbitrary textual or +-binary data of specified length. +-.PP +-An empty buffer of +-.I size +-zero can be passed into these calls to return the current size of the +-named extended attribute, which can be used to estimate the size of a +-buffer which is sufficiently large to hold the value associated with +-the extended attribute. +-.PP +-The interface is designed to allow guessing of initial buffer +-sizes, and to enlarge buffers when the return value indicates +-that the buffer provided was too small. +-.SH RETURN VALUE +-On success, a positive number is returned indicating the size of the +-extended attribute value. +-On failure, \-1 is returned and +-.I errno +-is set appropriately. +-.PP +-If the named attribute does not exist, or the process has no access to +-this attribute, +-.I errno +-is set to ENOATTR. +-.PP +-If the +-.I size +-of the +-.I value +-buffer is too small to hold the result, +-.I errno +-is set to ERANGE. +-.PP +-If extended attributes are not supported by the filesystem, or are disabled, +-.I errno +-is set to ENOTSUP. +-.PP +-The errors documented for the +-.BR stat (2) +-system call are also applicable here. +-.SH AUTHORS +-Andreas Gruenbacher, +-.RI < a.gruenbacher@bestbits.at > +-and the SGI XFS development team, +-.RI < linux-xfs@oss.sgi.com >. +-Please send any bug reports or comments to these addresses. +-.SH SEE ALSO +-.BR getfattr (1), +-.BR setfattr (1), +-.BR open (2), +-.BR stat (2), +-.BR setxattr (2), +-.BR listxattr (2), +-.BR removexattr (2), +-and +-.BR attr (5). +diff --git a/man/man2/listxattr.2 b/man/man2/listxattr.2 +deleted file mode 100644 +index 8b4371c..0000000 +--- a/man/man2/listxattr.2 ++++ /dev/null +@@ -1,158 +0,0 @@ +-.\" +-.\" Extended attributes system calls manual pages +-.\" +-.\" (C) Andreas Gruenbacher, February 2001 +-.\" (C) Silicon Graphics Inc, September 2001 +-.\" +-.\" This is free documentation; you can redistribute it and/or +-.\" modify it under the terms of the GNU General Public License as +-.\" published by the Free Software Foundation; either version 2 of +-.\" the License, or (at your option) any later version. +-.\" +-.\" The GNU General Public License's references to "object code" +-.\" and "executables" are to be interpreted as the output of any +-.\" document formatting or typesetting system, including +-.\" intermediate and printed output. +-.\" +-.\" This manual is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public +-.\" License along with this manual. If not, see +-.\" <http://www.gnu.org/licenses/>. +-.\" +-.TH LISTXATTR 2 "Extended Attributes" "Dec 2001" "System calls" +-.SH NAME +-listxattr, llistxattr, flistxattr \- list extended attribute names +-.SH SYNOPSIS +-.fam C +-.nf +-.B #include <sys/types.h> +-.B #include <attr/xattr.h> +-.sp +-.BI "ssize_t listxattr (const char\ *" path ", +-.BI "\t\t\t\t char\ *" list ", size_t " size ); +-.BI "ssize_t llistxattr (const char\ *" path ", +-.BI "\t\t\t\t char\ *" list ", size_t " size ); +-.BI "ssize_t flistxattr (int " filedes ", +-.BI "\t\t\t\t char\ *" list ", size_t " size ); +-.fi +-.fam T +-.SH DESCRIPTION +-Extended attributes are name:value +-pairs associated with inodes (files, directories, symlinks, etc). +-They are extensions to the normal attributes which are associated +-with all inodes in the system (i.e. the +-.BR stat (2) +-data). +-A complete overview of extended attributes concepts can be found in +-.BR attr (5). +-.PP +-.B listxattr +-retrieves the +-.I list +-of extended attribute names associated with the given +-.I path +-in the filesystem. +-The list is the set of (NULL-terminated) names, one after the other. +-Names of extended attributes to which the calling process does not +-have access may be omitted from the list. +-The length of the attribute name +-.I list +-is returned. +-.PP +-.B llistxattr +-is identical to +-.BR listxattr , +-except in the case of a symbolic link, where the list of names of +-extended attributes associated with the link itself is retrieved, +-not the file that it refers to. +-.I list +-is a caller-allocated buffer of size +-.IR size . +-.PP +-.B flistxattr +-is identical to +-.BR listxattr , +-only the open file pointed to by +-.I filedes +-(as returned by +-.BR open (2)) +-is interrogated in place of +-.IR path . +-.PP +-A single extended attribute +-.I name +-is a simple NULL-terminated string. +-The name includes a namespace prefix \- there may be several, disjoint +-namespaces associated with an individual inode. +-.PP +-An empty buffer of +-.I size +-zero can be passed into these calls to return the current size of the +-list of extended attribute names, which can be used to estimate the +-size of a buffer which is sufficiently large to hold the list of names. +-.SH EXAMPLES +-The +-.I list +-of names is returned as an unordered array of NULL-terminated character +-strings (attribute names are separated by NULL characters), like this: +-.fam C +-.RS +-.nf +-user.name1\\0system.name1\\0user.name2\\0 +-.fi +-.RE +-.fam T +-.P +-Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using +-extended attributes, might return a +-.I list +-like this: +-.fam C +-.RS +-.nf +-system.posix_acl_access\\0system.posix_acl_default\\0 +-.fi +-.RE +-.fam T +-.SH RETURN VALUE +-On success, a positive number is returned indicating the size of the +-extended attribute name list. +-On failure, \-1 is returned and +-.I errno +-is set appropriately. +-.PP +-If the +-.I size +-of the +-.I list +-buffer is too small to hold the result, +-.I errno +-is set to ERANGE. +-.PP +-If extended attributes are not supported by the filesystem, or are disabled, +-.I errno +-is set to ENOTSUP. +-.PP +-The errors documented for the +-.BR stat (2) +-system call are also applicable here. +-.SH AUTHORS +-Andreas Gruenbacher, +-.RI < a.gruenbacher@bestbits.at > +-and the SGI XFS development team, +-.RI < linux-xfs@oss.sgi.com >. +-Please send any bug reports or comments to these addresses. +-.SH SEE ALSO +-.BR getfattr (1), +-.BR setfattr (1), +-.BR open (2), +-.BR stat (2), +-.BR getxattr (2), +-.BR setxattr (2), +-.BR removexattr (2), +-and +-.BR attr (5). +diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2 +deleted file mode 100644 +index 2c7d934..0000000 +--- a/man/man2/removexattr.2 ++++ /dev/null +@@ -1,111 +0,0 @@ +-.\" +-.\" Extended attributes system calls manual pages +-.\" +-.\" (C) Andreas Gruenbacher, February 2001 +-.\" (C) Silicon Graphics Inc, September 2001 +-.\" +-.\" This is free documentation; you can redistribute it and/or +-.\" modify it under the terms of the GNU General Public License as +-.\" published by the Free Software Foundation; either version 2 of +-.\" the License, or (at your option) any later version. +-.\" +-.\" The GNU General Public License's references to "object code" +-.\" and "executables" are to be interpreted as the output of any +-.\" document formatting or typesetting system, including +-.\" intermediate and printed output. +-.\" +-.\" This manual is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public +-.\" License along with this manual. If not, see +-.\" <http://www.gnu.org/licenses/>. +-.\" +-.TH REMOVEXATTR 2 "Extended Attributes" "Dec 2001" "System calls" +-.SH NAME +-removexattr, lremovexattr, fremovexattr \- remove an extended attribute +-.SH SYNOPSIS +-.fam C +-.nf +-.B #include <sys/types.h> +-.B #include <attr/xattr.h> +-.sp +-.BI "int removexattr (const char\ *" path ", const char\ *" name ); +-.BI "int lremovexattr (const char\ *" path ", const char\ *" name ); +-.BI "int fremovexattr (int " filedes ", const char\ *" name ); +-.fi +-.fam T +-.SH DESCRIPTION +-Extended attributes are +-.IR name :\c +-value pairs associated with inodes (files, directories, symlinks, etc). +-They are extensions to the normal attributes which are associated +-with all inodes in the system (i.e. the +-.BR stat (2) +-data). +-A complete overview of extended attributes concepts can be found in +-.BR attr (5). +-.PP +-.B removexattr +-removes the extended attribute identified by +-.I name +-and associated with the given +-.I path +-in the filesystem. +-.PP +-.B lremovexattr +-is identical to +-.BR removexattr , +-except in the case of a symbolic link, where the extended attribute is +-removed from the link itself, not the file that it refers to. +-.PP +-.B fremovexattr +-is identical to +-.BR removexattr , +-only the extended attribute is removed from the open file pointed to by +-.I filedes +-(as returned by +-.BR open (2)) +-in place of +-.IR path . +-.PP +-An extended attribute name is a simple NULL-terminated string. +-The +-.I name +-includes a namespace prefix \- there may be several, disjoint +-namespaces associated with an individual inode. +-.SH RETURN VALUE +-On success, zero is returned. +-On failure, \-1 is returned and +-.I errno +-is set appropriately. +-.PP +-If the named attribute does not exist, +-.I errno +-is set to ENOATTR. +-.PP +-If extended attributes are not supported by the filesystem, or are disabled, +-.I errno +-is set to ENOTSUP. +-.PP +-The errors documented for the +-.BR stat (2) +-system call are also applicable here. +-.SH AUTHORS +-Andreas Gruenbacher, +-.RI < a.gruenbacher@bestbits.at > +-and the SGI XFS development team, +-.RI < linux-xfs@oss.sgi.com >. +-Please send any bug reports or comments to these addresses. +-.SH SEE ALSO +-.BR getfattr (1), +-.BR setfattr (1), +-.BR open (2), +-.BR stat (2), +-.BR setxattr (2), +-.BR getxattr (2), +-.BR listxattr (2), +-and +-.BR attr (5). +diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2 +deleted file mode 100644 +index b20dc9f..0000000 +--- a/man/man2/setxattr.2 ++++ /dev/null +@@ -1,143 +0,0 @@ +-.\" +-.\" Extended attributes system calls manual pages +-.\" +-.\" (C) Andreas Gruenbacher, February 2001 +-.\" (C) Silicon Graphics Inc, September 2001 +-.\" +-.\" This is free documentation; you can redistribute it and/or +-.\" modify it under the terms of the GNU General Public License as +-.\" published by the Free Software Foundation; either version 2 of +-.\" the License, or (at your option) any later version. +-.\" +-.\" The GNU General Public License's references to "object code" +-.\" and "executables" are to be interpreted as the output of any +-.\" document formatting or typesetting system, including +-.\" intermediate and printed output. +-.\" +-.\" This manual is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public +-.\" License along with this manual. If not, see +-.\" <http://www.gnu.org/licenses/>. +-.\" +-.TH SETXATTR 2 "Extended Attributes" "Dec 2001" "System calls" +-.SH NAME +-setxattr, lsetxattr, fsetxattr \- set an extended attribute value +-.SH SYNOPSIS +-.fam C +-.nf +-.B #include <sys/types.h> +-.B #include <attr/xattr.h> +-.sp +-.BI "int setxattr (const char\ *" path ", const char\ *" name ", +-.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); +-.BI "int lsetxattr (const char\ *" path ", const char\ *" name ", +-.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); +-.BI "int fsetxattr (int " filedes ", const char\ *" name ", +-.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); +-.fi +-.fam T +-.SH DESCRIPTION +-Extended attributes are +-.IR name :\c +-.I value +-pairs associated with inodes (files, directories, symlinks, etc). +-They are extensions to the normal attributes which are associated +-with all inodes in the system (i.e. the +-.BR stat (2) +-data). +-A complete overview of extended attributes concepts can be found in +-.BR attr (5). +-.PP +-.B setxattr +-sets the +-.I value +-of the extended attribute identified by +-.I name +-and associated with the given +-.I path +-in the filesystem. +-The +-.I size +-of the +-.I value +-must be specified. +-.PP +-.B lsetxattr +-is identical to +-.BR setxattr , +-except in the case of a symbolic link, where the extended attribute is +-set on the link itself, not the file that it refers to. +-.PP +-.B fsetxattr +-is identical to +-.BR setxattr , +-only the extended attribute is set on the open file pointed to by +-.I filedes +-(as returned by +-.BR open (2)) +-in place of +-.IR path . +-.PP +-An extended attribute name is a simple NULL-terminated string. +-The +-.I name +-includes a namespace prefix \- there may be several, disjoint +-namespaces associated with an individual inode. +-The +-.I value +-of an extended attribute is a chunk of arbitrary textual or +-binary data of specified length. +-.PP +-The +-.I flags +-parameter can be used to refine the semantics of the operation. +-XATTR_CREATE specifies a pure create, which fails if the named +-attribute exists already. +-XATTR_REPLACE specifies a pure replace operation, which fails if the +-named attribute does not already exist. +-By default (no flags), the extended attribute will be created if +-need be, or will simply replace the value if the attribute exists. +-.SH RETURN VALUE +-On success, zero is returned. +-On failure, \-1 is returned and +-.I errno +-is set appropriately. +-.PP +-If XATTR_CREATE is specified, and the attribute exists already, +-.I errno +-is set to EEXIST. +-If XATTR_REPLACE is specified, and the attribute does not exist, +-.I errno +-is set to ENOATTR. +-.PP +-If there is insufficient space remaining to store the extended attribute, +-.I errno +-is set to either ENOSPC, or EDQUOT if quota enforcement was the cause. +-.PP +-If extended attributes are not supported by the filesystem, or are disabled, +-.I errno +-is set to ENOTSUP. +-.PP +-The errors documented for the +-.BR stat (2) +-system call are also applicable here. +-.SH AUTHORS +-Andreas Gruenbacher, +-.RI < a.gruenbacher@bestbits.at > +-and the SGI XFS development team, +-.RI < linux-xfs@oss.sgi.com >. +-Please send any bug reports or comments to these addresses. +-.SH SEE ALSO +-.BR getfattr (1), +-.BR setfattr (1), +-.BR open (2), +-.BR stat (2), +-.BR getxattr (2), +-.BR listxattr (2), +-.BR removexattr (2), +-and +-.BR attr (5). +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.5.bb b/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb index dd22857a7..f519b3f3d 100644 --- a/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb @@ -9,8 +9,8 @@ SECTION = "console/utils" SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "15300010bd4034de12c3fc4f171692e3" -SRC_URI[sha256sum] = "b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf" +SRC_URI[md5sum] = "28117492bdc9408438e6041683a423ce" +SRC_URI[sha256sum] = "41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e" UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar" UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases" @@ -25,7 +25,7 @@ do_install_append() { # Delete files already provided by util-linux local i - for i in mount umount; do + for i in mount umount rfkill; do rm ${D}${datadir}/${BPN}/completions/$i done } diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 8ef774f0f..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,29 +0,0 @@ -configure.ac: add check for NO_GETCONTEXT definition - -Signed-off-by: Samuel Martin <s.martin49@gmail.com> -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> -Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - ---- -Upstream-Status: Pending - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- bdwgc-7.2f.orig/configure.ac 2014-06-01 19:00:47.000000000 +0200 -+++ bdwgc-7.2f/configure.ac 2014-12-23 14:13:11.585716713 +0100 -@@ -365,6 +365,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch deleted file mode 100644 index 4a1849665..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add missing header to avoid: - -| 1472659610.016355: ../git/pthread_stop_world.c: In function 'GC_brief_async_signal_safe_sleep': -| 1472659610.0540252: ../git/pthread_stop_world.c:397:22: error: storage size of 'tv' isn't known -| 1472659610.0540252: struct timeval tv; -| 1472659610.0540252: ^~ -| 1472659610.054099: ../git/pthread_stop_world.c:397:22: warning: unused variable 'tv' [-Wunused-variable] -| 1472659610.054099: struct timeval tv; -| 1472659610.054099: ^~ -| 1472659610.054099: Makefile:1530: recipe for target 'pthread_stop_world.lo' failed - -in musl builds. - -Upstream-Status: Pending - -Index: git/pthread_stop_world.c -=================================================================== ---- git.orig/pthread_stop_world.c -+++ git/pthread_stop_world.c -@@ -45,6 +45,7 @@ - #include <semaphore.h> - #include <errno.h> - #include <unistd.h> -+#include <sys/time.h> - #include "atomic_ops.h" - - /* It's safe to call original pthread_sigmask() here. */ diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb deleted file mode 100644 index dcb68f028..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "A garbage collector for C and C++" - -DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ - used as a garbage collecting replacement for C malloc or C++ new. It allows\ - you to allocate memory basically as you normally would, without explicitly\ - deallocating memory that is no longer useful. The collector automatically\ - recycles memory when it determines that it can no longer be otherwise\ - accessed.\ - The collector is also used by a number of programming language\ - implementations that either use C as intermediate code, want to facilitate\ - easier interoperation with C libraries, or just prefer the simple collector\ - interface.\ - Alternatively, the garbage collector may be used as a leak detector for C\ - or C++ programs, though that is not its primary goal.\ - Empirically, this collector works with most unmodified C programs, simply\ - by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ - calls, and removing free calls." - -HOMEPAGE = "http://www.hboehm.info/gc/" -SECTION = "devel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3" - -SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa" -SRC_URI = "git://github.com/ivmai/bdwgc.git \ - file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ - file://musl_header_fix.patch \ - " - -FILES_${PN}-doc = "${datadir}" - -S = "${WORKDIR}/git" - -ARM_INSTRUCTION_SET = "arm" - -inherit autotools pkgconfig - -# by default use external libatomic-ops -PACKAGECONFIG ??= "libatomic-ops" -PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops" - -BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.2.bb b/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb index e10f5fd34..70b6e9134 100644 --- a/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb @@ -4,21 +4,19 @@ bmap. Bmaptool is a generic tool for creating the block map (bmap) for a file, \ and copying files using the block map. The idea is that large file containing \ unused blocks, like raw system image files, can be copied or flashed a lot \ faster with bmaptool than with traditional tools like "dd" or "cp"." -HOMEPAGE = "http://git.infradead.org/users/dedekind/bmap-tools.git" +HOMEPAGE = "https://github.com/01org/bmap-tools" SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "ftp://ftp.infradead.org/pub/${BPN}/${BPN}-${PV}.tgz" -SRC_URI[md5sum] = "92cdad1cb4dfa0cca7176c8e22752616" -SRC_URI[sha256sum] = "cc6c7f7dc0a37e2a32deb127308e24e6c4b80bfb54f3803c308efab02bf2d434" +SRC_URI = "git://github.com/intel/bmap-tools.git" +SRCREV = "9dad724104df265442226972a1e310813f9ffcba" -RDEPENDS_${PN} = "python-core python-compression" +S = "${WORKDIR}/git" -inherit setuptools +RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools" -BBCLASSEXTEND = "native" +inherit python3native +inherit setuptools3 -do_install_append_class-native() { - sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' ${D}${bindir}/bmaptool -} +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.63.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.64.0.bb index 46013f343..46013f343 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.63.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.64.0.bb diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.63.0.inc b/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.64.0.inc index b540a8992..dc7b1a9c0 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.63.0.inc +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.64.0.inc @@ -12,13 +12,10 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" - -SRC_URI[md5sum] = "1c837ecd990bb022d07e7aab32b09847" -SRC_URI[sha256sum] = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0" +SRC_URI[md5sum] = "93eecce2abed9d2442c9676914709349" +SRC_URI[sha256sum] = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" -PR = "r1" - S = "${WORKDIR}/${BOOST_P}" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc b/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc index 4ff70e399..41fc90fb2 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc @@ -38,7 +38,7 @@ BOOST_LIBS_remove_class-native = " context coroutine" BOOST_LIBS_remove_mips16e = "wave" # optional libraries -PACKAGECONFIG ??= "locale" +PACKAGECONFIG ??= "locale python" PACKAGECONFIG[locale] = ",,icu" PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich" PACKAGECONFIG[mpi] = ",,mpich" @@ -169,7 +169,7 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' # Adjust the build for x32 -BJAM_OPTS_append_linux-gnux32 = " abi=x32 address-model=64" +BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" do_configure() { cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch deleted file mode 100644 index bafd5ce00..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9ab0914207e6d0e6b75ce12147c54b96478feb64 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 21 Feb 2017 12:50:35 +0200 -Subject: [PATCH] When using soft-float, on ARM we should not expect the FE_* - symbols - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - boost/test/execution_monitor.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost/test/execution_monitor.hpp b/boost/test/execution_monitor.hpp -index f53348a..86252d7 100644 ---- a/boost/test/execution_monitor.hpp -+++ b/boost/test/execution_monitor.hpp -@@ -498,7 +498,7 @@ enum masks { - - BOOST_FPE_ALL = MCW_EM, - --#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) /* *** */ -+#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) || defined(__ARM_PCS) /* *** */ - BOOST_FPE_ALL = BOOST_FPE_OFF, - - #else /* *** */ --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch new file mode 100644 index 000000000..f96005ebc --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch @@ -0,0 +1,28 @@ +From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001 +From: Robert Ramey <ramey@rrsd.com> +Date: Wed, 1 Feb 2017 16:43:59 -0800 +Subject: [PATCH] correct error which appeared when compiling non c++ compliant + code for arrays + +Upstream-Status: Backport [expected to be released in v1.65] + +--- + boost/serialization/array.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp +index 61708b3..612d1a6 100644 +--- a/boost/serialization/array.hpp ++++ b/boost/serialization/array.hpp +@@ -23,6 +23,8 @@ namespace std{ + } // namespace std + #endif + ++#include <boost/serialization/array_wrapper.hpp> ++ + #ifndef BOOST_NO_CXX11_HDR_ARRAY + + #include <array> +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch deleted file mode 100644 index ab7826ba2..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c234cc557f60729e071d6da59747c1a9289555c5 Mon Sep 17 00:00:00 2001 -From: Peter Dimov <pdimov@pdimov.com> -Date: Sun, 28 Aug 2016 21:28:21 +0300 -Subject: [PATCH 4/4] Use <atomic> by default when BOOST_NO_CXX11_HDR_ATOMIC is - not defined - ---- -Upstream-Status: Backport [https://github.com/boostorg/smart_ptr/commit/20fedcff2ca3143503ec4e876d47745ab0ec7b0c] -Signed-off-by: André Draszik <git@andred.net> - boost/smart_ptr/detail/atomic_count.hpp | 3 +++ - boost/smart_ptr/detail/sp_counted_base.hpp | 3 +++ - boost/smart_ptr/detail/spinlock.hpp | 3 +++ - 3 files changed, 9 insertions(+) - -diff --git a/boost/smart_ptr/detail/atomic_count.hpp b/boost/smart_ptr/detail/atomic_count.hpp -index 8aefd44..6e4f71a 100644 ---- a/boost/smart_ptr/detail/atomic_count.hpp -+++ b/boost/smart_ptr/detail/atomic_count.hpp -@@ -73,6 +73,9 @@ - #elif defined( BOOST_DISABLE_THREADS ) && !defined( BOOST_SP_ENABLE_THREADS ) && !defined( BOOST_DISABLE_WIN32 ) - # include <boost/smart_ptr/detail/atomic_count_nt.hpp> - -+#elif !defined( BOOST_NO_CXX11_HDR_ATOMIC ) -+# include <boost/smart_ptr/detail/atomic_count_std_atomic.hpp> -+ - #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) && !defined( __PATHSCALE__ ) - # include <boost/smart_ptr/detail/atomic_count_gcc_x86.hpp> - -diff --git a/boost/smart_ptr/detail/sp_counted_base.hpp b/boost/smart_ptr/detail/sp_counted_base.hpp -index 0995ca8..83ede23 100644 ---- a/boost/smart_ptr/detail/sp_counted_base.hpp -+++ b/boost/smart_ptr/detail/sp_counted_base.hpp -@@ -44,6 +44,9 @@ - #elif defined( BOOST_SP_HAS_CLANG_C11_ATOMICS ) - # include <boost/smart_ptr/detail/sp_counted_base_clang.hpp> - -+#elif !defined( BOOST_NO_CXX11_HDR_ATOMIC ) -+# include <boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp> -+ - #elif defined( __SNC__ ) - # include <boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp> - -diff --git a/boost/smart_ptr/detail/spinlock.hpp b/boost/smart_ptr/detail/spinlock.hpp -index 19f93d7..0b618df 100644 ---- a/boost/smart_ptr/detail/spinlock.hpp -+++ b/boost/smart_ptr/detail/spinlock.hpp -@@ -43,6 +43,9 @@ - #elif defined( BOOST_SP_USE_PTHREADS ) - # include <boost/smart_ptr/detail/spinlock_pt.hpp> - -+#elif !defined( BOOST_NO_CXX11_HDR_ATOMIC ) -+# include <boost/smart_ptr/detail/spinlock_std_atomic.hpp> -+ - #elif defined(__GNUC__) && defined( __arm__ ) && !defined( __thumb__ ) - # include <boost/smart_ptr/detail/spinlock_gcc_arm.hpp> - --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/py3.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/py3.patch deleted file mode 100644 index 2b1ff1865..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/py3.patch +++ /dev/null @@ -1,269 +0,0 @@ -Backport fixes from upstream (as of boost super-module commit 0d52b9) to improve -the building of the Boost Python module with Python 3. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/build/Jamfile b/build/Jamfile -index 313fdab..f14dc11 100644 ---- a/libs/python/build/Jamfile -+++ b/libs/python/build/Jamfile -@@ -6,6 +6,7 @@ import os ; - import indirect ; - import modules ; - import feature ; -+import property ; - - import python ; - -@@ -30,21 +31,8 @@ else - ; - } - --rule find-py3-version --{ -- local versions = [ feature.values python ] ; -- local py3ver ; -- for local v in $(versions) -- { -- if $(v) >= 3.0 -- { -- py3ver = $(v) ; -- } -- } -- return $(py3ver) ; --} -- --py3-version = [ find-py3-version ] ; -+py2-version = [ py-version 2 ] ; -+py3-version = [ py-version 3 ] ; - - project boost/python - : source-location ../src -@@ -52,11 +40,17 @@ project boost/python - - rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } - rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } -+local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } } - --rule lib_boost_python ( is-py3 ? ) --{ -+lib_boost_python(2) = boost_python ; -+lib_boost_python(3) = boost_python3 ; - -- lib [ cond $(is-py3) : boost_python3 : boost_python ] -+lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ; -+lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ; -+ -+rule lib_boost_python ( version ) -+{ -+ lib $(lib_boost_python($(version))) - : # sources - numeric.cpp - list.cpp -@@ -112,11 +106,13 @@ rule lib_boost_python ( is-py3 ? ) - <dependency>config-warning - - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -- [ cond $(is-py3) : <python>$(py3-version) ] -+ <python>$(version) - - -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag - <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag - -+ <conditional>@python.require-py -+ - : # default build - <link>shared - : # usage requirements -@@ -125,51 +121,68 @@ rule lib_boost_python ( is-py3 ? ) - ; - } - --rule lib_boost_numpy ( is-py3 ? ) -+lib_boost_numpy(2) = boost_numpy ; -+lib_boost_numpy(3) = boost_numpy3 ; -+ -+lib_boost_numpy($(py2-version)) = $(lib_boost_python(2)) ; -+lib_boost_numpy($(py3-version)) = $(lib_boost_python(3)) ; -+ -+rule lib_boost_numpy ( version ) - { - numpy-include = [ python.numpy-include ] ; -- lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ] -+ lib $(lib_boost_numpy($(version))) - : # sources - numpy/dtype.cpp - numpy/matrix.cpp - numpy/ndarray.cpp -- numpy/numpy.cpp -- numpy/scalars.cpp -- numpy/ufunc.cpp -+ numpy/numpy.cpp -+ numpy/scalars.cpp -+ numpy/ufunc.cpp - : # requirements -+ <link>static:<define>BOOST_NUMPY_STATIC_LIB -+ <define>BOOST_NUMPY_SOURCE - [ cond [ python.numpy ] : <library>/python//python_for_extensions ] - [ unless [ python.numpy ] : <build>no ] -- <include>$(numpy-include) -- <library>boost_python -+ <include>$(numpy-include) -+ <library>$(lib_boost_python($(version))) - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -- [ cond $(is-py3) : <python>$(py3-version) ] -+ <python>$(version) - - -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag - <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag - -+ <conditional>@python.require-py -+ - : # default build - <link>shared - : # usage requirements -+ <link>static:<define>BOOST_NUMPY_STATIC_LIB - <python-debugging>on:<define>BOOST_DEBUG_PYTHON - ; - } - --libraries = boost_python ; --libraries3 = boost_python3 ; --if [ python.numpy ] --{ -- libraries += boost_numpy ; -- libraries3 += boost_numpy3 ; --} -- --lib_boost_python ; --lib_boost_numpy ; -+libraries = ; - --if $(py3-version) -+for local N in 2 3 - { -- lib_boost_python yes ; -- lib_boost_numpy yes ; -- libraries += $(libraries3) ; -+ if $(py$(N)-version) -+ { -+ lib_boost_python $(py$(N)-version) ; -+ libraries += $(lib_boost_python($(py$(N)-version))) ; -+ } -+ else -+ { -+ alias $(lib_boost_python($(N))) ; -+ } -+ if $(py$(N)-version) && [ python.numpy ] -+ { -+ lib_boost_numpy $(py$(N)-version) ; -+ libraries += $(lib_boost_numpy($(py$(N)-version))) ; -+ } -+ else -+ { -+ alias $(lib_boost_numpy($(N))) ; -+ } - } - - boost-install $(libraries) ; -diff --git a/src/tools/python.jam b/src/tools/python.jam -index cc13385..bf300b8 100644 ---- a/tools/build/src/tools/python.jam -+++ b/tools/build/src/tools/python.jam -@@ -34,6 +34,7 @@ import path ; - import feature ; - import set ; - import builtin ; -+import property-set ; - - - # Make this module a project. -@@ -60,6 +61,10 @@ lib rt ; - # installed in the development system's default paths. - feature.feature pythonpath : : free optional path ; - -+# The best configured version of Python 2 and 3. -+py2-version = ; -+py3-version = ; -+ - # Initializes the Python toolset. Note that all parameters are optional. - # - # - version -- the version of Python to use. Should be in Major.Minor format, -@@ -861,6 +866,11 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : - if ! $(version) in [ feature.values python ] - { - feature.extend python : $(version) ; -+ py$(major-minor[1])-version ?= $(version) ; -+ if $(py$(major-minor[1])-version) < $(version) -+ { -+ py$(major-minor[1])-version = $(version) ; -+ } - } - target-requirements += <python>$(version:E=default) ; - } -@@ -916,6 +926,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : - } - } - -+ # In case we added duplicate requirements from what the user specified. -+ target-requirements = [ sequence.unique $(target-requirements) ] ; -+ - # Global, but conditional, requirements to give access to the interpreter - # for general utilities, like other toolsets, that run Python scripts. - toolset.add-requirements -@@ -934,19 +947,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : - toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ; - } - -- # We also set a default requirement that assigns the first python configured -- # for a particular target OS as the default. This makes it so that we can -- # select a python interpreter with only knowledge of the target OS. And hence -- # can configure different Pythons based on the target OS only. -- local toolset-requirements = [ toolset.requirements ] ; -- local toolset-target-os-requirements -- = [ property.evaluate-conditionals-in-context -- [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ; -- if ! <python> in $(toolset-target-os-requirements:G) -- { -- toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ; -- } -- - # Register the right suffix for extensions. - register-extension-suffix $(extension-suffix) : $(target-requirements) ; - -@@ -1038,6 +1038,22 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : - : $(usage-requirements) - ; - } -+ -+} -+ -+# Conditional rule specification that will prevent building of a target -+# if there is no matching python configuration available with the given -+# required properties. -+rule require-py ( properties * ) -+{ -+ local py-ext-target = [ $(.project).find python_for_extensions ] ; -+ local property-set = [ property-set.create $(properties) ] ; -+ property-set = [ $(property-set).expand ] ; -+ local py-ext-alternative = [ $(py-ext-target).select-alternatives $(property-set) ] ; -+ if ! $(py-ext-alternative) -+ { -+ return <build>no ; -+ } - } - - -@@ -1298,5 +1314,11 @@ rule numpy-test ( name : sources * : requirements * ) - : $(name) ] ; - } - -+rule py-version ( n ) -+{ -+ return $(py$(n)-version) ; -+} -+ - IMPORT $(__name__) : bpl-test : : bpl-test ; - IMPORT $(__name__) : numpy-test : : numpy-test ; -+IMPORT $(__name__) : py-version : : py-version ; diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.63.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.64.0.bb index 1107686bc..d1c20e1d0 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.63.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.64.0.bb @@ -3,13 +3,11 @@ require boost.inc SRC_URI += "\ file://arm-intrinsics.patch \ - file://0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch \ file://boost-CVE-2012-2677.patch \ file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ - file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ - file://py3.patch \ + file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \ " diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb index c282ace26..7d59fa637 100644 --- a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb +++ b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb @@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native" # Need c_rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" -SRCREV = "61b70a1007dc269d56881a0d480fc841daacc77c" +SRCREV = "34b8e19e541b8af4076616b2e170c7a70cdaded0" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://0002-update-ca-certificates-use-SYSROOT.patch \ @@ -24,6 +24,7 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://sbindir.patch" S = "${WORKDIR}/git" +SYSROOT_DIRS_class-native += "/etc" inherit allarch diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000099.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000099.patch new file mode 100644 index 000000000..96ff1b064 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000099.patch @@ -0,0 +1,41 @@ +From c9332fa5e84f24da300b42b1a931ade929d3e27d Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Tue, 1 Aug 2017 17:17:06 +0200 +Subject: [PATCH] file: output the correct buffer to the user + +Regression brought by 7c312f84ea930d8 (April 2017) + +CVE: CVE-2017-1000099 + +Bug: https://curl.haxx.se/docs/adv_20170809C.html + +Credit to OSS-Fuzz for the discovery + +Upstream-Status: Backport +https://github.com/curl/curl/commit/c9332fa5e84f24da300b42b1a931ade929d3e27d + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + lib/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/file.c b/lib/file.c +index bd426eac2..666cbe75b 100644 +--- a/lib/file.c ++++ b/lib/file.c +@@ -499,11 +499,11 @@ static CURLcode file_do(struct connectdata *conn, bool *done) + Curl_month[tm->tm_mon], + tm->tm_year + 1900, + tm->tm_hour, + tm->tm_min, + tm->tm_sec); +- result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0); ++ result = Curl_client_write(conn, CLIENTWRITE_BOTH, header, 0); + if(!result) + /* set the file size to make it available post transfer */ + Curl_pgrsSetDownloadSize(data, expected_size); + return result; + } +-- +2.13.3 + diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch index 508df8c7d..f74f1dd89 100644 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch @@ -6,7 +6,7 @@ Subject: [PATCH] tftp: reject file name lengths that don't fit ... and thereby avoid telling send() to send off more bytes than the size of the buffer! -CVE-2017-1000100 +CVE: CVE-2017-1000100 Bug: https://curl.haxx.se/docs/adv_20170809B.html Reported-by: Even Rouault @@ -16,17 +16,15 @@ Credit to OSS-Fuzz for the discovery Upstream-Status: Backport https://github.com/curl/curl/commit/358b2b131ad6c095696f20dcfa62b8305263f898 -CVE: CVE-2017-1000100 -Signed-off-by: Armin Kuster <akuster@mvista.com> - +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> --- - lib/tftp.c | 7 ++++++- + lib/tftp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -Index: curl-7.53.1/lib/tftp.c -=================================================================== ---- curl-7.53.1.orig/lib/tftp.c -+++ curl-7.53.1/lib/tftp.c +diff --git a/lib/tftp.c b/lib/tftp.c +index 02bd842..f6f4bce 100644 +--- a/lib/tftp.c ++++ b/lib/tftp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| @@ -36,7 +34,7 @@ Index: curl-7.53.1/lib/tftp.c * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -@@ -490,6 +490,11 @@ static CURLcode tftp_send_first(tftp_sta +@@ -491,6 +491,11 @@ static CURLcode tftp_send_first(tftp_state_data_t *state, tftp_event_t event) if(result) return result; @@ -48,3 +46,6 @@ Index: curl-7.53.1/lib/tftp.c snprintf((char *)state->spacket.data+2, state->blksize, "%s%c%s%c", filename, '\0', mode, '\0'); +-- +1.7.9.5 + diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch index 9eef5e2a2..c300fff00 100644 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch @@ -6,15 +6,17 @@ Subject: [PATCH] glob: do not continue parsing after a strtoul() overflow Added test 1289 to verify. -CVE-2017-1000101 +CVE: CVE-2017-1000101 Bug: https://curl.haxx.se/docs/adv_20170809A.html Reported-by: Brian Carpenter Upstream-Status: Backport -CVE: CVE-2017-1000101 -Signed-off-by: Armin Kuster <akuster@mvista.com> +https://github.com/curl/curl/commit/453e7a7a03a2cec749abd3878a48e728c515cca7 +Rebase the tests/data/Makefile.inc changes for curl 7.54.1. + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> --- src/tool_urlglob.c | 5 ++++- tests/data/Makefile.inc | 2 +- @@ -22,11 +24,11 @@ Signed-off-by: Armin Kuster <akuster@mvista.com> 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 tests/data/test1289 -Index: curl-7.53.1/src/tool_urlglob.c -=================================================================== ---- curl-7.53.1.orig/src/tool_urlglob.c -+++ curl-7.53.1/src/tool_urlglob.c -@@ -269,7 +269,10 @@ static CURLcode glob_range(URLGlob *glob +diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c +index 6b1ece0..d56dcd9 100644 +--- a/src/tool_urlglob.c ++++ b/src/tool_urlglob.c +@@ -273,7 +273,10 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, } errno = 0; max_n = strtoul(pattern, &endp, 10); @@ -38,22 +40,24 @@ Index: curl-7.53.1/src/tool_urlglob.c pattern = endp+1; errno = 0; step_n = strtoul(pattern, &endp, 10); -Index: curl-7.53.1/tests/data/Makefile.inc -=================================================================== ---- curl-7.53.1.orig/tests/data/Makefile.inc -+++ curl-7.53.1/tests/data/Makefile.inc -@@ -131,6 +131,7 @@ test1244 test1245 test1246 test1247 test - test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 155320a..7adbee6 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -132,7 +132,7 @@ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ + test1260 test1261 test1262 \ \ - test1280 test1281 test1282 test1283 test1284 test1285 test1286 \ -+test1289 \ + test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \ +-test1288 \ ++test1288 test1289 \ \ test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ -Index: curl-7.53.1/tests/data/test1289 -=================================================================== +diff --git a/tests/data/test1289 b/tests/data/test1289 +new file mode 100644 +index 0000000..d679cc0 --- /dev/null -+++ curl-7.53.1/tests/data/test1289 ++++ b/tests/data/test1289 @@ -0,0 +1,35 @@ +<testcase> +<info> @@ -90,3 +94,6 @@ Index: curl-7.53.1/tests/data/test1289 +</errorcode> +</verify> +</testcase> +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000254.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000254.patch new file mode 100644 index 000000000..2b0798b92 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000254.patch @@ -0,0 +1,138 @@ +From 1b2eba6f9745c064f7283e0ada8f46df9d9d6e42 Mon Sep 17 00:00:00 2001 +From: Li Zhou <li.zhou@windriver.com> +Date: Mon, 23 Oct 2017 00:26:50 -0700 +Subject: [PATCH] FTP: zero terminate the entry path even on bad input + +... a single double quote could leave the entry path buffer without a zero +terminating byte. CVE-2017-1000254 + +Test 1152 added to verify. + +Reported-by: Max Dymond +Bug: https://curl.haxx.se/docs/adv_20171004.html + +Upstream-Status: Backport +CVE: CVE-2017-1000254 +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + lib/ftp.c | 7 ++++-- + tests/data/Makefile.inc | 2 ++ + tests/data/test1152 | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 68 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test1152 + +diff --git a/lib/ftp.c b/lib/ftp.c +index 5edec37..493dbf9 100644 +--- a/lib/ftp.c ++++ b/lib/ftp.c +@@ -2826,6 +2826,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) + const size_t buf_size = data->set.buffer_size; + char *dir; + char *store; ++ bool entry_extracted = FALSE; + + dir = malloc(nread + 1); + if(!dir) +@@ -2857,7 +2858,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) + } + else { + /* end of path */ +- *store = '\0'; /* zero terminate */ ++ entry_extracted = TRUE; + break; /* get out of this loop */ + } + } +@@ -2866,7 +2867,9 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) + store++; + ptr++; + } +- ++ *store = '\0'; /* zero terminate */ ++ } ++ if(entry_extracted) { + /* If the path name does not look like an absolute path (i.e.: it + does not start with a '/'), we probably need some server-dependent + adjustments. For example, this is the case when connecting to +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 7adbee6..5284654 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -121,6 +121,8 @@ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ + test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ + test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ + test1144 test1145 test1146 \ ++test1152 \ ++\ + test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ + test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ + test1216 test1217 test1218 test1219 \ +diff --git a/tests/data/test1152 b/tests/data/test1152 +new file mode 100644 +index 0000000..aa8c0a7 +--- /dev/null ++++ b/tests/data/test1152 +@@ -0,0 +1,61 @@ ++<testcase> ++<info> ++<keywords> ++FTP ++PASV ++LIST ++</keywords> ++</info> ++# ++# Server-side ++<reply> ++<servercmd> ++REPLY PWD 257 "just one ++</servercmd> ++ ++# When doing LIST, we get the default list output hard-coded in the test ++# FTP server ++<data mode="text"> ++total 20 ++drwxr-xr-x 8 98 98 512 Oct 22 13:06 . ++drwxr-xr-x 8 98 98 512 Oct 22 13:06 .. ++drwxr-xr-x 2 98 98 512 May 2 1996 curl-releases ++-r--r--r-- 1 0 1 35 Jul 16 1996 README ++lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin ++dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev ++drwxrwxrwx 2 98 98 512 May 29 16:04 download.html ++dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc ++drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub ++dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ++</data> ++</reply> ++ ++# ++# Client-side ++<client> ++<server> ++ftp ++</server> ++ <name> ++FTP with uneven quote in PWD response ++ </name> ++ <command> ++ftp://%HOSTIP:%FTPPORT/test-1152/ ++</command> ++</client> ++ ++# ++# Verify data after the test has been "shot" ++<verify> ++<protocol> ++USER anonymous ++PASS ftp@example.com ++PWD ++CWD test-1152 ++EPSV ++TYPE A ++LIST ++QUIT ++</protocol> ++</verify> ++</testcase> +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/reproducible-mkhelp.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/reproducible-mkhelp.patch new file mode 100644 index 000000000..268bbebf0 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/reproducible-mkhelp.patch @@ -0,0 +1,32 @@ +From 1fe92fd3dd64c7228f6ff41e3fc16c4f2392471a Mon Sep 17 00:00:00 2001 +From: Juro Bystricky <juro.bystricky@intel.com> +Date: Fri, 27 Oct 2017 08:28:25 -0700 +Subject: mkhelp.pl: support reproducible build + +Do not generate line with the current date, such as: + +* Generation time: Tue Oct-24 18:01:41 2017 + +This will improve reproducibility. The generated string is only +part of a comment, so there should be no adverse consequences. + +Upstream-Status: Submitted [ https://github.com/curl/curl/pull/2026 ] + +Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> + +diff --git a/src/mkhelp.pl b/src/mkhelp.pl +index 270daa2..757f024 100755 +--- a/src/mkhelp.pl ++++ b/src/mkhelp.pl +@@ -102,11 +102,9 @@ while(<READ>) { + } + close(READ); + +-$now = localtime; + print <<HEAD + /* + * NEVER EVER edit this manually, fix the mkhelp.pl script instead! +- * Generation time: $now + */ + #ifdef USE_MANUAL + #include "tool_hugehelp.h" diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.53.1.bb b/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.54.1.bb index c3e1f898a..58f05316f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.53.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.54.1.bb @@ -7,18 +7,23 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ + file://CVE-2017-1000099.patch \ + file://CVE-2017-1000100.patch \ + file://CVE-2017-1000101.patch \ + file://CVE-2017-1000254.patch \ +" + +SRC_URI_append_class-target = " \ + file://reproducible-mkhelp.patch \ " # curl likes to set -g0 in CFLAGS, so we stop it # from mucking around with debug options # -SRC_URI += " file://configure_ac.patch \ - file://CVE-2017-1000100.patch \ - file://CVE-2017-1000101.patch \ - " +SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "fb1f03a142236840c1a77c035fa4c542" -SRC_URI[sha256sum] = "1c7207c06d75e9136a944a2e0528337ce76f15b9ec9ae4bb30d703b59bf530e8" +SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55" +SRC_URI[sha256sum] = "fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0" CVE_PRODUCT = "libcurl" inherit autotools pkgconfig binconfig multilib_header @@ -27,6 +32,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls prox PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver zlib" +# 'ares' and 'threaded-resolver' are mutually exclusive +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," @@ -48,13 +55,13 @@ PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" EXTRA_OECONF = " \ --enable-crypto-auth \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libmetalink \ --without-libpsl \ - --without-nghttp2 \ " do_install_append() { @@ -63,7 +70,11 @@ do_install_append() { do_install_append_class-target() { # cleanup buildpaths from curl-config - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + ${D}${bindir}/curl-config } PACKAGES =+ "lib${BPN}" diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch b/import-layers/yocto-poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch new file mode 100644 index 000000000..cb28db134 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch @@ -0,0 +1,42 @@ +From 32e5943a3c4637d39e4d65b544dcb99e280210e3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 23 Jul 2017 10:54:26 -0700 +Subject: [PATCH] configure: Add explicit tag options to libtool invocation + +This helps cross compile when tag inference via heuristics +fail because CC variable is having -fPIE -pie and libtool +smartly removes it when building libraries + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dist/configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dist/configure.ac b/dist/configure.ac +index 689f3b8..9c14bdb 100644 +--- a/dist/configure.ac ++++ b/dist/configure.ac +@@ -366,12 +366,12 @@ LIBTOOL="./libtool" + + INSTALLER="\$(LIBTOOL) --mode=install cp -p" + +-MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" +-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" +-MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" +-MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" +-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" +-MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" ++MAKEFILE_CC="\$(LIBTOOL) --tag=CC --mode=compile ${MAKEFILE_CC}" ++MAKEFILE_SOLINK="\$(LIBTOOL) --tag=CC --mode=link ${MAKEFILE_CCLINK} -avoid-version" ++MAKEFILE_CCLINK="\$(LIBTOOL) --tag=CC --mode=link ${MAKEFILE_CCLINK}" ++MAKEFILE_CXX="\$(LIBTOOL) --tag=CXX --mode=compile ${MAKEFILE_CXX}" ++MAKEFILE_XSOLINK="\$(LIBTOOL) --tag=CXX --mode=link ${MAKEFILE_CXXLINK} -avoid-version" ++MAKEFILE_CXXLINK="\$(LIBTOOL) --tag=CXX --mode=link ${MAKEFILE_CXXLINK}" + + + case "$host_os" in +-- +2.13.3 + diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/sequence-type.patch b/import-layers/yocto-poky/meta/recipes-support/db/db/sequence-type.patch new file mode 100644 index 000000000..a6fe3d62a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/db/db/sequence-type.patch @@ -0,0 +1,59 @@ +configure wants to use host-specific types to get a 64-bit integer in db.h +instead of using an alias such as int64_t. This means that the header differs +in multilib environments for no good reason, so replace the type with the alias +in stdint.h. + +This then breaks the overly complicated type check but as we know that int64_t +exists and works, we can just delete that. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- a/dist/aclocal/sequence.m4~ 2013-09-09 16:35:02.000000000 +0100 ++++ b/dist/aclocal/sequence.m4 2017-11-01 13:21:45.472295971 +0000 +@@ -24 +24 @@ +- db_cv_seq_type="long" ++ db_cv_seq_type="int64_t" +@@ -31 +31 @@ +- db_cv_seq_type="long long" ++ db_cv_seq_type="int64_t" +@@ -41,38 +41 @@ +- # Test to see if we can declare variables of the appropriate size +- # and format them. If we're cross-compiling, all we get is a link +- # test, which won't test for the appropriate printf format strings. +- if test "$db_cv_build_sequence" = "yes"; then +- AC_TRY_RUN([ +- main() { +- $db_cv_seq_type l; +- unsigned $db_cv_seq_type u; +- char buf@<:@100@:>@; +- +- buf@<:@0@:>@ = 'a'; +- l = 9223372036854775807LL; +- (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l); +- if (strcmp(buf, "9223372036854775807")) +- return (1); +- u = 18446744073709551615ULL; +- (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, u); +- if (strcmp(buf, "18446744073709551615")) +- return (1); +- return (0); +- }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ +- $db_cv_seq_type l; +- unsigned $db_cv_seq_type u; +- char buf@<:@100@:>@; +- +- buf@<:@0@:>@ = 'a'; +- l = 9223372036854775807LL; +- (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l); +- if (strcmp(buf, "9223372036854775807")) +- return (1); +- u = 18446744073709551615ULL; +- (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, u); +- if (strcmp(buf, "18446744073709551615")) +- return (1); +- return (0); +- ],, [db_cv_build_sequence="no"])) +- fi ++ db_cv_build_sequence="yes" diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb b/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb index 26065bbb0..fb4befbaf 100644 --- a/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb +++ b/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb @@ -22,14 +22,20 @@ SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch \ file://fix-parallel-build.patch \ file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ + file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ + file://sequence-type.patch \ " +# We are not interested in official latest 6.x versions; +# let's track what debian is using. +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/db5.3/" +UPSTREAM_CHECK_REGEX = "db5\.3_(?P<pver>.+)\.orig" SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24" SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628" LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955" -inherit autotools multilib_header +inherit autotools # Put virtual/db in any appropriate provider of a # relational database, use it as a dependency in @@ -72,22 +78,32 @@ MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" EXTRA_OECONF += "${MUTEX} STRIP=true" -EXTRA_OEMAKE_append_class-target = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" +EXTRA_OEMAKE += "LIBTOOL='./${HOST_SYS}-libtool'" +EXTRA_AUTORECONF += "--exclude=autoheader -I ${S}/dist/aclocal -I${S}/dist/aclocal_java" AUTOTOOLS_SCRIPT_PATH = "${S}/dist" # Cancel the site stuff - it's set for db3 and destroys the # configure. CONFIG_SITE = "" -do_configure() { - cd ${B} - gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH} - oe_runconf + +oe_runconf_prepend() { + . ${S}/dist/RELEASE + # Edit version information we couldn't pre-compute. + sed -i -e "s/__EDIT_DB_VERSION_FAMILY__/$DB_VERSION_FAMILY/g" \ + -e "s/__EDIT_DB_VERSION_RELEASE__/$DB_VERSION_RELEASE/g" \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_FULL_STRING__/$DB_VERSION_FULL_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" ${S}/dist/configure } do_compile_prepend() { # Stop libtool adding RPATHs - sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool + sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/${HOST_SYS}-libtool } do_install_append() { @@ -97,8 +113,6 @@ do_install_append() { ln -s db51/db.h ${D}/${includedir}/db.h ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h - oe_multilib_header db51/db.h - # The docs end up in /usr/docs - not right. if test -d "${D}/${prefix}/docs" then diff --git a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.bb b/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb index 12c63ee1e..1857d4bf3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb @@ -3,14 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20170402T211732Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" # the package is taken from snapshots.debian.org; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" - -SRC_URI[md5sum] = "44083fc66164746880dffd30d62d054b" -SRC_URI[sha256sum] = "2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026" +SRC_URI[md5sum] = "ee5fcecaab071bd0c93e8a0cee65d6c4" +SRC_URI[sha256sum] = "06446cd4c0d309fd31a0682c5c2f07f7613fb867f769414b9cc51f155ad73172" inherit autotools update-alternatives @@ -38,6 +37,8 @@ RDEPENDS_${PN}_class-native = "" ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE_${PN}-run-parts = "run-parts" ALTERNATIVE_${PN}-doc = "which.1" diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch b/import-layers/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch index 65236fb48..b9461bec6 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch @@ -1,30 +1,41 @@ -Add install-ptest rules. +From 4e4b70a4a3dcf1fdbee9e68bed3b62f42b197a3a Mon Sep 17 00:00:00 2001 +From: Josep Puigdemont <josep.puigdemont@enea.com> +Date: Sun, 4 May 2014 16:02:07 +0200 +Subject: [PATCH] Add install-ptest rules. Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Maxin B. John <maxin.john@enea.com> Upstream-Status: Pending -diff -ur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2011-08-16 10:13:10.000000000 +0200 -+++ b/Makefile.am 2013-04-12 18:02:16.473715873 +0200 -@@ -31,3 +31,8 @@ - d=`date '+%d/%m/%Y'`; \ - sed 's|/\*@DIST_DATE@\*/|"'"$$d"'"|' $(srcdir)/src/version.c > \ - $(distdir)/src/version.c +--- + Makefile.am | 5 +++++ + tests/Makefile.am | 12 +++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 4cdc734..24b99f0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,3 +45,8 @@ ChangeLog: + awk -f $(top_srcdir)/git2chg.awk \ + -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \ + fi + +install-ptest: + @for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ + done -diff -ur a/tests/Makefile.am b/tests/Makefile.am ---- a/tests/Makefile.am 2011-11-11 19:39:42.000000000 +0100 -+++ b/tests/Makefile.am 2013-04-12 18:30:57.066301037 +0200 -@@ -132,4 +132,14 @@ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 3dbb580..22ffc44 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -130,4 +130,14 @@ dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la +- +buildtests: $(check_PROGRAMS) $(TESTSUITE) - ++ +install-ptest: $(check_PROGRAMS) $(TESTSUITE) + @$(INSTALL) -d $(DESTDIR) + @for file in $^; do \ @@ -34,3 +45,6 @@ diff -ur a/tests/Makefile.am b/tests/Makefile.am + $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ + fi \ + done +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.12.bb b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.13.bb index c380073c3..4bbe147df 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.12.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.13.bb @@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "9ce96ff4c99e74295ea19040931c8fb9" -SRC_URI[sha256sum] = "d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea" +SRC_URI[md5sum] = "8929dcda2a8de3fd2367bdbf66769376" +SRC_URI[sha256sum] = "9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253" inherit autotools gettext texinfo lib_package ptest diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb index 5e6507558..b008710d0 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb @@ -25,8 +25,11 @@ EXTRA_OECONF_mipsarchr6_append = " --disable-assembly" PACKAGES =+ "libgmpxx" FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" -do_install_append_class-target() { - sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h +do_install_prepend_class-target() { + sed -i \ + -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ + -e "s|${DEBUG_PREFIX_MAP}||g" \ + ${B}/gmp.h } SSTATE_SCAN_FILES += "gmp.h" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch index f958603ca..5c9c02222 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/pkgconfig.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch @@ -1,15 +1,27 @@ -Use pkg-config to find pth instead of pth-config. +From 59a3c76d4016ffc615f1c45184f4c6820061d69c Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Wed, 16 Aug 2017 11:14:12 +0800 +Subject: [PATCH 1/4] Use pkg-config to find pth instead of pth-config. Upstream-Status: Denied -[not submitted but they've been clear they don't want a pkg-config dependency] +[not submitted but they've been clear they don't want a pkg-config +dependency] RP 2014/5/22 -Index: gnupg-2.1.0/m4/gnupg-pth.m4 -=================================================================== ---- gnupg-2.1.0.orig/m4/gnupg-pth.m4 -+++ gnupg-2.1.0/m4/gnupg-pth.m4 -@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Rebase to 2.1.23 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + m4/gnupg-pth.m4 | 53 ++++++++--------------------------------------------- + 1 file changed, 8 insertions(+), 45 deletions(-) + +diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4 +index 6dc9e0e..5892531 100644 +--- a/m4/gnupg-pth.m4 ++++ b/m4/gnupg-pth.m4 +@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # Taken and modified from the m4 macros which come with Pth. AC_DEFUN([GNUPG_PTH_VERSION_CHECK], [ @@ -88,3 +100,6 @@ Index: gnupg-2.1.0/m4/gnupg-pth.m4 AC_SUBST(PTH_LIBS) ]) - +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index c6dbf1b75..6d86e5c99 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch @@ -1,12 +1,22 @@ +From 53c2aec2e13f4e2d09be7148869c862f07dfdd4d Mon Sep 17 00:00:00 2001 +From: Saul Wold <sgw@linux.intel.com> +Date: Wed, 16 Aug 2017 11:16:30 +0800 +Subject: [PATCH 2/4] use pkgconfig instead of npth config + Upstream-Status: Inappropriate [openembedded specific] Signed-off-by: Saul Wold <sgw@linux.intel.com> +Rebase to 2.1.23 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + m4/npth.m4 | 34 ++++++++-------------------------- + 1 file changed, 8 insertions(+), 26 deletions(-) -Index: gnupg-2.1.0/m4/npth.m4 -=================================================================== ---- gnupg-2.1.0.orig/m4/npth.m4 -+++ gnupg-2.1.0/m4/npth.m4 +diff --git a/m4/npth.m4 b/m4/npth.m4 +index 17c2644..15a931b 100644 +--- a/m4/npth.m4 ++++ b/m4/npth.m4 @@ -17,10 +17,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], if test "x$npth_config_prefix" != x ; then NPTH_CONFIG="$npth_config_prefix/bin/npth-config" @@ -70,3 +80,6 @@ Index: gnupg-2.1.0/m4/npth.m4 NPTH_CFLAGS="" NPTH_LIBS="" ifelse([$3], , :, [$3]) +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch new file mode 100644 index 000000000..3e798efd0 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch @@ -0,0 +1,32 @@ +From 9c3858ffda6246bf9e1e6aeeb920532a56b19408 Mon Sep 17 00:00:00 2001 +From: Saul Wold <sgw@linux.intel.com> +Date: Wed, 16 Aug 2017 11:18:01 +0800 +Subject: [PATCH 3/4] dirmngr uses libgpg error + +Upstream-Status: Pending +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Rebase to 2.1.23 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + dirmngr/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am +index b404165..d3f916e 100644 +--- a/dirmngr/Makefile.am ++++ b/dirmngr/Makefile.am +@@ -82,7 +82,8 @@ endif + dirmngr_LDADD = $(libcommonpth) \ + $(DNSLIBS) $(LIBASSUAN_LIBS) \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ +- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) ++ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ ++ $(GPG_ERROR_LIBS) + if USE_LDAP + dirmngr_LDADD += $(ldaplibs) + endif +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch index 4241bc3a2..dcd8582ca 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch @@ -1,7 +1,7 @@ -From 717f994be2466d378e6611a4739c606db6d0dc46 Mon Sep 17 00:00:00 2001 +From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Sun, 25 Oct 2015 22:44:47 -0400 -Subject: [PATCH] autogen.sh: fix find-version for beta checking +Date: Wed, 16 Aug 2017 11:23:22 +0800 +Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking find-version always assumes that gnupg is beta if autogen.sh is run out of git-repo. This doesn't work for users whom just take release @@ -10,16 +10,19 @@ tarball and re-run autoconf in their local build dir. Upstream-Status: Pending Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + +Rebase to 2.1.23 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- autogen.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index 7effd56..d673432 100755 +index e5ba5bf..05e0e11 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -228,7 +228,6 @@ if [ "$myhost" = "find-version" ]; then - rvd=$((0x$(echo ${rev} | head -c 4))) +@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no - beta=yes @@ -27,5 +30,5 @@ index 7effd56..d673432 100755 rev="0000000" rvd="0" -- -1.9.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch deleted file mode 100644 index 7af1955d5..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Saul Wold <sgw@linux.intel.com> -Index: gnupg-2.1.0/dirmngr/Makefile.am -=================================================================== ---- gnupg-2.1.0.orig/dirmngr/Makefile.am -+++ gnupg-2.1.0/dirmngr/Makefile.am -@@ -78,7 +78,8 @@ endif - dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ - $(DNSLIBS) $(LIBASSUAN_LIBS) \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ -- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) -+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ -+ $(GPG_ERROR_LIBS) - if USE_LDAP - dirmngr_LDADD += $(ldaplibs) - endif diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.18.bb b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.0.bb index a0611aa00..0176dddad 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.18.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.0.bb @@ -2,7 +2,7 @@ SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" HOMEPAGE = "http://www.gnupg.org/" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ - file://COPYING.LIB;md5=a2b6bf2cb38ee52619e60f30a1fc7257" + file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257" DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" @@ -10,20 +10,21 @@ inherit autotools gettext texinfo pkgconfig UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://pkgconfig.patch \ - file://use-pkgconfig-instead-of-npth-config.patch \ - file://dirmngr-uses-libgpg-error.patch \ - file://autogen.sh-fix-find-version-for-beta-checking.patch \ + file://0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch \ + file://0002-use-pkgconfig-instead-of-npth-config.patch \ + file://0003-dirmngr-uses-libgpg-error.patch \ + file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ " -SRC_URI[md5sum] = "c67f908b0b35c7ebc62144f362757e1e" -SRC_URI[sha256sum] = "d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994" +SRC_URI[md5sum] = "789f16949fae2d003d387f49e9da4b74" +SRC_URI[sha256sum] = "d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-bzip2=${STAGING_LIBDIR}/.. \ - --with-readline=${STAGING_LIBDIR}/.. \ + --with-readline=${STAGING_LIBDIR}/.. \ + --enable-gpg-is-gpg2 \ " RRECOMMENDS_${PN} = "pinentry" @@ -40,7 +41,6 @@ do_install_append() { ln -sf gpgv2 ${D}${bindir}/gpgv } -RDEPENDS_${PN} = "gnutls" - -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "gnutls" +PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc index 1ecad1f99..29b5dd6ae 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc @@ -46,7 +46,6 @@ EXTRA_OECONF = " \ " LDFLAGS_append_libc-musl = " -largp" -LDFLAGS_append_libc-uclibc = " -luargp -pthread" do_configure_prepend() { for dir in . lib; do @@ -59,5 +58,3 @@ PACKAGES =+ "${PN}-openssl ${PN}-xx" FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch deleted file mode 100644 index 96b023a46..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 81b0f04c14f673b99778d2e7d8e85461e0bf2018 Mon Sep 17 00:00:00 2001 -From: Valentin Popa <valentin.popa@intel.com> -Date: Fri, 25 Apr 2014 13:58:55 +0300 -Subject: [PATCH 1/3] Correct rpl_gettimeofday signature - -Currently we fail on uclibc like below - -| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0, -| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26, -| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392, -| from ../../gl/signal.h:52, -| from ../../gl/sys/select.h:58, -| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220, -| from ../../gl/sys/types.h:28, -| from ../../lib/includes/gnutls/gnutls.h:46, -| from ex-cxx.cpp:3: -| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict' -| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict' -| make[4]: *** [ex-cxx.o] Error 1 -| make[4]: *** Waiting for unfinished jobs.... - -GCC detects that we call 'restrict' as param name in function -signatures and complains since both params are called 'restrict' -therefore we use __restrict to denote the C99 keywork - -This only happens of uclibc since this code is not excercised with -eglibc otherwise we will have same issue there too - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - ---- - gl/sys_time.in.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h -index 5a8caf3..2dc5718 100644 ---- a/gl/sys_time.in.h -+++ b/gl/sys_time.in.h -@@ -93,20 +93,20 @@ struct timeval - # define gettimeofday rpl_gettimeofday - # endif - _GL_FUNCDECL_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - _GL_CXXALIAS_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # else - # if !@HAVE_GETTIMEOFDAY@ - _GL_FUNCDECL_SYS (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - # endif - /* Need to cast, because on glibc systems, by default, the second argument is - struct timezone *. */ - _GL_CXXALIAS_SYS_CAST (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # endif - _GL_CXXALIASWARN (gettimeofday); - # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch index 0e1b7c8f7..ae141a5bc 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch @@ -1,7 +1,9 @@ -From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 26 May 2015 21:41:24 -0700 -Subject: [PATCH] use pkg-config to locate zlib +From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001 +From: Fan Xin <fan.xin@jp.fujitsu.com> +Date: Fri, 9 Jun 2017 15:20:31 +0900 +Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 + 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 26 May + 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES @@ -18,15 +20,19 @@ Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch: Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + +Rebase on gnutls 3.5.13 + +Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> --- - configure.ac | 24 ++++++++++-------------- - 1 file changed, 10 insertions(+), 14 deletions(-) + configure.ac | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac -index 1b561d5..0c787dc 100644 +index c65268e..f6a18aa 100644 --- a/configure.ac +++ b/configure.ac -@@ -508,25 +508,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], +@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], AC_MSG_CHECKING([whether to include zlib compression support]) if test x$ac_zlib != xno; then AC_MSG_RESULT(yes) @@ -49,6 +55,7 @@ index 1b561d5..0c787dc 100644 - else - GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" - fi +- LIBZ_PC="" + PKG_CHECK_MODULES(ZLIB, zlib) + HAVE_LIBZ=yes + AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) @@ -57,11 +64,12 @@ index 1b561d5..0c787dc 100644 + AC_SUBST(LTLIBZ) + if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then + GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" -+ else + else +- LIBZ_PC=$LIBZ + GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" fi fi - AC_SUBST(GNUTLS_REQUIRES_PRIVATE) + AC_SUBST(LIBZ_PC) -- 1.9.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.13.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.13.bb new file mode 100644 index 000000000..35d7d09c8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.13.bb @@ -0,0 +1,10 @@ +require gnutls.inc + +SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ + file://arm_eabi.patch \ + " +SRC_URI[md5sum] = "4fd41ad86572933c2379b4cc321a0959" +SRC_URI[sha256sum] = "79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096" + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.9.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.9.bb deleted file mode 100644 index 8f84dbbf4..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.9.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - file://0001-configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - file://arm_eabi.patch \ - " -SRC_URI[md5sum] = "0ab25eb6a1509345dd085bc21a387951" -SRC_URI[sha256sum] = "82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951" - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.10.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.12.bb index dfc7f12c2..7a7571ad3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.10.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.12.bb @@ -16,8 +16,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "f4faffdf63969d0e4e6df43b9679e8e5" -SRC_URI[sha256sum] = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02" +SRC_URI[md5sum] = "5c724bd1f73aaf4a311833e1cd297b21" +SRC_URI[sha256sum] = "6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753" inherit autotools texinfo binconfig lib_package gtk-doc diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 341cabfc5..14a43eeee 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,10 +1,18 @@ +From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Wed, 16 Aug 2017 02:00:08 -0400 +Subject: [PATCH 1/5] pkgconfig + Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling. Upstream-Status: Denied [Upstream not interested in pkg-config support] RP 2015/4/17 -Rebase to 1.8.0 +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Rebase to 1.9.0 + Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- configure.ac | 1 + @@ -17,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 0a67b48..e402dd3 100644 +index 0dac6ce..6a9e507 100644 --- a/configure.ac +++ b/configure.ac -@@ -875,6 +875,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -50,7 +58,7 @@ index ce6f1d4..5f38fee 100644 diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 -index 0000000..980a48e +index 0000000..074bbf6 --- /dev/null +++ b/src/gpgme-pthread.pc.in @@ -0,0 +1,15 @@ diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-lang-config.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index 132e42677..f1f8c911f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-lang-config.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,4 +1,7 @@ -gpgme/lang/python: gpg-error-config should not be used. +From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001 +From: Mark Hatle <mark.hatle@windriver.com> +Date: Wed, 16 Aug 2017 02:02:47 -0400 +Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used. gpg-error-config was modified by OE to always return an error. So we want to find an alternative way to retrieve whatever it is we need. It turns @@ -9,10 +12,17 @@ Upstream-Status: Inappropriate [changes are specific to OE] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Index: gpgme-1.8.0/lang/python/setup.py.in -=================================================================== ---- gpgme-1.8.0.orig/lang/python/setup.py.in -+++ gpgme-1.8.0/lang/python/setup.py.in +Rebase to 1.9.0 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lang/python/setup.py.in | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in +index bf4efa3..7c34487 100755 +--- a/lang/python/setup.py.in ++++ b/lang/python/setup.py.in @@ -24,7 +24,6 @@ import glob import subprocess @@ -35,7 +45,7 @@ Index: gpgme-1.8.0/lang/python/setup.py.in subprocess.check_call(gpgme_config + ['--version'], stdout=devnull) except: -@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and min +@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)): if not gpgme_h: gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") @@ -50,3 +60,6 @@ Index: gpgme-1.8.0/lang/python/setup.py.in print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index 42655fbbe..d38331171 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,26 +1,30 @@ -From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001 +From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 9 Mar 2017 21:34:55 +0200 -Subject: [PATCH] Correctly install python modules +Date: Wed, 16 Aug 2017 02:05:34 -0400 +Subject: [PATCH 3/5] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +Rebase to 1.9.0 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- lang/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index e32fd12..5ecf6fb 100644 +index d91ead9..67f7cdc 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -102,6 +102,7 @@ install-exec-local: - for PYTHON in $(PYTHONS); do \ +@@ -106,6 +106,7 @@ install-exec-local: + cd python$${VERSION}-gpg ; \ $$PYTHON setup.py install \ --prefix $(DESTDIR)$(prefix) \ -+ --install-lib=$(DESTDIR)${pythondir} \ ++ --install-lib=$(DESTDIR)${pythondir} \ --record files.txt \ --verbose ; \ - cat files.txt >> install_files.txt ; \ + cat files.txt >> ../install_files.txt ; \ -- -2.11.0 +2.8.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-import.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch index 61b77a1f7..93071030f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-import.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch @@ -1,9 +1,21 @@ +From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 16 Aug 2017 02:06:45 -0400 +Subject: [PATCH 4/5] python import + Don't check for output on stderr to know if an import worked, host inputrc and sysroot readline can cause warnings on stderr. Upstream-Status: Backport (from autoconf-archive 883a2abd) Signed-off-by: Ross Burton <ross.burton@intel.com> +Rebase to 1.9.0 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + m4/ax_python_devel.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 index b990d5b..318b089 100644 --- a/m4/ax_python_devel.m4 @@ -17,3 +29,6 @@ index b990d5b..318b089 100644 AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 84d55b968..7a6cc7b84 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,7 +1,7 @@ -From 8c317f6186bd3a9a1c80b4d1e872b3db95934bb6 Mon Sep 17 00:00:00 2001 +From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 13 Apr 2017 16:40:27 +0300 -Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH 5/5] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other @@ -27,5 +27,5 @@ index a4d152e..8342865 100644 ;; -L*|-l*) -- -2.11.0 +2.8.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.9.0.bb index 4ddf6ed99..065c34663 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.8.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.9.0.bb @@ -6,20 +6,20 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=0f7059665c4b7897f4f4d0cb93aa9f98 \ + file://src/gpgme.h.in;endline=23;md5=9d157d08a69059344e6f82abd2d25781 \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ - file://pkgconfig.patch \ - file://python-lang-config.patch \ - file://0001-Correctly-install-python-modules.patch \ - file://python-import.patch \ - file://0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ + file://0001-pkgconfig.patch \ + file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ + file://0003-Correctly-install-python-modules.patch \ + file://0004-python-import.patch \ + file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ " -SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" -SRC_URI[sha256sum] = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33" +SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3" +SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" @@ -73,4 +73,5 @@ do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 rm -f ${S}/m4/libassuan.m4 + rm -f ${S}/m4/python.m4 } diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc b/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc index fe48101f2..a1ef9ec8b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc @@ -15,8 +15,6 @@ S = "${WORKDIR}/icu/source" SPDX_S = "${WORKDIR}/icu" STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" -CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0" - BINCONFIG = "${bindir}/icu-config" inherit autotools pkgconfig binconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/CVE-2017-14952.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/CVE-2017-14952.patch new file mode 100644 index 000000000..f759efc43 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/CVE-2017-14952.patch @@ -0,0 +1,28 @@ +From fc83cd832725d3968011f118637b9f5d212e8717 Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait <ovidiu.panait@windriver.com> +Date: Fri, 10 Nov 2017 16:51:25 +0200 +Subject: [PATCH] Removed redundant UVector entry clean up function call. + +Upstream-Status: Backport +CVE: CVE-2017-14952 + +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +--- + i18n/zonemeta.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/i18n/zonemeta.cpp b/i18n/zonemeta.cpp +index 84a9657..e163b00 100644 +--- a/i18n/zonemeta.cpp ++++ b/i18n/zonemeta.cpp +@@ -690,7 +690,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) { + mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status); + if (U_FAILURE(status)) { + delete mzMappings; +- deleteOlsonToMetaMappingEntry(entry); + uprv_free(entry); + break; + } +-- +2.10.2 + diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch index 6e4065922..e758a623e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch @@ -8,14 +8,16 @@ LARGE_BUFFER_MAX_SIZE. Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- - tools/pkgdata/pkgdata.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + tools/pkgdata/pkgdata.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp +index 60167dd..506dd32 100644 --- a/tools/pkgdata/pkgdata.cpp +++ b/tools/pkgdata/pkgdata.cpp -@@ -1019,7 +1019,7 @@ normal_symlink_mode: +@@ -1084,7 +1084,7 @@ normal_symlink_mode: static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) { int32_t result = 0; @@ -24,6 +26,24 @@ diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp sprintf(cmd, "cd %s && %s %s %s%s%s", targetDir, +@@ -1152,7 +1152,7 @@ static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, + + static int32_t pkg_installCommonMode(const char *installDir, const char *fileName) { + int32_t result = 0; +- char cmd[SMALL_BUFFER_MAX_SIZE] = ""; ++ char cmd[LARGE_BUFFER_MAX_SIZE] = ""; + + if (!T_FileStream_file_exists(installDir)) { + UErrorCode status = U_ZERO_ERROR; +@@ -1184,7 +1184,7 @@ static int32_t pkg_installCommonMode(const char *installDir, const char *fileNam + #endif + static int32_t pkg_installFileMode(const char *installDir, const char *srcDir, const char *fileListName) { + int32_t result = 0; +- char cmd[SMALL_BUFFER_MAX_SIZE] = ""; ++ char cmd[LARGE_BUFFER_MAX_SIZE] = ""; + + if (!T_FileStream_file_exists(installDir)) { + UErrorCode status = U_ZERO_ERROR; -- -1.7.10.4 +1.9.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu_58.2.bb b/import-layers/yocto-poky/meta/recipes-support/icu/icu_59.1.bb index 47684a6c8..9fb1be81c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu_58.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu_59.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=fe9e1f2c500466d8f18df2cd068e4b74" def icu_download_version(d): pvsplit = d.getVar('PV').split('.') @@ -17,13 +17,14 @@ SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ file://0001-i18n-Drop-include-xlocale.h.patch \ + file://CVE-2017-14952.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "fac212b32b7ec7ab007a12dff1f3aea1" -SRC_URI[sha256sum] = "2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c" +SRC_URI[md5sum] = "54923fa9fab5b2b83f235fb72523de37" +SRC_URI[sha256sum] = "7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.74.bb b/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.75.bb index c436a1dd2..4f3d53c17 100644 --- a/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.74.bb +++ b/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.75.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz" -SRC_URI[md5sum] = "d5448475d087756b78391b8c53c5b83a" -SRC_URI[sha256sum] = "21f4f3cea8fe09f5b53784522303a0e1e7d083964ecaf1c75b1441d4d9ec6aee" +SRC_URI[md5sum] = "9ba173b69d4360003414f23837597a92" +SRC_URI[sha256sum] = "7335e0301cd77cd4ee019bf5d3709aa79309d49dd66e85ba350caf67e00b00cd" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch diff --git a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.4.bb b/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.4.bb deleted file mode 100644 index 930c1b8ed..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A library for atomic integer operations" -HOMEPAGE = "https://github.com/ivmai/libatomic_ops/" -SECTION = "optional" -PROVIDES += "libatomics-ops" -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ - " - -SRC_URI = "\ - http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${PV}.tar.gz \ - file://0001-Add-initial-nios2-architecture-support.patch \ - " - -SRC_URI[md5sum] = "426d804baae12c372967a6d183e25af2" -SRC_URI[sha256sum] = "bf210a600dd1becbf7936dd2914cf5f5d3356046904848dcfd27d0c8b12b6f8f" - -S = "${WORKDIR}/libatomic_ops-${PV}" - -ALLOW_EMPTY_${PN} = "1" - -ARM_INSTRUCTION_SET = "arm" - -inherit autotools pkgconfig - -do_install_append() { - # those contain only docs, not necessary for now. - install -m 0755 -d ${D}${docdir} - mv ${D}${datadir}/libatomic_ops ${D}${docdir}/${BPN} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb b/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb new file mode 100644 index 000000000..4463d86c8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A library for atomic integer operations" +HOMEPAGE = "https://github.com/ivmai/libatomic_ops/" +SECTION = "optional" +PROVIDES += "libatomics-ops" +LICENSE = "GPLv2 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ + " +PV .= "+git${SRCPV}" + +SRCREV = "73c60c5ef1ed370111549ee5aab6d4020ba70ed4" +SRC_URI = "git://github.com/ivmai/libatomic_ops" + +S = "${WORKDIR}/git" + +ALLOW_EMPTY_${PN} = "1" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch index 83ce7c8dd..60da15eb8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch @@ -15,17 +15,17 @@ Upstream-Status: Inappropriate [musl specific] 3 files changed, 3 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am -index e4d6e4a..c701d94 100644 +index 28192c0..a22787d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am -@@ -29,7 +29,6 @@ dist_man_MANS = \ - flopen.3 \ - fmtcheck.3 \ - fparseln.3 \ +@@ -168,7 +168,6 @@ dist_man_MANS = \ + fmtcheck.3bsd \ + fparseln.3bsd \ + fpurge.3bsd \ - funopen.3bsd \ - getbsize.3 \ - getmode.3 \ - getpeereid.3 \ + getbsize.3bsd \ + getmode.3bsd \ + getpeereid.3bsd \ diff --git a/src/Makefile.am b/src/Makefile.am index ad83dbf..13225a3 100644 --- a/src/Makefile.am @@ -39,7 +39,7 @@ index ad83dbf..13225a3 100644 getpeereid.c \ hash/md5.c \ diff --git a/test/Makefile.am b/test/Makefile.am -index a75c8ff..e3a1d41 100644 +index d86539a..b32ed2e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -36,7 +36,6 @@ check_PROGRAMS = \ @@ -50,6 +50,3 @@ index a75c8ff..e3a1d41 100644 fparseln \ fpurge \ md5 \ --- -2.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch deleted file mode 100644 index 176d940fc..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch +++ /dev/null @@ -1,130 +0,0 @@ -From a1b93c25311834f2f411e9bfe2e616899ba2122d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 6 Nov 2016 10:23:55 -0800 -Subject: [PATCH 3/3] Fix build breaks due to missing a.out.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - include/bsd/nlist.h | 1 - - include/bsd/nlist.h => src/local-aout.h | 47 ++++++++++++++++++++++----------- - src/nlist.c | 9 +++++++ - 3 files changed, 41 insertions(+), 16 deletions(-) - copy include/bsd/nlist.h => src/local-aout.h (63%) - -diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h -index 0389ab7..9c7e3d8 100644 ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -28,7 +28,6 @@ - #define LIBBSD_NLIST_H - - #include <sys/cdefs.h> --#include <a.out.h> - - /* __BEGIN_DECLS */ - #ifdef __cplusplus -diff --git a/include/bsd/nlist.h b/src/local-aout.h -similarity index 63% -copy from include/bsd/nlist.h -copy to src/local-aout.h -index 0389ab7..2adb93e 100644 ---- a/include/bsd/nlist.h -+++ b/src/local-aout.h -@@ -1,5 +1,5 @@ - /* -- * Copyright © 2009 Guillem Jover <guillem@hadrons.org> -+ * Copyright © 2016 Khem Raj <raj.khem@gmail.com> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -24,20 +24,37 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef LIBBSD_NLIST_H --#define LIBBSD_NLIST_H -+#ifndef LIBBSD_LOCAL_AOUT_H -+#define LIBBSD_LOCAL_AOUT_H - --#include <sys/cdefs.h> --#include <a.out.h> -+#define N_UNDF 0 -+#define N_ABS 2 -+#define N_TEXT 4 -+#define N_DATA 6 -+#define N_BSS 8 -+#define N_FN 15 -+#define N_EXT 1 -+#define N_TYPE 036 -+#define N_STAB 0340 -+#define N_INDR 0xa -+#define N_SETA 0x14 /* Absolute set element symbol. */ -+#define N_SETT 0x16 /* Text set element symbol. */ -+#define N_SETD 0x18 /* Data set element symbol. */ -+#define N_SETB 0x1A /* Bss set element symbol. */ -+#define N_SETV 0x1C /* Pointer to set vector in data area. */ - --/* __BEGIN_DECLS */ --#ifdef __cplusplus --extern "C" { --#endif --extern int nlist(const char *filename, struct nlist *list); --#ifdef __cplusplus --} --#endif --/* __END_DECLS */ -+struct nlist -+{ -+ union -+ { -+ char *n_name; -+ struct nlist *n_next; -+ long n_strx; -+ } n_un; -+ unsigned char n_type; -+ char n_other; -+ short n_desc; -+ unsigned long n_value; -+}; - --#endif -+#endif /* LIBBSD_LOCAL_AOUT_H */ -diff --git a/src/nlist.c b/src/nlist.c -index 0cffe55..625d310 100644 ---- a/src/nlist.c -+++ b/src/nlist.c -@@ -40,7 +40,11 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; - - #include <errno.h> - #include <fcntl.h> -+#ifdef __GLIBC__ - #include <a.out.h> -+#else -+#define __NO_A_OUT_SUPPORT -+#endif - #include <stdio.h> - #include <string.h> - #include <unistd.h> -@@ -48,12 +52,17 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; - #if !defined(__NO_A_OUT_SUPPORT) - #define _NLIST_DO_AOUT - #endif -+ - #define _NLIST_DO_ELF - - #ifdef _NLIST_DO_ELF - #include "local-elf.h" - #endif - -+#ifdef _NLIST_DO_ELF -+#include "local-aout.h" -+#endif -+ - #define SIZE_T_MAX 0xffffffffU - - #ifdef _NLIST_DO_AOUT --- -2.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.3.bb b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.6.bb index e85ee2153..182543fd4 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.6.bb @@ -30,7 +30,7 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" # License: public-domain # License: public-domain-Colin-Plumb LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=0b9c89d861915b86655b96e5e32fa2aa" +LIC_FILES_CHKSUM = "file://COPYING;md5=08fc4e66be4526715dab09c5fba5e9e8" SECTION = "libs" SRC_URI = " \ @@ -40,11 +40,10 @@ SRC_URI = " \ SRC_URI_append_libc-musl = " \ file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \ file://0002-Remove-funopen.patch \ - file://0003-Fix-build-breaks-due-to-missing-a.out.h.patch \ " -SRC_URI[md5sum] = "e935c1bb6cc98a4a43cb1da22795493a" -SRC_URI[sha256sum] = "934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8" +SRC_URI[md5sum] = "4ab7bec639af17d0aacb50222b479110" +SRC_URI[sha256sum] = "467fbf9df1f49af11f7f686691057c8c0a7613ae5a870577bef9155de39f9687" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch b/import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch new file mode 100644 index 000000000..110ef902d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch @@ -0,0 +1,41 @@ +From a05eba68c42222f02465d7ba376015926433c531 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 26 Jul 2017 13:37:49 +0300 +Subject: [PATCH] Fix build with gperf 3.1 + +The generated gperf file refers to size_t which needs to be +provided by stddef.h include. Also, adjust the makefile +to match the declaration in the gperf file. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + libcap/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libcap/Makefile b/libcap/Makefile +index d189777..1a57206 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -22,7 +22,7 @@ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc + + ifeq ($(BUILD_GPERF),yes) + USE_GPERF_OUTPUT = $(GPERF_OUTPUT) +-INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) ++INCLUDE_GPERF_OUTPUT = -include stddef.h -include $(GPERF_OUTPUT) + endif + + libcap.pc: libcap.pc.in +@@ -41,7 +41,7 @@ cap_names.h: _makenames + ./_makenames > cap_names.h + + $(GPERF_OUTPUT): cap_names.list.h +- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ ++ perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, register size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ + + cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h + @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h" +-- +2.13.2 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb b/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb index 0587e77e9..d619a2eb4 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb @@ -9,7 +9,8 @@ DEPENDS = "hostperl-runtime-native gperf-native" SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ -" + file://0001-Fix-build-with-gperf-3.1.patch \ + " SRC_URI[md5sum] = "6666b839e5d46c2ad33fc8aa2ceb5f77" SRC_URI[sha256sum] = "693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162" @@ -22,9 +23,6 @@ do_configure() { # on what should be replaced with ?= sed -e 's,:=,?=,g' -i Make.Rules sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules - - # disable gperf detection - sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile } PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" @@ -37,6 +35,7 @@ EXTRA_OEMAKE = " \ lib=${@os.path.basename('${libdir}')} \ RAISE_SETFCAP=no \ DYNAMIC=yes \ + BUILD_GPERF=yes \ " EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.11.bb b/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb index 9df792320..b0af75919 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.11.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb @@ -16,5 +16,5 @@ BINCONFIG = "${bindir}/croco-0.6-config" inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled -SRC_URI[archive.md5sum] = "dabc1911dfbfa85f8e6859ca47863168" -SRC_URI[archive.sha256sum] = "132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056" +SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" +SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860" diff --git a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.6.bb b/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.7.bb index 2f84554bd..f740da206 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.6.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.7.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" -SRC_URI[md5sum] = "d4ce9f061f8f954bea7adba0cb768a53" -SRC_URI[sha256sum] = "ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688" +SRC_URI[md5sum] = "4f1cfaee8d75ea3fbbfeb99a98730952" +SRC_URI[sha256sum] = "a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch new file mode 100644 index 000000000..8880bd040 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch @@ -0,0 +1,27 @@ +Fix missing test directory creation. + +GCC used in OE-core has "dependency tracking" disabled and +libevent has problem with this. +Due to removed makefile.am/in files in test/sample/include +directories, output directories are not created in +configuration step. Compilation step will fails, when +trying to write to non-existing directory. + +Upstream-Status: Inappropriate [Other] +Workaround specific to our build system. + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +Signed-off-by: Pascal Bach <pascal.bach@siemens.com> + +diff --git a/libevent-2.1.8-stable/test/include.am b/libevent-2.1.8-stable/test/include.am +index eea249f..d323dff 100644 +--- a/test/include.am ++++ b/test/include.am +@@ -161,6 +161,7 @@ test_bench_httpclient_LDADD = $(LIBEVENT_GC_SECTIONS) libevent_core.la + test/regress.gen.c test/regress.gen.h: test/rpcgen-attempted + + test/rpcgen-attempted: test/regress.rpc event_rpcgen.py test/rpcgen_wrapper.sh ++ @$(MKDIR_P) test + $(AM_V_GEN)date -u > $@ + $(AM_V_at)if $(srcdir)/test/rpcgen_wrapper.sh $(srcdir)/test; then \ + true; \ diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb index df8a31c58..1270d627f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb @@ -1,18 +1,19 @@ SUMMARY = "An asynchronous event notification library" HOMEPAGE = "http://libevent.org/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=50884&atid=461322" +BUGTRACKER = "https://github.com/libevent/libevent/issues" SECTION = "libs" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz \ + https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \ + file://Makefile-missing-test-dir.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11" -SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3" +SRC_URI[md5sum] = "f3eeaed018542963b7d2416ef1135ecc" +SRC_URI[sha256sum] = "965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2" UPSTREAM_CHECK_URI = "http://libevent.org/" @@ -24,7 +25,7 @@ PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" inherit autotools # Needed for Debian packaging -LEAD_SONAME = "libevent-2.0.so" +LEAD_SONAME = "libevent-2.1.so" inherit ptest diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch b/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch new file mode 100644 index 000000000..6b167c842 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch @@ -0,0 +1,30 @@ +From 69c3906c85c791716bf650aa36d9361d22acf3fb Mon Sep 17 00:00:00 2001 +From: sweeaun <swee.aun.khor@intel.com> +Date: Thu, 6 Jul 2017 16:32:46 -0700 +Subject: [PATCH] libffi: Support musl x32 build + +Support libffi build with target musl-x32. + +Upstream-Status: Pending + +Signed-off-by: sweeaun <swee.aun.khor@intel.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a7bf5ee..8ebe99c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -177,7 +177,7 @@ case "$host" in + TARGETDIR=x86 + if test $ac_cv_sizeof_size_t = 4; then + case "$host" in +- *-gnux32) ++ *-gnux32 | *-muslx32) + TARGET=X86_64 + ;; + *) +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb b/import-layers/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb index 43eee8efc..a0b1fcd16 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb @@ -1,4 +1,5 @@ SUMMARY = "A portable foreign function interface library" +HOMEPAGE = "http://sourceware.org/libffi/" DESCRIPTION = "The `libffi' library provides a portable, high level programming interface to various calling \ conventions. This allows a programmer to call any function specified by a call interface description at run \ time. FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the \ @@ -13,13 +14,14 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \ file://not-win32.patch \ file://0001-mips-Use-compiler-internal-define-for-linux.patch \ file://0001-mips-fix-MIPS-softfloat-build-issue.patch \ + file://0001-libffi-Support-musl-x32-build.patch \ " SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43" SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37" EXTRA_OECONF += "--disable-builddir" - +EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" inherit autotools texinfo FILES_${PN}-dev += "${libdir}/libffi-${PV}" @@ -29,3 +31,4 @@ FILES_${PN}-dev += "${libdir}/libffi-${PV}" MIPS_INSTRUCTION_SET = "mips" BBCLASSEXTEND = "native nativesdk" + diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb index aca59e147..1ddddfdc9 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -32,6 +32,7 @@ do_install_append () { rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h rm -f ${D}${includedir}/libfm-1.0/fm-version.h rm -f ${D}${includedir}/libfm-1.0/fm-extra.h + rm -f ${D}${includedir}/libfm rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc rm -f ${D}${libdir}/libfm-extra.so* rm -f ${D}${libdir}/libfm-extra.a diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch index 69589f548..d41c3de3b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch @@ -1,10 +1,16 @@ -Add and use pkg-config for libgcrypt instead of -config scripts. +From 72b9e9040d58c15f0302bd8abda28179f04e1c5f Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Wed, 16 Aug 2017 10:43:18 +0800 +Subject: [PATCH 1/4] Add and use pkg-config for libgcrypt instead of -config + scripts. -Upstream-Status: Denied [upstream have indicated they don't want a pkg-config dependency] +Upstream-Status: Denied [upstream have indicated they don't want a +pkg-config dependency] RP 2014/5/22 -Rebase to 1.7.0 +Rebase to 1.8.0 + Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- configure.ac | 1 + @@ -14,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> create mode 100644 src/libgcrypt.pc.in diff --git a/configure.ac b/configure.ac -index f683e21..566e1c8 100644 +index bbe8104..3d2de73 100644 --- a/configure.ac +++ b/configure.ac -@@ -2314,6 +2314,7 @@ random/Makefile +@@ -2607,6 +2607,7 @@ random/Makefile doc/Makefile src/Makefile src/gcrypt.h @@ -173,5 +179,5 @@ index 0000000..2fc8f53 +Libs.private: -L${libdir} -lgpg-error +Cflags: -I${includedir} -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch deleted file mode 100644 index 0a4dfe677..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch +++ /dev/null @@ -1,39 +0,0 @@ -CVE: CVE-2017-9526 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 4a1768d683f6572ad86d833508c70e6b3dc1efdc Mon Sep 17 00:00:00 2001 -From: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be> -Date: Thu, 19 Jan 2017 17:00:15 +0100 -Subject: [PATCH] ecc: Store EdDSA session key in secure memory. - -* cipher/ecc-eddsa.c (_gcry_ecc_eddsa_sign): use mpi_snew to allocate -session key. --- - -An attacker who learns the EdDSA session key from side-channel -observation during the signing process, can easily revover the long- -term secret key. Storing the session key in secure memory ensures that -constant time point operations are used in the MPI library. - -Signed-off-by: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be> ---- - cipher/ecc-eddsa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cipher/ecc-eddsa.c b/cipher/ecc-eddsa.c -index f91f8489..813e030d 100644 ---- a/cipher/ecc-eddsa.c -+++ b/cipher/ecc-eddsa.c -@@ -603,7 +603,7 @@ _gcry_ecc_eddsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - a = mpi_snew (0); - x = mpi_new (0); - y = mpi_new (0); -- r = mpi_new (0); -+ r = mpi_snew (0); - ctx = _gcry_mpi_ec_p_internal_new (skey->E.model, skey->E.dialect, 0, - skey->E.p, skey->E.a, skey->E.b); - b = (ctx->nbits+7)/8; --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch index a3e540369..d7554f38a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch @@ -1,25 +1,34 @@ -Upstream-Status: Pending +From 97570ef271ea1fb7b5ca903eec88f68407b0ec76 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 16 Aug 2017 10:44:41 +0800 +Subject: [PATCH 2/4] libgcrypt: fix building error with '-O2' in sysroot path -libgcrypt: fix building error with '-O2' in sysroot path +Upstream-Status: Pending -Characters like '-O2' or '-Ofast' will be replaced by '-O1' when compiling cipher. -If we are cross compiling libgcrypt and sysroot contains such characters, we would +Characters like '-O2' or '-Ofast' will be replaced by '-O1' when +compiling cipher. +If we are cross compiling libgcrypt and sysroot contains such +characters, we would get compile errors because the sysroot path has been modified. -Fix this by adding blank spaces before and after the original matching pattern in the +Fix this by adding blank spaces before and after the original matching +pattern in the sed command. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +Rebase to 1.8.0 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - cipher/Makefile.am | 2 +- + cipher/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index 76cdc96..9a89792 100644 +index 95c4510..bd52ec7 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am -@@ -69,7 +69,7 @@ rfc2268.c \ - camellia.c camellia.h camellia-glue.c +@@ -116,7 +116,7 @@ gost-s-box: gost-s-box.c + if ENABLE_O_FLAG_MUNGING -o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' @@ -28,5 +37,5 @@ index 76cdc96..9a89792 100644 o_flag_munging = cat endif -- -1.7.9.5 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch index 582e62f70..105df2957 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch @@ -1,4 +1,8 @@ -tests/bench-slope.c: workaround ICE failure on mips with '-O -g' +From 7cc702c7b5a1ccc2b0091f3effa1391b6c3030fd Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 16 Aug 2017 10:46:28 +0800 +Subject: [PATCH 3/4] tests/bench-slope.c: workaround ICE failure on mips with + '-O -g' Hit a ICE and could reduce it to the following minimal example: @@ -24,31 +28,35 @@ END 2. Only -O1 and -g on mips caused the issue: $ mips-poky-linux-gcc -O1 -g -o mipgcc-test mipgcc-test.c mipgcc-test.c: In function 'main': -mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:20810 +mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location, +at dwarf2out.c:20810 } ^ Please submit a full bug report, with preprocessed source if appropriate. See <http://gcc.gnu.org/bugs.html> for instructions -3. The quick workround is trying to enlarge the size of array with larger +3. The quick workround is trying to enlarge the size of array with +larger than 2. -4. File a bug to GNU, but it could not be reproduced on there environment. +4. File a bug to GNU, but it could not be reproduced on there +environment. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60643 Upstream-Status: Inappropriate [oe specific] +Rebase to 1.8.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- tests/bench-slope.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bench-slope.c b/tests/bench-slope.c -index bd05064..28c2438 100644 +index 75e6e43..4e70842 100644 --- a/tests/bench-slope.c +++ b/tests/bench-slope.c -@@ -1197,7 +1197,7 @@ static struct bench_ops hash_ops = { +@@ -1463,7 +1463,7 @@ static struct bench_ops hash_ops = { }; @@ -57,7 +65,7 @@ index bd05064..28c2438 100644 {"", &hash_ops}, {0}, }; -@@ -1349,7 +1349,7 @@ static struct bench_ops mac_ops = { +@@ -1629,7 +1629,7 @@ static struct bench_ops mac_ops = { }; @@ -67,5 +75,5 @@ index bd05064..28c2438 100644 {0}, }; -- -1.8.1.2 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch index e7de8badf..8622df3ea 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch @@ -1,7 +1,8 @@ -From cc0e2b403d33892963513a3ba98e4ae5a05a4d3c Mon Sep 17 00:00:00 2001 +From e20dbdb0b8f0af840ef90b299c4e2277c52ddf87 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sun, 12 Jun 2016 04:44:29 -0400 -Subject: [PATCH] tests/Makefile.am: fix undefined reference to `pthread_create' +Subject: [PATCH 4/4] tests/Makefile.am: fix undefined reference to + `pthread_create' Add missing '-lpthread' to CFLAGS @@ -13,15 +14,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index d462f30..bef6dd7 100644 +index 1744ea7..04cf425 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -62,4 +62,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \ +@@ -64,4 +64,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \ LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS) t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) -t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) +t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0005-ecc-Add-input-validation-for-X25519.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0005-ecc-Add-input-validation-for-X25519.patch new file mode 100644 index 000000000..66fdd740b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0005-ecc-Add-input-validation-for-X25519.patch @@ -0,0 +1,158 @@ +From ef570e3d2773c12126e7d3fcdc4db9ef80a5e214 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Fri, 25 Aug 2017 18:13:28 +0900 +Subject: [PATCH] ecc: Add input validation for X25519. + +* cipher/ecc.c (ecc_decrypt_raw): Add input validation. +* mpi/ec.c (ec_p_init): Use scratch buffer for bad points. +(_gcry_mpi_ec_bad_point): New. + +-- + +Following is the paper describing the attack: + + May the Fourth Be With You: A Microarchitectural Side Channel Attack + on Real-World Applications of Curve25519 + by Daniel Genkin, Luke Valenta, and Yuval Yarom + +In the current implementation, we do output checking and it results an +error for those bad points. However, when attacked, the computation +will done with leak of private key, even it will results errors. To +mitigate leak, we added input validation. + +Note that we only list bad points with MSB=0. By X25519, MSB is +always cleared. + +In future, we should implement constant-time field computation. Then, +this input validation could be removed, if performance is important +and we are sure for no leak. + +CVE-id: CVE-2017-0379 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> + +Upstream-Status: Backport +CVE: CVE-2017-0379 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + cipher/ecc.c | 17 +++++++++++++++-- + mpi/ec.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- + src/mpi.h | 1 + + 3 files changed, 64 insertions(+), 5 deletions(-) + +diff --git a/cipher/ecc.c b/cipher/ecc.c +index e25bf09..4e3e5b1 100644 +--- a/cipher/ecc.c ++++ b/cipher/ecc.c +@@ -1628,9 +1628,22 @@ ecc_decrypt_raw (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t keyparms) + if (DBG_CIPHER) + log_printpnt ("ecc_decrypt kG", &kG, NULL); + +- if (!(flags & PUBKEY_FLAG_DJB_TWEAK) ++ if ((flags & PUBKEY_FLAG_DJB_TWEAK)) ++ { + /* For X25519, by its definition, validation should not be done. */ +- && !_gcry_mpi_ec_curve_point (&kG, ec)) ++ /* (Instead, we do output check.) ++ * ++ * However, to mitigate secret key leak from our implementation, ++ * we also do input validation here. For constant-time ++ * implementation, we can remove this input validation. ++ */ ++ if (_gcry_mpi_ec_bad_point (&kG, ec)) ++ { ++ rc = GPG_ERR_INV_DATA; ++ goto leave; ++ } ++ } ++ else if (!_gcry_mpi_ec_curve_point (&kG, ec)) + { + rc = GPG_ERR_INV_DATA; + goto leave; +diff --git a/mpi/ec.c b/mpi/ec.c +index a0f7357..4c16603 100644 +--- a/mpi/ec.c ++++ b/mpi/ec.c +@@ -396,6 +396,29 @@ ec_get_two_inv_p (mpi_ec_t ec) + } + + ++static const char *curve25519_bad_points[] = { ++ "0x0000000000000000000000000000000000000000000000000000000000000000", ++ "0x0000000000000000000000000000000000000000000000000000000000000001", ++ "0x00b8495f16056286fdb1329ceb8d09da6ac49ff1fae35616aeb8413b7c7aebe0", ++ "0x57119fd0dd4e22d8868e1c58c45c44045bef839c55b1d0b1248c50a3bc959c5f", ++ "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec", ++ "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed", ++ "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffee", ++ NULL ++}; ++ ++static gcry_mpi_t ++scanval (const char *string) ++{ ++ gpg_err_code_t rc; ++ gcry_mpi_t val; ++ ++ rc = _gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL); ++ if (rc) ++ log_fatal ("scanning ECC parameter failed: %s\n", gpg_strerror (rc)); ++ return val; ++} ++ + + /* This function initialized a context for elliptic curve based on the + field GF(p). P is the prime specifying this field, A is the first +@@ -434,9 +457,17 @@ ec_p_init (mpi_ec_t ctx, enum gcry_mpi_ec_models model, + + _gcry_mpi_ec_get_reset (ctx); + +- /* Allocate scratch variables. */ +- for (i=0; i< DIM(ctx->t.scratch); i++) +- ctx->t.scratch[i] = mpi_alloc_like (ctx->p); ++ if (model == MPI_EC_MONTGOMERY) ++ { ++ for (i=0; i< DIM(ctx->t.scratch) && curve25519_bad_points[i]; i++) ++ ctx->t.scratch[i] = scanval (curve25519_bad_points[i]); ++ } ++ else ++ { ++ /* Allocate scratch variables. */ ++ for (i=0; i< DIM(ctx->t.scratch); i++) ++ ctx->t.scratch[i] = mpi_alloc_like (ctx->p); ++ } + + /* Prepare for fast reduction. */ + /* FIXME: need a test for NIST values. However it does not gain us +@@ -1572,3 +1603,17 @@ _gcry_mpi_ec_curve_point (gcry_mpi_point_t point, mpi_ec_t ctx) + + return res; + } ++ ++ ++int ++_gcry_mpi_ec_bad_point (gcry_mpi_point_t point, mpi_ec_t ctx) ++{ ++ int i; ++ gcry_mpi_t x_bad; ++ ++ for (i = 0; (x_bad = ctx->t.scratch[i]); i++) ++ if (!mpi_cmp (point->x, x_bad)) ++ return 1; ++ ++ return 0; ++} +diff --git a/src/mpi.h b/src/mpi.h +index b5385b5..aeba7f8 100644 +--- a/src/mpi.h ++++ b/src/mpi.h +@@ -296,6 +296,7 @@ void _gcry_mpi_ec_mul_point (mpi_point_t result, + gcry_mpi_t scalar, mpi_point_t point, + mpi_ec_t ctx); + int _gcry_mpi_ec_curve_point (gcry_mpi_point_t point, mpi_ec_t ctx); ++int _gcry_mpi_ec_bad_point (gcry_mpi_point_t point, mpi_ec_t ctx); + + gcry_mpi_t _gcry_mpi_ec_ec2os (gcry_mpi_point_t point, mpi_ec_t ectx); + +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch new file mode 100644 index 000000000..65b9fd41e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch @@ -0,0 +1,96 @@ +From 4a7aa30ae9f3ce798dd886c2f2d4164c43027748 Mon Sep 17 00:00:00 2001 +From: Jussi Kivilinna <jussi.kivilinna@iki.fi> +Date: Sat, 29 Jul 2017 14:34:23 +0300 +Subject: [PATCH] Fix building AArch32 CE implementations when target is ARMv6 + arch + +* cipher/cipher-gcm-armv8-aarch32-ce.S: Select ARMv8 architecure. +* cipher/rijndael-armv8-aarch32-ce.S: Ditto. +* cipher/sha1-armv8-aarch32-ce.S: Ditto. +* cipher/sha256-armv8-aarch32-ce.S: Ditto. +* configure.ac (gcry_cv_gcc_inline_asm_aarch32_crypto): Ditto. +-- + +Raspbian distribution defaults to ARMv6 architecture thus 'rbit' +instruction is not available with default compiler flags. Patch +adds explicit architecture selection for ARMv8 to enable 'rbit' +usage with ARMv8/AArch32-CE assembly implementations of SHA, +GHASH and AES. + +Reported-by: Chris Horry <zerbey@gmail.com> +Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> + +Signed-off-by: Paul Barker <pbarker@toganlabs.com> +Upstream-Status: Backport + +--- + cipher/cipher-gcm-armv8-aarch32-ce.S | 1 + + cipher/rijndael-armv8-aarch32-ce.S | 1 + + cipher/sha1-armv8-aarch32-ce.S | 1 + + cipher/sha256-armv8-aarch32-ce.S | 1 + + configure.ac | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/cipher/cipher-gcm-armv8-aarch32-ce.S b/cipher/cipher-gcm-armv8-aarch32-ce.S +index b61a7871..1de66a16 100644 +--- a/cipher/cipher-gcm-armv8-aarch32-ce.S ++++ b/cipher/cipher-gcm-armv8-aarch32-ce.S +@@ -24,6 +24,7 @@ + defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) + + .syntax unified ++.arch armv8-a + .fpu crypto-neon-fp-armv8 + .arm + +diff --git a/cipher/rijndael-armv8-aarch32-ce.S b/cipher/rijndael-armv8-aarch32-ce.S +index f375f673..5c8fa3c0 100644 +--- a/cipher/rijndael-armv8-aarch32-ce.S ++++ b/cipher/rijndael-armv8-aarch32-ce.S +@@ -24,6 +24,7 @@ + defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) + + .syntax unified ++.arch armv8-a + .fpu crypto-neon-fp-armv8 + .arm + +diff --git a/cipher/sha1-armv8-aarch32-ce.S b/cipher/sha1-armv8-aarch32-ce.S +index b0bc5ffe..bf2b233b 100644 +--- a/cipher/sha1-armv8-aarch32-ce.S ++++ b/cipher/sha1-armv8-aarch32-ce.S +@@ -24,6 +24,7 @@ + defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) && defined(USE_SHA1) + + .syntax unified ++.arch armv8-a + .fpu crypto-neon-fp-armv8 + .arm + +diff --git a/cipher/sha256-armv8-aarch32-ce.S b/cipher/sha256-armv8-aarch32-ce.S +index 2041a237..2b17ab1b 100644 +--- a/cipher/sha256-armv8-aarch32-ce.S ++++ b/cipher/sha256-armv8-aarch32-ce.S +@@ -24,6 +24,7 @@ + defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) && defined(USE_SHA256) + + .syntax unified ++.arch armv8-a + .fpu crypto-neon-fp-armv8 + .arm + +diff --git a/configure.ac b/configure.ac +index 27faa7f4..66e7cd67 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1619,6 +1619,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AArch32 Crypto Extension i + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [[__asm__( + ".syntax unified\n\t" ++ ".arch armv8-a\n\t" + ".arm\n\t" + ".fpu crypto-neon-fp-armv8\n\t" + +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch deleted file mode 100644 index 384fa964a..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch +++ /dev/null @@ -1,455 +0,0 @@ -Flush+reload side-channel attack on RSA secret keys dubbed "Sliding right -into disaster". - -CVE: CVE-2017-7526 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 12ee400c39e0ebb5fb819c3926d459c278fc99fd Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Tue, 4 Apr 2017 17:38:05 +0900 -Subject: [PATCH 1/5] mpi: Simplify mpi_powm. - -* mpi/mpi-pow.c (_gcry_mpi_powm): Simplify the loop. - --- - -This fix is not a solution for the problem reported (yet). The -problem is that the current algorithm of _gcry_mpi_powm depends on -exponent and some information leaks is possible. - -Reported-by: Andreas Zankl <andreas.zankl@aisec.fraunhofer.de> -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> - -(backport from master commit: -719468e53133d3bdf12156c5bfdea2bf15f9f6f1) - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - mpi/mpi-pow.c | 105 +++++++++++++++++----------------------------------------- - 1 file changed, 30 insertions(+), 75 deletions(-) - -diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c -index a780ebd1..7b3dc318 100644 ---- a/mpi/mpi-pow.c -+++ b/mpi/mpi-pow.c -@@ -609,12 +609,8 @@ _gcry_mpi_powm (gcry_mpi_t res, - if (e == 0) - { - j += c; -- i--; -- if ( i < 0 ) -- { -- c = 0; -- break; -- } -+ if ( --i < 0 ) -+ break; - - e = ep[i]; - c = BITS_PER_MPI_LIMB; -@@ -629,38 +625,33 @@ _gcry_mpi_powm (gcry_mpi_t res, - c -= c0; - j += c0; - -+ e0 = (e >> (BITS_PER_MPI_LIMB - W)); - if (c >= W) -- { -- e0 = (e >> (BITS_PER_MPI_LIMB - W)); -- e = (e << W); -- c -= W; -- } -+ c0 = 0; - else - { -- i--; -- if ( i < 0 ) -+ if ( --i < 0 ) - { -- e = (e >> (BITS_PER_MPI_LIMB - c)); -- break; -+ e0 = (e >> (BITS_PER_MPI_LIMB - c)); -+ j += c - W; -+ goto last_step; -+ } -+ else -+ { -+ c0 = c; -+ e = ep[i]; -+ c = BITS_PER_MPI_LIMB; -+ e0 |= (e >> (BITS_PER_MPI_LIMB - (W - c0))); - } -- -- c0 = c; -- e0 = (e >> (BITS_PER_MPI_LIMB - W)) -- | (ep[i] >> (BITS_PER_MPI_LIMB - W + c0)); -- e = (ep[i] << (W - c0)); -- c = BITS_PER_MPI_LIMB - W + c0; - } - -+ e = e << (W - c0); -+ c -= (W - c0); -+ -+ last_step: - count_trailing_zeros (c0, e0); - e0 = (e0 >> c0) >> 1; - -- for (j += W - c0; j; j--) -- { -- mul_mod (xp, &xsize, rp, rsize, rp, rsize, mp, msize, &karactx); -- tp = rp; rp = xp; xp = tp; -- rsize = xsize; -- } -- - /* - * base_u <= precomp[e0] - * base_u_size <= precomp_size[e0] -@@ -677,25 +668,23 @@ _gcry_mpi_powm (gcry_mpi_t res, - u.d = precomp[k]; - - mpi_set_cond (&w, &u, k == e0); -- base_u_size |= (precomp_size[k] & ((mpi_size_t)0 - (k == e0)) ); -+ base_u_size |= ( precomp_size[k] & ((mpi_size_t)0 - (k == e0)) ); - } - -- mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, -- mp, msize, &karactx); -- tp = rp; rp = xp; xp = tp; -- rsize = xsize; -+ for (j += W - c0; j >= 0; j--) -+ { -+ mul_mod (xp, &xsize, rp, rsize, -+ j == 0 ? base_u : rp, j == 0 ? base_u_size : rsize, -+ mp, msize, &karactx); -+ tp = rp; rp = xp; xp = tp; -+ rsize = xsize; -+ } - - j = c0; -+ if ( i < 0 ) -+ break; - } - -- if (c != 0) -- { -- j += c; -- count_trailing_zeros (c, e); -- e = (e >> c); -- j -= c; -- } -- - while (j--) - { - mul_mod (xp, &xsize, rp, rsize, rp, rsize, mp, msize, &karactx); -@@ -703,40 +692,6 @@ _gcry_mpi_powm (gcry_mpi_t res, - rsize = xsize; - } - -- if (e != 0) -- { -- /* -- * base_u <= precomp[(e>>1)] -- * base_u_size <= precomp_size[(e>>1)] -- */ -- base_u_size = 0; -- for (k = 0; k < (1<< (W - 1)); k++) -- { -- struct gcry_mpi w, u; -- w.alloced = w.nlimbs = precomp_size[k]; -- u.alloced = u.nlimbs = precomp_size[k]; -- w.sign = u.sign = 0; -- w.flags = u.flags = 0; -- w.d = base_u; -- u.d = precomp[k]; -- -- mpi_set_cond (&w, &u, k == (e>>1)); -- base_u_size |= (precomp_size[k] & ((mpi_size_t)0 - (k == (e>>1))) ); -- } -- -- mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, -- mp, msize, &karactx); -- tp = rp; rp = xp; xp = tp; -- rsize = xsize; -- -- for (; c; c--) -- { -- mul_mod (xp, &xsize, rp, rsize, rp, rsize, mp, msize, &karactx); -- tp = rp; rp = xp; xp = tp; -- rsize = xsize; -- } -- } -- - /* We shifted MOD, the modulo reduction argument, left - MOD_SHIFT_CNT steps. Adjust the result by reducing it with the - original MOD. --- -2.11.0 - - -From a4b275c4d5378837e820fdc84f4ada876f9c8ccd Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Sat, 24 Jun 2017 20:46:20 +0900 -Subject: [PATCH 2/5] Same computation for square and multiply. - -* mpi/mpi-pow.c (_gcry_mpi_powm): Compare msize for max_u_size. Move -the assignment to base_u into the loop. Copy content refered by RP to -BASE_U except the last of the loop. - --- - -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> -(backport from master commit: -78130828e9a140a9de4dafadbc844dbb64cb709a) - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - mpi/mpi-pow.c | 50 +++++++++++++++++++++++++++++--------------------- - 1 file changed, 29 insertions(+), 21 deletions(-) - -diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c -index 7b3dc318..3cba6903 100644 ---- a/mpi/mpi-pow.c -+++ b/mpi/mpi-pow.c -@@ -573,6 +573,8 @@ _gcry_mpi_powm (gcry_mpi_t res, - MPN_COPY (precomp[i], rp, rsize); - } - -+ if (msize > max_u_size) -+ max_u_size = msize; - base_u = mpi_alloc_limb_space (max_u_size, esec); - MPN_ZERO (base_u, max_u_size); - -@@ -619,6 +621,10 @@ _gcry_mpi_powm (gcry_mpi_t res, - { - int c0; - mpi_limb_t e0; -+ struct gcry_mpi w, u; -+ w.sign = u.sign = 0; -+ w.flags = u.flags = 0; -+ w.d = base_u; - - count_leading_zeros (c0, e); - e = (e << c0); -@@ -652,29 +658,31 @@ _gcry_mpi_powm (gcry_mpi_t res, - count_trailing_zeros (c0, e0); - e0 = (e0 >> c0) >> 1; - -- /* -- * base_u <= precomp[e0] -- * base_u_size <= precomp_size[e0] -- */ -- base_u_size = 0; -- for (k = 0; k < (1<< (W - 1)); k++) -- { -- struct gcry_mpi w, u; -- w.alloced = w.nlimbs = precomp_size[k]; -- u.alloced = u.nlimbs = precomp_size[k]; -- w.sign = u.sign = 0; -- w.flags = u.flags = 0; -- w.d = base_u; -- u.d = precomp[k]; -- -- mpi_set_cond (&w, &u, k == e0); -- base_u_size |= ( precomp_size[k] & ((mpi_size_t)0 - (k == e0)) ); -- } -- - for (j += W - c0; j >= 0; j--) - { -- mul_mod (xp, &xsize, rp, rsize, -- j == 0 ? base_u : rp, j == 0 ? base_u_size : rsize, -+ -+ /* -+ * base_u <= precomp[e0] -+ * base_u_size <= precomp_size[e0] -+ */ -+ base_u_size = 0; -+ for (k = 0; k < (1<< (W - 1)); k++) -+ { -+ w.alloced = w.nlimbs = precomp_size[k]; -+ u.alloced = u.nlimbs = precomp_size[k]; -+ u.d = precomp[k]; -+ -+ mpi_set_cond (&w, &u, k == e0); -+ base_u_size |= ( precomp_size[k] & (0UL - (k == e0)) ); -+ } -+ -+ w.alloced = w.nlimbs = rsize; -+ u.alloced = u.nlimbs = rsize; -+ u.d = rp; -+ mpi_set_cond (&w, &u, j != 0); -+ base_u_size ^= ((base_u_size ^ rsize) & (0UL - (j != 0))); -+ -+ mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, - mp, msize, &karactx); - tp = rp; rp = xp; xp = tp; - rsize = xsize; --- -2.11.0 - - -From 129c1960e55603ec3f6fd1cd9cd51b22e9a9a7ef Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Thu, 29 Jun 2017 11:48:44 +0900 -Subject: [PATCH 3/5] rsa: Add exponent blinding. - -* cipher/rsa.c (secret): Blind secret D with randomized nonce R for -mpi_powm computation. - --- - -Co-authored-by: Werner Koch <wk@gnupg.org> -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> - -The paper describing attack: https://eprint.iacr.org/2017/627 - -Sliding right into disaster: Left-to-right sliding windows leak -by Daniel J. Bernstein and Joachim Breitner and Daniel Genkin and -Leon Groot Bruinderink and Nadia Heninger and Tanja Lange and -Christine van Vredendaal and Yuval Yarom - - It is well known that constant-time implementations of modular - exponentiation cannot use sliding windows. However, software - libraries such as Libgcrypt, used by GnuPG, continue to use sliding - windows. It is widely believed that, even if the complete pattern of - squarings and multiplications is observed through a side-channel - attack, the number of exponent bits leaked is not sufficient to - carry out a full key-recovery attack against RSA. Specifically, - 4-bit sliding windows leak only 40% of the bits, and 5-bit sliding - windows leak only 33% of the bits. - - In this paper we demonstrate a complete break of RSA-1024 as - implemented in Libgcrypt. Our attack makes essential use of the fact - that Libgcrypt uses the left-to-right method for computing the - sliding-window expansion. We show for the first time that the - direction of the encoding matters: the pattern of squarings and - multiplications in left-to-right sliding windows leaks significantly - more information about exponent bits than for right-to-left. We show - how to incorporate this additional information into the - Heninger-Shacham algorithm for partial key reconstruction, and use - it to obtain very efficient full key recovery for RSA-1024. We also - provide strong evidence that the same attack works for RSA-2048 with - only moderately more computation. - -Exponent blinding is a kind of workaround to add noise. Signal (leak) -is still there for non-constant-time implementation. - -(backported from master commit: -8725c99ffa41778f382ca97233183bcd687bb0ce) - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - cipher/rsa.c | 32 +++++++++++++++++++++++++------- - 1 file changed, 25 insertions(+), 7 deletions(-) - -diff --git a/cipher/rsa.c b/cipher/rsa.c -index b6c73741..25e29b5c 100644 ---- a/cipher/rsa.c -+++ b/cipher/rsa.c -@@ -1021,15 +1021,33 @@ secret (gcry_mpi_t output, gcry_mpi_t input, RSA_secret_key *skey ) - gcry_mpi_t m1 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); - gcry_mpi_t m2 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); - gcry_mpi_t h = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); -- -- /* m1 = c ^ (d mod (p-1)) mod p */ -+ gcry_mpi_t D_blind = mpi_alloc_secure ( mpi_get_nlimbs(skey->n) + 1 ); -+ gcry_mpi_t r; -+ unsigned int r_nbits; -+ -+ r_nbits = mpi_get_nbits (skey->p) / 4; -+ if (r_nbits < 96) -+ r_nbits = 96; -+ r = mpi_alloc_secure ((r_nbits + BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB); -+ -+ /* d_blind = (d mod (p-1)) + (p-1) * r */ -+ /* m1 = c ^ d_blind mod p */ -+ _gcry_mpi_randomize (r, r_nbits, GCRY_WEAK_RANDOM); -+ mpi_set_highbit (r, r_nbits - 1); - mpi_sub_ui( h, skey->p, 1 ); -- mpi_fdiv_r( h, skey->d, h ); -- mpi_powm( m1, input, h, skey->p ); -- /* m2 = c ^ (d mod (q-1)) mod q */ -+ mpi_mul ( D_blind, h, r ); -+ mpi_fdiv_r ( h, skey->d, h ); -+ mpi_add ( D_blind, D_blind, h ); -+ mpi_powm( m1, input, D_blind, skey->p ); -+ /* d_blind = (d mod (q-1)) + (q-1) * r */ -+ /* m2 = c ^ d_blind mod q */ -+ _gcry_mpi_randomize (r, r_nbits, GCRY_WEAK_RANDOM); -+ mpi_set_highbit (r, r_nbits - 1); - mpi_sub_ui( h, skey->q, 1 ); -- mpi_fdiv_r( h, skey->d, h ); -- mpi_powm( m2, input, h, skey->q ); -+ mpi_mul ( D_blind, h, r ); -+ mpi_fdiv_r ( h, skey->d, h ); -+ mpi_add ( D_blind, D_blind, h ); -+ mpi_powm( m2, input, D_blind, skey->q ); - /* h = u * ( m2 - m1 ) mod q */ - mpi_sub( h, m2, m1 ); - if ( mpi_has_sign ( h ) ) --- -2.11.0 - - -From 8e1a6289b7d11a8bf6c94affa06c9794e7216e26 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Thu, 29 Jun 2017 12:36:27 +0900 -Subject: [PATCH 4/5] rsa: Fix exponent blinding. - -* cipher/rsa.c (secret): Free D_BLIND. - --- - -Fixes-commit: a9f612def801c8145d551d995475e5d51a4c988c -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - cipher/rsa.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cipher/rsa.c b/cipher/rsa.c -index 25e29b5c..33f92ebd 100644 ---- a/cipher/rsa.c -+++ b/cipher/rsa.c -@@ -1057,6 +1057,7 @@ secret (gcry_mpi_t output, gcry_mpi_t input, RSA_secret_key *skey ) - mpi_mul ( h, h, skey->p ); - mpi_add ( output, m1, h ); - -+ mpi_free ( D_blind ); - mpi_free ( h ); - mpi_free ( m1 ); - mpi_free ( m2 ); --- -2.11.0 - - -From 4e5497752172edc444029af645f28cb88ce93906 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Thu, 29 Jun 2017 12:40:19 +0900 -Subject: [PATCH 5/5] rsa: More fix. - -* cipher/rsa.c (secret): Free R. - --- - -Fixes-commit: a9f612def801c8145d551d995475e5d51a4c988c -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - cipher/rsa.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cipher/rsa.c b/cipher/rsa.c -index 33f92ebd..8d8d157b 100644 ---- a/cipher/rsa.c -+++ b/cipher/rsa.c -@@ -1057,6 +1057,7 @@ secret (gcry_mpi_t output, gcry_mpi_t input, RSA_secret_key *skey ) - mpi_mul ( h, h, skey->p ); - mpi_add ( output, m1, h ); - -+ mpi_free ( r ); - mpi_free ( D_blind ); - mpi_free ( h ); - mpi_free ( m1 ); --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb deleted file mode 100644 index da0a1fe7f..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libgcrypt.inc - -SRC_URI[md5sum] = "eac6d11999650e8a1493674c1bdbc7f8" -SRC_URI[sha256sum] = "fc0aec7714d75d812b665bd510d66031b1b2ce8fa855cc2c02238c954ea36982" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb index 3403579a7..02982f03c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb @@ -16,19 +16,22 @@ DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \ - file://add-pkgconfig-support.patch \ - file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ - file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \ - file://fix-undefined-reference-to-pthread.patch \ - file://0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch \ - file://CVE-2017-7526.patch \ + file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \ + file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ + file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ + file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ + file://0005-ecc-Add-input-validation-for-X25519.patch \ + file://0006-Fix-building-AArch32-CE-implementations-when-target-.patch \ " +SRC_URI[md5sum] = "110ce4352f9ea6f560bdc6c5644ae93c" +SRC_URI[sha256sum] = "f6e470b7f2d3a703e8747f05a8c19d9e10e26ebf2d5f3d71ff75a40f504e12ee" BINCONFIG = "${bindir}/libgcrypt-config" inherit autotools texinfo binconfig-disabled pkgconfig EXTRA_OECONF = "--disable-asm" +EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" PACKAGECONFIG ??= "capabilities" PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap" @@ -49,6 +52,4 @@ PACKAGES =+ "dumpsexp-dev" FILES_${PN}-dev += "${bindir}/hmac256" FILES_dumpsexp-dev += "${bindir}/dumpsexp" -ARM_INSTRUCTION_SET = "arm" - BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb b/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb index 090db1b49..b2e2d507c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;endline=23;md5=64af9846baaf852793fd3a5af393acbf \ + file://src/gpg-error.h.in;endline=23;md5=beae1e44d8d5c265d194760276033a7c \ file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" @@ -16,9 +16,8 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "97456709dbbcbb69354317ffe3e347cd" -SRC_URI[sha256sum] = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69" -PR = "r1" +SRC_URI[md5sum] = "5217ef3e76a7275a2a3b569a12ddc989" +SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2" BINCONFIG = "${bindir}/gpg-error-config" diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch deleted file mode 100644 index 6af377b4c..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch +++ /dev/null @@ -1,5008 +0,0 @@ -This patch is needed to solve issues like -| iconv.o: In function `main': -| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/src/./iconv.c:861: undefined reference to `relocate' -| ../srclib/libicrt.a(progreloc.o): In function `prepare_relocate': -| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/srclib/progreloc.c:297: undefined reference to `compute_curr_prefix' -| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/srclib/progreloc.c:302: undefined reference to `set_relocation_prefix' -| collect2: ld returned 1 exit status -| make[1]: *** [install] Error 1 - -Upstream-Status: Inappropriate [OE config specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -diff -Naurp libiconv-1.14.org//build-aux/arg-nonnull.h libiconv-1.14/build-aux/arg-nonnull.h ---- libiconv-1.14.org//build-aux/arg-nonnull.h 1969-12-31 16:00:00.000000000 -0800 -+++ libiconv-1.14/build-aux/arg-nonnull.h 2012-01-08 02:07:39.930484438 -0800 -@@ -0,0 +1,26 @@ -+/* A C macro for declaring that specific arguments must not be NULL. -+ Copyright (C) 2009-2011 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published -+ by the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -+ -+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools -+ that the values passed as arguments n, ..., m must be non-NULL pointers. -+ n = 1 stands for the first argument, n = 2 for the second argument etc. */ -+#ifndef _GL_ARG_NONNULL -+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 -+# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) -+# else -+# define _GL_ARG_NONNULL(params) -+# endif -+#endif -diff -Naurp libiconv-1.14.org//build-aux/c++defs.h libiconv-1.14/build-aux/c++defs.h ---- libiconv-1.14.org//build-aux/c++defs.h 1969-12-31 16:00:00.000000000 -0800 -+++ libiconv-1.14/build-aux/c++defs.h 2012-01-08 02:07:39.942484438 -0800 -@@ -0,0 +1,271 @@ -+/* C++ compatible function declaration macros. -+ Copyright (C) 2010-2011 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published -+ by the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -+ -+#ifndef _GL_CXXDEFS_H -+#define _GL_CXXDEFS_H -+ -+/* The three most frequent use cases of these macros are: -+ -+ * For providing a substitute for a function that is missing on some -+ platforms, but is declared and works fine on the platforms on which -+ it exists: -+ -+ #if @GNULIB_FOO@ -+ # if !@HAVE_FOO@ -+ _GL_FUNCDECL_SYS (foo, ...); -+ # endif -+ _GL_CXXALIAS_SYS (foo, ...); -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+ -+ * For providing a replacement for a function that exists on all platforms, -+ but is broken/insufficient and needs to be replaced on some platforms: -+ -+ #if @GNULIB_FOO@ -+ # if @REPLACE_FOO@ -+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ # undef foo -+ # define foo rpl_foo -+ # endif -+ _GL_FUNCDECL_RPL (foo, ...); -+ _GL_CXXALIAS_RPL (foo, ...); -+ # else -+ _GL_CXXALIAS_SYS (foo, ...); -+ # endif -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+ -+ * For providing a replacement for a function that exists on some platforms -+ but is broken/insufficient and needs to be replaced on some of them and -+ is additionally either missing or undeclared on some other platforms: -+ -+ #if @GNULIB_FOO@ -+ # if @REPLACE_FOO@ -+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ # undef foo -+ # define foo rpl_foo -+ # endif -+ _GL_FUNCDECL_RPL (foo, ...); -+ _GL_CXXALIAS_RPL (foo, ...); -+ # else -+ # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ -+ _GL_FUNCDECL_SYS (foo, ...); -+ # endif -+ _GL_CXXALIAS_SYS (foo, ...); -+ # endif -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+*/ -+ -+/* _GL_EXTERN_C declaration; -+ performs the declaration with C linkage. */ -+#if defined __cplusplus -+# define _GL_EXTERN_C extern "C" -+#else -+# define _GL_EXTERN_C extern -+#endif -+ -+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); -+ declares a replacement function, named rpl_func, with the given prototype, -+ consisting of return type, parameters, and attributes. -+ Example: -+ _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) -+ _GL_ARG_NONNULL ((1))); -+ */ -+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ -+ _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) -+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C rettype rpl_func parameters_and_attributes -+ -+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); -+ declares the system function, named func, with the given prototype, -+ consisting of return type, parameters, and attributes. -+ Example: -+ _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) -+ _GL_ARG_NONNULL ((1))); -+ */ -+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C rettype func parameters_and_attributes -+ -+/* _GL_CXXALIAS_RPL (func, rettype, parameters); -+ declares a C++ alias called GNULIB_NAMESPACE::func -+ that redirects to rpl_func, if GNULIB_NAMESPACE is defined. -+ Example: -+ _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); -+ */ -+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ -+ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ rettype (*const func) parameters = ::rpl_func; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); -+ is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); -+ except that the C function rpl_func may have a slightly different -+ declaration. A cast is used to silence the "invalid conversion" error -+ that would otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ rettype (*const func) parameters = \ -+ reinterpret_cast<rettype(*)parameters>(::rpl_func); \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS (func, rettype, parameters); -+ declares a C++ alias called GNULIB_NAMESPACE::func -+ that redirects to the system provided function func, if GNULIB_NAMESPACE -+ is defined. -+ Example: -+ _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); -+ */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+ /* If we were to write -+ rettype (*const func) parameters = ::func; -+ like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls -+ better (remove an indirection through a 'static' pointer variable), -+ but then the _GL_CXXALIASWARN macro below would cause a warning not only -+ for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ -+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static rettype (*func) parameters = ::func; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); -+ is like _GL_CXXALIAS_SYS (func, rettype, parameters); -+ except that the C function func may have a slightly different declaration. -+ A cast is used to silence the "invalid conversion" error that would -+ otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static rettype (*func) parameters = \ -+ reinterpret_cast<rettype(*)parameters>(::func); \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); -+ is like _GL_CXXALIAS_SYS (func, rettype, parameters); -+ except that the C function is picked among a set of overloaded functions, -+ namely the one with rettype2 and parameters2. Two consecutive casts -+ are used to silence the "cannot find a match" and "invalid conversion" -+ errors that would otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+ /* The outer cast must be a reinterpret_cast. -+ The inner cast: When the function is defined as a set of overloaded -+ functions, it works as a static_cast<>, choosing the designated variant. -+ When the function is defined as a single variant, it works as a -+ reinterpret_cast<>. The parenthesized cast syntax works both ways. */ -+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static rettype (*func) parameters = \ -+ reinterpret_cast<rettype(*)parameters>( \ -+ (rettype2(*)parameters2)(::func)); \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIASWARN (func); -+ causes a warning to be emitted when ::func is used but not when -+ GNULIB_NAMESPACE::func is used. func must be defined without overloaded -+ variants. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIASWARN(func) \ -+ _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) -+# define _GL_CXXALIASWARN_1(func,namespace) \ -+ _GL_CXXALIASWARN_2 (func, namespace) -+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, -+ we enable the warning only when not optimizing. */ -+# if !__OPTIMIZE__ -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ _GL_WARN_ON_USE (func, \ -+ "The symbol ::" #func " refers to the system function. " \ -+ "Use " #namespace "::" #func " instead.") -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ extern __typeof__ (func) func -+# else -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+# endif -+#else -+# define _GL_CXXALIASWARN(func) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); -+ causes a warning to be emitted when the given overloaded variant of ::func -+ is used but not when GNULIB_NAMESPACE::func is used. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -+ _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ -+ GNULIB_NAMESPACE) -+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) -+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, -+ we enable the warning only when not optimizing. */ -+# if !__OPTIMIZE__ -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ -+ "The symbol ::" #func " refers to the system function. " \ -+ "Use " #namespace "::" #func " instead.") -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ extern __typeof__ (func) func -+# else -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+# endif -+#else -+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+#endif /* _GL_CXXDEFS_H */ -diff -Naurp libiconv-1.14.org//build-aux/snippet/arg-nonnull.h libiconv-1.14/build-aux/snippet/arg-nonnull.h ---- libiconv-1.14.org//build-aux/snippet/arg-nonnull.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/arg-nonnull.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,26 +0,0 @@ --/* A C macro for declaring that specific arguments must not be NULL. -- Copyright (C) 2009-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -- --/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools -- that the values passed as arguments n, ..., m must be non-NULL pointers. -- n = 1 stands for the first argument, n = 2 for the second argument etc. */ --#ifndef _GL_ARG_NONNULL --# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 --# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) --# else --# define _GL_ARG_NONNULL(params) --# endif --#endif -diff -Naurp libiconv-1.14.org//build-aux/snippet/c++defs.h libiconv-1.14/build-aux/snippet/c++defs.h ---- libiconv-1.14.org//build-aux/snippet/c++defs.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/c++defs.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,271 +0,0 @@ --/* C++ compatible function declaration macros. -- Copyright (C) 2010-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -- --#ifndef _GL_CXXDEFS_H --#define _GL_CXXDEFS_H -- --/* The three most frequent use cases of these macros are: -- -- * For providing a substitute for a function that is missing on some -- platforms, but is declared and works fine on the platforms on which -- it exists: -- -- #if @GNULIB_FOO@ -- # if !@HAVE_FOO@ -- _GL_FUNCDECL_SYS (foo, ...); -- # endif -- _GL_CXXALIAS_SYS (foo, ...); -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif -- -- * For providing a replacement for a function that exists on all platforms, -- but is broken/insufficient and needs to be replaced on some platforms: -- -- #if @GNULIB_FOO@ -- # if @REPLACE_FOO@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- # undef foo -- # define foo rpl_foo -- # endif -- _GL_FUNCDECL_RPL (foo, ...); -- _GL_CXXALIAS_RPL (foo, ...); -- # else -- _GL_CXXALIAS_SYS (foo, ...); -- # endif -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif -- -- * For providing a replacement for a function that exists on some platforms -- but is broken/insufficient and needs to be replaced on some of them and -- is additionally either missing or undeclared on some other platforms: -- -- #if @GNULIB_FOO@ -- # if @REPLACE_FOO@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- # undef foo -- # define foo rpl_foo -- # endif -- _GL_FUNCDECL_RPL (foo, ...); -- _GL_CXXALIAS_RPL (foo, ...); -- # else -- # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ -- _GL_FUNCDECL_SYS (foo, ...); -- # endif -- _GL_CXXALIAS_SYS (foo, ...); -- # endif -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif --*/ -- --/* _GL_EXTERN_C declaration; -- performs the declaration with C linkage. */ --#if defined __cplusplus --# define _GL_EXTERN_C extern "C" --#else --# define _GL_EXTERN_C extern --#endif -- --/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); -- declares a replacement function, named rpl_func, with the given prototype, -- consisting of return type, parameters, and attributes. -- Example: -- _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) -- _GL_ARG_NONNULL ((1))); -- */ --#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ -- _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) --#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C rettype rpl_func parameters_and_attributes -- --/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); -- declares the system function, named func, with the given prototype, -- consisting of return type, parameters, and attributes. -- Example: -- _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) -- _GL_ARG_NONNULL ((1))); -- */ --#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C rettype func parameters_and_attributes -- --/* _GL_CXXALIAS_RPL (func, rettype, parameters); -- declares a C++ alias called GNULIB_NAMESPACE::func -- that redirects to rpl_func, if GNULIB_NAMESPACE is defined. -- Example: -- _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); -- */ --#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ -- _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- rettype (*const func) parameters = ::rpl_func; \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); -- is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); -- except that the C function rpl_func may have a slightly different -- declaration. A cast is used to silence the "invalid conversion" error -- that would otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- rettype (*const func) parameters = \ -- reinterpret_cast<rettype(*)parameters>(::rpl_func); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS (func, rettype, parameters); -- declares a C++ alias called GNULIB_NAMESPACE::func -- that redirects to the system provided function func, if GNULIB_NAMESPACE -- is defined. -- Example: -- _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); -- */ --#if defined __cplusplus && defined GNULIB_NAMESPACE -- /* If we were to write -- rettype (*const func) parameters = ::func; -- like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls -- better (remove an indirection through a 'static' pointer variable), -- but then the _GL_CXXALIASWARN macro below would cause a warning not only -- for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ --# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = ::func; \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); -- is like _GL_CXXALIAS_SYS (func, rettype, parameters); -- except that the C function func may have a slightly different declaration. -- A cast is used to silence the "invalid conversion" error that would -- otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = \ -- reinterpret_cast<rettype(*)parameters>(::func); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); -- is like _GL_CXXALIAS_SYS (func, rettype, parameters); -- except that the C function is picked among a set of overloaded functions, -- namely the one with rettype2 and parameters2. Two consecutive casts -- are used to silence the "cannot find a match" and "invalid conversion" -- errors that would otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE -- /* The outer cast must be a reinterpret_cast. -- The inner cast: When the function is defined as a set of overloaded -- functions, it works as a static_cast<>, choosing the designated variant. -- When the function is defined as a single variant, it works as a -- reinterpret_cast<>. The parenthesized cast syntax works both ways. */ --# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = \ -- reinterpret_cast<rettype(*)parameters>( \ -- (rettype2(*)parameters2)(::func)); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIASWARN (func); -- causes a warning to be emitted when ::func is used but not when -- GNULIB_NAMESPACE::func is used. func must be defined without overloaded -- variants. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIASWARN(func) \ -- _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) --# define _GL_CXXALIASWARN_1(func,namespace) \ -- _GL_CXXALIASWARN_2 (func, namespace) --/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, -- we enable the warning only when not optimizing. */ --# if !__OPTIMIZE__ --# define _GL_CXXALIASWARN_2(func,namespace) \ -- _GL_WARN_ON_USE (func, \ -- "The symbol ::" #func " refers to the system function. " \ -- "Use " #namespace "::" #func " instead.") --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --# define _GL_CXXALIASWARN_2(func,namespace) \ -- extern __typeof__ (func) func --# else --# define _GL_CXXALIASWARN_2(func,namespace) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --# endif --#else --# define _GL_CXXALIASWARN(func) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); -- causes a warning to be emitted when the given overloaded variant of ::func -- is used but not when GNULIB_NAMESPACE::func is used. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -- _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ -- GNULIB_NAMESPACE) --# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ -- _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) --/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, -- we enable the warning only when not optimizing. */ --# if !__OPTIMIZE__ --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ -- "The symbol ::" #func " refers to the system function. " \ -- "Use " #namespace "::" #func " instead.") --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- extern __typeof__ (func) func --# else --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --# endif --#else --# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --#endif /* _GL_CXXDEFS_H */ -diff -Naurp libiconv-1.14.org//build-aux/snippet/_Noreturn.h libiconv-1.14/build-aux/snippet/_Noreturn.h ---- libiconv-1.14.org//build-aux/snippet/_Noreturn.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/_Noreturn.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,10 +0,0 @@ --#ifndef _Noreturn --# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ -- || 0x5110 <= __SUNPRO_C) --# define _Noreturn __attribute__ ((__noreturn__)) --# elif 1200 <= _MSC_VER --# define _Noreturn __declspec (noreturn) --# else --# define _Noreturn --# endif --#endif -diff -Naurp libiconv-1.14.org//build-aux/snippet/warn-on-use.h libiconv-1.14/build-aux/snippet/warn-on-use.h ---- libiconv-1.14.org//build-aux/snippet/warn-on-use.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/warn-on-use.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,109 +0,0 @@ --/* A C macro for emitting warnings if a function is used. -- Copyright (C) 2010-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -- --/* _GL_WARN_ON_USE (function, "literal string") issues a declaration -- for FUNCTION which will then trigger a compiler warning containing -- the text of "literal string" anywhere that function is called, if -- supported by the compiler. If the compiler does not support this -- feature, the macro expands to an unused extern declaration. -- -- This macro is useful for marking a function as a potential -- portability trap, with the intent that "literal string" include -- instructions on the replacement function that should be used -- instead. However, one of the reasons that a function is a -- portability trap is if it has the wrong signature. Declaring -- FUNCTION with a different signature in C is a compilation error, so -- this macro must use the same type as any existing declaration so -- that programs that avoid the problematic FUNCTION do not fail to -- compile merely because they included a header that poisoned the -- function. But this implies that _GL_WARN_ON_USE is only safe to -- use if FUNCTION is known to already have a declaration. Use of -- this macro implies that there must not be any other macro hiding -- the declaration of FUNCTION; but undefining FUNCTION first is part -- of the poisoning process anyway (although for symbols that are -- provided only via a macro, the result is a compilation error rather -- than a warning containing "literal string"). Also note that in -- C++, it is only safe to use if FUNCTION has no overloads. -- -- For an example, it is possible to poison 'getline' by: -- - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]], -- [getline]) in configure.ac, which potentially defines -- HAVE_RAW_DECL_GETLINE -- - adding this code to a header that wraps the system <stdio.h>: -- #undef getline -- #if HAVE_RAW_DECL_GETLINE -- _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" -- "not universally present; use the gnulib module getline"); -- #endif -- -- It is not possible to directly poison global variables. But it is -- possible to write a wrapper accessor function, and poison that -- (less common usage, like &environ, will cause a compilation error -- rather than issue the nice warning, but the end result of informing -- the developer about their portability problem is still achieved): -- #if HAVE_RAW_DECL_ENVIRON -- static inline char ***rpl_environ (void) { return &environ; } -- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); -- # undef environ -- # define environ (*rpl_environ ()) -- #endif -- */ --#ifndef _GL_WARN_ON_USE -- --# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) --/* A compiler attribute is available in gcc versions 4.3.0 and later. */ --# define _GL_WARN_ON_USE(function, message) \ --extern __typeof__ (function) function __attribute__ ((__warning__ (message))) --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --/* Verify the existence of the function. */ --# define _GL_WARN_ON_USE(function, message) \ --extern __typeof__ (function) function --# else /* Unsupported. */ --# define _GL_WARN_ON_USE(function, message) \ --_GL_WARN_EXTERN_C int _gl_warn_on_use --# endif --#endif -- --/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") -- is like _GL_WARN_ON_USE (function, "string"), except that the function is -- declared with the given prototype, consisting of return type, parameters, -- and attributes. -- This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does -- not work in this case. */ --#ifndef _GL_WARN_ON_USE_CXX --# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --extern rettype function parameters_and_attributes \ -- __attribute__ ((__warning__ (msg))) --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --/* Verify the existence of the function. */ --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --extern rettype function parameters_and_attributes --# else /* Unsupported. */ --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --_GL_WARN_EXTERN_C int _gl_warn_on_use --# endif --#endif -- --/* _GL_WARN_EXTERN_C declaration; -- performs the declaration with C linkage. */ --#ifndef _GL_WARN_EXTERN_C --# if defined __cplusplus --# define _GL_WARN_EXTERN_C extern "C" --# else --# define _GL_WARN_EXTERN_C extern --# endif --#endif -diff -Naurp libiconv-1.14.org//build-aux/warn-on-use.h libiconv-1.14/build-aux/warn-on-use.h ---- libiconv-1.14.org//build-aux/warn-on-use.h 1969-12-31 16:00:00.000000000 -0800 -+++ libiconv-1.14/build-aux/warn-on-use.h 2012-01-08 02:07:39.950484439 -0800 -@@ -0,0 +1,109 @@ -+/* A C macro for emitting warnings if a function is used. -+ Copyright (C) 2010-2011 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published -+ by the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -+ -+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration -+ for FUNCTION which will then trigger a compiler warning containing -+ the text of "literal string" anywhere that function is called, if -+ supported by the compiler. If the compiler does not support this -+ feature, the macro expands to an unused extern declaration. -+ -+ This macro is useful for marking a function as a potential -+ portability trap, with the intent that "literal string" include -+ instructions on the replacement function that should be used -+ instead. However, one of the reasons that a function is a -+ portability trap is if it has the wrong signature. Declaring -+ FUNCTION with a different signature in C is a compilation error, so -+ this macro must use the same type as any existing declaration so -+ that programs that avoid the problematic FUNCTION do not fail to -+ compile merely because they included a header that poisoned the -+ function. But this implies that _GL_WARN_ON_USE is only safe to -+ use if FUNCTION is known to already have a declaration. Use of -+ this macro implies that there must not be any other macro hiding -+ the declaration of FUNCTION; but undefining FUNCTION first is part -+ of the poisoning process anyway (although for symbols that are -+ provided only via a macro, the result is a compilation error rather -+ than a warning containing "literal string"). Also note that in -+ C++, it is only safe to use if FUNCTION has no overloads. -+ -+ For an example, it is possible to poison 'getline' by: -+ - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]], -+ [getline]) in configure.ac, which potentially defines -+ HAVE_RAW_DECL_GETLINE -+ - adding this code to a header that wraps the system <stdio.h>: -+ #undef getline -+ #if HAVE_RAW_DECL_GETLINE -+ _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" -+ "not universally present; use the gnulib module getline"); -+ #endif -+ -+ It is not possible to directly poison global variables. But it is -+ possible to write a wrapper accessor function, and poison that -+ (less common usage, like &environ, will cause a compilation error -+ rather than issue the nice warning, but the end result of informing -+ the developer about their portability problem is still achieved): -+ #if HAVE_RAW_DECL_ENVIRON -+ static inline char ***rpl_environ (void) { return &environ; } -+ _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); -+ # undef environ -+ # define environ (*rpl_environ ()) -+ #endif -+ */ -+#ifndef _GL_WARN_ON_USE -+ -+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -+/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -+# define _GL_WARN_ON_USE(function, message) \ -+extern __typeof__ (function) function __attribute__ ((__warning__ (message))) -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+/* Verify the existence of the function. */ -+# define _GL_WARN_ON_USE(function, message) \ -+extern __typeof__ (function) function -+# else /* Unsupported. */ -+# define _GL_WARN_ON_USE(function, message) \ -+_GL_WARN_EXTERN_C int _gl_warn_on_use -+# endif -+#endif -+ -+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") -+ is like _GL_WARN_ON_USE (function, "string"), except that the function is -+ declared with the given prototype, consisting of return type, parameters, -+ and attributes. -+ This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does -+ not work in this case. */ -+#ifndef _GL_WARN_ON_USE_CXX -+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+extern rettype function parameters_and_attributes \ -+ __attribute__ ((__warning__ (msg))) -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+/* Verify the existence of the function. */ -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+extern rettype function parameters_and_attributes -+# else /* Unsupported. */ -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+_GL_WARN_EXTERN_C int _gl_warn_on_use -+# endif -+#endif -+ -+/* _GL_WARN_EXTERN_C declaration; -+ performs the declaration with C linkage. */ -+#ifndef _GL_WARN_EXTERN_C -+# if defined __cplusplus -+# define _GL_WARN_EXTERN_C extern "C" -+# else -+# define _GL_WARN_EXTERN_C extern -+# endif -+#endif -diff -Naurp libiconv-1.14.org//srclib/allocator.h libiconv-1.14/srclib/allocator.h ---- libiconv-1.14.org//srclib/allocator.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/allocator.h 2012-01-08 02:07:40.050484444 -0800 -@@ -45,11 +45,10 @@ struct allocator - /* Call FREE to free memory, like 'free'. */ - void (*free) (void *); - -- /* If nonnull, call DIE (SIZE) if MALLOC (SIZE) or REALLOC (..., -- SIZE) fails. DIE should not return. SIZE should equal SIZE_MAX -- if size_t overflow was detected while calculating sizes to be -- passed to MALLOC or REALLOC. */ -- void (*die) (size_t); -+ /* If nonnull, call DIE if MALLOC or REALLOC fails. DIE should not -+ return. DIE can be used by code that detects memory overflow -+ while calculating sizes to be passed to MALLOC or REALLOC. */ -+ void (*die) (void); - }; - - /* An allocator using the stdlib functions and a null DIE function. */ -diff -Naurp libiconv-1.14.org//srclib/canonicalize-lgpl.c libiconv-1.14/srclib/canonicalize-lgpl.c ---- libiconv-1.14.org//srclib/canonicalize-lgpl.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/canonicalize-lgpl.c 2012-01-08 02:07:40.094484446 -0800 -@@ -125,7 +125,7 @@ __realpath (const char *name, char *reso - #else - path_max = pathconf (name, _PC_PATH_MAX); - if (path_max <= 0) -- path_max = 8192; -+ path_max = 1024; - #endif - - if (resolved == NULL) -diff -Naurp libiconv-1.14.org//srclib/careadlinkat.c libiconv-1.14/srclib/careadlinkat.c ---- libiconv-1.14.org//srclib/careadlinkat.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/careadlinkat.c 2012-01-08 02:07:40.102484445 -0800 -@@ -133,7 +133,6 @@ careadlinkat (int fd, char const *filena - if (buf == stack_buf) - { - char *b = (char *) alloc->allocate (link_size); -- buf_size = link_size; - if (! b) - break; - memcpy (b, buf, link_size); -@@ -157,11 +156,6 @@ careadlinkat (int fd, char const *filena - buf_size *= 2; - else if (buf_size < buf_size_max) - buf_size = buf_size_max; -- else if (buf_size_max < SIZE_MAX) -- { -- errno = ENAMETOOLONG; -- return NULL; -- } - else - break; - buf = (char *) alloc->allocate (buf_size); -@@ -169,7 +163,7 @@ careadlinkat (int fd, char const *filena - while (buf); - - if (alloc->die) -- alloc->die (buf_size); -+ alloc->die (); - errno = ENOMEM; - return NULL; - } -diff -Naurp libiconv-1.14.org//srclib/errno.in.h libiconv-1.14/srclib/errno.in.h ---- libiconv-1.14.org//srclib/errno.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/errno.in.h 2012-01-08 02:07:40.122484446 -0800 -@@ -16,7 +16,7 @@ - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - --#ifndef _@GUARD_PREFIX@_ERRNO_H -+#ifndef _GL_ERRNO_H - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -26,8 +26,8 @@ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_ERRNO_H@ - --#ifndef _@GUARD_PREFIX@_ERRNO_H --#define _@GUARD_PREFIX@_ERRNO_H -+#ifndef _GL_ERRNO_H -+#define _GL_ERRNO_H - - - /* On native Windows platforms, many macros are not defined. */ -@@ -147,16 +147,6 @@ - # define GNULIB_defined_ENOTSUP 1 - # endif - --# ifndef ENETRESET --# define ENETRESET 2011 --# define GNULIB_defined_ENETRESET 1 --# endif -- --# ifndef ECONNABORTED --# define ECONNABORTED 2012 --# define GNULIB_defined_ECONNABORTED 1 --# endif -- - # ifndef ESTALE - # define ESTALE 2009 - # define GNULIB_defined_ESTALE 1 -@@ -173,5 +163,5 @@ - # endif - - --#endif /* _@GUARD_PREFIX@_ERRNO_H */ --#endif /* _@GUARD_PREFIX@_ERRNO_H */ -+#endif /* _GL_ERRNO_H */ -+#endif /* _GL_ERRNO_H */ -diff -Naurp libiconv-1.14.org//srclib/error.c libiconv-1.14/srclib/error.c ---- libiconv-1.14.org//srclib/error.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/error.c 2012-01-08 02:07:40.134484448 -0800 -@@ -97,15 +97,11 @@ extern void __error_at_line (int status, - /* The gnulib override of fcntl is not needed in this file. */ - # undef fcntl - --# if !HAVE_DECL_STRERROR_R -+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P - # ifndef HAVE_DECL_STRERROR_R - "this configure-time declaration test was not run" - # endif --# if STRERROR_R_CHAR_P - char *strerror_r (); --# else --int strerror_r (); --# endif - # endif - - /* The calling program should define program_name and set it to the -diff -Naurp libiconv-1.14.org//srclib/fcntl.in.h libiconv-1.14/srclib/fcntl.in.h ---- libiconv-1.14.org//srclib/fcntl.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/fcntl.in.h 2012-01-08 02:07:40.154484449 -0800 -@@ -40,7 +40,7 @@ - #else - /* Normal invocation convention. */ - --#ifndef _@GUARD_PREFIX@_FCNTL_H -+#ifndef _GL_FCNTL_H - - #include <sys/types.h> - /* On some systems other than glibc, <sys/stat.h> is a prerequisite of -@@ -55,8 +55,8 @@ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ - --#ifndef _@GUARD_PREFIX@_FCNTL_H --#define _@GUARD_PREFIX@_FCNTL_H -+#ifndef _GL_FCNTL_H -+#define _GL_FCNTL_H - - #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ - # include <unistd.h> -@@ -320,6 +320,6 @@ _GL_WARN_ON_USE (openat, "openat is not - #endif - - --#endif /* _@GUARD_PREFIX@_FCNTL_H */ --#endif /* _@GUARD_PREFIX@_FCNTL_H */ -+#endif /* _GL_FCNTL_H */ -+#endif /* _GL_FCNTL_H */ - #endif -diff -Naurp libiconv-1.14.org//srclib/intprops.h libiconv-1.14/srclib/intprops.h ---- libiconv-1.14.org//srclib/intprops.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/intprops.h 2012-01-08 02:07:40.174484450 -0800 -@@ -22,13 +22,14 @@ - - #include <limits.h> - --/* Return an integer value, converted to the same type as the integer -- expression E after integer type promotion. V is the unconverted value. */ --#define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) -+/* Return a integer value, converted to the same type as the integer -+ expression E after integer type promotion. V is the unconverted value. -+ E should not have side effects. */ -+#define _GL_INT_CONVERT(e, v) ((e) - (e) + (v)) - - /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>. */ --#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) -+#define _GL_INT_NEGATE_CONVERT(e, v) ((e) - (e) - (v)) - - /* The extra casts in the following macros work around compiler bugs, - e.g., in Cray C 5.0.3.0. */ -@@ -52,7 +53,7 @@ - #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - - /* Return 1 if the integer expression E, after integer promotion, has -- a signed type. */ -+ a signed type. E should not have side effects. */ - #define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) - - -@@ -310,10 +311,13 @@ - /* Return 1 if the expression A <op> B would overflow, - where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test, - assuming MIN and MAX are the minimum and maximum for the result type. -- Arguments should be free of side effects. */ -+ -+ This macro assumes that A | B is a valid integer if both A and B are, -+ which is true of all known practical hosts. If this is a problem -+ for you, please let us know how to fix it for your host. */ - #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \ - op_result_overflow (a, b, \ -- _GL_INT_MINIMUM (0 * (b) + (a)), \ -- _GL_INT_MAXIMUM (0 * (b) + (a))) -+ _GL_INT_MINIMUM ((a) | (b)), \ -+ _GL_INT_MAXIMUM ((a) | (b))) - - #endif /* _GL_INTPROPS_H */ -diff -Naurp libiconv-1.14.org//srclib/Makefile.gnulib libiconv-1.14/srclib/Makefile.gnulib ---- libiconv-1.14.org//srclib/Makefile.gnulib 2012-01-08 02:05:18.754477606 -0800 -+++ libiconv-1.14/srclib/Makefile.gnulib 2012-01-08 02:07:43.138484592 -0800 -@@ -9,7 +9,7 @@ - # the same distribution terms as the rest of that program. - # - # Generated by gnulib-tool. --# Reproduce by: gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc -+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc - - - MOSTLYCLEANFILES += core *.stackdump -@@ -60,12 +60,60 @@ EXTRA_DIST += areadlink.h - - ## end gnulib module areadlink - -+## begin gnulib module arg-nonnull -+ -+# The BUILT_SOURCES created by this Makefile snippet are not used via #include -+# statements but through direct file reference. Therefore this snippet must be -+# present in all Makefile.am that need it. This is ensured by the applicability -+# 'all' defined above. -+ -+BUILT_SOURCES += arg-nonnull.h -+# The arg-nonnull.h that gets inserted into generated .h files is the same as -+# build-aux/arg-nonnull.h, except that it has the copyright header cut off. -+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ sed -n -e '/GL_ARG_NONNULL/,$$p' \ -+ < $(top_srcdir)/build-aux/arg-nonnull.h \ -+ > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t -+ -+ARG_NONNULL_H=arg-nonnull.h -+ -+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h -+ -+## end gnulib module arg-nonnull -+ - ## begin gnulib module binary-io - - libicrt_a_SOURCES += binary-io.h - - ## end gnulib module binary-io - -+## begin gnulib module c++defs -+ -+# The BUILT_SOURCES created by this Makefile snippet are not used via #include -+# statements but through direct file reference. Therefore this snippet must be -+# present in all Makefile.am that need it. This is ensured by the applicability -+# 'all' defined above. -+ -+BUILT_SOURCES += c++defs.h -+# The c++defs.h that gets inserted into generated .h files is the same as -+# build-aux/c++defs.h, except that it has the copyright header cut off. -+c++defs.h: $(top_srcdir)/build-aux/c++defs.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ sed -n -e '/_GL_CXXDEFS/,$$p' \ -+ < $(top_srcdir)/build-aux/c++defs.h \ -+ > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += c++defs.h c++defs.h-t -+ -+CXXDEFS_H=c++defs.h -+ -+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h -+ -+## end gnulib module c++defs -+ - ## begin gnulib module canonicalize-lgpl - - -@@ -100,8 +148,7 @@ if GL_GENERATE_ERRNO_H - errno.h: errno.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ -@@ -142,15 +189,14 @@ BUILT_SOURCES += fcntl.h - fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -+ -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \ -+ -e 's|@''GNULIB_NONBLOCKING''@|$(GNULIB_NONBLOCKING)|g' \ -+ -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \ -+ -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ -@@ -297,7 +343,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/co - ## begin gnulib module relocatable-prog-wrapper - - --EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c -+EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c - - EXTRA_DIST += $(top_srcdir)/build-aux/install-reloc - -@@ -305,9 +351,10 @@ EXTRA_DIST += $(top_srcdir)/build-aux/in - - ## begin gnulib module safe-read - --libicrt_a_SOURCES += safe-read.c - --EXTRA_DIST += safe-read.h -+EXTRA_DIST += safe-read.c safe-read.h -+ -+EXTRA_libicrt_a_SOURCES += safe-read.c - - ## end gnulib module safe-read - -@@ -320,24 +367,20 @@ BUILT_SOURCES += signal.h - signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -- -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ -- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -+ -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \ -+ -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -- -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ - -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ - -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ - -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ - -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ - -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ -- -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ -@@ -368,87 +411,6 @@ EXTRA_libicrt_a_SOURCES += sigprocmask.c - - ## end gnulib module sigprocmask - --## begin gnulib module snippet/_Noreturn -- --# Because this Makefile snippet defines a variable used by other --# gnulib Makefile snippets, it must be present in all Makefile.am that --# need it. This is ensured by the applicability 'all' defined above. -- --_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h -- --## end gnulib module snippet/_Noreturn -- --## begin gnulib module snippet/arg-nonnull -- --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --BUILT_SOURCES += arg-nonnull.h --# The arg-nonnull.h that gets inserted into generated .h files is the same as --# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut --# off. --arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/GL_ARG_NONNULL/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t -- --ARG_NONNULL_H=arg-nonnull.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h -- --## end gnulib module snippet/arg-nonnull -- --## begin gnulib module snippet/c++defs -- --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --BUILT_SOURCES += c++defs.h --# The c++defs.h that gets inserted into generated .h files is the same as --# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. --c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/_GL_CXXDEFS/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/c++defs.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += c++defs.h c++defs.h-t -- --CXXDEFS_H=c++defs.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h -- --## end gnulib module snippet/c++defs -- --## begin gnulib module snippet/warn-on-use -- --BUILT_SOURCES += warn-on-use.h --# The warn-on-use.h that gets inserted into generated .h files is the same as --# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut --# off. --warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/^.ifndef/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t -- --WARN_ON_USE_H=warn-on-use.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h -- --## end gnulib module snippet/warn-on-use -- - ## begin gnulib module stat - - -@@ -491,8 +453,7 @@ if GL_GENERATE_STDDEF_H - stddef.h: stddef.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -@@ -521,8 +482,7 @@ if GL_GENERATE_STDINT_H - stdint.h: stdint.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -+ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@@ -570,63 +530,62 @@ BUILT_SOURCES += stdio.h - stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ -- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ -- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ -- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ -- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ -- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ -- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ -- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ -- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ -- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ -- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ -- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ -- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ -- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ -- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ -- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ -- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ -- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ -- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ -- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ -- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ -- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ -- -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ -- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ -- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ -- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ -- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ -- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ -- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ -- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ -- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ -- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ -- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ -- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ -- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ -- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ -- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ -- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ -- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ -+ -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \ -+ -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \ -+ -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \ -+ -e 's|@''GNULIB_FGETC''@|$(GNULIB_FGETC)|g' \ -+ -e 's|@''GNULIB_FGETS''@|$(GNULIB_FGETS)|g' \ -+ -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \ -+ -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \ -+ -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \ -+ -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \ -+ -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \ -+ -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \ -+ -e 's|@''GNULIB_FREAD''@|$(GNULIB_FREAD)|g' \ -+ -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \ -+ -e 's|@''GNULIB_FSCANF''@|$(GNULIB_FSCANF)|g' \ -+ -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \ -+ -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \ -+ -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \ -+ -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \ -+ -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \ -+ -e 's|@''GNULIB_GETC''@|$(GNULIB_GETC)|g' \ -+ -e 's|@''GNULIB_GETCHAR''@|$(GNULIB_GETCHAR)|g' \ -+ -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \ -+ -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \ -+ -e 's|@''GNULIB_GETS''@|$(GNULIB_GETS)|g' \ -+ -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \ -+ -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \ -+ -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \ -+ -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \ -+ -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \ -+ -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \ -+ -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \ -+ -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \ -+ -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \ -+ -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \ -+ -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \ -+ -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \ -+ -e 's|@''GNULIB_SCANF''@|$(GNULIB_SCANF)|g' \ -+ -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \ -+ -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \ -+ -e 's|@''GNULIB_STDIO_H_NONBLOCKING''@|$(GNULIB_STDIO_H_NONBLOCKING)|g' \ -+ -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \ -+ -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \ -+ -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \ -+ -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \ -+ -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \ -+ -e 's|@''GNULIB_VFSCANF''@|$(GNULIB_VFSCANF)|g' \ -+ -e 's|@''GNULIB_VSCANF''@|$(GNULIB_VSCANF)|g' \ -+ -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \ -+ -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \ -+ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \ -+ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ - -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ -@@ -691,43 +650,41 @@ BUILT_SOURCES += stdlib.h - - # We need the following in order to create <stdlib.h> when the system - # doesn't have one that works with the given compiler. --stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -- $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -+stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ -- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ -- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ -- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ -- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ -- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ -- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ -- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ -- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ -- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ -- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ -- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ -- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ -- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ -- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ -- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ -- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ -- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ -- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ -+ -e 's|@''GNULIB__EXIT''@|$(GNULIB__EXIT)|g' \ -+ -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \ -+ -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \ -+ -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \ -+ -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \ -+ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ -+ -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \ -+ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ -+ -e 's|@''GNULIB_MBTOWC''@|$(GNULIB_MBTOWC)|g' \ -+ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -+ -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \ -+ -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \ -+ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ -+ -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \ -+ -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \ -+ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \ -+ -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \ -+ -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \ -+ -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \ -+ -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \ -+ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \ -+ -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \ -+ -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \ -+ -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \ -+ -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \ -+ -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \ -+ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ -+ -e 's|@''GNULIB_WCTOMB''@|$(GNULIB_WCTOMB)|g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -@@ -766,7 +723,6 @@ stdlib.h: stdlib.in.h $(top_builddir)/co - -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ - -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -- -e '/definition of _Noreturn/r $(_NORETURN_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ -@@ -793,15 +749,6 @@ EXTRA_libicrt_a_SOURCES += strerror.c - - ## end gnulib module strerror - --## begin gnulib module strerror-override -- -- --EXTRA_DIST += strerror-override.c strerror-override.h -- --EXTRA_libicrt_a_SOURCES += strerror-override.c -- --## end gnulib module strerror-override -- - ## begin gnulib module string - - BUILT_SOURCES += string.h -@@ -811,52 +758,47 @@ BUILT_SOURCES += string.h - string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ -- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ -- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ -- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ -- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ -- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ -- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ -- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ -- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ -- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ -- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ -- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ -- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ -- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ -- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ -- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ -- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ -- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ -- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ -- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ -- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ -- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ -- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ -- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ -- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ -- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ -- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ -- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ -- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ -- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ -- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ -- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ -- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ -- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ -+ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ -+ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \ -+ -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \ -+ -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \ -+ -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \ -+ -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \ -+ -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \ -+ -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \ -+ -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \ -+ -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \ -+ -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \ -+ -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \ -+ -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \ -+ -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \ -+ -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \ -+ -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \ -+ -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \ -+ -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \ -+ -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \ -+ -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \ -+ -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \ -+ -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \ -+ -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \ -+ -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \ -+ -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \ -+ -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \ -+ -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \ -+ -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \ -+ -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \ -+ -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \ -+ -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -+ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ -+ -e 's|@''GNULIB_STRERROR_R''@|$(GNULIB_STRERROR_R)|g' \ -+ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ -+ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ - < $(srcdir)/string.in.h | \ -- sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -- -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -- -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ -+ sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ - -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ - -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -@@ -912,23 +854,22 @@ sys/stat.h: sys_stat.in.h $(top_builddir - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ -- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ -- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ -- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ -- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ -- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ -- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -+ -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \ -+ -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \ -+ -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \ -+ -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \ -+ -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \ -+ -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \ -+ -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \ -+ -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \ -+ -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \ -+ -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \ -+ -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \ -+ -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ -@@ -971,16 +912,15 @@ BUILT_SOURCES += time.h - time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -+ -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \ -+ -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \ -+ -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \ -+ -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \ -+ -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -@@ -1013,56 +953,55 @@ BUILT_SOURCES += unistd.h - unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ -- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ -- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ -- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ -- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ -- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ -- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ -- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ -- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ -- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ -- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ -- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ -- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ -- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ -- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ -- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ -- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ -- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ -- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ -- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ -- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ -- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ -- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ -- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ -- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ -- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ -- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ -- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ -- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/$(GNULIB_UNISTD_H_GETOPT)/g' \ -- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ -- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ -- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ -- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ -+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ -+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ -+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ -+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ -+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ -+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ -+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ -+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ -+ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ -+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -+ -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \ -+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -+ -e 's|@''GNULIB_GROUP_MEMBER''@|$(GNULIB_GROUP_MEMBER)|g' \ -+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -+ -e 's|@''GNULIB_PIPE''@|$(GNULIB_PIPE)|g' \ -+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -+ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \ -+ -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \ -+ -e 's|@''GNULIB_READ''@|$(GNULIB_READ)|g' \ -+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ -+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ -+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ -+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ -+ -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_NONBLOCKING''@|$(GNULIB_UNISTD_H_NONBLOCKING)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ -+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ -+ -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \ -+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -@@ -1198,6 +1137,25 @@ EXTRA_DIST += verify.h - - ## end gnulib module verify - -+## begin gnulib module warn-on-use -+ -+BUILT_SOURCES += warn-on-use.h -+# The warn-on-use.h that gets inserted into generated .h files is the same as -+# build-aux/warn-on-use.h, except that it has the copyright header cut off. -+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ sed -n -e '/^.ifndef/,$$p' \ -+ < $(top_srcdir)/build-aux/warn-on-use.h \ -+ > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t -+ -+WARN_ON_USE_H=warn-on-use.h -+ -+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h -+ -+## end gnulib module warn-on-use -+ - ## begin gnulib module xalloc - - libicrt_a_SOURCES += xalloc.h xmalloc.c xstrdup.c -diff -Naurp libiconv-1.14.org//srclib/pathmax.h libiconv-1.14/srclib/pathmax.h ---- libiconv-1.14.org//srclib/pathmax.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/pathmax.h 2012-01-08 02:07:40.218484451 -0800 -@@ -19,27 +19,6 @@ - #ifndef _PATHMAX_H - # define _PATHMAX_H - --/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename, -- including the terminating NUL byte. -- <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html> -- PATH_MAX is not defined on systems which have no limit on filename length, -- such as GNU/Hurd. -- -- This file does *not* define PATH_MAX always. Programs that use this file -- can handle the GNU/Hurd case in several ways: -- - Either with a package-wide handling, or with a per-file handling, -- - Either through a -- #ifdef PATH_MAX -- or through a fallback like -- #ifndef PATH_MAX -- # define PATH_MAX 8192 -- #endif -- or through a fallback like -- #ifndef PATH_MAX -- # define PATH_MAX pathconf ("/", _PC_PATH_MAX) -- #endif -- */ -- - # include <unistd.h> - - # include <limits.h> -@@ -48,6 +27,11 @@ - # define _POSIX_PATH_MAX 256 - # endif - -+# if !defined PATH_MAX && defined _PC_PATH_MAX && defined HAVE_PATHCONF -+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \ -+ : pathconf ("/", _PC_PATH_MAX)) -+# endif -+ - /* Don't include sys/param.h if it already has been. */ - # if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN - # include <sys/param.h> -@@ -57,13 +41,8 @@ - # define PATH_MAX MAXPATHLEN - # endif - --# ifdef __hpux --/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename, -- *not* including the terminating NUL byte, and is set to 1023. -- Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is -- not defined at all any more. */ --# undef PATH_MAX --# define PATH_MAX 1024 -+# ifndef PATH_MAX -+# define PATH_MAX _POSIX_PATH_MAX - # endif - - #endif /* _PATHMAX_H */ -diff -Naurp libiconv-1.14.org//srclib/relocwrapper.c libiconv-1.14/srclib/relocwrapper.c ---- libiconv-1.14.org//srclib/relocwrapper.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/relocwrapper.c 2012-01-08 02:07:40.282484455 -0800 -@@ -29,6 +29,7 @@ - -> relocatable - -> setenv - -> malloca -+ -> strerror - -> c-ctype - - Macros that need to be set while compiling this file: -diff -Naurp libiconv-1.14.org//srclib/safe-read.h libiconv-1.14/srclib/safe-read.h ---- libiconv-1.14.org//srclib/safe-read.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/safe-read.h 2012-01-08 02:07:40.298484455 -0800 -@@ -14,19 +14,6 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - --/* Some system calls may be interrupted and fail with errno = EINTR in the -- following situations: -- - The process is stopped and restarted (signal SIGSTOP and SIGCONT, user -- types Ctrl-Z) on some platforms: MacOS X. -- - The process receives a signal for which a signal handler was installed -- with sigaction() with an sa_flags field that does not contain -- SA_RESTART. -- - The process receives a signal for which a signal handler was installed -- with signal() and for which no call to siginterrupt(sig,0) was done, -- on some platforms: AIX, HP-UX, IRIX, OSF/1, Solaris. -- -- This module provides a wrapper around read() that handles EINTR. */ -- - #include <stddef.h> - - #ifdef __cplusplus -diff -Naurp libiconv-1.14.org//srclib/signal.in.h libiconv-1.14/srclib/signal.in.h ---- libiconv-1.14.org//srclib/signal.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/signal.in.h 2012-01-08 02:07:40.314484456 -0800 -@@ -20,49 +20,21 @@ - #endif - @PRAGMA_COLUMNS@ - --#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T) --/* Special invocation convention: -- - Inside glibc header files. -- - On glibc systems we have a sequence of nested includes -- <signal.h> -> <ucontext.h> -> <signal.h>. -- In this situation, the functions are not yet declared, therefore we cannot -- provide the C++ aliases. -- - On glibc systems with GCC 4.3 we have a sequence of nested includes -- <csignal> -> </usr/include/signal.h> -> <sys/ucontext.h> -> <signal.h>. -- In this situation, some of the functions are not yet declared, therefore -- we cannot provide the C++ aliases. */ -+#if defined __need_sig_atomic_t || defined __need_sigset_t -+/* Special invocation convention inside glibc header files. */ - - # @INCLUDE_NEXT@ @NEXT_SIGNAL_H@ - - #else - /* Normal invocation convention. */ - --#ifndef _@GUARD_PREFIX@_SIGNAL_H -- --#define _GL_ALREADY_INCLUDING_SIGNAL_H -- --/* Define pid_t, uid_t. -- Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. -- On Solaris 10, <signal.h> includes <sys/types.h>, which eventually includes -- us; so include <sys/types.h> now, before the second inclusion guard. */ --#include <sys/types.h> -+#ifndef _GL_SIGNAL_H - - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@ - --#undef _GL_ALREADY_INCLUDING_SIGNAL_H -- --#ifndef _@GUARD_PREFIX@_SIGNAL_H --#define _@GUARD_PREFIX@_SIGNAL_H -- --/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare -- pthread_sigmask in <pthread.h>, not in <signal.h>. -- But avoid namespace pollution on glibc systems.*/ --#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ -- && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \ -- && ! defined __GLIBC__ --# include <pthread.h> --#endif -+#ifndef _GL_SIGNAL_H -+#define _GL_SIGNAL_H - - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -@@ -70,6 +42,10 @@ - - /* The definition of _GL_WARN_ON_USE is copied here. */ - -+/* Define pid_t, uid_t. -+ Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */ -+#include <sys/types.h> -+ - /* On AIX, sig_atomic_t already includes volatile. C99 requires that - 'volatile sig_atomic_t' ignore the extra modifier, but C89 did not. - Hence, redefine this to a non-volatile type as needed. */ -@@ -124,34 +100,6 @@ typedef void (*sighandler_t) (int); - #endif - - --#if @GNULIB_PTHREAD_SIGMASK@ --# if @REPLACE_PTHREAD_SIGMASK@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef pthread_sigmask --# define pthread_sigmask rpl_pthread_sigmask --# endif --_GL_FUNCDECL_RPL (pthread_sigmask, int, -- (int how, const sigset_t *new_mask, sigset_t *old_mask)); --_GL_CXXALIAS_RPL (pthread_sigmask, int, -- (int how, const sigset_t *new_mask, sigset_t *old_mask)); --# else --# if !@HAVE_PTHREAD_SIGMASK@ --_GL_FUNCDECL_SYS (pthread_sigmask, int, -- (int how, const sigset_t *new_mask, sigset_t *old_mask)); --# endif --_GL_CXXALIAS_SYS (pthread_sigmask, int, -- (int how, const sigset_t *new_mask, sigset_t *old_mask)); --# endif --_GL_CXXALIASWARN (pthread_sigmask); --#elif defined GNULIB_POSIXCHECK --# undef pthread_sigmask --# if HAVE_RAW_DECL_PTHREAD_SIGMASK --_GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - " -- "use gnulib module pthread_sigmask for portability"); --# endif --#endif -- -- - #if @GNULIB_SIGPROCMASK@ - # if !@HAVE_POSIX_SIGNALBLOCKING@ - -@@ -423,6 +371,6 @@ _GL_WARN_ON_USE (sigaction, "sigaction i - #endif - - --#endif /* _@GUARD_PREFIX@_SIGNAL_H */ --#endif /* _@GUARD_PREFIX@_SIGNAL_H */ -+#endif /* _GL_SIGNAL_H */ -+#endif /* _GL_SIGNAL_H */ - #endif -diff -Naurp libiconv-1.14.org//srclib/stat.c libiconv-1.14/srclib/stat.c ---- libiconv-1.14.org//srclib/stat.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/stat.c 2012-01-08 02:07:40.330484457 -0800 -@@ -38,7 +38,6 @@ orig_stat (const char *filename, struct - #include <stdbool.h> - #include <string.h> - #include "dosname.h" --#include "verify.h" - - /* Store information about NAME into ST. Work around bugs with - trailing slashes. Mingw has other bugs (such as st_ino always -@@ -64,12 +63,6 @@ rpl_stat (char const *name, struct stat - } - #endif /* REPLACE_FUNC_STAT_FILE */ - #if REPLACE_FUNC_STAT_DIR -- /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also -- have a constant PATH_MAX. */ --# ifndef PATH_MAX --# error "Please port this replacement to your platform" --# endif -- - if (result == -1 && errno == ENOENT) - { - /* Due to mingw's oddities, there are some directories (like -@@ -84,7 +77,6 @@ rpl_stat (char const *name, struct stat - char fixed_name[PATH_MAX + 1] = {0}; - size_t len = strlen (name); - bool check_dir = false; -- verify (PATH_MAX <= 4096); - if (PATH_MAX <= len) - errno = ENAMETOOLONG; - else if (len) -diff -Naurp libiconv-1.14.org//srclib/stddef.in.h libiconv-1.14/srclib/stddef.in.h ---- libiconv-1.14.org//srclib/stddef.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/stddef.in.h 2012-01-08 02:07:40.346484458 -0800 -@@ -38,9 +38,9 @@ - remember if special invocation has ever been used to obtain wint_t, - in which case we need to clean up NULL yet again. */ - --# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) -+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T) - # ifdef __need_wint_t --# undef _@GUARD_PREFIX@_STDDEF_H -+# undef _GL_STDDEF_H - # define _GL_STDDEF_WINT_T - # endif - # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ -@@ -49,14 +49,14 @@ - #else - /* Normal invocation convention. */ - --# ifndef _@GUARD_PREFIX@_STDDEF_H -+# ifndef _GL_STDDEF_H - - /* The include_next requires a split double-inclusion guard. */ - - # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ - --# ifndef _@GUARD_PREFIX@_STDDEF_H --# define _@GUARD_PREFIX@_STDDEF_H -+# ifndef _GL_STDDEF_H -+# define _GL_STDDEF_H - - /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ - #if @REPLACE_NULL@ -@@ -82,6 +82,6 @@ - # define wchar_t int - #endif - --# endif /* _@GUARD_PREFIX@_STDDEF_H */ --# endif /* _@GUARD_PREFIX@_STDDEF_H */ -+# endif /* _GL_STDDEF_H */ -+# endif /* _GL_STDDEF_H */ - #endif /* __need_XXX */ -diff -Naurp libiconv-1.14.org//srclib/stdint.in.h libiconv-1.14/srclib/stdint.in.h ---- libiconv-1.14.org//srclib/stdint.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/stdint.in.h 2012-01-08 02:07:40.358484458 -0800 -@@ -21,7 +21,7 @@ - * <http://www.opengroup.org/susv3xbd/stdint.h.html> - */ - --#ifndef _@GUARD_PREFIX@_STDINT_H -+#ifndef _GL_STDINT_H - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -52,13 +52,13 @@ - /* Other systems may have an incomplete or buggy <stdint.h>. - Include it before <inttypes.h>, since any "#include <stdint.h>" - in <inttypes.h> would reinclude us, skipping our contents because -- _@GUARD_PREFIX@_STDINT_H is defined. -+ _GL_STDINT_H is defined. - The include_next requires a split double-inclusion guard. */ - # @INCLUDE_NEXT@ @NEXT_STDINT_H@ - #endif - --#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H --#define _@GUARD_PREFIX@_STDINT_H -+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H -+#define _GL_STDINT_H - - /* <sys/types.h> defines some of the stdint.h types as well, on glibc, - IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>). -@@ -270,36 +270,26 @@ typedef unsigned long int gl_uintptr_t; - /* Note: These types are compiler dependent. It may be unwise to use them in - public header files. */ - --/* If the system defines INTMAX_MAX, assume that intmax_t works, and -- similarly for UINTMAX_MAX and uintmax_t. This avoids problems with -- assuming one type where another is used by the system. */ -- --#ifndef INTMAX_MAX --# undef INTMAX_C --# undef intmax_t --# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 -+#undef intmax_t -+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 - typedef long long int gl_intmax_t; --# define intmax_t gl_intmax_t --# elif defined GL_INT64_T --# define intmax_t int64_t --# else -+# define intmax_t gl_intmax_t -+#elif defined GL_INT64_T -+# define intmax_t int64_t -+#else - typedef long int gl_intmax_t; --# define intmax_t gl_intmax_t --# endif -+# define intmax_t gl_intmax_t - #endif - --#ifndef UINTMAX_MAX --# undef UINTMAX_C --# undef uintmax_t --# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 -+#undef uintmax_t -+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 - typedef unsigned long long int gl_uintmax_t; --# define uintmax_t gl_uintmax_t --# elif defined GL_UINT64_T --# define uintmax_t uint64_t --# else -+# define uintmax_t gl_uintmax_t -+#elif defined GL_UINT64_T -+# define uintmax_t uint64_t -+#else - typedef unsigned long int gl_uintmax_t; --# define uintmax_t gl_uintmax_t --# endif -+# define uintmax_t gl_uintmax_t - #endif - - /* Verify that intmax_t and uintmax_t have the same size. Too much code -@@ -441,23 +431,21 @@ typedef int _verify_intmax_size[sizeof ( - - /* 7.18.2.5. Limits of greatest-width integer types */ - --#ifndef INTMAX_MAX --# undef INTMAX_MIN --# ifdef INT64_MAX --# define INTMAX_MIN INT64_MIN --# define INTMAX_MAX INT64_MAX --# else --# define INTMAX_MIN INT32_MIN --# define INTMAX_MAX INT32_MAX --# endif -+#undef INTMAX_MIN -+#undef INTMAX_MAX -+#ifdef INT64_MAX -+# define INTMAX_MIN INT64_MIN -+# define INTMAX_MAX INT64_MAX -+#else -+# define INTMAX_MIN INT32_MIN -+# define INTMAX_MAX INT32_MAX - #endif - --#ifndef UINTMAX_MAX --# ifdef UINT64_MAX --# define UINTMAX_MAX UINT64_MAX --# else --# define UINTMAX_MAX UINT32_MAX --# endif -+#undef UINTMAX_MAX -+#ifdef UINT64_MAX -+# define UINTMAX_MAX UINT64_MAX -+#else -+# define UINTMAX_MAX UINT32_MAX - #endif - - /* 7.18.3. Limits of other integer types */ -@@ -580,27 +568,25 @@ typedef int _verify_intmax_size[sizeof ( - - /* 7.18.4.2. Macros for greatest-width integer constants */ - --#ifndef INTMAX_C --# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 --# define INTMAX_C(x) x##LL --# elif defined GL_INT64_T --# define INTMAX_C(x) INT64_C(x) --# else --# define INTMAX_C(x) x##L --# endif -+#undef INTMAX_C -+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 -+# define INTMAX_C(x) x##LL -+#elif defined GL_INT64_T -+# define INTMAX_C(x) INT64_C(x) -+#else -+# define INTMAX_C(x) x##L - #endif - --#ifndef UINTMAX_C --# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 --# define UINTMAX_C(x) x##ULL --# elif defined GL_UINT64_T --# define UINTMAX_C(x) UINT64_C(x) --# else --# define UINTMAX_C(x) x##UL --# endif -+#undef UINTMAX_C -+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 -+# define UINTMAX_C(x) x##ULL -+#elif defined GL_UINT64_T -+# define UINTMAX_C(x) UINT64_C(x) -+#else -+# define UINTMAX_C(x) x##UL - #endif - - #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */ - --#endif /* _@GUARD_PREFIX@_STDINT_H */ --#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */ -+#endif /* _GL_STDINT_H */ -+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */ -diff -Naurp libiconv-1.14.org//srclib/stdio.in.h libiconv-1.14/srclib/stdio.in.h ---- libiconv-1.14.org//srclib/stdio.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/stdio.in.h 2012-01-08 02:07:40.378484459 -0800 -@@ -35,7 +35,7 @@ - #else - /* Normal invocation convention. */ - --#ifndef _@GUARD_PREFIX@_STDIO_H -+#ifndef _GL_STDIO_H - - #define _GL_ALREADY_INCLUDING_STDIO_H - -@@ -44,8 +44,8 @@ - - #undef _GL_ALREADY_INCLUDING_STDIO_H - --#ifndef _@GUARD_PREFIX@_STDIO_H --#define _@GUARD_PREFIX@_STDIO_H -+#ifndef _GL_STDIO_H -+#define _GL_STDIO_H - - /* Get va_list. Needed on many systems, including glibc 2.8. */ - #include <stdarg.h> -@@ -461,6 +461,25 @@ _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp - _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)); - # endif - _GL_CXXALIASWARN (fseeko); -+# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@ -+ /* Provide an fseek function that is consistent with fseeko. */ -+ /* In order to avoid that fseek gets defined as a macro here, the -+ developer can request the 'fseek' module. */ -+# if !GNULIB_defined_fseek_function -+# undef fseek -+# define fseek rpl_fseek -+static inline int _GL_ARG_NONNULL ((1)) -+rpl_fseek (FILE *fp, long offset, int whence) -+{ -+# if @REPLACE_FSEEKO@ -+ return rpl_fseeko (fp, offset, whence); -+# else -+ return fseeko (fp, offset, whence); -+# endif -+} -+# define GNULIB_defined_fseek_function 1 -+# endif -+# endif - #elif defined GNULIB_POSIXCHECK - # define _GL_FSEEK_WARN /* Category 1, above. */ - # undef fseek -@@ -520,6 +539,25 @@ _GL_FUNCDECL_SYS (ftello, off_t, (FILE * - _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp)); - # endif - _GL_CXXALIASWARN (ftello); -+# if (@REPLACE_FTELLO@ || !@HAVE_FTELLO@) && !@GNULIB_FTELL@ -+ /* Provide an ftell function that is consistent with ftello. */ -+ /* In order to avoid that ftell gets defined as a macro here, the -+ developer can request the 'ftell' module. */ -+# if !GNULIB_defined_ftell_function -+# undef ftell -+# define ftell rpl_ftell -+static inline long _GL_ARG_NONNULL ((1)) -+rpl_ftell (FILE *f) -+{ -+# if @REPLACE_FTELLO@ -+ return rpl_ftello (f); -+# else -+ return ftello (f); -+# endif -+} -+# define GNULIB_defined_ftell_function 1 -+# endif -+# endif - #elif defined GNULIB_POSIXCHECK - # define _GL_FTELL_WARN /* Category 1, above. */ - # undef ftell -@@ -1307,6 +1345,6 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is - #endif - - --#endif /* _@GUARD_PREFIX@_STDIO_H */ --#endif /* _@GUARD_PREFIX@_STDIO_H */ -+#endif /* _GL_STDIO_H */ -+#endif /* _GL_STDIO_H */ - #endif -diff -Naurp libiconv-1.14.org//srclib/stdlib.in.h libiconv-1.14/srclib/stdlib.in.h ---- libiconv-1.14.org//srclib/stdlib.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/stdlib.in.h 2012-01-08 02:07:40.390484459 -0800 -@@ -28,13 +28,13 @@ - #else - /* Normal invocation convention. */ - --#ifndef _@GUARD_PREFIX@_STDLIB_H -+#ifndef _GL_STDLIB_H - - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_STDLIB_H@ - --#ifndef _@GUARD_PREFIX@_STDLIB_H --#define _@GUARD_PREFIX@_STDLIB_H -+#ifndef _GL_STDLIB_H -+#define _GL_STDLIB_H - - /* NetBSD 5.0 mis-defines NULL. */ - #include <stddef.h> -@@ -89,7 +89,11 @@ struct random_data - # include <unistd.h> - #endif - --/* The definition of _Noreturn is copied here. */ -+#if 3 <= __GNUC__ || __GNUC__ == 2 && 8 <= __GNUC_MINOR__ -+# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) -+#else -+# define _GL_ATTRIBUTE_NORETURN -+#endif - - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -@@ -116,7 +120,7 @@ struct random_data - /* Terminate the current process with the given return code, without running - the 'atexit' handlers. */ - # if !@HAVE__EXIT@ --_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status)); -+_GL_FUNCDECL_SYS (_Exit, void, (int status) _GL_ATTRIBUTE_NORETURN); - # endif - _GL_CXXALIAS_SYS (_Exit, void, (int status)); - _GL_CXXALIASWARN (_Exit); -@@ -757,6 +761,6 @@ _GL_CXXALIASWARN (wctomb); - #endif - - --#endif /* _@GUARD_PREFIX@_STDLIB_H */ --#endif /* _@GUARD_PREFIX@_STDLIB_H */ -+#endif /* _GL_STDLIB_H */ -+#endif /* _GL_STDLIB_H */ - #endif -diff -Naurp libiconv-1.14.org//srclib/strerror.c libiconv-1.14/srclib/strerror.c ---- libiconv-1.14.org//srclib/strerror.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/strerror.c 2012-01-08 02:07:40.406484461 -0800 -@@ -17,54 +17,340 @@ - - #include <config.h> - --/* Specification. */ - #include <string.h> - --#include <errno.h> --#include <stdio.h> --#include <stdlib.h> --#include <string.h> -+#if REPLACE_STRERROR -+ -+# include <errno.h> -+# include <stdio.h> -+ -+# if GNULIB_defined_ESOCK /* native Windows platforms */ -+# if HAVE_WINSOCK2_H -+# include <winsock2.h> -+# endif -+# endif - --#include "intprops.h" --#include "strerror-override.h" --#include "verify.h" -+# include "intprops.h" - - /* Use the system functions, not the gnulib overrides in this file. */ --#undef sprintf -+# undef sprintf -+ -+# undef strerror -+# if ! HAVE_DECL_STRERROR -+# define strerror(n) NULL -+# endif - - char * --strerror (int n) --#undef strerror -+rpl_strerror (int n) - { -- static char buf[STACKBUF_LEN]; -- size_t len; -+ char const *msg = NULL; -+ /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */ -+ switch (n) -+ { -+# if GNULIB_defined_ETXTBSY -+ case ETXTBSY: -+ msg = "Text file busy"; -+ break; -+# endif -+ -+# if GNULIB_defined_ESOCK /* native Windows platforms */ -+ /* EWOULDBLOCK is the same as EAGAIN. */ -+ case EINPROGRESS: -+ msg = "Operation now in progress"; -+ break; -+ case EALREADY: -+ msg = "Operation already in progress"; -+ break; -+ case ENOTSOCK: -+ msg = "Socket operation on non-socket"; -+ break; -+ case EDESTADDRREQ: -+ msg = "Destination address required"; -+ break; -+ case EMSGSIZE: -+ msg = "Message too long"; -+ break; -+ case EPROTOTYPE: -+ msg = "Protocol wrong type for socket"; -+ break; -+ case ENOPROTOOPT: -+ msg = "Protocol not available"; -+ break; -+ case EPROTONOSUPPORT: -+ msg = "Protocol not supported"; -+ break; -+ case ESOCKTNOSUPPORT: -+ msg = "Socket type not supported"; -+ break; -+ case EOPNOTSUPP: -+ msg = "Operation not supported"; -+ break; -+ case EPFNOSUPPORT: -+ msg = "Protocol family not supported"; -+ break; -+ case EAFNOSUPPORT: -+ msg = "Address family not supported by protocol"; -+ break; -+ case EADDRINUSE: -+ msg = "Address already in use"; -+ break; -+ case EADDRNOTAVAIL: -+ msg = "Cannot assign requested address"; -+ break; -+ case ENETDOWN: -+ msg = "Network is down"; -+ break; -+ case ENETUNREACH: -+ msg = "Network is unreachable"; -+ break; -+ case ENETRESET: -+ msg = "Network dropped connection on reset"; -+ break; -+ case ECONNABORTED: -+ msg = "Software caused connection abort"; -+ break; -+ case ECONNRESET: -+ msg = "Connection reset by peer"; -+ break; -+ case ENOBUFS: -+ msg = "No buffer space available"; -+ break; -+ case EISCONN: -+ msg = "Transport endpoint is already connected"; -+ break; -+ case ENOTCONN: -+ msg = "Transport endpoint is not connected"; -+ break; -+ case ESHUTDOWN: -+ msg = "Cannot send after transport endpoint shutdown"; -+ break; -+ case ETOOMANYREFS: -+ msg = "Too many references: cannot splice"; -+ break; -+ case ETIMEDOUT: -+ msg = "Connection timed out"; -+ break; -+ case ECONNREFUSED: -+ msg = "Connection refused"; -+ break; -+ case ELOOP: -+ msg = "Too many levels of symbolic links"; -+ break; -+ case EHOSTDOWN: -+ msg = "Host is down"; -+ break; -+ case EHOSTUNREACH: -+ msg = "No route to host"; -+ break; -+ case EPROCLIM: -+ msg = "Too many processes"; -+ break; -+ case EUSERS: -+ msg = "Too many users"; -+ break; -+ case EDQUOT: -+ msg = "Disk quota exceeded"; -+ break; -+ case ESTALE: -+ msg = "Stale NFS file handle"; -+ break; -+ case EREMOTE: -+ msg = "Object is remote"; -+ break; -+# if HAVE_WINSOCK2_H -+ /* WSA_INVALID_HANDLE maps to EBADF */ -+ /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */ -+ /* WSA_INVALID_PARAMETER maps to EINVAL */ -+ case WSA_OPERATION_ABORTED: -+ msg = "Overlapped operation aborted"; -+ break; -+ case WSA_IO_INCOMPLETE: -+ msg = "Overlapped I/O event object not in signaled state"; -+ break; -+ case WSA_IO_PENDING: -+ msg = "Overlapped operations will complete later"; -+ break; -+ /* WSAEINTR maps to EINTR */ -+ /* WSAEBADF maps to EBADF */ -+ /* WSAEACCES maps to EACCES */ -+ /* WSAEFAULT maps to EFAULT */ -+ /* WSAEINVAL maps to EINVAL */ -+ /* WSAEMFILE maps to EMFILE */ -+ /* WSAEWOULDBLOCK maps to EWOULDBLOCK */ -+ /* WSAEINPROGRESS is EINPROGRESS */ -+ /* WSAEALREADY is EALREADY */ -+ /* WSAENOTSOCK is ENOTSOCK */ -+ /* WSAEDESTADDRREQ is EDESTADDRREQ */ -+ /* WSAEMSGSIZE is EMSGSIZE */ -+ /* WSAEPROTOTYPE is EPROTOTYPE */ -+ /* WSAENOPROTOOPT is ENOPROTOOPT */ -+ /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */ -+ /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */ -+ /* WSAEOPNOTSUPP is EOPNOTSUPP */ -+ /* WSAEPFNOSUPPORT is EPFNOSUPPORT */ -+ /* WSAEAFNOSUPPORT is EAFNOSUPPORT */ -+ /* WSAEADDRINUSE is EADDRINUSE */ -+ /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */ -+ /* WSAENETDOWN is ENETDOWN */ -+ /* WSAENETUNREACH is ENETUNREACH */ -+ /* WSAENETRESET is ENETRESET */ -+ /* WSAECONNABORTED is ECONNABORTED */ -+ /* WSAECONNRESET is ECONNRESET */ -+ /* WSAENOBUFS is ENOBUFS */ -+ /* WSAEISCONN is EISCONN */ -+ /* WSAENOTCONN is ENOTCONN */ -+ /* WSAESHUTDOWN is ESHUTDOWN */ -+ /* WSAETOOMANYREFS is ETOOMANYREFS */ -+ /* WSAETIMEDOUT is ETIMEDOUT */ -+ /* WSAECONNREFUSED is ECONNREFUSED */ -+ /* WSAELOOP is ELOOP */ -+ /* WSAENAMETOOLONG maps to ENAMETOOLONG */ -+ /* WSAEHOSTDOWN is EHOSTDOWN */ -+ /* WSAEHOSTUNREACH is EHOSTUNREACH */ -+ /* WSAENOTEMPTY maps to ENOTEMPTY */ -+ /* WSAEPROCLIM is EPROCLIM */ -+ /* WSAEUSERS is EUSERS */ -+ /* WSAEDQUOT is EDQUOT */ -+ /* WSAESTALE is ESTALE */ -+ /* WSAEREMOTE is EREMOTE */ -+ case WSASYSNOTREADY: -+ msg = "Network subsystem is unavailable"; -+ break; -+ case WSAVERNOTSUPPORTED: -+ msg = "Winsock.dll version out of range"; -+ break; -+ case WSANOTINITIALISED: -+ msg = "Successful WSAStartup not yet performed"; -+ break; -+ case WSAEDISCON: -+ msg = "Graceful shutdown in progress"; -+ break; -+ case WSAENOMORE: case WSA_E_NO_MORE: -+ msg = "No more results"; -+ break; -+ case WSAECANCELLED: case WSA_E_CANCELLED: -+ msg = "Call was canceled"; -+ break; -+ case WSAEINVALIDPROCTABLE: -+ msg = "Procedure call table is invalid"; -+ break; -+ case WSAEINVALIDPROVIDER: -+ msg = "Service provider is invalid"; -+ break; -+ case WSAEPROVIDERFAILEDINIT: -+ msg = "Service provider failed to initialize"; -+ break; -+ case WSASYSCALLFAILURE: -+ msg = "System call failure"; -+ break; -+ case WSASERVICE_NOT_FOUND: -+ msg = "Service not found"; -+ break; -+ case WSATYPE_NOT_FOUND: -+ msg = "Class type not found"; -+ break; -+ case WSAEREFUSED: -+ msg = "Database query was refused"; -+ break; -+ case WSAHOST_NOT_FOUND: -+ msg = "Host not found"; -+ break; -+ case WSATRY_AGAIN: -+ msg = "Nonauthoritative host not found"; -+ break; -+ case WSANO_RECOVERY: -+ msg = "Nonrecoverable error"; -+ break; -+ case WSANO_DATA: -+ msg = "Valid name, no data record of requested type"; -+ break; -+ /* WSA_QOS_* omitted */ -+# endif -+# endif -+ -+# if GNULIB_defined_ENOMSG -+ case ENOMSG: -+ msg = "No message of desired type"; -+ break; -+# endif -+ -+# if GNULIB_defined_EIDRM -+ case EIDRM: -+ msg = "Identifier removed"; -+ break; -+# endif -+ -+# if GNULIB_defined_ENOLINK -+ case ENOLINK: -+ msg = "Link has been severed"; -+ break; -+# endif -+ -+# if GNULIB_defined_EPROTO -+ case EPROTO: -+ msg = "Protocol error"; -+ break; -+# endif -+ -+# if GNULIB_defined_EMULTIHOP -+ case EMULTIHOP: -+ msg = "Multihop attempted"; -+ break; -+# endif -+ -+# if GNULIB_defined_EBADMSG -+ case EBADMSG: -+ msg = "Bad message"; -+ break; -+# endif -+ -+# if GNULIB_defined_EOVERFLOW -+ case EOVERFLOW: -+ msg = "Value too large for defined data type"; -+ break; -+# endif -+ -+# if GNULIB_defined_ENOTSUP -+ case ENOTSUP: -+ msg = "Not supported"; -+ break; -+# endif -+ -+# if GNULIB_defined_ESTALE -+ case ESTALE: -+ msg = "Stale NFS file handle"; -+ break; -+# endif -+ -+# if GNULIB_defined_EDQUOT -+ case EDQUOT: -+ msg = "Disk quota exceeded"; -+ break; -+# endif -+ -+# if GNULIB_defined_ECANCELED -+ case ECANCELED: -+ msg = "Operation canceled"; -+ break; -+# endif -+ } - -- /* Cast away const, due to the historical signature of strerror; -- callers should not be modifying the string. */ -- const char *msg = strerror_override (n); - if (msg) - return (char *) msg; - -- msg = strerror (n); -+ { -+ char *result = strerror (n); - -- /* Our strerror_r implementation might use the system's strerror -- buffer, so all other clients of strerror have to see the error -- copied into a buffer that we manage. This is not thread-safe, -- even if the system strerror is, but portable programs shouldn't -- be using strerror if they care about thread-safety. */ -- if (!msg || !*msg) -- { -- static char const fmt[] = "Unknown error %d"; -- verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n)); -- sprintf (buf, fmt, n); -- errno = EINVAL; -- return buf; -- } -+ if (result == NULL || result[0] == '\0') -+ { -+ static char const fmt[] = "Unknown error (%d)"; -+ static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)]; -+ sprintf (msg_buf, fmt, n); -+ return msg_buf; -+ } - -- /* Fix STACKBUF_LEN if this ever aborts. */ -- len = strlen (msg); -- if (sizeof buf <= len) -- abort (); -- -- return memcpy (buf, msg, len + 1); -+ return result; -+ } - } -+ -+#endif -diff -Naurp libiconv-1.14.org//srclib/strerror-override.c libiconv-1.14/srclib/strerror-override.c ---- libiconv-1.14.org//srclib/strerror-override.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/strerror-override.c 1969-12-31 16:00:00.000000000 -0800 -@@ -1,279 +0,0 @@ --/* strerror-override.c --- POSIX compatible system error routine -- -- Copyright (C) 2010-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -- --/* Written by Bruno Haible <bruno@clisp.org>, 2010. */ -- --#include <config.h> -- --#include "strerror-override.h" -- --#include <errno.h> -- --#if GNULIB_defined_ESOCK /* native Windows platforms */ --# if HAVE_WINSOCK2_H --# include <winsock2.h> --# endif --#endif -- --/* If ERRNUM maps to an errno value defined by gnulib, return a string -- describing the error. Otherwise return NULL. */ --const char * --strerror_override (int errnum) --{ -- /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */ -- switch (errnum) -- { --#if REPLACE_STRERROR_0 -- case 0: -- return "Success"; --#endif -- --#if GNULIB_defined_ETXTBSY -- case ETXTBSY: -- return "Text file busy"; --#endif -- --#if GNULIB_defined_ESOCK /* native Windows platforms */ -- /* EWOULDBLOCK is the same as EAGAIN. */ -- case EINPROGRESS: -- return "Operation now in progress"; -- case EALREADY: -- return "Operation already in progress"; -- case ENOTSOCK: -- return "Socket operation on non-socket"; -- case EDESTADDRREQ: -- return "Destination address required"; -- case EMSGSIZE: -- return "Message too long"; -- case EPROTOTYPE: -- return "Protocol wrong type for socket"; -- case ENOPROTOOPT: -- return "Protocol not available"; -- case EPROTONOSUPPORT: -- return "Protocol not supported"; -- case ESOCKTNOSUPPORT: -- return "Socket type not supported"; -- case EOPNOTSUPP: -- return "Operation not supported"; -- case EPFNOSUPPORT: -- return "Protocol family not supported"; -- case EAFNOSUPPORT: -- return "Address family not supported by protocol"; -- case EADDRINUSE: -- return "Address already in use"; -- case EADDRNOTAVAIL: -- return "Cannot assign requested address"; -- case ENETDOWN: -- return "Network is down"; -- case ENETUNREACH: -- return "Network is unreachable"; -- case ENETRESET: -- return "Network dropped connection on reset"; -- case ECONNABORTED: -- return "Software caused connection abort"; -- case ECONNRESET: -- return "Connection reset by peer"; -- case ENOBUFS: -- return "No buffer space available"; -- case EISCONN: -- return "Transport endpoint is already connected"; -- case ENOTCONN: -- return "Transport endpoint is not connected"; -- case ESHUTDOWN: -- return "Cannot send after transport endpoint shutdown"; -- case ETOOMANYREFS: -- return "Too many references: cannot splice"; -- case ETIMEDOUT: -- return "Connection timed out"; -- case ECONNREFUSED: -- return "Connection refused"; -- case ELOOP: -- return "Too many levels of symbolic links"; -- case EHOSTDOWN: -- return "Host is down"; -- case EHOSTUNREACH: -- return "No route to host"; -- case EPROCLIM: -- return "Too many processes"; -- case EUSERS: -- return "Too many users"; -- case EDQUOT: -- return "Disk quota exceeded"; -- case ESTALE: -- return "Stale NFS file handle"; -- case EREMOTE: -- return "Object is remote"; --# if HAVE_WINSOCK2_H -- /* WSA_INVALID_HANDLE maps to EBADF */ -- /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */ -- /* WSA_INVALID_PARAMETER maps to EINVAL */ -- case WSA_OPERATION_ABORTED: -- return "Overlapped operation aborted"; -- case WSA_IO_INCOMPLETE: -- return "Overlapped I/O event object not in signaled state"; -- case WSA_IO_PENDING: -- return "Overlapped operations will complete later"; -- /* WSAEINTR maps to EINTR */ -- /* WSAEBADF maps to EBADF */ -- /* WSAEACCES maps to EACCES */ -- /* WSAEFAULT maps to EFAULT */ -- /* WSAEINVAL maps to EINVAL */ -- /* WSAEMFILE maps to EMFILE */ -- /* WSAEWOULDBLOCK maps to EWOULDBLOCK */ -- /* WSAEINPROGRESS is EINPROGRESS */ -- /* WSAEALREADY is EALREADY */ -- /* WSAENOTSOCK is ENOTSOCK */ -- /* WSAEDESTADDRREQ is EDESTADDRREQ */ -- /* WSAEMSGSIZE is EMSGSIZE */ -- /* WSAEPROTOTYPE is EPROTOTYPE */ -- /* WSAENOPROTOOPT is ENOPROTOOPT */ -- /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */ -- /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */ -- /* WSAEOPNOTSUPP is EOPNOTSUPP */ -- /* WSAEPFNOSUPPORT is EPFNOSUPPORT */ -- /* WSAEAFNOSUPPORT is EAFNOSUPPORT */ -- /* WSAEADDRINUSE is EADDRINUSE */ -- /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */ -- /* WSAENETDOWN is ENETDOWN */ -- /* WSAENETUNREACH is ENETUNREACH */ -- /* WSAENETRESET is ENETRESET */ -- /* WSAECONNABORTED is ECONNABORTED */ -- /* WSAECONNRESET is ECONNRESET */ -- /* WSAENOBUFS is ENOBUFS */ -- /* WSAEISCONN is EISCONN */ -- /* WSAENOTCONN is ENOTCONN */ -- /* WSAESHUTDOWN is ESHUTDOWN */ -- /* WSAETOOMANYREFS is ETOOMANYREFS */ -- /* WSAETIMEDOUT is ETIMEDOUT */ -- /* WSAECONNREFUSED is ECONNREFUSED */ -- /* WSAELOOP is ELOOP */ -- /* WSAENAMETOOLONG maps to ENAMETOOLONG */ -- /* WSAEHOSTDOWN is EHOSTDOWN */ -- /* WSAEHOSTUNREACH is EHOSTUNREACH */ -- /* WSAENOTEMPTY maps to ENOTEMPTY */ -- /* WSAEPROCLIM is EPROCLIM */ -- /* WSAEUSERS is EUSERS */ -- /* WSAEDQUOT is EDQUOT */ -- /* WSAESTALE is ESTALE */ -- /* WSAEREMOTE is EREMOTE */ -- case WSASYSNOTREADY: -- return "Network subsystem is unavailable"; -- case WSAVERNOTSUPPORTED: -- return "Winsock.dll version out of range"; -- case WSANOTINITIALISED: -- return "Successful WSAStartup not yet performed"; -- case WSAEDISCON: -- return "Graceful shutdown in progress"; -- case WSAENOMORE: case WSA_E_NO_MORE: -- return "No more results"; -- case WSAECANCELLED: case WSA_E_CANCELLED: -- return "Call was canceled"; -- case WSAEINVALIDPROCTABLE: -- return "Procedure call table is invalid"; -- case WSAEINVALIDPROVIDER: -- return "Service provider is invalid"; -- case WSAEPROVIDERFAILEDINIT: -- return "Service provider failed to initialize"; -- case WSASYSCALLFAILURE: -- return "System call failure"; -- case WSASERVICE_NOT_FOUND: -- return "Service not found"; -- case WSATYPE_NOT_FOUND: -- return "Class type not found"; -- case WSAEREFUSED: -- return "Database query was refused"; -- case WSAHOST_NOT_FOUND: -- return "Host not found"; -- case WSATRY_AGAIN: -- return "Nonauthoritative host not found"; -- case WSANO_RECOVERY: -- return "Nonrecoverable error"; -- case WSANO_DATA: -- return "Valid name, no data record of requested type"; -- /* WSA_QOS_* omitted */ --# endif --#endif -- --#if GNULIB_defined_ENOMSG -- case ENOMSG: -- return "No message of desired type"; --#endif -- --#if GNULIB_defined_EIDRM -- case EIDRM: -- return "Identifier removed"; --#endif -- --#if GNULIB_defined_ENOLINK -- case ENOLINK: -- return "Link has been severed"; --#endif -- --#if GNULIB_defined_EPROTO -- case EPROTO: -- return "Protocol error"; --#endif -- --#if GNULIB_defined_EMULTIHOP -- case EMULTIHOP: -- return "Multihop attempted"; --#endif -- --#if GNULIB_defined_EBADMSG -- case EBADMSG: -- return "Bad message"; --#endif -- --#if GNULIB_defined_EOVERFLOW -- case EOVERFLOW: -- return "Value too large for defined data type"; --#endif -- --#if GNULIB_defined_ENOTSUP -- case ENOTSUP: -- return "Not supported"; --#endif -- --#if GNULIB_defined_ENETRESET -- case ENETRESET: -- return "Network dropped connection on reset"; --#endif -- --#if GNULIB_defined_ECONNABORTED -- case ECONNABORTED: -- return "Software caused connection abort"; --#endif -- --#if GNULIB_defined_ESTALE -- case ESTALE: -- return "Stale NFS file handle"; --#endif -- --#if GNULIB_defined_EDQUOT -- case EDQUOT: -- return "Disk quota exceeded"; --#endif -- --#if GNULIB_defined_ECANCELED -- case ECANCELED: -- return "Operation canceled"; --#endif -- -- default: -- return NULL; -- } --} -diff -Naurp libiconv-1.14.org//srclib/strerror-override.h libiconv-1.14/srclib/strerror-override.h ---- libiconv-1.14.org//srclib/strerror-override.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/strerror-override.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,52 +0,0 @@ --/* strerror-override.h --- POSIX compatible system error routine -- -- Copyright (C) 2010-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -- --#ifndef _GL_STRERROR_OVERRIDE_H --# define _GL_STRERROR_OVERRIDE_H -- --# include <errno.h> --# include <stddef.h> -- --/* Reasonable buffer size that should never trigger ERANGE; if this -- proves too small, we intentionally abort(), to remind us to fix -- this value. */ --# define STACKBUF_LEN 256 -- --/* If ERRNUM maps to an errno value defined by gnulib, return a string -- describing the error. Otherwise return NULL. */ --# if REPLACE_STRERROR_0 \ -- || GNULIB_defined_ETXTBSY \ -- || GNULIB_defined_ESOCK \ -- || GNULIB_defined_ENOMSG \ -- || GNULIB_defined_EIDRM \ -- || GNULIB_defined_ENOLINK \ -- || GNULIB_defined_EPROTO \ -- || GNULIB_defined_EMULTIHOP \ -- || GNULIB_defined_EBADMSG \ -- || GNULIB_defined_EOVERFLOW \ -- || GNULIB_defined_ENOTSUP \ -- || GNULIB_defined_ENETRESET \ -- || GNULIB_defined_ECONNABORTED \ -- || GNULIB_defined_ESTALE \ -- || GNULIB_defined_EDQUOT \ -- || GNULIB_defined_ECANCELED --extern const char *strerror_override (int errnum); --# else --# define strerror_override(ignored) NULL --# endif -- --#endif /* _GL_STRERROR_OVERRIDE_H */ -diff -Naurp libiconv-1.14.org//srclib/string.in.h libiconv-1.14/srclib/string.in.h ---- libiconv-1.14.org//srclib/string.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/string.in.h 2012-01-08 02:07:40.418484461 -0800 -@@ -16,7 +16,7 @@ - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - --#ifndef _@GUARD_PREFIX@_STRING_H -+#ifndef _GL_STRING_H - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -26,8 +26,8 @@ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_STRING_H@ - --#ifndef _@GUARD_PREFIX@_STRING_H --#define _@GUARD_PREFIX@_STRING_H -+#ifndef _GL_STRING_H -+#define _GL_STRING_H - - /* NetBSD 5.0 mis-defines NULL. */ - #include <stddef.h> -@@ -59,36 +59,6 @@ - /* The definition of _GL_WARN_ON_USE is copied here. */ - - --/* Find the index of the least-significant set bit. */ --#if @GNULIB_FFSL@ --# if !@HAVE_FFSL@ --_GL_FUNCDECL_SYS (ffsl, int, (long int i)); --# endif --_GL_CXXALIAS_SYS (ffsl, int, (long int i)); --_GL_CXXALIASWARN (ffsl); --#elif defined GNULIB_POSIXCHECK --# undef ffsl --# if HAVE_RAW_DECL_FFSL --_GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module"); --# endif --#endif -- -- --/* Find the index of the least-significant set bit. */ --#if @GNULIB_FFSLL@ --# if !@HAVE_FFSLL@ --_GL_FUNCDECL_SYS (ffsll, int, (long long int i)); --# endif --_GL_CXXALIAS_SYS (ffsll, int, (long long int i)); --_GL_CXXALIASWARN (ffsll); --#elif defined GNULIB_POSIXCHECK --# undef ffsll --# if HAVE_RAW_DECL_FFSLL --_GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module"); --# endif --#endif -- -- - /* Return the first instance of C within N bytes of S, or NULL. */ - #if @GNULIB_MEMCHR@ - # if @REPLACE_MEMCHR@ -@@ -1007,5 +977,5 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp - #endif - - --#endif /* _@GUARD_PREFIX@_STRING_H */ --#endif /* _@GUARD_PREFIX@_STRING_H */ -+#endif /* _GL_STRING_H */ -+#endif /* _GL_STRING_H */ -diff -Naurp libiconv-1.14.org//srclib/sys_stat.in.h libiconv-1.14/srclib/sys_stat.in.h ---- libiconv-1.14.org//srclib/sys_stat.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/sys_stat.in.h 2012-01-08 02:07:40.430484461 -0800 -@@ -34,7 +34,7 @@ - #else - /* Normal invocation convention. */ - --#ifndef _@GUARD_PREFIX@_SYS_STAT_H -+#ifndef _GL_SYS_STAT_H - - /* Get nlink_t. */ - #include <sys/types.h> -@@ -45,8 +45,8 @@ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@ - --#ifndef _@GUARD_PREFIX@_SYS_STAT_H --#define _@GUARD_PREFIX@_SYS_STAT_H -+#ifndef _GL_SYS_STAT_H -+#define _GL_SYS_STAT_H - - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -@@ -653,6 +653,6 @@ _GL_WARN_ON_USE (utimensat, "utimensat i - #endif - - --#endif /* _@GUARD_PREFIX@_SYS_STAT_H */ --#endif /* _@GUARD_PREFIX@_SYS_STAT_H */ -+#endif /* _GL_SYS_STAT_H */ -+#endif /* _GL_SYS_STAT_H */ - #endif -diff -Naurp libiconv-1.14.org//srclib/time.in.h libiconv-1.14/srclib/time.in.h ---- libiconv-1.14.org//srclib/time.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/time.in.h 2012-01-08 02:07:40.438484462 -0800 -@@ -28,13 +28,13 @@ - without adding our own declarations. */ - #if (defined __need_time_t || defined __need_clock_t \ - || defined __need_timespec \ -- || defined _@GUARD_PREFIX@_TIME_H) -+ || defined _GL_TIME_H) - - # @INCLUDE_NEXT@ @NEXT_TIME_H@ - - #else - --# define _@GUARD_PREFIX@_TIME_H -+# define _GL_TIME_H - - # @INCLUDE_NEXT@ @NEXT_TIME_H@ - -diff -Naurp libiconv-1.14.org//srclib/unistd.in.h libiconv-1.14/srclib/unistd.in.h ---- libiconv-1.14.org//srclib/unistd.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/unistd.in.h 2012-01-08 02:07:40.450484462 -0800 -@@ -36,7 +36,7 @@ - # define _GL_WINSOCK2_H_WITNESS - - /* Normal invocation. */ --#elif !defined _@GUARD_PREFIX@_UNISTD_H -+#elif !defined _GL_UNISTD_H - - /* The include_next requires a split double-inclusion guard. */ - #if @HAVE_UNISTD_H@ -@@ -51,8 +51,8 @@ - # undef _GL_INCLUDING_WINSOCK2_H - #endif - --#if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H --#define _@GUARD_PREFIX@_UNISTD_H -+#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H -+#define _GL_UNISTD_H - - /* NetBSD 5.0 mis-defines NULL. Also get size_t. */ - #include <stddef.h> -@@ -117,77 +117,78 @@ - /* The definition of _GL_WARN_ON_USE is copied here. */ - - --/* Hide some function declarations from <winsock2.h>. */ -- --#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ --# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef socket --# define socket socket_used_without_including_sys_socket_h --# undef connect --# define connect connect_used_without_including_sys_socket_h --# undef accept --# define accept accept_used_without_including_sys_socket_h --# undef bind --# define bind bind_used_without_including_sys_socket_h --# undef getpeername --# define getpeername getpeername_used_without_including_sys_socket_h --# undef getsockname --# define getsockname getsockname_used_without_including_sys_socket_h --# undef getsockopt --# define getsockopt getsockopt_used_without_including_sys_socket_h --# undef listen --# define listen listen_used_without_including_sys_socket_h --# undef recv --# define recv recv_used_without_including_sys_socket_h --# undef send --# define send send_used_without_including_sys_socket_h --# undef recvfrom --# define recvfrom recvfrom_used_without_including_sys_socket_h --# undef sendto --# define sendto sendto_used_without_including_sys_socket_h --# undef setsockopt --# define setsockopt setsockopt_used_without_including_sys_socket_h --# undef shutdown --# define shutdown shutdown_used_without_including_sys_socket_h --# else -- _GL_WARN_ON_USE (socket, -- "socket() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (connect, -- "connect() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (accept, -- "accept() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (bind, -- "bind() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (getpeername, -- "getpeername() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (getsockname, -- "getsockname() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (getsockopt, -- "getsockopt() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (listen, -- "listen() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (recv, -- "recv() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (send, -- "send() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (recvfrom, -- "recvfrom() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (sendto, -- "sendto() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (setsockopt, -- "setsockopt() used without including <sys/socket.h>"); -- _GL_WARN_ON_USE (shutdown, -- "shutdown() used without including <sys/socket.h>"); -+#if @GNULIB_GETHOSTNAME@ -+/* Get all possible declarations of gethostname(). */ -+# if @UNISTD_H_HAVE_WINSOCK2_H@ -+# if !defined _GL_SYS_SOCKET_H -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef socket -+# define socket socket_used_without_including_sys_socket_h -+# undef connect -+# define connect connect_used_without_including_sys_socket_h -+# undef accept -+# define accept accept_used_without_including_sys_socket_h -+# undef bind -+# define bind bind_used_without_including_sys_socket_h -+# undef getpeername -+# define getpeername getpeername_used_without_including_sys_socket_h -+# undef getsockname -+# define getsockname getsockname_used_without_including_sys_socket_h -+# undef getsockopt -+# define getsockopt getsockopt_used_without_including_sys_socket_h -+# undef listen -+# define listen listen_used_without_including_sys_socket_h -+# undef recv -+# define recv recv_used_without_including_sys_socket_h -+# undef send -+# define send send_used_without_including_sys_socket_h -+# undef recvfrom -+# define recvfrom recvfrom_used_without_including_sys_socket_h -+# undef sendto -+# define sendto sendto_used_without_including_sys_socket_h -+# undef setsockopt -+# define setsockopt setsockopt_used_without_including_sys_socket_h -+# undef shutdown -+# define shutdown shutdown_used_without_including_sys_socket_h -+# else -+ _GL_WARN_ON_USE (socket, -+ "socket() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (connect, -+ "connect() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (accept, -+ "accept() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (bind, -+ "bind() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (getpeername, -+ "getpeername() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (getsockname, -+ "getsockname() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (getsockopt, -+ "getsockopt() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (listen, -+ "listen() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (recv, -+ "recv() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (send, -+ "send() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (recvfrom, -+ "recvfrom() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (sendto, -+ "sendto() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (setsockopt, -+ "setsockopt() used without including <sys/socket.h>"); -+ _GL_WARN_ON_USE (shutdown, -+ "shutdown() used without including <sys/socket.h>"); -+# endif - # endif --# endif --# if !defined _@GUARD_PREFIX@_SYS_SELECT_H --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef select --# define select select_used_without_including_sys_select_h --# else -- _GL_WARN_ON_USE (select, -- "select() used without including <sys/select.h>"); -+# if !defined _GL_SYS_SELECT_H -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef select -+# define select select_used_without_including_sys_select_h -+# else -+ _GL_WARN_ON_USE (select, -+ "select() used without including <sys/select.h>"); -+# endif - # endif - # endif - #endif -@@ -1061,7 +1062,6 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unport - specification <http://www.opengroup.org/susv3xsh/pread.html>. */ - # if @REPLACE_PREAD@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef pread - # define pread rpl_pread - # endif - _GL_FUNCDECL_RPL (pread, ssize_t, -@@ -1096,7 +1096,6 @@ _GL_WARN_ON_USE (pread, "pread is unport - <http://www.opengroup.org/susv3xsh/pwrite.html>. */ - # if @REPLACE_PWRITE@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef pwrite - # define pwrite rpl_pwrite - # endif - _GL_FUNCDECL_RPL (pwrite, ssize_t, -@@ -1417,5 +1416,5 @@ _GL_CXXALIASWARN (write); - #endif - - --#endif /* _@GUARD_PREFIX@_UNISTD_H */ --#endif /* _@GUARD_PREFIX@_UNISTD_H */ -+#endif /* _GL_UNISTD_H */ -+#endif /* _GL_UNISTD_H */ -diff -Naurp libiconv-1.14.org//srclib/verify.h libiconv-1.14/srclib/verify.h ---- libiconv-1.14.org//srclib/verify.h 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srclib/verify.h 2012-01-08 02:07:40.494484464 -0800 -@@ -164,13 +164,10 @@ - (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) - - # ifdef __cplusplus --# if !GNULIB_defined_struct__gl_verify_type - template <int w> - struct _gl_verify_type { - unsigned int _gl_verify_error_if_negative: w; - }; --# define GNULIB_defined_struct__gl_verify_type 1 --# endif - # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - _gl_verify_type<(R) ? 1 : -1> - # elif defined _GL_HAVE__STATIC_ASSERT -@@ -209,7 +206,7 @@ template <int w> - # endif - # endif - --/* @assert.h omit start@ */ -+# ifdef _GL_VERIFY_H - - /* Each of these macros verifies that its argument R is nonzero. To - be portable, R should be an integer constant expression. Unlike -@@ -221,23 +218,15 @@ template <int w> - contexts, e.g., the top level. */ - - /* Verify requirement R at compile-time, as an integer constant expression. -- Return 1. This is equivalent to verify_expr (R, 1). -- -- verify_true is obsolescent; please use verify_expr instead. */ -- --# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") -+ Return 1. */ - --/* Verify requirement R at compile-time. Return the value of the -- expression E. */ -- --# define verify_expr(R, E) \ -- (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) -+# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") - - /* Verify requirement R at compile-time, as a declaration without a - trailing ';'. */ - --# define verify(R) _GL_VERIFY (R, "verify (" #R ")") -+# define verify(R) _GL_VERIFY (R, "verify (" #R ")") - --/* @assert.h omit end@ */ -+# endif - - #endif -diff -Naurp libiconv-1.14.org//srcm4/canonicalize.m4 libiconv-1.14/srcm4/canonicalize.m4 ---- libiconv-1.14.org//srcm4/canonicalize.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/canonicalize.m4 2012-01-08 02:07:40.566484469 -0800 -@@ -1,4 +1,4 @@ --# canonicalize.m4 serial 23 -+# canonicalize.m4 serial 21 - - dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc. - -@@ -10,6 +10,8 @@ dnl with or without modifications, as lo - # not provide or fix realpath. - AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE], - [ -+ AC_LIBOBJ([canonicalize]) -+ - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) - AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) -@@ -28,14 +30,16 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], - AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE]) - if test $ac_cv_func_canonicalize_file_name = no; then - HAVE_CANONICALIZE_FILE_NAME=0 -+ AC_LIBOBJ([canonicalize-lgpl]) - if test $ac_cv_func_realpath = no; then - HAVE_REALPATH=0 - elif test "$gl_cv_func_realpath_works" != yes; then - REPLACE_REALPATH=1 - fi - elif test "$gl_cv_func_realpath_works" != yes; then -- REPLACE_CANONICALIZE_FILE_NAME=1 -+ AC_LIBOBJ([canonicalize-lgpl]) - REPLACE_REALPATH=1 -+ REPLACE_CANONICALIZE_FILE_NAME=1 - fi - ]) - -diff -Naurp libiconv-1.14.org//srcm4/errno_h.m4 libiconv-1.14/srcm4/errno_h.m4 ---- libiconv-1.14.org//srcm4/errno_h.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/errno_h.m4 2012-01-08 02:07:40.590484469 -0800 -@@ -1,4 +1,4 @@ --# errno_h.m4 serial 10 -+# errno_h.m4 serial 9 - dnl Copyright (C) 2004, 2006, 2008-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,12 +34,6 @@ booboo - #if !defined ENOTSUP - booboo - #endif --#if !defined ENETRESET --booboo --#endif --#if !defined ECONNABORTED --booboo --#endif - #if !defined ESTALE - booboo - #endif -diff -Naurp libiconv-1.14.org//srcm4/error.m4 libiconv-1.14/srcm4/error.m4 ---- libiconv-1.14.org//srcm4/error.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/error.m4 2012-01-08 02:07:40.598484470 -0800 -@@ -1,4 +1,4 @@ --#serial 14 -+#serial 13 - - # Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc. - # -@@ -8,8 +8,16 @@ - - AC_DEFUN([gl_ERROR], - [ -- dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer -- dnl maintained in Autoconf and because it invokes AC_LIBOBJ. -+ AC_FUNC_ERROR_AT_LINE -+ dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]). -+ gl_PREREQ_ERROR -+]) -+ -+# Redefine AC_FUNC_ERROR_AT_LINE, because it is no longer maintained in -+# Autoconf. -+AC_DEFUN([AC_FUNC_ERROR_AT_LINE], -+[ -+ AC_LIBSOURCES([error.h, error.c])dnl - AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( -@@ -17,6 +25,9 @@ AC_DEFUN([gl_ERROR], - [[error_at_line (0, 0, "", 0, "an error occurred");]])], - [ac_cv_lib_error_at_line=yes], - [ac_cv_lib_error_at_line=no])]) -+ if test $ac_cv_lib_error_at_line = no; then -+ AC_LIBOBJ([error]) -+ fi - ]) - - # Prerequisites of lib/error.c. -diff -Naurp libiconv-1.14.org//srcm4/extensions.m4 libiconv-1.14/srcm4/extensions.m4 ---- libiconv-1.14.org//srcm4/extensions.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/extensions.m4 2012-01-08 02:07:40.606484471 -0800 -@@ -1,4 +1,4 @@ --# serial 10 -*- Autoconf -*- -+# serial 9 -*- Autoconf -*- - # Enable extensions on systems that normally disable them. - - # Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc. -@@ -67,10 +67,6 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl - #ifndef _ALL_SOURCE - # undef _ALL_SOURCE - #endif --/* Enable general extensions on MacOS X. */ --#ifndef _DARWIN_C_SOURCE --# undef _DARWIN_C_SOURCE --#endif - /* Enable GNU extensions on systems that have them. */ - #ifndef _GNU_SOURCE - # undef _GNU_SOURCE -@@ -99,7 +95,6 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl - test $ac_cv_safe_to_define___extensions__ = yes && - AC_DEFINE([__EXTENSIONS__]) - AC_DEFINE([_ALL_SOURCE]) -- AC_DEFINE([_DARWIN_C_SOURCE]) - AC_DEFINE([_GNU_SOURCE]) - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) - AC_DEFINE([_TANDEM_SOURCE]) -diff -Naurp libiconv-1.14.org//srcm4/gnulib-cache.m4 libiconv-1.14/srcm4/gnulib-cache.m4 ---- libiconv-1.14.org//srcm4/gnulib-cache.m4 2011-08-07 06:42:11.000000000 -0700 -+++ libiconv-1.14/srcm4/gnulib-cache.m4 2012-01-08 02:07:43.154484593 -0800 -@@ -15,7 +15,7 @@ - - - # Specification in the form of a command-line invocation: --# gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc -+# gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc - - # Specification in the form of a few gnulib-tool.m4 macro invocations: - gl_LOCAL_DIR([gnulib-local]) -@@ -28,6 +28,7 @@ gl_MODULES([ - mbstate - memmove - progname -+ relocatable - relocatable-prog - safe-read - sigpipe -@@ -49,5 +50,4 @@ gl_LIB([libicrt]) - gl_MAKEFILE_NAME([Makefile.gnulib]) - gl_MACRO_PREFIX([gl]) - gl_PO_DOMAIN([]) --gl_WITNESS_C_DOMAIN([]) - gl_VC_FILES([false]) -diff -Naurp libiconv-1.14.org//srcm4/gnulib-common.m4 libiconv-1.14/srcm4/gnulib-common.m4 ---- libiconv-1.14.org//srcm4/gnulib-common.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/gnulib-common.m4 2012-01-08 02:07:40.634484471 -0800 -@@ -1,4 +1,4 @@ --# gnulib-common.m4 serial 29 -+# gnulib-common.m4 serial 24 - dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -12,19 +12,6 @@ AC_DEFUN([gl_COMMON], [ - AC_REQUIRE([gl_COMMON_BODY]) - ]) - AC_DEFUN([gl_COMMON_BODY], [ -- AH_VERBATIM([_Noreturn], --[/* The _Noreturn keyword of draft C1X. */ --#ifndef _Noreturn --# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ -- || 0x5110 <= __SUNPRO_C) --# define _Noreturn __attribute__ ((__noreturn__)) --# elif 1200 <= _MSC_VER --# define _Noreturn __declspec (noreturn) --# else --# define _Noreturn --# endif --#endif --]) - AH_VERBATIM([isoc99_inline], - [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports - the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of -@@ -47,20 +34,6 @@ AC_DEFUN([gl_COMMON_BODY], [ - /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name - is a misnomer outside of parameter lists. */ - #define _UNUSED_PARAMETER_ _GL_UNUSED -- --/* The __pure__ attribute was added in gcc 2.96. */ --#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) --# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) --#else --# define _GL_ATTRIBUTE_PURE /* empty */ --#endif -- --/* The __const__ attribute was added in gcc 2.95. */ --#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) --# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) --#else --# define _GL_ATTRIBUTE_CONST /* empty */ --#endif - ]) - dnl Preparation for running test programs: - dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not -@@ -74,49 +47,16 @@ AC_DEFUN([gl_COMMON_BODY], [ - # expands to a C preprocessor expression that evaluates to 1 or 0, depending - # whether a gnulib module that has been requested shall be considered present - # or not. --m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) -+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1]) - - # gl_MODULE_INDICATOR_SET_VARIABLE([modulename]) - # sets the shell variable that indicates the presence of the given module to - # a C preprocessor expression that will evaluate to 1. - AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], - [ -- gl_MODULE_INDICATOR_SET_VARIABLE_AUX( -- [GNULIB_[]m4_translit([[$1]], -- [abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], -- [gl_MODULE_INDICATOR_CONDITION]) --]) -- --# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable]) --# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION. --# The shell variable's value is a C preprocessor expression that evaluates --# to 0 or 1. --AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX], --[ -- m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1], -- [ -- dnl Simplify the expression VALUE || 1 to 1. -- $1=1 -- ], -- [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1], -- [gl_MODULE_INDICATOR_CONDITION])]) --]) -- --# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition]) --# modifies the shell variable to include the given condition. The shell --# variable's value is a C preprocessor expression that evaluates to 0 or 1. --AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR], --[ -- dnl Simplify the expression 1 || CONDITION to 1. -- if test "$[]$1" != 1; then -- dnl Simplify the expression 0 || CONDITION to CONDITION. -- if test "$[]$1" = 0; then -- $1=$2 -- else -- $1="($[]$1 || $2)" -- fi -- fi -+ GNULIB_[]m4_translit([[$1]], -+ [abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION - ]) - - # gl_MODULE_INDICATOR([modulename]) -@@ -211,35 +151,6 @@ m4_ifndef([AS_VAR_IF], - [m4_define([AS_VAR_IF], - [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])]) - --# gl_PROG_AR_RANLIB --# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler. --AC_DEFUN([gl_PROG_AR_RANLIB], --[ -- dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler -- dnl as "cc", and GCC as "gcc". They have different object file formats and -- dnl library formats. In particular, the GNU binutils programs ar, ranlib -- dnl produce libraries that work only with gcc, not with cc. -- AC_REQUIRE([AC_PROG_CC]) -- AC_EGREP_CPP([Amsterdam], -- [ --#ifdef __ACK__ --Amsterdam --#endif -- ], -- [AR='cc -c.a' -- ARFLAGS='-o' -- RANLIB=':' -- ], -- [dnl Use the Automake-documented default values for AR and ARFLAGS. -- AR='ar' -- ARFLAGS='cru' -- dnl Use the ranlib program if it is available. -- AC_PROG_RANLIB -- ]) -- AC_SUBST([AR]) -- AC_SUBST([ARFLAGS]) --]) -- - # AC_PROG_MKDIR_P - # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix - # for interoperability with automake-1.9.6 from autoconf-2.62. -diff -Naurp libiconv-1.14.org//srcm4/gnulib-comp.m4 libiconv-1.14/srcm4/gnulib-comp.m4 ---- libiconv-1.14.org//srcm4/gnulib-comp.m4 2011-08-07 06:42:12.000000000 -0700 -+++ libiconv-1.14/srcm4/gnulib-comp.m4 2012-01-08 02:07:43.922484630 -0800 -@@ -25,12 +25,14 @@ AC_DEFUN([gl_EARLY], - m4_pattern_allow([^gl_ES$])dnl a valid locale name - m4_pattern_allow([^gl_LIBOBJS$])dnl a variable - m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable -- AC_REQUIRE([gl_PROG_AR_RANLIB]) -+ AC_REQUIRE([AC_PROG_RANLIB]) - AC_REQUIRE([AM_PROG_CC_C_O]) - # Code from module alloca-opt: - # Code from module allocator: - # Code from module areadlink: -+ # Code from module arg-nonnull: - # Code from module binary-io: -+ # Code from module c++defs: - # Code from module canonicalize-lgpl: - # Code from module careadlinkat: - # Code from module dosname: -@@ -46,7 +48,6 @@ AC_DEFUN([gl_EARLY], - # Code from module havelib: - # Code from module include_next: - # Code from module intprops: -- # Code from module largefile: - # Code from module libiconv-misc: - # Code from module lstat: - # Code from module malloca: -@@ -64,10 +65,6 @@ AC_DEFUN([gl_EARLY], - # Code from module signal: - # Code from module sigpipe: - # Code from module sigprocmask: -- # Code from module snippet/_Noreturn: -- # Code from module snippet/arg-nonnull: -- # Code from module snippet/c++defs: -- # Code from module snippet/warn-on-use: - # Code from module ssize_t: - # Code from module stat: - # Code from module stdbool: -@@ -77,7 +74,6 @@ AC_DEFUN([gl_EARLY], - # Code from module stdlib: - # Code from module streq: - # Code from module strerror: -- # Code from module strerror-override: - # Code from module string: - # Code from module sys_stat: - # Code from module time: -@@ -87,6 +83,7 @@ AC_DEFUN([gl_EARLY], - # Code from module uniwidth/width: - # Code from module unlocked-io: - # Code from module verify: -+ # Code from module warn-on-use: - # Code from module xalloc: - # Code from module xreadlink: - ]) -@@ -109,9 +106,6 @@ AC_DEFUN([gl_INIT], - gl_source_base='srclib' - gl_FUNC_ALLOCA - gl_CANONICALIZE_LGPL --if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -- AC_LIBOBJ([canonicalize-lgpl]) --fi - gl_MODULE_INDICATOR([canonicalize-lgpl]) - gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name]) - gl_STDLIB_MODULE_INDICATOR([realpath]) -@@ -121,10 +115,6 @@ gl_ENVIRON - gl_UNISTD_MODULE_INDICATOR([environ]) - gl_HEADER_ERRNO_H - gl_ERROR --if test $ac_cv_lib_error_at_line = no; then -- AC_LIBOBJ([error]) -- gl_PREREQ_ERROR --fi - m4_ifdef([AM_XGETTEXT_OPTION], - [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) - AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) -@@ -134,43 +124,26 @@ AM_GNU_GETTEXT_VERSION([0.18.1]) - AC_SUBST([LIBINTL]) - AC_SUBST([LTLIBINTL]) - gl_FUNC_LSTAT --if test $REPLACE_LSTAT = 1; then -- AC_LIBOBJ([lstat]) -- gl_PREREQ_LSTAT --fi - gl_SYS_STAT_MODULE_INDICATOR([lstat]) - gl_MALLOCA - AC_TYPE_MBSTATE_T - gl_FUNC_MEMMOVE --if test $ac_cv_func_memmove = no; then -- AC_LIBOBJ([memmove]) -- gl_PREREQ_MEMMOVE --fi - gl_MULTIARCH - gl_PATHMAX - AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>]) - AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>]) - gl_FUNC_READ --if test $REPLACE_READ = 1; then -- AC_LIBOBJ([read]) --fi - gl_UNISTD_MODULE_INDICATOR([read]) - gl_FUNC_READLINK --if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then -- AC_LIBOBJ([readlink]) -- gl_PREREQ_READLINK --fi - gl_UNISTD_MODULE_INDICATOR([readlink]) - gl_RELOCATABLE([$gl_source_base]) --if test $RELOCATABLE = yes; then -- AC_LIBOBJ([progreloc]) --fi - gl_FUNC_READLINK_SEPARATE - gl_CANONICALIZE_LGPL_SEPARATE - gl_MALLOCA --gl_RELOCATABLE_LIBRARY -+gl_RELOCATABLE_LIBRARY_SEPARATE - gl_FUNC_SETENV_SEPARATE --gl_PREREQ_SAFE_READ -+gl_FUNC_STRERROR_SEPARATE -+gl_SAFE_READ - gl_SIGNAL_H - gl_SIGNAL_SIGPIPE - dnl Define the C macro GNULIB_SIGPIPE to 1. -@@ -186,17 +159,9 @@ dnl Define the substituted variable GNUL - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - GNULIB_UNISTD_H_SIGPIPE=1 - gl_SIGNALBLOCKING --if test $HAVE_POSIX_SIGNALBLOCKING = 0; then -- AC_LIBOBJ([sigprocmask]) -- gl_PREREQ_SIGPROCMASK --fi - gl_SIGNAL_MODULE_INDICATOR([sigprocmask]) - gt_TYPE_SSIZE_T - gl_FUNC_STAT --if test $REPLACE_STAT = 1; then -- AC_LIBOBJ([stat]) -- gl_PREREQ_STAT --fi - gl_SYS_STAT_MODULE_INDICATOR([stat]) - AM_STDBOOL_H - gl_STDDEF_H -@@ -204,17 +169,7 @@ gl_STDINT_H - gl_STDIO_H - gl_STDLIB_H - gl_FUNC_STRERROR --if test $REPLACE_STRERROR = 1; then -- AC_LIBOBJ([strerror]) --fi --gl_MODULE_INDICATOR([strerror]) - gl_STRING_MODULE_INDICATOR([strerror]) --AC_REQUIRE([gl_HEADER_ERRNO_H]) --AC_REQUIRE([gl_FUNC_STRERROR_0]) --if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then -- AC_LIBOBJ([strerror-override]) -- gl_PREREQ_SYS_H_WINSOCK2 --fi - gl_HEADER_STRING_H - gl_HEADER_SYS_STAT_H - AC_PROG_MKDIR_P -@@ -364,14 +319,13 @@ AC_DEFUN([gltests_LIBSOURCES], [ - # This macro records the list of files which have been installed by - # gnulib-tool and may be removed by future gnulib-tool invocations. - AC_DEFUN([gl_FILE_LIST], [ -+ build-aux/arg-nonnull.h -+ build-aux/c++defs.h - build-aux/config.libpath - build-aux/config.rpath - build-aux/install-reloc - build-aux/reloc-ldflags -- build-aux/snippet/_Noreturn.h -- build-aux/snippet/arg-nonnull.h -- build-aux/snippet/c++defs.h -- build-aux/snippet/warn-on-use.h -+ build-aux/warn-on-use.h - doc/relocatable.texi - lib/alloca.in.h - lib/allocator.c -@@ -419,8 +373,6 @@ AC_DEFUN([gl_FILE_LIST], [ - lib/stdio.in.h - lib/stdlib.in.h - lib/streq.h -- lib/strerror-override.c -- lib/strerror-override.h - lib/strerror.c - lib/string.in.h - lib/sys_stat.in.h -@@ -463,7 +415,6 @@ AC_DEFUN([gl_FILE_LIST], [ - m4/intmax.m4 - m4/inttypes-pri.m4 - m4/inttypes_h.m4 -- m4/largefile.m4 - m4/lcmessage.m4 - m4/lib-ld.m4 - m4/lib-link.m4 -@@ -502,7 +453,6 @@ AC_DEFUN([gl_FILE_LIST], [ - m4/stdlib_h.m4 - m4/strerror.m4 - m4/string_h.m4 -- m4/sys_socket_h.m4 - m4/sys_stat_h.m4 - m4/threadlib.m4 - m4/time_h.m4 -diff -Naurp libiconv-1.14.org//srcm4/include_next.m4 libiconv-1.14/srcm4/include_next.m4 ---- libiconv-1.14.org//srcm4/include_next.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/include_next.m4 2012-01-08 02:07:40.650484472 -0800 -@@ -1,4 +1,4 @@ --# include_next.m4 serial 20 -+# include_next.m4 serial 18 - dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -175,13 +175,11 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], - [AC_CHECK_HEADERS_ONCE([$1]) - ]) - --dnl FIXME: gl_next_header and gl_header_exists must be used unquoted --dnl until we can assume autoconf 2.64 or newer. - m4_foreach_w([gl_HEADER_NAME], [$1], - [AS_VAR_PUSHDEF([gl_next_header], - [gl_cv_next_]m4_defn([gl_HEADER_NAME])) - if test $gl_cv_have_include_next = yes; then -- AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) -+ AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) - else - AC_CACHE_CHECK( - [absolute name of <]m4_defn([gl_HEADER_NAME])[>], -@@ -210,7 +208,7 @@ dnl until we can assume autoconf 2.64 or - dnl eval is necessary to expand gl_absname_cpp. - dnl Ultrix and Pyramid sh refuse to redirect output of eval, - dnl so use subshell. -- AS_VAR_SET(gl_next_header, -+ AS_VAR_SET([gl_next_header], - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ - s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# -@@ -220,20 +218,20 @@ dnl until we can assume autoconf 2.64 or - }'`'"']) - m4_if([$2], [check], - [else -- AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) -+ AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) - fi - ]) - ]) - fi - AC_SUBST( - AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])), -- [AS_VAR_GET(gl_next_header)]) -+ [AS_VAR_GET([gl_next_header])]) - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'gl_HEADER_NAME'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' -- gl_next_as_first_directive=AS_VAR_GET(gl_next_header) -+ gl_next_as_first_directive=AS_VAR_GET([gl_next_header]) - fi - AC_SUBST( - AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])), -diff -Naurp libiconv-1.14.org//srcm4/largefile.m4 libiconv-1.14/srcm4/largefile.m4 ---- libiconv-1.14.org//srcm4/largefile.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/largefile.m4 1969-12-31 16:00:00.000000000 -0800 -@@ -1,104 +0,0 @@ --# Enable large files on systems where this is not the default. -- --# Copyright 1992-1996, 1998-2011 Free Software Foundation, Inc. --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# The following implementation works around a problem in autoconf <= 2.68; --# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5. --m4_version_prereq([2.69], [] ,[ -- --# _AC_SYS_LARGEFILE_TEST_INCLUDES --# ------------------------------- --m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], --[@%:@include <sys/types.h> -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]];[]dnl --]) -- -- --# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, --# CACHE-VAR, --# DESCRIPTION, --# PROLOGUE, [FUNCTION-BODY]) --# -------------------------------------------------------- --m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], --[AC_CACHE_CHECK([for $1 value needed for large files], [$3], --[while :; do -- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( -- [AC_LANG_PROGRAM([$5], [$6])], -- [$3=no; break]) -- m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( -- [AC_LANG_PROGRAM([@%:@define $1 $2 --$5], [$6])], -- [$3=$2; break]) -- $3=unknown -- break --done]) --case $$3 in #( -- no | unknown) ;; -- *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);; --esac --rm -rf conftest*[]dnl --])# _AC_SYS_LARGEFILE_MACRO_VALUE -- -- --# AC_SYS_LARGEFILE --# ---------------- --# By default, many hosts won't let programs access large files; --# one must use special compiler options to get large-file access to work. --# For more details about this brain damage please see: --# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html --AC_DEFUN([AC_SYS_LARGEFILE], --[AC_ARG_ENABLE(largefile, -- [ --disable-largefile omit support for large files]) --if test "$enable_largefile" != no; then -- -- AC_CACHE_CHECK([for special C compiler options needed for large files], -- ac_cv_sys_largefile_CC, -- [ac_cv_sys_largefile_CC=no -- if test "$GCC" != yes; then -- ac_save_CC=$CC -- while :; do -- # IRIX 6.2 and later do not support large files by default, -- # so use the C compiler's -n32 option if that helps. -- AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) -- AC_COMPILE_IFELSE([], [break]) -- CC="$CC -n32" -- AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break]) -- break -- done -- CC=$ac_save_CC -- rm -f conftest.$ac_ext -- fi]) -- if test "$ac_cv_sys_largefile_CC" != no; then -- CC=$CC$ac_cv_sys_largefile_CC -- fi -- -- _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, -- ac_cv_sys_file_offset_bits, -- [Number of bits in a file offset, on hosts where this is settable.], -- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- if test $ac_cv_sys_file_offset_bits = unknown; then -- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, -- ac_cv_sys_large_files, -- [Define for large files, on AIX-style hosts.], -- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- fi -- -- AH_VERBATIM([_DARWIN_USE_64_BIT_INODE], --[/* Enable large inode numbers on Mac OS X. */ --#ifndef _DARWIN_USE_64_BIT_INODE --# define _DARWIN_USE_64_BIT_INODE 1 --#endif]) --fi --])# AC_SYS_LARGEFILE -- --])# m4_version_prereq 2.69 -diff -Naurp libiconv-1.14.org//srcm4/lstat.m4 libiconv-1.14/srcm4/lstat.m4 ---- libiconv-1.14.org//srcm4/lstat.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/lstat.m4 2012-01-08 02:07:40.722484476 -0800 -@@ -1,4 +1,4 @@ --# serial 23 -+# serial 21 - - # Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc. - # -@@ -15,28 +15,24 @@ AC_DEFUN([gl_FUNC_LSTAT], - dnl "#define lstat stat", and lstat.c is a no-op. - AC_CHECK_FUNCS_ONCE([lstat]) - if test $ac_cv_func_lstat = yes; then -- AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) -- if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then -+ AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) -+ if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then -+ dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]). - REPLACE_LSTAT=1 - fi -+ # Prerequisites of lib/lstat.c. -+ AC_REQUIRE([AC_C_INLINE]) - else - HAVE_LSTAT=0 - fi - ]) - --# Prerequisites of lib/lstat.c. --AC_DEFUN([gl_PREREQ_LSTAT], -+# Redefine AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK, because it is no longer -+# maintained in Autoconf. -+AC_DEFUN([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], - [ -- AC_REQUIRE([AC_C_INLINE]) -- : --]) -- --AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], --[ -- dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it -- dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ. - AC_CACHE_CHECK([whether lstat correctly handles trailing slash], -- [gl_cv_func_lstat_dereferences_slashed_symlink], -+ [ac_cv_func_lstat_dereferences_slashed_symlink], - [rm -f conftest.sym conftest.file - echo >conftest.file - if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then -@@ -49,22 +45,25 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_ - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ]])], -- [gl_cv_func_lstat_dereferences_slashed_symlink=yes], -- [gl_cv_func_lstat_dereferences_slashed_symlink=no], -+ [ac_cv_func_lstat_dereferences_slashed_symlink=yes], -+ [ac_cv_func_lstat_dereferences_slashed_symlink=no], - [# When cross-compiling, be pessimistic so we will end up using the - # replacement version of lstat that checks for trailing slashes and - # calls lstat a second time when necessary. -- gl_cv_func_lstat_dereferences_slashed_symlink=no -+ ac_cv_func_lstat_dereferences_slashed_symlink=no - ]) - else - # If the 'ln -s' command failed, then we probably don't even - # have an lstat function. -- gl_cv_func_lstat_dereferences_slashed_symlink=no -+ ac_cv_func_lstat_dereferences_slashed_symlink=no - fi - rm -f conftest.sym conftest.file - ]) -- test $gl_cv_func_lstat_dereferences_slashed_symlink = yes && -+ test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1], - [Define to 1 if `lstat' dereferences a symlink specified - with a trailing slash.]) -+ if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then -+ AC_LIBOBJ([lstat]) -+ fi - ]) -diff -Naurp libiconv-1.14.org//srcm4/memmove.m4 libiconv-1.14/srcm4/memmove.m4 ---- libiconv-1.14.org//srcm4/memmove.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/memmove.m4 2012-01-08 02:07:40.738484477 -0800 -@@ -1,4 +1,4 @@ --# memmove.m4 serial 4 -+# memmove.m4 serial 3 - dnl Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,10 @@ dnl with or without modifications, as lo - - AC_DEFUN([gl_FUNC_MEMMOVE], - [ -- AC_CHECK_FUNCS([memmove]) -+ AC_REPLACE_FUNCS([memmove]) -+ if test $ac_cv_func_memmove = no; then -+ gl_PREREQ_MEMMOVE -+ fi - ]) - - # Prerequisites of lib/memmove.c. -diff -Naurp libiconv-1.14.org//srcm4/pathmax.m4 libiconv-1.14/srcm4/pathmax.m4 ---- libiconv-1.14.org//srcm4/pathmax.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/pathmax.m4 2012-01-08 02:07:40.758484478 -0800 -@@ -1,4 +1,4 @@ --# pathmax.m4 serial 9 -+# pathmax.m4 serial 8 - dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -8,5 +8,6 @@ dnl with or without modifications, as lo - AC_DEFUN([gl_PATHMAX], - [ - dnl Prerequisites of lib/pathmax.h. -+ AC_CHECK_FUNCS_ONCE([pathconf]) - AC_CHECK_HEADERS_ONCE([sys/param.h]) - ]) -diff -Naurp libiconv-1.14.org//srcm4/po.m4 libiconv-1.14/srcm4/po.m4 ---- libiconv-1.14.org//srcm4/po.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/po.m4 2012-01-08 02:07:40.766484477 -0800 -@@ -1,4 +1,4 @@ --# po.m4 serial 17a -+# po.m4 serial 17 (gettext-0.18) - dnl Copyright (C) 1995-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -118,8 +118,7 @@ changequote([,])dnl - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" -- gt_tab=`printf '\t'` -- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" -+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration -@@ -255,7 +254,6 @@ EOT - fi - - # A sed script that extracts the value of VARIABLE from a Makefile. -- tab=`printf '\t'` - sed_x_variable=' - # Test if the hold space is empty. - x -@@ -263,9 +261,9 @@ s/P/P/ - x - ta - # Yes it was empty. Look if we have the expected variable definition. --/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ -+/^[ ]*VARIABLE[ ]*=/{ - # Seen the first line of the variable definition. -- s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// -+ s/^[ ]*VARIABLE[ ]*=// - ba - } - bd -@@ -407,15 +405,14 @@ changequote([,])dnl - fi - - sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" -- tab=`printf '\t'` - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" <<EOF - $frobbedlang.msg: $lang.po --${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ --${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } -+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ -+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } - EOF - done - fi -@@ -425,8 +422,8 @@ EOF - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <<EOF - $frobbedlang/\$(DOMAIN).resources.dll: $lang.po --${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ --${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } -+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ -+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } - EOF - done - fi -diff -Naurp libiconv-1.14.org//srcm4/readlink.m4 libiconv-1.14/srcm4/readlink.m4 ---- libiconv-1.14.org//srcm4/readlink.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/readlink.m4 2012-01-08 02:07:40.790484479 -0800 -@@ -1,4 +1,4 @@ --# readlink.m4 serial 11 -+# readlink.m4 serial 10 - dnl Copyright (C) 2003, 2007, 2009-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -10,6 +10,8 @@ AC_DEFUN([gl_FUNC_READLINK], - AC_CHECK_FUNCS_ONCE([readlink]) - if test $ac_cv_func_readlink = no; then - HAVE_READLINK=0 -+ AC_LIBOBJ([readlink]) -+ gl_PREREQ_READLINK - else - AC_CACHE_CHECK([whether readlink signature is correct], - [gl_cv_decl_readlink_works], -@@ -38,8 +40,10 @@ AC_DEFUN([gl_FUNC_READLINK], - AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink - fails to recognize a trailing slash.]) - REPLACE_READLINK=1 -+ AC_LIBOBJ([readlink]) - elif test "$gl_cv_decl_readlink_works" != yes; then - REPLACE_READLINK=1 -+ AC_LIBOBJ([readlink]) - fi - fi - ]) -diff -Naurp libiconv-1.14.org//srcm4/read.m4 libiconv-1.14/srcm4/read.m4 ---- libiconv-1.14.org//srcm4/read.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/read.m4 2012-01-08 02:07:40.782484478 -0800 -@@ -1,4 +1,4 @@ --# read.m4 serial 2 -+# read.m4 serial 1 - dnl Copyright (C) 2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_READ], - gl_NONBLOCKING_IO - if test $gl_cv_have_nonblocking != yes; then - REPLACE_READ=1 -+ AC_LIBOBJ([read]) - fi - ]) - ]) -diff -Naurp libiconv-1.14.org//srcm4/relocatable-lib.m4 libiconv-1.14/srcm4/relocatable-lib.m4 ---- libiconv-1.14.org//srcm4/relocatable-lib.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/relocatable-lib.m4 2012-01-08 02:07:40.798484480 -0800 -@@ -1,4 +1,4 @@ --# relocatable-lib.m4 serial 6 -+# relocatable-lib.m4 serial 5 - dnl Copyright (C) 2003, 2005-2007, 2009-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -10,6 +10,9 @@ dnl Support for relocatable libraries. - AC_DEFUN([gl_RELOCATABLE_LIBRARY], - [ - AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) -+ if test $RELOCATABLE = yes; then -+ AC_LIBOBJ([relocatable]) -+ fi - ]) - AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], - [ -@@ -29,6 +32,13 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], - fi - ]) - -+dnl Like gl_RELOCATABLE_LIBRARY, except prepare for separate compilation -+dnl (no AC_LIBOBJ). -+AC_DEFUN([gl_RELOCATABLE_LIBRARY_SEPARATE], -+[ -+ AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) -+]) -+ - dnl Support for relocatable packages for which it is a nop. - AC_DEFUN([gl_RELOCATABLE_NOP], - [ -diff -Naurp libiconv-1.14.org//srcm4/relocatable.m4 libiconv-1.14/srcm4/relocatable.m4 ---- libiconv-1.14.org//srcm4/relocatable.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/relocatable.m4 2012-01-08 02:07:40.802484479 -0800 -@@ -1,4 +1,4 @@ --# relocatable.m4 serial 17 -+# relocatable.m4 serial 16 - dnl Copyright (C) 2003, 2005-2007, 2009-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -14,6 +14,9 @@ AC_DEFUN([gl_RELOCATABLE], - [ - AC_REQUIRE([gl_RELOCATABLE_BODY]) - gl_RELOCATABLE_LIBRARY -+ if test $RELOCATABLE = yes; then -+ AC_LIBOBJ([progreloc]) -+ fi - : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'} - RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base" - RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base" -diff -Naurp libiconv-1.14.org//srcm4/safe-read.m4 libiconv-1.14/srcm4/safe-read.m4 ---- libiconv-1.14.org//srcm4/safe-read.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/safe-read.m4 2012-01-08 02:07:40.810484480 -0800 -@@ -1,10 +1,17 @@ --# safe-read.m4 serial 6 -+# safe-read.m4 serial 5 - dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - -+AC_DEFUN([gl_SAFE_READ], -+[ -+ AC_LIBOBJ([safe-read]) -+ -+ gl_PREREQ_SAFE_READ -+]) -+ - # Prerequisites of lib/safe-read.c. - AC_DEFUN([gl_PREREQ_SAFE_READ], - [ -diff -Naurp libiconv-1.14.org//srcm4/setenv.m4 libiconv-1.14/srcm4/setenv.m4 ---- libiconv-1.14.org//srcm4/setenv.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/setenv.m4 2012-01-08 02:07:40.818484481 -0800 -@@ -1,4 +1,4 @@ --# setenv.m4 serial 24 -+# setenv.m4 serial 22 - dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -38,6 +38,9 @@ AC_DEFUN([gl_FUNC_SETENV], - REPLACE_SETENV=1 - fi - fi -+ if test $HAVE_SETENV$REPLACE_SETENV != 10; then -+ AC_LIBOBJ([setenv]) -+ fi - ]) - - # Like gl_FUNC_SETENV, except prepare for separate compilation -@@ -62,9 +65,9 @@ AC_DEFUN([gl_FUNC_UNSETENV], - fi - AC_CHECK_FUNCS([unsetenv]) - if test $ac_cv_func_unsetenv = no; then -- HAVE_UNSETENV=0 -+ AC_LIBOBJ([unsetenv]) -+ gl_PREREQ_UNSETENV - else -- HAVE_UNSETENV=1 - dnl Some BSDs return void, failing to do error checking. - AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret], - [AC_COMPILE_IFELSE( -@@ -90,6 +93,7 @@ int unsetenv(); - AC_DEFINE([VOID_UNSETENV], [1], [Define to 1 if unsetenv returns void - instead of int.]) - REPLACE_UNSETENV=1 -+ AC_LIBOBJ([unsetenv]) - fi - - dnl Solaris 10 unsetenv does not remove all copies of a name. -@@ -122,6 +126,7 @@ int unsetenv(); - [gl_cv_func_unsetenv_works="guessing no"])]) - if test "$gl_cv_func_unsetenv_works" != yes; then - REPLACE_UNSETENV=1 -+ AC_LIBOBJ([unsetenv]) - fi - fi - ]) -diff -Naurp libiconv-1.14.org//srcm4/signalblocking.m4 libiconv-1.14/srcm4/signalblocking.m4 ---- libiconv-1.14.org//srcm4/signalblocking.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/signalblocking.m4 2012-01-08 02:07:40.834484482 -0800 -@@ -1,4 +1,4 @@ --# signalblocking.m4 serial 12 -+# signalblocking.m4 serial 10 - dnl Copyright (C) 2001-2002, 2006-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -12,14 +12,31 @@ dnl with or without modifications, as lo - AC_DEFUN([gl_SIGNALBLOCKING], - [ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -- AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) -- if test $gl_cv_type_sigset_t = yes; then -+ signals_not_posix= -+ AC_EGREP_HEADER([sigset_t], [signal.h], , [signals_not_posix=1]) -+ if test -z "$signals_not_posix"; then - AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1]) - fi - if test -z "$gl_cv_func_sigprocmask"; then - HAVE_POSIX_SIGNALBLOCKING=0 -+ AC_LIBOBJ([sigprocmask]) -+ gl_PREREQ_SIGPROCMASK - fi - ]) - --# Prerequisites of lib/sigprocmask.c. --AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:]) -+# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c. -+AC_DEFUN([gl_PREREQ_SIGPROCMASK], -+[ -+ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+ AC_CHECK_TYPES([sigset_t], -+ [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no], -+ [#include <signal.h> -+/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */ -+#include <sys/types.h>]) -+ if test $gl_cv_type_sigset_t != yes; then -+ HAVE_SIGSET_T=0 -+ fi -+ dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has -+ dnl the sigset_t type. -+ AC_SUBST([HAVE_SIGSET_T]) -+]) -diff -Naurp libiconv-1.14.org//srcm4/signal_h.m4 libiconv-1.14/srcm4/signal_h.m4 ---- libiconv-1.14.org//srcm4/signal_h.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/signal_h.m4 2012-01-08 02:07:40.826484480 -0800 -@@ -1,4 +1,4 @@ --# signal_h.m4 serial 16 -+# signal_h.m4 serial 12 - dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,6 @@ dnl with or without modifications, as lo - AC_DEFUN([gl_SIGNAL_H], - [ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -- AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) - gl_NEXT_HEADERS([signal.h]) - - # AIX declares sig_atomic_t to already include volatile, and C89 compilers -@@ -28,25 +27,10 @@ AC_DEFUN([gl_SIGNAL_H], - dnl Check for declarations of anything we want to poison if the - dnl corresponding gnulib module is not in use. - gl_WARN_ON_USE_PREPARE([[#include <signal.h> -- ]], [pthread_sigmask sigaction -- sigaddset sigdelset sigemptyset sigfillset sigismember -+ ]], [sigaction sigaddset sigdelset sigemptyset sigfillset sigismember - sigpending sigprocmask]) - ]) - --AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], --[ -- AC_CHECK_TYPES([sigset_t], -- [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no], -- [[ -- #include <signal.h> -- /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */ -- #include <sys/types.h> -- ]]) -- if test $gl_cv_type_sigset_t != yes; then -- HAVE_SIGSET_T=0 -- fi --]) -- - AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], - [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -@@ -58,13 +42,11 @@ AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], - - AC_DEFUN([gl_SIGNAL_H_DEFAULTS], - [ -- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) - GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) - GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) - GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) -- HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) - HAVE_SIGSET_T=1; AC_SUBST([HAVE_SIGSET_T]) - HAVE_SIGINFO_T=1; AC_SUBST([HAVE_SIGINFO_T]) - HAVE_SIGACTION=1; AC_SUBST([HAVE_SIGACTION]) -@@ -73,5 +55,4 @@ AC_DEFUN([gl_SIGNAL_H_DEFAULTS], - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1; - AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T]) - HAVE_SIGHANDLER_T=1; AC_SUBST([HAVE_SIGHANDLER_T]) -- REPLACE_PTHREAD_SIGMASK=0; AC_SUBST([REPLACE_PTHREAD_SIGMASK]) - ]) -diff -Naurp libiconv-1.14.org//srcm4/stat.m4 libiconv-1.14/srcm4/stat.m4 ---- libiconv-1.14.org//srcm4/stat.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/stat.m4 2012-01-08 02:07:40.854484483 -0800 -@@ -1,4 +1,4 @@ --# serial 8 -+# serial 7 - - # Copyright (C) 2009-2011 Free Software Foundation, Inc. - # -@@ -58,11 +58,9 @@ AC_DEFUN([gl_FUNC_STAT], - AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs - help when passed a file name with a trailing slash]);; - esac --]) -- --# Prerequisites of lib/stat.c. --AC_DEFUN([gl_PREREQ_STAT], --[ -- AC_REQUIRE([AC_C_INLINE]) -- : -+ if test $REPLACE_STAT = 1; then -+ AC_LIBOBJ([stat]) -+ dnl Prerequisites of lib/stat.c. -+ AC_REQUIRE([AC_C_INLINE]) -+ fi - ]) -diff -Naurp libiconv-1.14.org//srcm4/strerror.m4 libiconv-1.14/srcm4/strerror.m4 ---- libiconv-1.14.org//srcm4/strerror.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/strerror.m4 2012-01-08 02:07:40.890484484 -0800 -@@ -1,4 +1,4 @@ --# strerror.m4 serial 16 -+# strerror.m4 serial 9 - dnl Copyright (C) 2002, 2007-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,73 +6,63 @@ dnl with or without modifications, as lo - - AC_DEFUN([gl_FUNC_STRERROR], - [ -+ AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE]) -+ if test $REPLACE_STRERROR = 1; then -+ AC_LIBOBJ([strerror]) -+ AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR], -+ [Define this to 1 if strerror is broken.]) -+ fi -+]) -+ -+# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ). -+AC_DEFUN([gl_FUNC_STRERROR_SEPARATE], -+[ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REQUIRE([gl_HEADER_ERRNO_H]) -- AC_REQUIRE([gl_FUNC_STRERROR_0]) -- m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [ -- AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS]) -- ]) -- if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then -+ if test -z "$ERRNO_H"; then - AC_CACHE_CHECK([for working strerror function], - [gl_cv_func_working_strerror], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include <string.h> - ]], -- [[if (!*strerror (-2)) return 1;]])], -+ [[return !*strerror (-2);]])], - [gl_cv_func_working_strerror=yes], - [gl_cv_func_working_strerror=no], -- [dnl Be pessimistic on cross-compiles for now. -- gl_cv_func_working_strerror="guessing no"]) -+ [dnl Assume crossbuild works if it compiles. -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include <string.h> -+ ]], -+ [[return !*strerror (-2);]])], -+ [gl_cv_func_working_strerror=yes], -+ [gl_cv_func_working_strerror=no]) -+ ]) - ]) -- if test "$gl_cv_func_working_strerror" != yes; then -+ if test $gl_cv_func_working_strerror = no; then - dnl The system's strerror() fails to return a string for out-of-range - dnl integers. Replace it. - REPLACE_STRERROR=1 - fi -- m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [ -- dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's -- dnl buffer, we must replace strerror. -- case "$gl_cv_func_strerror_r_works" in -- *no) REPLACE_STRERROR=1 ;; -- esac -- ]) - else - dnl The system's strerror() cannot know about the new errno values we add -- dnl to <errno.h>, or any fix for strerror(0). Replace it. -+ dnl to <errno.h>. Replace it. - REPLACE_STRERROR=1 - fi -+ if test $REPLACE_STRERROR = 1; then -+ gl_PREREQ_STRERROR -+ fi - ]) - --dnl Detect if strerror(0) passes (that is, does not set errno, and does not --dnl return a string that matches strerror(-1)). --AC_DEFUN([gl_FUNC_STRERROR_0], --[ -- REPLACE_STRERROR_0=0 -- AC_CACHE_CHECK([whether strerror(0) succeeds], -- [gl_cv_func_strerror_0_works], -- [AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [[#include <string.h> -- #include <errno.h> -- ]], -- [[int result = 0; -- char *str; -- errno = 0; -- str = strerror (0); -- if (!*str) result |= 1; -- if (errno) result |= 2; -- if (strstr (str, "nknown") || strstr (str, "ndefined")) -- result |= 4; -- return result;]])], -- [gl_cv_func_strerror_0_works=yes], -- [gl_cv_func_strerror_0_works=no], -- [dnl Be pessimistic on cross-compiles for now. -- gl_cv_func_strerror_0_works="guessing no"]) -- ]) -- if test "$gl_cv_func_strerror_0_works" != yes; then -- REPLACE_STRERROR_0=1 -- AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0) -- does not return a message implying success.]) -+# Prerequisites of lib/strerror.c. -+AC_DEFUN([gl_PREREQ_STRERROR], [ -+ AC_CHECK_DECLS([strerror]) -+ AC_CHECK_HEADERS_ONCE([sys/socket.h]) -+ if test $ac_cv_header_sys_socket_h != yes; then -+ dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make -+ dnl the check for those headers unconditional; yet cygwin reports -+ dnl that the headers are present but cannot be compiled (since on -+ dnl cygwin, all socket information should come from sys/socket.h). -+ AC_CHECK_HEADERS([winsock2.h]) - fi - ]) -diff -Naurp libiconv-1.14.org//srcm4/string_h.m4 libiconv-1.14/srcm4/string_h.m4 ---- libiconv-1.14.org//srcm4/string_h.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/string_h.m4 2012-01-08 02:07:40.894484485 -0800 -@@ -5,7 +5,7 @@ - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 21 -+# serial 20 - - # Written by Paul Eggert. - -@@ -27,9 +27,9 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], - dnl guaranteed by C89. - gl_WARN_ON_USE_PREPARE([[#include <string.h> - ]], -- [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul -- strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r -- strerror_r strsignal strverscmp]) -+ [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup -+ strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r -+ strsignal strverscmp]) - ]) - - AC_DEFUN([gl_STRING_MODULE_INDICATOR], -@@ -43,8 +43,6 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR], - - AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], - [ -- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) -- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) - GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) - GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) - GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) -@@ -82,8 +80,6 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], - GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) - HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) - dnl Assume proper GNU behavior unless another module says otherwise. -- HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) -- HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL]) - HAVE_MEMCHR=1; AC_SUBST([HAVE_MEMCHR]) - HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) - HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) -diff -Naurp libiconv-1.14.org//srcm4/sys_socket_h.m4 libiconv-1.14/srcm4/sys_socket_h.m4 ---- libiconv-1.14.org//srcm4/sys_socket_h.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/sys_socket_h.m4 1969-12-31 16:00:00.000000000 -0800 -@@ -1,177 +0,0 @@ --# sys_socket_h.m4 serial 22 --dnl Copyright (C) 2005-2011 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl From Simon Josefsson. -- --AC_DEFUN([gl_HEADER_SYS_SOCKET], --[ -- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -- AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_REQUIRE([AC_C_INLINE]) -- -- dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have -- dnl old-style declarations (with return type 'int' instead of 'ssize_t') -- dnl unless _POSIX_PII_SOCKET is defined. -- case "$host_os" in -- osf*) -- AC_DEFINE([_POSIX_PII_SOCKET], [1], -- [Define to 1 in order to get the POSIX compatible declarations -- of socket functions.]) -- ;; -- esac -- -- AC_CACHE_CHECK([whether <sys/socket.h> is self-contained], -- [gl_cv_header_sys_socket_h_selfcontained], -- [ -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[]])], -- [gl_cv_header_sys_socket_h_selfcontained=yes], -- [gl_cv_header_sys_socket_h_selfcontained=no]) -- ]) -- if test $gl_cv_header_sys_socket_h_selfcontained = yes; then -- dnl If the shutdown function exists, <sys/socket.h> should define -- dnl SHUT_RD, SHUT_WR, SHUT_RDWR. -- AC_CHECK_FUNCS([shutdown]) -- if test $ac_cv_func_shutdown = yes; then -- AC_CACHE_CHECK([whether <sys/socket.h> defines the SHUT_* macros], -- [gl_cv_header_sys_socket_h_shut], -- [ -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([[#include <sys/socket.h>]], -- [[int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };]])], -- [gl_cv_header_sys_socket_h_shut=yes], -- [gl_cv_header_sys_socket_h_shut=no]) -- ]) -- if test $gl_cv_header_sys_socket_h_shut = no; then -- SYS_SOCKET_H='sys/socket.h' -- fi -- fi -- fi -- # We need to check for ws2tcpip.h now. -- gl_PREREQ_SYS_H_SOCKET -- AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[ -- /* sys/types.h is not needed according to POSIX, but the -- sys/socket.h in i386-unknown-freebsd4.10 and -- powerpc-apple-darwin5.5 required it. */ --#include <sys/types.h> --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifdef HAVE_WS2TCPIP_H --#include <ws2tcpip.h> --#endif --]) -- if test $ac_cv_type_struct_sockaddr_storage = no; then -- HAVE_STRUCT_SOCKADDR_STORAGE=0 -- fi -- if test $ac_cv_type_sa_family_t = no; then -- HAVE_SA_FAMILY_T=0 -- fi -- if test $ac_cv_type_struct_sockaddr_storage != no; then -- AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family], -- [], -- [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0], -- [#include <sys/types.h> -- #ifdef HAVE_SYS_SOCKET_H -- #include <sys/socket.h> -- #endif -- #ifdef HAVE_WS2TCPIP_H -- #include <ws2tcpip.h> -- #endif -- ]) -- fi -- if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \ -- || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then -- SYS_SOCKET_H='sys/socket.h' -- fi -- gl_PREREQ_SYS_H_WINSOCK2 -- -- dnl Check for declarations of anything we want to poison if the -- dnl corresponding gnulib module is not in use. -- gl_WARN_ON_USE_PREPARE([[ --/* Some systems require prerequisite headers. */ --#include <sys/types.h> --#include <sys/socket.h> -- ]], [socket connect accept bind getpeername getsockname getsockopt -- listen recv send recvfrom sendto setsockopt shutdown accept4]) --]) -- --AC_DEFUN([gl_PREREQ_SYS_H_SOCKET], --[ -- dnl Check prerequisites of the <sys/socket.h> replacement. -- AC_REQUIRE([gl_CHECK_SOCKET_HEADERS]) -- gl_CHECK_NEXT_HEADERS([sys/socket.h]) -- if test $ac_cv_header_sys_socket_h = yes; then -- HAVE_SYS_SOCKET_H=1 -- HAVE_WS2TCPIP_H=0 -- else -- HAVE_SYS_SOCKET_H=0 -- if test $ac_cv_header_ws2tcpip_h = yes; then -- HAVE_WS2TCPIP_H=1 -- else -- HAVE_WS2TCPIP_H=0 -- fi -- fi -- AC_SUBST([HAVE_SYS_SOCKET_H]) -- AC_SUBST([HAVE_WS2TCPIP_H]) --]) -- --# Common prerequisites of the <sys/socket.h> replacement and of the --# <sys/select.h> replacement. --# Sets and substitutes HAVE_WINSOCK2_H. --AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2], --[ -- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) -- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) -- AC_CHECK_HEADERS_ONCE([sys/socket.h]) -- if test $ac_cv_header_sys_socket_h != yes; then -- dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make -- dnl the check for those headers unconditional; yet cygwin reports -- dnl that the headers are present but cannot be compiled (since on -- dnl cygwin, all socket information should come from sys/socket.h). -- AC_CHECK_HEADERS([winsock2.h]) -- fi -- if test "$ac_cv_header_winsock2_h" = yes; then -- HAVE_WINSOCK2_H=1 -- UNISTD_H_HAVE_WINSOCK2_H=1 -- SYS_IOCTL_H_HAVE_WINSOCK2_H=1 -- else -- HAVE_WINSOCK2_H=0 -- fi -- AC_SUBST([HAVE_WINSOCK2_H]) --]) -- --AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], --[ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -- gl_MODULE_INDICATOR_SET_VARIABLE([$1]) -- dnl Define it also as a C macro, for the benefit of the unit tests. -- gl_MODULE_INDICATOR_FOR_TESTS([$1]) --]) -- --AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], --[ -- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) -- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) -- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) -- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) -- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) -- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) -- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) -- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) -- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) -- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) -- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) -- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) -- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) -- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) -- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) -- HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) -- HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; -- AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) -- HAVE_SA_FAMILY_T=1; AC_SUBST([HAVE_SA_FAMILY_T]) -- HAVE_ACCEPT4=1; AC_SUBST([HAVE_ACCEPT4]) --]) -diff -Naurp libiconv-1.14.org//srcm4/warn-on-use.m4 libiconv-1.14/srcm4/warn-on-use.m4 ---- libiconv-1.14.org//srcm4/warn-on-use.m4 2011-08-07 06:42:07.000000000 -0700 -+++ libiconv-1.14/srcm4/warn-on-use.m4 2012-01-08 02:07:40.934484487 -0800 -@@ -1,4 +1,4 @@ --# warn-on-use.m4 serial 4 -+# warn-on-use.m4 serial 2 - dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -27,8 +27,6 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], - [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])), - [Define to 1 if ]m4_defn([gl_decl])[ is declared even after - undefining macros.])])dnl --dnl FIXME: gl_Symbol must be used unquoted until we can assume --dnl autoconf 2.64 or newer. - for gl_func in m4_flatten([$2]); do - AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl - AC_CACHE_CHECK([whether $gl_func is declared without a macro], -@@ -37,8 +35,8 @@ dnl autoconf 2.64 or newer. - [@%:@undef $gl_func - (void) $gl_func;])], - [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])]) -- AS_VAR_IF(gl_Symbol, [yes], -- [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) -+ AS_VAR_IF(gl_Symbol, [yes], -+ [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) - dnl shortcut - if the raw declaration exists, then set a cache - dnl variable to allow skipping any later AC_CHECK_DECL efforts - eval ac_cv_have_decl_$gl_func=yes]) diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch deleted file mode 100644 index 5d34ce7c0..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch +++ /dev/null @@ -1,50 +0,0 @@ -It adds the variables that are needed -for autoconf 2.65 to reconfigure libiconv and delete the m4 macros -directory. Its imported from OE. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libiconv-1.13.1/configure.ac -=================================================================== ---- libiconv-1.13.1.orig/configure.ac -+++ libiconv-1.13.1/configure.ac -@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AM_INIT_AUTOMAKE([libiconv], [1.13.1]) - AC_CONFIG_HEADERS([config.h lib/config.h]) - AC_PROG_MAKE_SET -- -+AC_CONFIG_MACRO_DIR([m4]) - dnl checks for basic programs - - AC_PROG_CC -Index: libiconv-1.13.1/libcharset/configure.ac -=================================================================== ---- libiconv-1.13.1.orig/libcharset/configure.ac -+++ libiconv-1.13.1/libcharset/configure.ac -@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library; - dnl write to the Free Software Foundation, Inc., 51 Franklin Street, - dnl Fifth Floor, Boston, MA 02110-1301, USA. - --AC_PREREQ([2.13]) -+AC_PREREQ(2.61) -+AC_INIT([libcharset],[1.4] ) -+AC_CONFIG_SRCDIR([lib/localcharset.c]) - --PACKAGE=libcharset --VERSION=1.4 -- --AC_INIT([lib/localcharset.c]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_HEADER([config.h]) - AC_PROG_MAKE_SET --AC_SUBST([PACKAGE]) --AC_SUBST([VERSION]) -+dnl AC_SUBST(PACKAGE) -+dnl AC_SUBST(VERSION) -+ -+AC_CONFIG_MACRO_DIR([m4]) - - dnl checks for basic programs - diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb deleted file mode 100644 index 9fd5114ac..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Character encoding support library" -DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ -multiple character encodings, but that support lacks from your system." -HOMEPAGE = "http://www.gnu.org/software/libiconv" -SECTION = "libs" -NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" -PROVIDES = "virtual/libiconv" -PR = "r1" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ - file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://autoconf.patch \ - file://add-relocatable-module.patch \ - " - -SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6" -SRC_URI[sha256sum] = "72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613" - -S = "${WORKDIR}/libiconv-${PV}" - -inherit autotools pkgconfig gettext - -python __anonymous() { - if d.getVar("TARGET_OS") != "linux": - return - if d.getVar("TCLIBC") == "glibc": - raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") -} - -EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" - -LEAD_SONAME = "libiconv.so" - -do_configure_prepend () { - rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4 -} - -do_configure_append () { - # forcibly remove RPATH from libtool - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool -} - -do_install_append () { - rm -rf ${D}${libdir}/preloadable_libiconv.so - rm -rf ${D}${libdir}/charset.alias -} - -BBCLASSEXTEND = "nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-7186.patch b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-7186.patch new file mode 100644 index 000000000..bfa3bfeec --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-7186.patch @@ -0,0 +1,96 @@ +libpcre2-10.23: Fix CVE-2017-7186 + +A fuzz on libpcre1 through the pcretest utility revealed an invalid read in the +library. For who is interested in a detailed description of the bug, will +follow a feedback from upstream: + +This was a genuine bug in the 32-bit library. Thanks for finding it. The crash +was caused by trying to find a Unicode property for a code value greater than +0x10ffff, the Unicode maximum, when running in non-UTF mode (where character +values can be up to 0xffffffff). + +The complete ASan output: + +# pcretest -32 -d $FILE +==14788==ERROR: AddressSanitizer: SEGV on unknown address 0x7f1bbffed4df (pc 0x7f1bbee3fe6b bp 0x7fff8b50d8c0 sp 0x7fff8b50d3a0 T0) +==14788==The signal is caused by a READ memory access. + #0 0x7f1bbee3fe6a in match /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcre_exec.c:5473:18 + #1 0x7f1bbee09226 in pcre32_exec /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcre_exec.c:6936:8 + #2 0x527d6c in main /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcretest.c:5218:9 + #3 0x7f1bbddd678f in __libc_start_main /tmp/portage/sys-libs/glibc-2.23-r3/work/glibc-2.23/csu/../csu/libc-start.c:289 + #4 0x41b438 in _init (/usr/bin/pcretest+0x41b438) + +AddressSanitizer can not provide additional info. +SUMMARY: AddressSanitizer: SEGV /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcre_exec.c:5473:18 in match +==14788==ABORTING + +Upstream-Status: Backport [https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date \ + https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date] +CVE: CVE-2017-7186 + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- trunk/src/pcre2_ucd.c 2015/07/17 15:44:51 316 ++++ trunk/src/pcre2_ucd.c 2017/02/24 18:25:32 670 +@@ -41,6 +41,20 @@ + + const char *PRIV(unicode_version) = "8.0.0"; + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre2_internal.h (the actual + field names will be different): +--- trunk/src/pcre2_internal.h 2016/11/19 12:46:24 600 ++++ trunk/src/pcre2_internal.h 2017/02/24 18:25:32 670 +@@ -1774,10 +1774,17 @@ + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) + ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++#define GET_UCD(ch) ((ch > MAX_UTF_CODE_POINT)? \ ++ PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif ++ + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script + #define UCD_CATEGORY(ch) PRIV(ucp_gentype)[UCD_CHARTYPE(ch)] +@@ -1834,6 +1841,9 @@ + #define _pcre2_default_compile_context PCRE2_SUFFIX(_pcre2_default_compile_context_) + #define _pcre2_default_match_context PCRE2_SUFFIX(_pcre2_default_match_context_) + #define _pcre2_default_tables PCRE2_SUFFIX(_pcre2_default_tables_) ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++#define _pcre2_dummy_ucd_record PCRE2_SUFFIX(_pcre2_dummy_ucd_record_) ++#endif + #define _pcre2_hspace_list PCRE2_SUFFIX(_pcre2_hspace_list_) + #define _pcre2_vspace_list PCRE2_SUFFIX(_pcre2_vspace_list_) + #define _pcre2_ucd_caseless_sets PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_) +@@ -1858,6 +1868,9 @@ + extern const uint32_t PRIV(vspace_list)[]; + extern const uint32_t PRIV(ucd_caseless_sets)[]; + extern const ucd_record PRIV(ucd_records)[]; ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + extern const uint8_t PRIV(ucd_stage1)[]; + extern const uint16_t PRIV(ucd_stage2)[]; + extern const uint32_t PRIV(ucp_gbtable)[]; diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-8786.patch b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-8786.patch new file mode 100644 index 000000000..eafafc1f6 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-8786.patch @@ -0,0 +1,93 @@ +libpcre2-10.23: Fix CVE-2017-8786 + +The pcre2test.c in PCRE2 10.23 allows remote attackers to cause a denial of +service (heap-based buffer overflow) or possibly have unspecified other impact +via a crafted regular expression. + +Upstream-Status: Backport [https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch] +CVE: CVE-2017-8786 + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- trunk/src/pcre2test.c 2017/03/21 16:18:54 692 ++++ trunk/src/pcre2test.c 2017/03/21 18:36:13 697 +@@ -1017,9 +1017,9 @@ + if (test_mode == PCRE8_MODE) \ + r = pcre2_get_error_message_8(a,G(b,8),G(G(b,8),_size)); \ + else if (test_mode == PCRE16_MODE) \ +- r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size)); \ ++ r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size/2)); \ + else \ +- r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size)) ++ r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size/4)) + + #define PCRE2_GET_OVECTOR_COUNT(a,b) \ + if (test_mode == PCRE8_MODE) \ +@@ -1399,6 +1399,9 @@ + + /* ----- Common macros for two-mode cases ----- */ + ++#define BYTEONE (BITONE/8) ++#define BYTETWO (BITTWO/8) ++ + #define CASTFLD(t,a,b) \ + ((test_mode == G(G(PCRE,BITONE),_MODE))? (t)(G(a,BITONE)->b) : \ + (t)(G(a,BITTWO)->b)) +@@ -1481,9 +1484,9 @@ + + #define PCRE2_GET_ERROR_MESSAGE(r,a,b) \ + if (test_mode == G(G(PCRE,BITONE),_MODE)) \ +- r = G(pcre2_get_error_message_,BITONE)(a,G(b,BITONE),G(G(b,BITONE),_size)); \ ++ r = G(pcre2_get_error_message_,BITONE)(a,G(b,BITONE),G(G(b,BITONE),_size/BYTEONE)); \ + else \ +- r = G(pcre2_get_error_message_,BITTWO)(a,G(b,BITTWO),G(G(b,BITTWO),_size)) ++ r = G(pcre2_get_error_message_,BITTWO)(a,G(b,BITTWO),G(G(b,BITTWO),_size/BYTETWO)) + + #define PCRE2_GET_OVECTOR_COUNT(a,b) \ + if (test_mode == G(G(PCRE,BITONE),_MODE)) \ +@@ -1904,7 +1907,7 @@ + #define PCRE2_DFA_MATCH(a,b,c,d,e,f,g,h,i,j) \ + a = pcre2_dfa_match_16(G(b,16),(PCRE2_SPTR16)c,d,e,f,G(g,16),h,i,j) + #define PCRE2_GET_ERROR_MESSAGE(r,a,b) \ +- r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size)) ++ r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size/2)) + #define PCRE2_GET_OVECTOR_COUNT(a,b) a = pcre2_get_ovector_count_16(G(b,16)) + #define PCRE2_GET_STARTCHAR(a,b) a = pcre2_get_startchar_16(G(b,16)) + #define PCRE2_JIT_COMPILE(r,a,b) r = pcre2_jit_compile_16(G(a,16),b) +@@ -2000,7 +2003,7 @@ + #define PCRE2_DFA_MATCH(a,b,c,d,e,f,g,h,i,j) \ + a = pcre2_dfa_match_32(G(b,32),(PCRE2_SPTR32)c,d,e,f,G(g,32),h,i,j) + #define PCRE2_GET_ERROR_MESSAGE(r,a,b) \ +- r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size)) ++ r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size/4)) + #define PCRE2_GET_OVECTOR_COUNT(a,b) a = pcre2_get_ovector_count_32(G(b,32)) + #define PCRE2_GET_STARTCHAR(a,b) a = pcre2_get_startchar_32(G(b,32)) + #define PCRE2_JIT_COMPILE(r,a,b) r = pcre2_jit_compile_32(G(a,32),b) +@@ -2889,7 +2892,7 @@ + { + if (pbuffer32 != NULL) free(pbuffer32); + pbuffer32_size = 4*len + 4; +- if (pbuffer32_size < 256) pbuffer32_size = 256; ++ if (pbuffer32_size < 512) pbuffer32_size = 512; + pbuffer32 = (uint32_t *)malloc(pbuffer32_size); + if (pbuffer32 == NULL) + { +@@ -7600,7 +7603,8 @@ + int errcode; + char *endptr; + +-/* Ensure the relevant non-8-bit buffer is available. */ ++/* Ensure the relevant non-8-bit buffer is available. Ensure that it is at ++least 128 code units, because it is used for retrieving error messages. */ + + #ifdef SUPPORT_PCRE2_16 + if (test_mode == PCRE16_MODE) +@@ -7620,7 +7624,7 @@ + #ifdef SUPPORT_PCRE2_32 + if (test_mode == PCRE32_MODE) + { +- pbuffer32_size = 256; ++ pbuffer32_size = 512; + pbuffer32 = (uint32_t *)malloc(pbuffer32_size); + if (pbuffer32 == NULL) + { diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.22.bb b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.23.bb index 0cf81c050..ca2b028e1 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.22.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.23.bb @@ -8,14 +8,16 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=ab9633efd38d6f799398df2c248b5aec" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3de34df49e1fe3c3b59a08dff214488b" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ + file://libpcre2-CVE-2017-8786.patch \ + file://libpcre2-CVE-2017-7186.patch \ " -SRC_URI[md5sum] = "c0c02517938ee2b0d350d53edf450664" -SRC_URI[sha256sum] = "b2b44619f4ac6c50ad74c2865fd56807571392496fae1c9ad7a70993d018f416" +SRC_URI[md5sum] = "b2cd00ca7e24049040099b0a46bb3649" +SRC_URI[sha256sum] = "dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e" CVE_PRODUCT = "pcre2" diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.40.bb b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb index 8b6ab25e1..0eaed1808 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.40.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb @@ -7,15 +7,15 @@ HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=60da32d84d067f53e22071c4ecb4384d" -SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2 \ +SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch \ file://fix-pcre-name-collision.patch \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "41a842bf7dcecd6634219336e2167d1d" -SRC_URI[sha256sum] = "00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4" +SRC_URI[md5sum] = "c160d22723b1670447341b08c58981c1" +SRC_URI[sha256sum] = "e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530" CVE_PRODUCT = "pcre" diff --git a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb b/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb index 62a6a13c8..4c39f52ff 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb @@ -31,6 +31,7 @@ EXTRA_OECMAKE += " \ -DLIB_INSTALL_DIR=${libdir} \ -DLIBEXEC_INSTALL_DIR=${libexecdir} \ " +SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" FILES_${PN}-dev += "${datadir}/cmake" diff --git a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb b/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb index a1f294efb..c9f95e538 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb @@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "465083f74b7bb035959ddb0599313986" -SRC_URI[sha256sum] = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5" +SRC_URI[md5sum] = "eb33adb459c2283efc5c7d09ccdbbcfc" +SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287ff862542d4fc048f19a92a068a27d17b72" S = "${WORKDIR}/libsoup-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc index c8ff836e8..ed32d19bf 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc @@ -2,23 +2,18 @@ SUMMARY = "Library for obtaining the call-chain of a program" DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" HOMEPAGE = "http://www.nongnu.org/libunwind" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" +LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" DEPENDS += "libatomic-ops" inherit autotools PACKAGECONFIG ??= "" PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" -PACKAGECONFIG[latexdocs] = "--enable-documentaiton, --disable-documentation, latex2man-native" +PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" EXTRA_OECONF_arm = "--enable-debug-frame" EXTRA_OECONF_aarch64 = "--enable-debug-frame" -CFLAGS += "${ATOMICOPS}" -ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1" -ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1" -ATOMICOPS ?= "" - SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/fix-mips.patch b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/fix-mips.patch new file mode 100644 index 000000000..002223793 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/fix-mips.patch @@ -0,0 +1,134 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 5f354cb7b9c84dae006f0ebd8ad7a78d7e2aad0c Mon Sep 17 00:00:00 2001 +From: Dave Watson <davejwatson@fb.com> +Date: Wed, 25 Jan 2017 16:18:02 -0800 +Subject: [PATCH] mips/tilegx: Add missing unwind_i.h header file + +reported-by: John Knight <John.Knight@belkin.com> +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 5d874755..7de4c425 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -280,7 +280,7 @@ libunwind_hppa_la_SOURCES_hppa = $(libunwind_la_SOURCES_hppa_common) \ + hppa/Gresume.c hppa/Gstep.c + + # The list of files that go info libunwind and libunwind-mips: +-noinst_HEADERS += mips/init.h mips/offsets.h ++noinst_HEADERS += mips/init.h mips/offsets.h mips/unwind_i.h + libunwind_la_SOURCES_mips_common = $(libunwind_la_SOURCES_common) \ + mips/is_fpreg.c mips/regname.c + +@@ -299,7 +299,7 @@ libunwind_mips_la_SOURCES_mips = $(libunwind_la_SOURCES_mips_common) \ + mips/Gis_signal_frame.c mips/Gregs.c mips/Gresume.c mips/Gstep.c + + # The list of files that go info libunwind and libunwind-tilegx: +-noinst_HEADERS += tilegx/init.h tilegx/offsets.h ++noinst_HEADERS += tilegx/init.h tilegx/offsets.h tilegx/unwind_i.h + libunwind_la_SOURCES_tilegx_common = $(libunwind_la_SOURCES_common) \ + tilegx/is_fpreg.c tilegx/regname.c + +diff --git a/src/mips/unwind_i.h b/src/mips/unwind_i.h +new file mode 100644 +index 0000000..3382dcf +--- /dev/null ++++ b/src/mips/unwind_i.h +@@ -0,0 +1,43 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef unwind_i_h ++#define unwind_i_h ++ ++#include <stdint.h> ++ ++#include <libunwind-mips.h> ++ ++#include "libunwind_i.h" ++ ++#define mips_lock UNW_OBJ(lock) ++#define mips_local_resume UNW_OBJ(local_resume) ++#define mips_local_addr_space_init UNW_OBJ(local_addr_space_init) ++ ++extern int mips_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, ++ void *arg); ++ ++extern void mips_local_addr_space_init (void); ++ ++#endif /* unwind_i_h */ +diff --git a/src/tilegx/unwind_i.h b/src/tilegx/unwind_i.h +new file mode 100644 +index 0000000..aac7be3 +--- /dev/null ++++ b/src/tilegx/unwind_i.h +@@ -0,0 +1,44 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef unwind_i_h ++#define unwind_i_h ++ ++#include <memory.h> ++#include <stdint.h> ++ ++#include <libunwind-tilegx.h> ++ ++#include "libunwind_i.h" ++ ++#define tilegx_local_resume UNW_OBJ(local_resume) ++#define tilegx_local_addr_space_init UNW_OBJ(local_addr_space_init) ++ ++extern int tilegx_local_resume (unw_addr_space_t as, ++ unw_cursor_t *cursor, ++ void *arg); ++ ++extern void tilegx_local_addr_space_init (void); ++ ++#endif /* unwind_i_h */ diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_git.bb b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.bb index b637c5c44..c6312f24f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_git.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.bb @@ -1,10 +1,9 @@ require libunwind.inc -PV = "1.1+git${SRCPV}" +SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f" +SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992" -SRCREV = "bc8698fd7ed13a629a8ec3cb2a89bd74f9d8b5c0" - -SRC_URI = "git://git.sv.gnu.org/libunwind.git \ +SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ file://0001-x86-Stub-out-x86_local_resume.patch \ @@ -12,6 +11,7 @@ SRC_URI = "git://git.sv.gnu.org/libunwind.git \ file://0001-add-knobs-to-disable-enable-tests.patch \ file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ file://libunwind-1.1-x32.patch \ + file://fix-mips.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" @@ -21,10 +21,4 @@ EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests " ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -# see https://sourceware.org/bugzilla/show_bug.cgi?id=19987 -SECURITY_CFLAGS_remove_aarch64 = "-fpie" -SECURITY_CFLAGS_append_aarch64 = " -fPIE" - -S = "${WORKDIR}/git" - LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch deleted file mode 100644 index 6296238b8..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch +++ /dev/null @@ -1,145 +0,0 @@ -From f37c5b56376d9bb506da68bb11d0d7463e6e563b Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Tue, 9 Feb 2016 01:52:26 +0100 -Subject: [PATCH] Support for NIOS2 architecture - -Add support for the Altera NIOS2 CPU archirecture. The atomic operations -are handled by the GCC. The memory barriers on this systems are entirely -trivial too, since the CPU does not support SMP at all. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport [ http://git.lttng.org/?p=userspace-rcu.git;a=commit;h=859050b3088aa3f0cb59d7f51ce24b9a0f18faa5 ] - ---- - LICENSE | 1 + - README.md | 1 + - configure.ac | 1 + - urcu/arch/nios2.h | 40 ++++++++++++++++++++++++++++++++++++++++ - urcu/uatomic/nios2.h | 32 ++++++++++++++++++++++++++++++++ - 5 files changed, 75 insertions(+) - create mode 100644 urcu/arch/nios2.h - create mode 100644 urcu/uatomic/nios2.h - -diff --git a/LICENSE b/LICENSE -index 3147094..a06fdcc 100644 ---- a/LICENSE -+++ b/LICENSE -@@ -45,6 +45,7 @@ compiler.h - arch/s390.h - uatomic/alpha.h - uatomic/mips.h -+uatomic/nios2.h - uatomic/s390.h - system.h - -diff --git a/README.md b/README.md -index f6b290f..6fe9c1e 100644 ---- a/README.md -+++ b/README.md -@@ -43,6 +43,7 @@ Currently, the following architectures are supported: - - S390, S390x - - ARM 32/64 - - MIPS -+ - NIOS2 - - Alpha - - ia64 - - Sparcv9 32/64 -diff --git a/configure.ac b/configure.ac -index eebed56..8014e1d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -136,6 +136,7 @@ AS_CASE([$host_cpu], - [arm*], [ARCHTYPE="arm"], - [aarch64*], [ARCHTYPE="aarch64"], - [mips*], [ARCHTYPE="mips"], -+ [nios2*], [ARCHTYPE="nios2"], - [tile*], [ARCHTYPE="tile"], - [hppa*], [ARCHTYPE="hppa"], - [ARCHTYPE="unknown"] -diff --git a/urcu/arch/nios2.h b/urcu/arch/nios2.h -new file mode 100644 -index 0000000..b4f3e50 ---- /dev/null -+++ b/urcu/arch/nios2.h -@@ -0,0 +1,40 @@ -+#ifndef _URCU_ARCH_NIOS2_H -+#define _URCU_ARCH_NIOS2_H -+ -+/* -+ * arch_nios2.h: trivial definitions for the NIOS2 architecture. -+ * -+ * Copyright (c) 2016 Marek Vasut <marex@denx.de> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include <urcu/compiler.h> -+#include <urcu/config.h> -+#include <urcu/syscall-compat.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define cmm_mb() cmm_barrier() -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#include <urcu/arch/generic.h> -+ -+#endif /* _URCU_ARCH_NIOS2_H */ -diff --git a/urcu/uatomic/nios2.h b/urcu/uatomic/nios2.h -new file mode 100644 -index 0000000..5b3c303 ---- /dev/null -+++ b/urcu/uatomic/nios2.h -@@ -0,0 +1,32 @@ -+#ifndef _URCU_UATOMIC_ARCH_NIOS2_H -+#define _URCU_UATOMIC_ARCH_NIOS2_H -+ -+/* -+ * Atomic exchange operations for the NIOS2 architecture. Let GCC do it. -+ * -+ * Copyright (c) 2016 Marek Vasut <marex@denx.de> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to -+ * deal in the Software without restriction, including without limitation the -+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -+ * IN THE SOFTWARE. -+ */ -+ -+#include <urcu/compiler.h> -+#include <urcu/system.h> -+#include <urcu/uatomic/generic.h> -+ -+#endif /* _URCU_UATOMIC_ARCH_NIOS2_H */ --- -2.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.0.bb b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.0.bb new file mode 100644 index 000000000..4ecb20b75 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Userspace RCU (read-copy-update) library" +HOMEPAGE = "http://lttng.org/urcu" +BUGTRACKER = "http://lttng.org/project/issues" + +LICENSE = "LGPLv2.1+ & MIT-style" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ + file://src/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ + file://include/urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" + +SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "69dab85b6929c378338b9504adc6aea7" +SRC_URI[sha256sum] = "7cb58a7ba5151198087f025dc8d19d8918e9c6d56772f039696c111d9aad3190" + +S = "${WORKDIR}/userspace-rcu-${PV}" +inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.3.bb b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.3.bb deleted file mode 100644 index 4486e0abe..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Userspace RCU (read-copy-update) library" -HOMEPAGE = "http://lttng.org/urcu" -BUGTRACKER = "http://lttng.org/project/issues" - -LICENSE = "LGPLv2.1+ & MIT-style" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ - file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ - file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" - -SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ - file://0001-Support-for-NIOS2-architecture.patch \ - " - -SRC_URI[md5sum] = "920970e35a1a2066c8353eabfeab8730" -SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006" - -S = "${WORKDIR}/userspace-rcu-${PV}" -CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" -inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.29.bb b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.29.bb index d27c70660..5b11bc228 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.29.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.29.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \ +SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ file://pkgconfig_fix.patch \ file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \ file://0001-Link-libraries-with-libm.patch \ diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch b/import-layers/yocto-poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch new file mode 100644 index 000000000..00494e801 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch @@ -0,0 +1,82 @@ +From d4768d9e29b805096a86aa13c0d30ee8215af4df Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 26 Jun 2017 12:07:09 +0300 +Subject: [PATCH] tests/Makefile: don't use LIBDIR as variable + +LIBDIR may be overriden with a environment variable: In this case make +clean breaks. Use another variable name. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Backport +--- + tests/Makefile | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 97fa782..51dd038 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -32,7 +32,7 @@ DESTDIR ?= + PREFIX ?= /usr/local + BINDIR := $(PREFIX)/bin + MANDIR := $(PREFIX)/share/man/man1 +-LIBDIR := ../lib ++LZ4DIR := ../lib + PRGDIR := ../programs + VOID := /dev/null + TESTDIR := versionsTest +@@ -43,7 +43,7 @@ CFLAGS += -g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-e + -Wdeclaration-after-statement -Wstrict-prototypes \ + -Wpointer-arith -Wstrict-aliasing=1 + CFLAGS += $(MOREFLAGS) +-CPPFLAGS:= -I$(LIBDIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ ++CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ + FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) + + +@@ -79,31 +79,31 @@ lz4c32: # create a 32-bits version for 32/64 interop tests + $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS)" + cp $(LZ4) $(LZ4)c32 + +-fullbench : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/lz4frame.o $(LIBDIR)/xxhash.o fullbench.c ++fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c + $(CC) $(FLAGS) $^ -o $@$(EXT) + +-fullbench-lib: fullbench.c $(LIBDIR)/xxhash.c +- $(MAKE) -C $(LIBDIR) liblz4.a +- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/liblz4.a ++fullbench-lib: fullbench.c $(LZ4DIR)/xxhash.c ++ $(MAKE) -C $(LZ4DIR) liblz4.a ++ $(CC) $(FLAGS) $^ -o $@$(EXT) $(LZ4DIR)/liblz4.a + +-fullbench-dll: fullbench.c $(LIBDIR)/xxhash.c +- $(MAKE) -C $(LIBDIR) liblz4 +- $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LIBDIR)/dll/liblz4.dll ++fullbench-dll: fullbench.c $(LZ4DIR)/xxhash.c ++ $(MAKE) -C $(LZ4DIR) liblz4 ++ $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/liblz4.dll + +-fuzzer : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o fuzzer.c ++fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c + $(CC) $(FLAGS) $^ -o $@$(EXT) + +-frametest: $(LIBDIR)/lz4frame.o $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o frametest.c ++frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c + $(CC) $(FLAGS) $^ -o $@$(EXT) + +-fasttest: $(LIBDIR)/lz4.o fasttest.c ++fasttest: $(LZ4DIR)/lz4.o fasttest.c + $(CC) $(FLAGS) $^ -o $@$(EXT) + + datagen : $(PRGDIR)/datagen.c datagencli.c + $(CC) $(FLAGS) -I$(PRGDIR) $^ -o $@$(EXT) + + clean: +- @$(MAKE) -C $(LIBDIR) $@ > $(VOID) ++ @$(MAKE) -C $(LZ4DIR) $@ > $(VOID) + @$(MAKE) -C $(PRGDIR) $@ > $(VOID) + @$(RM) core *.o *.test tmp* \ + fullbench-dll$(EXT) fullbench-lib$(EXT) \ +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/files/run-ptest b/import-layers/yocto-poky/meta/recipes-support/lz4/files/run-ptest new file mode 100644 index 000000000..d3bfc49f1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/lz4/files/run-ptest @@ -0,0 +1,43 @@ +#!/bin/sh +cd testsuite + +echo -n "---- test-lz4 ----" +make -C tests test-lz4 > /dev/null 2>&1 + +if [ $? -eq 0 ]; then + echo "PASS" +else + echo "FAIL" +fi + +echo -n "---- test-fasttest ----" +make -C tests test-fasttest > /dev/null 2>&1 +if [ $? -eq 0 ]; then + echo "PASS" +else + echo "FAIL" +fi + +echo -n "---- test-frametest ----" +make -C tests test-frametest > /dev/null 2>&1 +if [ $? -eq 0 ]; then + echo "PASS" +else + echo "FAIL" +fi + +echo -n "---- test-fullbench ----" +make -C tests test-fullbench > /dev/null 2>&1 +if [ $? -eq 0 ]; then + echo "PASS" +else + echo "FAIL" +fi + +echo -n "---- test-fuzzer ----" +make -C tests test-fuzzer > /dev/null 2>&1 +if [ $? -eq 0 ]; then + echo "PASS" +else + echo "FAIL" +fi diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/lz4.bb b/import-layers/yocto-poky/meta/recipes-support/lz4/lz4_1.7.4.bb index 03c5a7ab3..86a1ab9ab 100644 --- a/import-layers/yocto-poky/meta/recipes-support/lz4/lz4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/lz4/lz4_1.7.4.bb @@ -1,14 +1,20 @@ SUMMARY = "Extremely Fast Compression algorithm" DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems." -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=0b0d063f37a4477b54af2459477dcafd" +LICENSE = "BSD | BSD-2-Clause | GPL-2.0" +LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc\ + file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE;md5=7f2857d58beff6d04137bf9b09e5ffb6" -SRCREV = "d86dc916771c126afb797637dda9f6421c0cb998" +PE = "1" -PV = "131+git${SRCPV}" +SRCREV = "7bb64ff2b69a9f8367de9ab483cdadf42b4c1b65" -SRC_URI = "git://github.com/Cyan4973/lz4.git" +SRC_URI = "git://github.com/lz4/lz4.git \ + file://0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch \ + file://run-ptest \ +" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch new file mode 100644 index 000000000..5235a15dc --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch @@ -0,0 +1,27 @@ +From e730bfd7c2d3a4b5f3605878599cb9b20d31b1fd Mon Sep 17 00:00:00 2001 +From: Fan Xin <fan.xin@jp.fujitsu.com> +Date: Fri, 2 Jun 2017 11:52:25 +0900 +Subject: [PATCH] Add pkgconfigdir to solve the undefine error. + +Upstream-Status: Pending + +Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index e4d383b..c75023d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,6 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) + LDADD = src/liblzo2.la + lib_LTLIBRARIES = + noinst_PROGRAMS = ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = lzo2.pc + + +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.09.bb b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb index 2978617bb..490d2307a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.09.bb +++ b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb @@ -3,16 +3,17 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/lzo_init.c;beginline=5;endline=25;md5=355023835a9b9eeb70ab895395e951ff" + file://src/lzo_init.c;beginline=5;endline=25;md5=9ae697ca01829b0a383c5d2d163e0108" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ file://0001-Use-memcpy-instead-of-reinventing-it.patch \ + file://0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch \ file://acinclude.m4 \ file://run-ptest \ " -SRC_URI[md5sum] = "c7ffc9a103afe2d1bba0b015e7aa887f" -SRC_URI[sha256sum] = "f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c" +SRC_URI[md5sum] = "39d3f3f9c55c87b1e5d6888e1420f4b5" +SRC_URI[sha256sum] = "c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072" inherit autotools ptest diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch new file mode 100644 index 000000000..c4f0b7ea1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch @@ -0,0 +1,20 @@ +Replace relative path of libnettle.so with absolute path so the test +program can find it. +Relative paths are not suitable, as the folder strucure for ptest +is different from the one expected by the nettle testsuite. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> + +--- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700 ++++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700 +@@ -9,7 +9,7 @@ + main (int argc UNUSED, char **argv UNUSED) + { + #if HAVE_LIBDL +- void *handle = dlopen ("../libnettle.so", RTLD_NOW); ++ void *handle = dlopen ("/usr/lib/libnettle.so", RTLD_NOW); + int (*get_version)(void); + if (!handle) + { diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb index b76babfe2..39516781b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb @@ -11,5 +11,9 @@ SRC_URI += "\ file://check-header-files-of-openssl-only-if-enable_.patch \ " +SRC_URI_append_class-target = "\ + file://dlopen-test.patch \ + " + SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe" SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e" diff --git a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.3.bb b/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb index d4fc064bf..54de70c5c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb @@ -1,18 +1,17 @@ SUMMARY = "New GNU Portable Threads library" HOMEPAGE = "http://www.gnupg.org/software/pth/" SECTION = "libs" -LICENSE = "LGPLv3+ & GPLv2+" +LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=751419260aa954499f7abaabaa882bbe\ - file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\ + file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\ " UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "efe1524c53670b5755dc27893d2d68a0" -SRC_URI[sha256sum] = "bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a" +SRC_URI[md5sum] = "9ba2dc4302d2f32c66737c43ed191b1b" +SRC_URI[sha256sum] = "294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2" BINCONFIG = "${bindir}/npth-config" diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch new file mode 100644 index 000000000..f3cd67002 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -0,0 +1,31 @@ +From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 18 Sep 2017 17:22:43 -0700 +Subject: [PATCH] md: Fix build with musl + +The MIPS specific header <sgidefs.h> is not provided by musl +linux kernel headers provide <asm/sgidefs.h> which has same definitions + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + pr/include/md/_linux.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index 640b19c..31296a8 100644 +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -499,7 +499,7 @@ + #elif defined(__mips__) + + /* For _ABI64 */ +-#include <sgidefs.h> ++#include <asm/sgidefs.h> + + #ifdef __MIPSEB__ + #define IS_BIG_ENDIAN 1 +-- +2.14.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.13.1.bb b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.16.bb index 63ebecf72..78ef994ff 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.13.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.16.bb @@ -11,6 +11,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://remove-srcdir-from-configure-in.patch \ file://0002-Add-nios2-support.patch \ file://0001-include-stdint.h-for-SSIZE_MAX-and-SIZE_MAX-definiti.patch \ + file://0001-md-Fix-build-with-musl.patch \ file://nspr.pc.in \ " @@ -22,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "9c44298a6fc478b3c0a4e98f4f9981ed" -SRC_URI[sha256sum] = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab" +SRC_URI[md5sum] = "42fd8963a4b394f62d43ba604f03fab7" +SRC_URI[sha256sum] = "9b3102d97665504aeee73363c11a21c062ad67a2522242368b7f019f96a53cd1" CVE_PRODUCT = "netscape_portable_runtime" @@ -154,7 +155,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } do_compile_append() { diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch index f7f2c217d..80b86908e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch @@ -6,6 +6,8 @@ Subject: [PATCH 7/7] Fix compilation for X32 X32 uses 32-bit pointers, not 64-bit. Signed-off-by: Christopher Larson <chris_larson@mentor.com> + +Upstream-Status: Pending --- nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.28.1.bb b/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.31.1.bb index fed86fc8e..2bb9bdb0c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.28.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.31.1.bb @@ -14,20 +14,22 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" -SRC_URI = "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_28_1_RTM/src/${BP}.tar.gz \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://nss-fix-nsinstall-build.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://Fix-compilation-for-X32.patch \ - file://nss.pc.in \ - file://signlibs.sh \ -" -SRC_URI[md5sum] = "e98d48435cee5792f97ef7fc35a602c3" -SRC_URI[sha256sum] = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad" +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://signlibs.sh \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://nss-fix-nsinstall-build.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://Fix-compilation-for-X32.patch \ + " + +SRC_URI[md5sum] = "ebb44f1394250d2cf6ec3c2e3d71fa20" +SRC_URI[sha256sum] = "933439214dc03ee60e86d1419c19e1568998b0776dde987f41fa70ced6cd08dc" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -64,8 +66,8 @@ do_compile_prepend_class-native() { do_compile() { export CROSS_COMPILE=1 - export NATIVE_CC="gcc" - export NATIVE_FLAGS="${HOST_CFLAGS}" + export NATIVE_CC="${BUILD_CC}" + export NATIVE_FLAGS="${BUILD_CFLAGS}" export BUILD_OPT=1 export FREEBL_NO_DEPEND=1 @@ -102,7 +104,12 @@ do_compile() { # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! # - export CC="${CC} -g" + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" make -C ./nss CCC="${CXX} -g" \ OS_TEST=${OS_TEST} \ RPATH="${RPATH}" @@ -116,7 +123,7 @@ do_install_prepend_class-nativesdk() { do_install() { export CROSS_COMPILE=1 - export NATIVE_CC="gcc" + export NATIVE_CC="${BUILD_CC}" export BUILD_OPT=1 export FREEBL_NO_DEPEND=1 diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch new file mode 100644 index 000000000..431edb035 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch @@ -0,0 +1,100 @@ +Convert to pkg-config support to match changes done to +the gpg-error recipe for gpg-error.pc generation. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: pinentry-1.0.0/m4/gpg-error.m4 +=================================================================== +--- pinentry-1.0.0.orig/m4/gpg-error.m4 ++++ pinentry-1.0.0/m4/gpg-error.m4 +@@ -25,74 +25,12 @@ dnl config script does not match the hos + dnl is added to the gpg_config_script_warn variable. + dnl + AC_DEFUN([AM_PATH_GPG_ERROR], +-[ AC_REQUIRE([AC_CANONICAL_HOST]) +- gpg_error_config_prefix="" +- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, +- dnl since that is consistent with how our three siblings use the directory/ +- dnl package name in --with-$dir_name-prefix=PFX. +- AC_ARG_WITH(libgpg-error-prefix, +- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], +- [prefix where GPG Error is installed (optional)]), +- [gpg_error_config_prefix="$withval"]) +- +- dnl Accept --with-gpg-error-prefix and make it work the same as +- dnl --with-libgpg-error-prefix above, for backwards compatibility, +- dnl but do not document this old, inconsistently-named option. +- AC_ARG_WITH(gpg-error-prefix,, +- [gpg_error_config_prefix="$withval"]) +- +- if test x"${GPG_ERROR_CONFIG}" = x ; then +- if test x"${gpg_error_config_prefix}" != x ; then +- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" +- else +- case "${SYSROOT}" in +- /*) +- if test -x "${SYSROOT}/bin/gpg-error-config" ; then +- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" +- fi +- ;; +- '') +- ;; +- *) +- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) +- ;; +- esac +- fi +- fi +- +- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) ++[ + min_gpg_error_version=ifelse([$1], ,0.0,$1) +- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) +- ok=no +- if test "$GPG_ERROR_CONFIG" != "no" \ +- && test -f "$GPG_ERROR_CONFIG" ; then +- req_major=`echo $min_gpg_error_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpg_error_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` +- major=`echo $gpg_error_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $gpg_error_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -ge "$req_minor"; then +- ok=yes +- fi +- fi +- fi +- fi ++ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no]) + if test $ok = yes; then +- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` +- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` +- AC_MSG_RESULT([yes ($gpg_error_config_version)]) + ifelse([$2], , :, [$2]) +- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` ++ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none` + if test x"$gpg_error_config_host" != xnone ; then + if test x"$gpg_error_config_host" != x"$host" ; then + AC_MSG_WARN([[ +@@ -107,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], + fi + fi + else +- GPG_ERROR_CFLAGS="" +- GPG_ERROR_LIBS="" +- GPG_ERROR_MT_CFLAGS="" +- GPG_ERROR_MT_LIBS="" + AC_MSG_RESULT(no) + ifelse([$3], , :, [$3]) + fi diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch new file mode 100644 index 000000000..11d564f35 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch @@ -0,0 +1,153 @@ +Convert to pkg-config support to match changes done to +the libassuan recipe for libassuan.pc generation. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: pinentry-1.0.0/m4/libassuan.m4 +=================================================================== +--- pinentry-1.0.0.orig/m4/libassuan.m4 ++++ pinentry-1.0.0/m4/libassuan.m4 +@@ -13,34 +13,8 @@ dnl + dnl Common code used for libassuan detection [internal] + dnl Returns ok set to yes or no. + dnl +-AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +-[ AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_ARG_WITH(libassuan-prefix, +- AC_HELP_STRING([--with-libassuan-prefix=PFX], +- [prefix where LIBASSUAN is installed (optional)]), +- libassuan_config_prefix="$withval", libassuan_config_prefix="") +- if test x$libassuan_config_prefix != x ; then +- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" +- if test x${LIBASSUAN_CONFIG+set} != xset ; then +- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config +- fi +- else +- case "${SYSROOT}" in +- /*) +- if test -x "${SYSROOT}/bin/libassuan-config" ; then +- LIBASSUAN_CONFIG="${SYSROOT}/bin/libassuan-config" +- fi +- ;; +- '') +- ;; +- *) +- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) +- ;; +- esac +- fi +- +- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) +- ++AC_DEFUN([AM_PATH_LIBASSUAN_COMMON], ++[ + tmp=ifelse([$1], ,1:0.9.2,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +@@ -50,51 +24,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + min_libassuan_version="$tmp" + fi + +- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) +- ok=no +- if test "$LIBASSUAN_CONFIG" != "no" \ +- && test -f "$LIBASSUAN_CONFIG" ; then +- req_major=`echo $min_libassuan_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_libassuan_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_libassuan_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- +- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- major=`echo $libassuan_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $libassuan_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- micro=`echo $libassuan_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` +- +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$minor" -eq "$req_minor"; then +- if test "$micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- +- if test $ok = yes; then +- AC_MSG_RESULT([yes ($libassuan_config_version)]) +- else +- AC_MSG_RESULT(no) +- fi ++ PKG_CHECK_MODULES(LIBASSUAN_COMMON, [libassuan >= $min_libassuan_version libassuan], [ok=yes], [ok=no]) + + if test $ok = yes; then + if test "$req_libassuan_api" -gt 0 ; then +- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` ++ tmp=`$PKG_CONFIG --variable=api_version libassuan 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBASSUAN API version]) + if test "$req_libassuan_api" -eq "$tmp" ; then +@@ -109,7 +43,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + + if test $ok = yes; then + if test x"$host" != x ; then +- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` ++ libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0` + if test x"$libassuan_config_host" != xnone ; then + if test x"$libassuan_config_host" != x"$host" ; then + AC_MSG_WARN([[ +@@ -132,7 +66,7 @@ dnl Test whether libassuan has at least + dnl used to test for features only available in newer versions. + dnl + AC_DEFUN([AM_CHECK_LIBASSUAN], +-[ _AM_PATH_LIBASSUAN_COMMON($1) ++[ AM_PATH_LIBASSUAN_COMMON($1) + if test $ok = yes; then + ifelse([$2], , :, [$2]) + else +@@ -148,16 +82,10 @@ dnl [ACTION-IF-FOUND [ + dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS + dnl + AC_DEFUN([AM_PATH_LIBASSUAN], +-[ _AM_PATH_LIBASSUAN_COMMON($1) ++[ AM_PATH_LIBASSUAN_COMMON($1) + if test $ok = yes; then +- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` +- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` + ifelse([$2], , :, [$2]) + else +- LIBASSUAN_CFLAGS="" +- LIBASSUAN_LIBS="" + ifelse([$3], , :, [$3]) + fi +- AC_SUBST(LIBASSUAN_CFLAGS) +- AC_SUBST(LIBASSUAN_LIBS) + ]) +Index: pinentry-1.0.0/configure.ac +=================================================================== +--- pinentry-1.0.0.orig/configure.ac ++++ pinentry-1.0.0/configure.ac +@@ -266,8 +266,8 @@ if test "$have_libassuan" = "yes"; then + [version of the libassuan library]) + fi + +-COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS" +-COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS" ++COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS" ++COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS" + + + dnl Checks for libsecmem. diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_0.9.2.bb b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.0.0.bb index d315a99d4..319acd3b4 100644 --- a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_0.9.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.0.0.bb @@ -8,26 +8,28 @@ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" -inherit autotools +inherit autotools pkgconfig -DEPENDS = "gettext-native" +DEPENDS = "gettext-native libassuan libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://libassuan_pkgconf.patch \ + file://gpg-error_pkconf.patch \ +" -SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278" -SRC_URI[sha256sum] = "fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1" +SRC_URI[md5sum] = "4a3fad8b31f9b4c5526c8837495015dc" +SRC_URI[sha256sum] = "1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a" -EXTRA_OECONF = "--disable-rpath \ - --disable-dependency-tracking \ - " +EXTRA_OECONF = "--disable-rpath --disable-dependency-tracking \ + --disable-pinentry-qt5 \ +" PACKAGECONFIG ??= "ncurses libcap" PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" -PACKAGECONFIG[qt4] = "--enable-pinentry-qt4, --disable-pinentry-qt4, qt4-x11" -PACKAGECONFIG[qt4_clipboard] = "--enable-pinentry-qt4-clipboard --enable-pinentry-qt4, --disable-pinentry-qt4-clipboard, qt4-x11" +PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qt4-x11" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" #To use libsecret, add meta-gnome diff --git a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.2.bb b/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.bb index a3e9a7e21..71c1dabee 100644 --- a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.bb @@ -7,8 +7,8 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "6d2872116cd9d6e1617a768f9d72bbf091489b2d" -PV = "2.0.2+git${SRCPV}" +SRCREV = "8a93832dad621535e90aa8e1fb74ae5ba743fc3e" +PV = "2.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-support/re2c/re2c/mkdir.patch b/import-layers/yocto-poky/meta/recipes-support/re2c/re2c/mkdir.patch new file mode 100644 index 000000000..d59f01b36 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/re2c/re2c/mkdir.patch @@ -0,0 +1,36 @@ +Upstream-Status: Submitted (https://github.com/skvadrik/re2c/pull/191) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From bccc10c60523f88c8f81413151cdcd612eb16198 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Mon, 31 Jul 2017 15:43:41 +0100 +Subject: [PATCH] Makefile.am: create target directory before writing into it + +In some situations src/parse/ may not exist before a file is copied into the +directory. Ensure that this doesn't happen by creating the directory first. +--- + re2c/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/re2c/Makefile.am b/re2c/Makefile.am +index 3b3b2c5e..0707fc5a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -187,6 +187,7 @@ CLEANFILES = \ + $(DOC) + + $(AUTOGEN_PARSER): $(CUSTOM_PARSER) ++ $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN) if test $(BISON) = "no"; \ + then \ + cp $(top_srcdir)/$(BOOTSTRAP_PARSER) $@ && \ +@@ -211,6 +212,7 @@ $(BOOTSTRAP_PARSER): $(CUSTOM_PARSER) + $(top_srcdir)/$(CUSTOM_PARSER); + + .re.cc: ++ $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN) if test -x $(RE2C); \ + then \ + $(top_builddir)/$(RE2C) $(RE2CFLAGS) -o $@ $< && \ +-- +2.11.0 diff --git a/import-layers/yocto-poky/meta/recipes-support/re2c/re2c_0.16.bb b/import-layers/yocto-poky/meta/recipes-support/re2c/re2c_0.16.bb new file mode 100644 index 000000000..50dd7b7d2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/re2c/re2c_0.16.bb @@ -0,0 +1,15 @@ +SUMMARY = "Tool for writing very fast and very flexible scanners" +HOMEPAGE = "http://re2c.sourceforge.net/" +AUTHOR = "Marcus Börger <helly@users.sourceforge.net>" +SECTION = "devel" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://mkdir.patch" +SRC_URI[md5sum] = "3bf508fabd52ed7334647d0ccb956e8d" +SRC_URI[sha256sum] = "48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84" + +BBCLASSEXTEND = "native" + +inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default index 7aede9be0..ab7cd9327 100644 --- a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default @@ -1,3 +1,2 @@ # Specify rng device -#RNG_DEVICE=/dev/hwrng -RNG_DEVICE=/dev/urandom +RNG_DEVICE=/dev/hwrng diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch new file mode 100644 index 000000000..93a5864a4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch @@ -0,0 +1,103 @@ +From: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> +Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86 + +This patch updates the fixes in the assembly in rdrand_asm.S in +sys-apps/rng-tools-5 so it won't generate textrels on PIC systems. +The main fixes are in the use of leal in SETPTR for such systems, the rest is +the usual PIC support stuff. + +This should fix Gentoo bug #469962 and help fix #518210 + +This patch is released under the GPLv2 or a higher version license as is the +original file as long as the author and the tester are credited. + +Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962 +Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210 +Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> +Reported-by: cilly <cilly@cilly.mine.nu> +Reported-by: Manuel Rüger <mrueg@gentoo.org> +Tested-by: Anthony Basile <blueness@gentoo.org> + +Upstream-Status: Pending + +Index: rng-tools-5/rdrand_asm.S +=================================================================== +--- rng-tools-5.orig/rdrand_asm.S ++++ rng-tools-5/rdrand_asm.S +@@ -2,6 +2,7 @@ + * Copyright (c) 2011-2014, Intel Corporation + * Authors: Fenghua Yu <fenghua.yu@intel.com>, + * H. Peter Anvin <hpa@linux.intel.com> ++ * PIC code by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, +@@ -174,7 +175,19 @@ ENTRY(x86_rdseed_or_rdrand_bytes) + jmp 4b + ENDPROC(x86_rdseed_or_rdrand_bytes) + ++#if defined(__PIC__) ++#define INIT_PIC() \ ++ pushl %ebx ; \ ++ call __x86.get_pc_thunk.bx ; \ ++ addl $_GLOBAL_OFFSET_TABLE_, %ebx ++#define END_PIC() \ ++ popl %ebx ++#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr ++#else ++#define INIT_PIC() ++#define END_PIC() + #define SETPTR(var,ptr) movl $(var),ptr ++#endif + #define PTR0 %eax + #define PTR1 %edx + #define PTR2 %ecx +@@ -190,6 +203,7 @@ ENTRY(x86_aes_mangle) + movl 8(%ebp), %eax + movl 12(%ebp), %edx + push %esi ++ INIT_PIC() + #endif + movl $512, CTR3 /* Number of rounds */ + +@@ -280,6 +294,7 @@ offset = offset + 16 + movdqa %xmm7, (7*16)(PTR1) + + #ifdef __i386__ ++ END_PIC() + pop %esi + pop %ebp + #endif +@@ -294,6 +309,7 @@ ENTRY(x86_aes_expand_key) + push %ebp + mov %esp, %ebp + movl 8(%ebp), %eax ++ INIT_PIC() + #endif + + SETPTR(aes_round_keys, PTR1) +@@ -323,6 +339,7 @@ ENTRY(x86_aes_expand_key) + call 1f + + #ifdef __i386__ ++ END_PIC() + pop %ebp + #endif + ret +@@ -343,6 +360,16 @@ ENTRY(x86_aes_expand_key) + + ENDPROC(x86_aes_expand_key) + ++#if defined(__i386__) && defined(__PIC__) ++ .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat ++ .globl __x86.get_pc_thunk.bx ++ .hidden __x86.get_pc_thunk.bx ++ .type __x86.get_pc_thunk.bx, @function ++__x86.get_pc_thunk.bx: ++ movl (%esp), %ebx ++ ret ++#endif ++ + .bss + .balign 64 + aes_round_keys: diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rngd.service new file mode 100644 index 000000000..b94ad5020 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hardware RNG Entropy Gatherer Daemon + +[Service] +ExecStart=@SBINDIR@/rngd -f -r /dev/urandom +SuccessExitStatus=66 + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch deleted file mode 100644 index e691315d1..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch +++ /dev/null @@ -1,63 +0,0 @@ -In case of uclibc, use libuargp - -If we use uclibc for system libraries, select libuargp - -Upstream-Status: Pending - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur rng-tools-5-orig/configure.ac rng-tools-5/configure.ac ---- rng-tools-5-orig/configure.ac 2016-02-24 18:11:24.023690235 +0200 -+++ rng-tools-5/configure.ac 2016-02-24 18:14:49.763118138 +0200 -@@ -39,6 +39,13 @@ - [with_libargp=check] - ) - -+AC_ARG_ENABLE([uclibc], -+ AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]), -+ use_uclibc=yes, use_uclibc=no) -+AM_CONDITIONAL(USE_UCLIBC, test "x$use_uclibc" = "xyes") -+AS_IF([test "x$use_uclibc" = "xyes"], [AC_DEFINE(USE_UCLIBC)]) -+AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.]) -+ - dnl Make sure anyone changing configure.ac/Makefile.am has a clue - AM_MAINTAINER_MODE - -@@ -101,7 +108,7 @@ - [need_libargp=no], - [need_libargp=yes - if test "x$with_libargp" = "xno"; then -- AC_MSG_FAILURE([libargp disabled and libc does not have argp]) -+ AC_MSG_WARN([libargp disabled and libc does not have argp]) - fi] - ) - ], -@@ -110,7 +117,7 @@ - - dnl Check for libargp - AS_IF( -- [test "x$need_libargp" = "xyes"], -+ [test "x$need_libargp" = "xyes" -a "x$use_uclibc" = "xno"], - [ - AC_CHECK_LIB( - [argp], -@@ -120,6 +127,19 @@ - ) - ] - ) -+ -+dnl Check for libuargp -+AS_IF( -+ [test "x$use_uclibc" = "xyes"], -+ [ -+ AC_CHECK_LIB( -+ [uargp], -+ [argp_parse], -+ [LIBS="$LIBS -luargp"], -+ [AC_MSG_FAILURE([libuargp not found])] -+ ) -+ ] -+) - - dnl ----------------- - dnl Configure options diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch index 142257181..afd08d577 100644 --- a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch @@ -7,6 +7,8 @@ Fix underquoted m4 entry. This causes a failure if gcrypt isn't present: RP 2016/2/16 +Upstream-Status: Pending + Index: rng-tools-5/configure.ac =================================================================== --- rng-tools-5.orig/configure.ac diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb index 9329e8ad3..4a66bed64 100644 --- a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb @@ -6,9 +6,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \ file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ file://0002-Add-argument-to-control-the-libargp-dependency.patch \ file://underquote.patch \ - file://uclibc-libuargp-configure.patch \ + file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ file://init \ - file://default" + file://default \ + file://rngd.service \ +" SRC_URI[md5sum] = "6726cdc6fae1f5122463f24ae980dd68" SRC_URI[sha256sum] = "60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e" @@ -20,13 +22,11 @@ python () { d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } -inherit autotools update-rc.d +inherit autotools update-rc.d systemd PACKAGECONFIG = "libgcrypt" PACKAGECONFIG_libc-musl = "libargp" -PACKAGECONFIG_libc-uclibc = "libuargp" PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," -PACKAGECONFIG[libuargp] = "--enable-uclibc,,," PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," do_install_append() { @@ -40,7 +40,15 @@ do_install_append() { install -d "${D}${sysconfdir}/default" install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service + fi } INITSCRIPT_NAME = "rng-tools" INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 6 1 ." + +SYSTEMD_SERVICE_${PN} = "rngd.service" diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc index 6eedb6d3f..1f51225b0 100644 --- a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc @@ -6,7 +6,6 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" -DEPENDS_class-native = "libxml2-native intltool-native glib-2.0-native" SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" @@ -33,4 +32,4 @@ do_install_class-native () { autotools_do_install } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch b/import-layers/yocto-poky/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch new file mode 100644 index 000000000..aac428c82 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch @@ -0,0 +1,57 @@ +Fix CVE-2017-13685 + +The dump_callback function in SQLite 3.20.0 allows remote attackers to +cause a denial of service (EXC_BAD_ACCESS and application crash) via a +crafted file. + +References: +https://sqlite.org/src/info/02f0f4c54f2819b3 +http://www.mail-archive.com/sqlite-users%40mailinglists.sqlite.org/msg105314.html + +Upstream-Status: Backport [https://sqlite.org/src/info/cf0d3715caac9149] + +CVE: CVE-2017-13685 + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + +Index: src/shell.c +================================================================== +--- src/shell.c ++++ src/shell.c +@@ -2657,10 +2657,11 @@ + int *aiType /* Column types */ + ){ + int i; + ShellState *p = (ShellState*)pArg; + ++ if( azArg==0 ) return 0; + switch( p->cMode ){ + case MODE_Line: { + int w = 5; + if( azArg==0 ) break; + for(i=0; i<nArg; i++){ +@@ -3007,10 +3008,11 @@ + */ + static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){ + ShellText *p = (ShellText*)pArg; + int i; + UNUSED_PARAMETER(az); ++ if( azArg==0 ) return 0; + if( p->n ) appendText(p, "|", 0); + for(i=0; i<nArg; i++){ + if( i ) appendText(p, ",", 0); + if( azArg[i] ) appendText(p, azArg[i], 0); + } +@@ -3888,11 +3890,11 @@ + const char *zType; + const char *zSql; + ShellState *p = (ShellState *)pArg; + + UNUSED_PARAMETER(azNotUsed); +- if( nArg!=3 ) return 1; ++ if( nArg!=3 || azArg==0 ) return 0; + zTable = azArg[0]; + zType = azArg[1]; + zSql = azArg[2]; + + if( strcmp(zTable, "sqlite_sequence")==0 ){ diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.17.0.bb b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.17.0.bb deleted file mode 100644 index 593cb3202..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.17.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" - -SRC_URI = "\ - http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - " -SRC_URI[md5sum] = "450a95a7bde697c9fe4de9ae2fffdcca" -SRC_URI[sha256sum] = "a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c" diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.20.0.bb b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.20.0.bb new file mode 100644 index 000000000..e50825833 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.20.0.bb @@ -0,0 +1,11 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "\ + http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + file://sqlite3-fix-CVE-2017-13685.patch \ + " +SRC_URI[md5sum] = "e262a28b73cc330e7e83520c8ce14e4d" +SRC_URI[sha256sum] = "3814c6f629ff93968b2b37a70497cfe98b366bf587a2261a56a5f750af6ae6a0" diff --git a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.46.1.bb b/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.48.3.bb index 0afe625bc..47208417b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.46.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.48.3.bb @@ -1,7 +1,7 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "LGPLv2.1+" -DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native" +DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" @@ -11,8 +11,8 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ " -SRC_URI[archive.md5sum] = "e8f4393b9f1ec2e2f3cdb3fd4f5a16de" -SRC_URI[archive.sha256sum] = "8800cf8bc259704a12ad1853fb0eb43bfe3857af15242e6fb9f2c3fd95b3f5c6" +SRC_URI[archive.md5sum] = "b300675ac5f269aa6eb48fe89a0d726d" +SRC_URI[archive.sha256sum] = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" @@ -24,6 +24,11 @@ export STAGING_DATADIR # Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files export XDG_DATA_DIRS = "${STAGING_DATADIR}" +# Help g-ir-scanner find the .so for linking +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" +} + # Package additional files FILES_${PN}-dev += "${datadir}/vala/vapi/*" |
