diff options
1310 files changed, 19781 insertions, 35177 deletions
diff --git a/meta-filesystems/README b/meta-filesystems/README index d2716f8f1f..97d0e94bfe 100644 --- a/meta-filesystems/README +++ b/meta-filesystems/README @@ -27,40 +27,7 @@ Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with '[meta-filesystems]' in the subject. -Maintainers List: - physfs Andreas Müller <schnitzeltony@googlemail.com> - - fuse Koen Kooi <koen@dominion.thruhere.net> - Philip Balister <philip@balister.org> - hongxu jia <hongxu.jia@windriver.com> - - ifuse Sander van Grieken <sander@outrightsolutions.nl> - Koen Kooi <koen@dominion.thruhere.net> - - sshfs-fuse Philip Balister <philip@balister.org> - Koen Kooi <koen@dominion.thruhere.net> - - owfs Otavio Salvador <otavio@ossystems.com.br> - Koen Kooi <koen@dominion.thruhere.net> - hongxu jia <hongxu.jia@windriver.com> - - ntfs-3g-ntfsprogs Otavio Salvador <otavio@ossystems.com.br> - hongxu jia <hongxu.jia@windriver.com> - - cramfs Koen Kooi <koen@dominion.thruhere.net> - - smbnetfs Sander van Grieken <sander@outrightsolutions.nl> - Koen Kooi <koen@dominion.thruhere.net> - - fuse-exfat hongxu jia <hongxu.jia@windriver.com> - - exfat-utils hongxu jia <hongxu.jia@windriver.com> - - f2fs-tools Martin Jansa <Martin.Jansa@gmail.com> - Koen Kooi <koen@dominion.thruhere.net> - - xfsprogs Koen Kooi <koen@dominion.thruhere.net> - hongxu jia <hongxu.jia@windriver.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> When sending single patches, please use something like: diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index 9ed6d1b739..dbcff42d44 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -14,3 +14,5 @@ BBFILE_PRIORITY_filesystems-layer = "6" LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" + +LAYERSERIES_COMPAT_filesystems-layer = "sumo" diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch index 371ab89821..6d60c9d229 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch @@ -11,12 +11,12 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> 2 files changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac -index ce21aef..ecd7119 100644 +index 4c03409..8d22e71 100644 --- a/configure.ac +++ b/configure.ac -@@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, - )] - ) +@@ -119,6 +119,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUseCCache, [], [ + LIBS="$LIBS $SMBCLIENT_LIBS" + CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS" +dnl ***************************************************************** +dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** @@ -27,10 +27,10 @@ index ce21aef..ecd7119 100644 dnl *** Final step *** dnl ****************** diff --git a/src/Makefile.am b/src/Makefile.am -index 41519d8..9fc97e9 100644 +index ccaa8c3..6598317 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -16,3 +16,6 @@ smbnetfs_SOURCES = \ +@@ -17,3 +17,6 @@ smbnetfs_SOURCES = \ event.c event.h \ reconfigure.c reconfigure.h \ main.c diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch index 152507cf31..55275669b1 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -3,7 +3,7 @@ Index: git/configure.in --- git.orig/configure.ac 2014-06-18 16:06:16.040721349 +0000 +++ git/configure.ac 2014-07-18 07:49:17.085552256 +0000 @@ -1,5 +1,5 @@ - AC_INIT([SMBNetFS],[0.6.0]) + AC_INIT([SMBNetFS],[0.6.1]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_HEADERS([src/config.h]) diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index 0fcfd6ae75..c72936c087 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -11,18 +11,22 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" DEPENDS = "fuse samba" DEPENDS_append_libc-musl = " libexecinfo" +# samba depends on libpam +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + inherit autotools gitpkgv pkgconfig PKGV = "${GITPKGVTAG}" -SRCREV = "21c63ed60202e5540613d4c822a57a0b81764499" +SRCREV = "bc6b94b015fdaf7c4dab56ccb996eecea8bc4373" SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ file://configure.patch \ file://Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch" PACKAGECONFIG ??= "" -PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring" +PACKAGECONFIG[libsecret] = "--with-libsecret=yes,--with-libsecret=no,libsecret" S = "${WORKDIR}/git" diff --git a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb index dc2c106497..cc97dead56 100644 --- a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb +++ b/meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "PhysicsFS is a library to provide abstract access to various archives" HOMEAPAGE = "http://icculus.org/physfs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5d94e3eaaa10b00ca803ba35a3e87cde" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2668e2fb051c3e564198e146a9a2d9f0" DEPENDS = "readline zlib" inherit cmake @@ -9,5 +9,5 @@ inherit cmake PE = "1" SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613" -SRC_URI[sha256sum] = "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69" +SRC_URI[md5sum] = "359f102bcbd62accf84ef32f4863255d" +SRC_URI[sha256sum] = "b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1" diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch index 9efea804b6..6732dc42e3 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch @@ -1,4 +1,4 @@ -From bb8801fb21ac8d73e3b1a11a8555aaf822182a51 Mon Sep 17 00:00:00 2001 +From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 5 Sep 2017 10:36:52 -0700 Subject: [PATCH] libau: Define STRIP weakly @@ -6,10 +6,11 @@ Subject: [PATCH] libau: Define STRIP weakly STRIP can be set on environment to use cross version of strip utility hardcoding to strip is not working in cross environment -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Submitted +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- libau/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -34,6 +35,3 @@ index 81520ac..c25eef2 100644 # readelf --syms --use-dynamic libau.so install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor} --- -2.14.1 - diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch b/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch index 5c35586899..c832696a31 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch @@ -1,3 +1,6 @@ +From 13a60c631d7cf6c7e1926473d8069795c0def9b6 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 19 Jun 2014 15:09:56 +0100 Subject: [PATCH] aufs-util: add tool concept to Makefile for cross compiling purpose @@ -7,23 +10,21 @@ Add a tools target to Makefile to allow for this. Upstream-Status: Pending Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- - Makefile | 2 +- + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 2f905ad..49c3cd5 100644 +index dbbe43d..aff969e 100644 --- a/Makefile +++ b/Makefile -@@ -85,7 +85,7 @@ aufs.5: aufs.in.5 c2tmac +@@ -152,7 +152,7 @@ aufs.5: aufs.in.5 c2tmac chmod a-w $@ c2sh c2tmac ver: CC = ${HOSTCC} -.INTERMEDIATE: c2sh c2tmac ver +tools: c2sh c2tmac ver - Install = install -o root -g root -p - install_sbin: File = auibusy auplink mount.aufs umount.aufs --- -1.7.9.5 - + install_sbin: File = auibusy aumvdown auplink mount.aufs umount.aufs + ifeq (${Glibc},no) diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch b/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch index fe2a6a576a..b40822c0d9 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch @@ -1,4 +1,4 @@ -From 244863eca77fcaa1187884836c3e28d6b6d1504a Mon Sep 17 00:00:00 2001 +From 9d5e7eff4ae906f1ea6e6527080fded0b595fbd4 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Tue, 9 Apr 2013 18:50:34 -0700 Subject: [PATCH] aufs-util: don't strip executables @@ -14,16 +14,19 @@ as follows: To prevent this, we remove -s from LDFLAGS. +Upstream-Status: Inappropriate [oe specific] + Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> + --- - Makefile | 2 +- + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 2f905ad..e0c6dcd 100644 +index 54f8d97..dbbe43d 100644 --- a/Makefile +++ b/Makefile -@@ -56,7 +56,7 @@ all: ver_test ${Man} ${Bin} ${Etc} +@@ -118,7 +118,7 @@ clean: ver_test: ver ./ver @@ -32,6 +35,3 @@ index 2f905ad..e0c6dcd 100644 ${Bin}: LDLIBS = -L. -lautil ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} --- -1.7.10.4 - diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb index 0ac991b238..39f11890e1 100644 --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb @@ -34,6 +34,8 @@ EXTRA_OEMAKE += "'LIBTOOL=${HOST_SYS}-libtool' V=1" do_configure () { export DEBUG="-DNDEBUG" + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf } diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch new file mode 100644 index 0000000000..d8ff555319 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch @@ -0,0 +1,82 @@ +From ae7172194d3fbb563ff8bbe7c02d34f1bd0e5ec9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Jan 2018 21:28:53 -0800 +Subject: [PATCH] build: Check for sync_file_range libc function + +glibc 2.27 now has sync_file_range() + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + include/builddefs.in | 1 + + io/Makefile | 5 ++++- + io/io.h | 2 +- + io/sync_file_range.c | 3 +++ + 4 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index 92d5076..504225a 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -105,6 +105,7 @@ HAVE_FIEMAP = @have_fiemap@ + HAVE_PREADV = @have_preadv@ + HAVE_PWRITEV2 = @have_pwritev2@ + HAVE_COPY_FILE_RANGE = @have_copy_file_range@ ++HAVE_NR_COPY_FILE_RANGE = @have_nr_copy_file_range@ + HAVE_SYNC_FILE_RANGE = @have_sync_file_range@ + HAVE_SYNCFS = @have_syncfs@ + HAVE_READDIR = @have_readdir@ +diff --git a/io/Makefile b/io/Makefile +index 6725936..1876e95 100644 +--- a/io/Makefile ++++ b/io/Makefile +@@ -59,10 +59,13 @@ CFILES += inject.c resblks.c + LCFLAGS += -DHAVE_INJECT -DHAVE_RESBLKS + endif + +-ifeq ($(HAVE_COPY_FILE_RANGE),yes) ++ifeq ($(HAVE_NR_COPY_FILE_RANGE),yes) + CFILES += copy_file_range.c ++LCFLAGS += -DHAVE_NR_COPY_FILE_RANGE ++ifeq ($(HAVE_COPY_FILE_RANGE),yes) + LCFLAGS += -DHAVE_COPY_FILE_RANGE + endif ++endif + + ifeq ($(HAVE_SYNC_FILE_RANGE),yes) + CFILES += sync_file_range.c +diff --git a/io/io.h b/io/io.h +index 3862985..79ddc7b 100644 +--- a/io/io.h ++++ b/io/io.h +@@ -158,7 +158,7 @@ extern void fiemap_init(void); + #define fiemap_init() do { } while (0) + #endif + +-#ifdef HAVE_COPY_FILE_RANGE ++#if defined(HAVE_NR_COPY_FILE_RANGE) && !defined(HAVE_COPY_FILE_RANGE) + extern void copy_range_init(void); + #else + #define copy_range_init() do { } while (0) +diff --git a/io/sync_file_range.c b/io/sync_file_range.c +index 7e4f3e6..aafea01 100644 +--- a/io/sync_file_range.c ++++ b/io/sync_file_range.c +@@ -16,6 +16,7 @@ + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#ifndef HAVE_COPY_FILE_RANGE + #include "command.h" + #include "input.h" + #include "init.h" +@@ -104,3 +105,5 @@ sync_range_init(void) + + add_command(&sync_range_cmd); + } ++ ++#endif +-- +2.16.1 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch deleted file mode 100644 index a47c487074..0000000000 --- a/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch +++ /dev/null @@ -1,2082 +0,0 @@ -From 4a492e72515509ee702286a42afe7d8f89d37636 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" <darrick.wong@oracle.com> -Date: Mon, 31 Jul 2017 15:08:10 -0500 -Subject: [PATCH] xfs: remove double-underscore integer types - -Source kernel commit: c8ce540db5f67d254aafb14b5d76422c62a906df - -This is a purely mechanical patch that removes the private -__{u,}int{8,16,32,64}_t typedefs in favor of using the system -{u,}int{8,16,32,64}_t typedefs. This is the sed script used to perform -the transformation and fix the resulting whitespace and indentation -errors: - -s/typedef\t__uint8_t/typedef __uint8_t\t/g -s/typedef\t__uint/typedef __uint/g -s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g -s/__uint8_t\t/__uint8_t\t\t/g -s/__uint/uint/g -s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g -s/__int/int/g -/^typedef.*int[0-9]*_t;$/d - -Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Eric Sandeen <sandeen@sandeen.net> ---- - libxfs/libxfs_priv.h | 1 + - libxfs/xfs_alloc_btree.c | 20 ++-- - libxfs/xfs_attr_remote.c | 8 +- - libxfs/xfs_attr_sf.h | 10 +- - libxfs/xfs_bit.h | 24 ++--- - libxfs/xfs_bmap_btree.c | 8 +- - libxfs/xfs_btree.c | 22 ++-- - libxfs/xfs_btree.h | 18 ++-- - libxfs/xfs_cksum.h | 16 +-- - libxfs/xfs_da_btree.c | 2 +- - libxfs/xfs_da_btree.h | 8 +- - libxfs/xfs_da_format.c | 28 ++--- - libxfs/xfs_da_format.h | 64 +++++------ - libxfs/xfs_dir2.h | 8 +- - libxfs/xfs_dir2_leaf.c | 12 +-- - libxfs/xfs_dir2_priv.h | 2 +- - libxfs/xfs_dir2_sf.c | 4 +- - libxfs/xfs_format.h | 112 +++++++++---------- - libxfs/xfs_fs.h | 12 +-- - libxfs/xfs_ialloc.c | 6 +- - libxfs/xfs_ialloc_btree.c | 4 +- - libxfs/xfs_inode_buf.c | 2 +- - libxfs/xfs_inode_buf.h | 28 ++--- - libxfs/xfs_log_format.h | 256 ++++++++++++++++++++++---------------------- - libxfs/xfs_quota_defs.h | 4 +- - libxfs/xfs_refcount_btree.c | 8 +- - libxfs/xfs_rmap.c | 8 +- - libxfs/xfs_rmap.h | 8 +- - libxfs/xfs_rmap_btree.c | 30 +++--- - libxfs/xfs_rtbitmap.c | 2 +- - libxfs/xfs_sb.c | 4 +- - libxfs/xfs_types.h | 46 ++++---- - 32 files changed, 393 insertions(+), 392 deletions(-) - -diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h -index 0b4c4890..b3cc7e53 100644 ---- a/libxfs/libxfs_priv.h -+++ b/libxfs/libxfs_priv.h -@@ -504,5 +504,6 @@ bool xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t); - #define XFS_STATS_INC_OFF(mp, off) - #define XFS_STATS_ADD_OFF(mp, off, val) - -+typedef unsigned char u8; - - #endif /* __LIBXFS_INTERNAL_XFS_H__ */ -diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c -index e11d89a3..8e77e6e3 100644 ---- a/libxfs/xfs_alloc_btree.c -+++ b/libxfs/xfs_alloc_btree.c -@@ -251,7 +251,7 @@ xfs_allocbt_init_ptr_from_cur( - ptr->s = agf->agf_roots[cur->bc_btnum]; - } - --STATIC __int64_t -+STATIC int64_t - xfs_bnobt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) -@@ -259,42 +259,42 @@ xfs_bnobt_key_diff( - xfs_alloc_rec_incore_t *rec = &cur->bc_rec.a; - xfs_alloc_key_t *kp = &key->alloc; - -- return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; -+ return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; - } - --STATIC __int64_t -+STATIC int64_t - xfs_cntbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) - { - xfs_alloc_rec_incore_t *rec = &cur->bc_rec.a; - xfs_alloc_key_t *kp = &key->alloc; -- __int64_t diff; -+ int64_t diff; - -- diff = (__int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount; -+ diff = (int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount; - if (diff) - return diff; - -- return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; -+ return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; - } - --STATIC __int64_t -+STATIC int64_t - xfs_bnobt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- return (__int64_t)be32_to_cpu(k1->alloc.ar_startblock) - -+ return (int64_t)be32_to_cpu(k1->alloc.ar_startblock) - - be32_to_cpu(k2->alloc.ar_startblock); - } - --STATIC __int64_t -+STATIC int64_t - xfs_cntbt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- __int64_t diff; -+ int64_t diff; - - diff = be32_to_cpu(k1->alloc.ar_blockcount) - - be32_to_cpu(k2->alloc.ar_blockcount); -diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c -index abe17052..1f25e363 100644 ---- a/libxfs/xfs_attr_remote.c -+++ b/libxfs/xfs_attr_remote.c -@@ -248,7 +248,7 @@ xfs_attr_rmtval_copyout( - xfs_ino_t ino, - int *offset, - int *valuelen, -- __uint8_t **dst) -+ uint8_t **dst) - { - char *src = bp->b_addr; - xfs_daddr_t bno = bp->b_bn; -@@ -296,7 +296,7 @@ xfs_attr_rmtval_copyin( - xfs_ino_t ino, - int *offset, - int *valuelen, -- __uint8_t **src) -+ uint8_t **src) - { - char *dst = bp->b_addr; - xfs_daddr_t bno = bp->b_bn; -@@ -350,7 +350,7 @@ xfs_attr_rmtval_get( - struct xfs_mount *mp = args->dp->i_mount; - struct xfs_buf *bp; - xfs_dablk_t lblkno = args->rmtblkno; -- __uint8_t *dst = args->value; -+ uint8_t *dst = args->value; - int valuelen; - int nmap; - int error; -@@ -416,7 +416,7 @@ xfs_attr_rmtval_set( - struct xfs_bmbt_irec map; - xfs_dablk_t lblkno; - xfs_fileoff_t lfileoff = 0; -- __uint8_t *src = args->value; -+ uint8_t *src = args->value; - int blkcnt; - int valuelen; - int nmap; -diff --git a/libxfs/xfs_attr_sf.h b/libxfs/xfs_attr_sf.h -index 90928bbe..afd684ae 100644 ---- a/libxfs/xfs_attr_sf.h -+++ b/libxfs/xfs_attr_sf.h -@@ -31,10 +31,10 @@ typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t; - * We generate this then sort it, attr_list() must return things in hash-order. - */ - typedef struct xfs_attr_sf_sort { -- __uint8_t entno; /* entry number in original list */ -- __uint8_t namelen; /* length of name value (no null) */ -- __uint8_t valuelen; /* length of value */ -- __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ -+ uint8_t entno; /* entry number in original list */ -+ uint8_t namelen; /* length of name value (no null) */ -+ uint8_t valuelen; /* length of value */ -+ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ - xfs_dahash_t hash; /* this entry's hash value */ - unsigned char *name; /* name value, pointer into buffer */ - } xfs_attr_sf_sort_t; -@@ -42,7 +42,7 @@ typedef struct xfs_attr_sf_sort { - #define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \ - (((int)sizeof(xfs_attr_sf_entry_t)-1 + (nlen)+(vlen))) - #define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \ -- ((1 << (NBBY*(int)sizeof(__uint8_t))) - 1) -+ ((1 << (NBBY*(int)sizeof(uint8_t))) - 1) - #define XFS_ATTR_SF_ENTSIZE(sfep) /* space an entry uses */ \ - ((int)sizeof(xfs_attr_sf_entry_t)-1 + (sfep)->namelen+(sfep)->valuelen) - #define XFS_ATTR_SF_NEXTENTRY(sfep) /* next entry in struct */ \ -diff --git a/libxfs/xfs_bit.h b/libxfs/xfs_bit.h -index e1649c0d..61c6b202 100644 ---- a/libxfs/xfs_bit.h -+++ b/libxfs/xfs_bit.h -@@ -25,47 +25,47 @@ - /* - * masks with n high/low bits set, 64-bit values - */ --static inline __uint64_t xfs_mask64hi(int n) -+static inline uint64_t xfs_mask64hi(int n) - { -- return (__uint64_t)-1 << (64 - (n)); -+ return (uint64_t)-1 << (64 - (n)); - } --static inline __uint32_t xfs_mask32lo(int n) -+static inline uint32_t xfs_mask32lo(int n) - { -- return ((__uint32_t)1 << (n)) - 1; -+ return ((uint32_t)1 << (n)) - 1; - } --static inline __uint64_t xfs_mask64lo(int n) -+static inline uint64_t xfs_mask64lo(int n) - { -- return ((__uint64_t)1 << (n)) - 1; -+ return ((uint64_t)1 << (n)) - 1; - } - - /* Get high bit set out of 32-bit argument, -1 if none set */ --static inline int xfs_highbit32(__uint32_t v) -+static inline int xfs_highbit32(uint32_t v) - { - return fls(v) - 1; - } - - /* Get high bit set out of 64-bit argument, -1 if none set */ --static inline int xfs_highbit64(__uint64_t v) -+static inline int xfs_highbit64(uint64_t v) - { - return fls64(v) - 1; - } - - /* Get low bit set out of 32-bit argument, -1 if none set */ --static inline int xfs_lowbit32(__uint32_t v) -+static inline int xfs_lowbit32(uint32_t v) - { - return ffs(v) - 1; - } - - /* Get low bit set out of 64-bit argument, -1 if none set */ --static inline int xfs_lowbit64(__uint64_t v) -+static inline int xfs_lowbit64(uint64_t v) - { -- __uint32_t w = (__uint32_t)v; -+ uint32_t w = (uint32_t)v; - int n = 0; - - if (w) { /* lower bits */ - n = ffs(w); - } else { /* upper bits */ -- w = (__uint32_t)(v >> 32); -+ w = (uint32_t)(v >> 32); - if (w) { - n = ffs(w); - if (n) -diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c -index c48cbec1..9ee40d8b 100644 ---- a/libxfs/xfs_bmap_btree.c -+++ b/libxfs/xfs_bmap_btree.c -@@ -91,8 +91,8 @@ xfs_bmdr_to_bmbt( - */ - STATIC void - __xfs_bmbt_get_all( -- __uint64_t l0, -- __uint64_t l1, -+ uint64_t l0, -+ uint64_t l1, - xfs_bmbt_irec_t *s) - { - int ext_flag; -@@ -585,12 +585,12 @@ xfs_bmbt_init_ptr_from_cur( - ptr->l = 0; - } - --STATIC __int64_t -+STATIC int64_t - xfs_bmbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) - { -- return (__int64_t)be64_to_cpu(key->bmbt.br_startoff) - -+ return (int64_t)be64_to_cpu(key->bmbt.br_startoff) - - cur->bc_rec.b.br_startoff; - } - -diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c -index 3d293520..56b50a5b 100644 ---- a/libxfs/xfs_btree.c -+++ b/libxfs/xfs_btree.c -@@ -39,7 +39,7 @@ kmem_zone_t *xfs_btree_cur_zone; - /* - * Btree magic numbers. - */ --static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { -+static const uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { - { XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, 0, XFS_BMAP_MAGIC, XFS_IBT_MAGIC, - XFS_FIBT_MAGIC, 0 }, - { XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC, XFS_RMAP_CRC_MAGIC, -@@ -47,12 +47,12 @@ static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { - XFS_REFC_CRC_MAGIC } - }; - --__uint32_t -+uint32_t - xfs_btree_magic( - int crc, - xfs_btnum_t btnum) - { -- __uint32_t magic = xfs_magics[crc][btnum]; -+ uint32_t magic = xfs_magics[crc][btnum]; - - /* Ensure we asked for crc for crc-only magics. */ - ASSERT(magic != 0); -@@ -774,14 +774,14 @@ xfs_btree_lastrec( - */ - void - xfs_btree_offsets( -- __int64_t fields, /* bitmask of fields */ -+ int64_t fields, /* bitmask of fields */ - const short *offsets, /* table of field offsets */ - int nbits, /* number of bits to inspect */ - int *first, /* output: first byte offset */ - int *last) /* output: last byte offset */ - { - int i; /* current bit number */ -- __int64_t imask; /* mask for current bit number */ -+ int64_t imask; /* mask for current bit number */ - - ASSERT(fields != 0); - /* -@@ -1842,7 +1842,7 @@ xfs_btree_lookup( - int *stat) /* success/failure */ - { - struct xfs_btree_block *block; /* current btree block */ -- __int64_t diff; /* difference for the current key */ -+ int64_t diff; /* difference for the current key */ - int error; /* error return value */ - int keyno; /* current key number */ - int level; /* level in the btree */ -@@ -4435,7 +4435,7 @@ xfs_btree_visit_blocks( - * recovery completion writes the changes to disk. - */ - struct xfs_btree_block_change_owner_info { -- __uint64_t new_owner; -+ uint64_t new_owner; - struct list_head *buffer_list; - }; - -@@ -4481,7 +4481,7 @@ xfs_btree_block_change_owner( - int - xfs_btree_change_owner( - struct xfs_btree_cur *cur, -- __uint64_t new_owner, -+ uint64_t new_owner, - struct list_head *buffer_list) - { - struct xfs_btree_block_change_owner_info bbcoi; -@@ -4585,7 +4585,7 @@ xfs_btree_simple_query_range( - { - union xfs_btree_rec *recp; - union xfs_btree_key rec_key; -- __int64_t diff; -+ int64_t diff; - int stat; - bool firstrec = true; - int error; -@@ -4682,8 +4682,8 @@ xfs_btree_overlapped_query_range( - union xfs_btree_key *hkp; - union xfs_btree_rec *recp; - struct xfs_btree_block *block; -- __int64_t ldiff; -- __int64_t hdiff; -+ int64_t ldiff; -+ int64_t hdiff; - int level; - struct xfs_buf *bp; - int i; -diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h -index 05cf35b5..3c1fed23 100644 ---- a/libxfs/xfs_btree.h -+++ b/libxfs/xfs_btree.h -@@ -76,7 +76,7 @@ union xfs_btree_rec { - #define XFS_BTNUM_RMAP ((xfs_btnum_t)XFS_BTNUM_RMAPi) - #define XFS_BTNUM_REFC ((xfs_btnum_t)XFS_BTNUM_REFCi) - --__uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum); -+uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum); - - /* - * For logging record fields. -@@ -150,14 +150,14 @@ struct xfs_btree_ops { - union xfs_btree_rec *rec); - - /* difference between key value and cursor value */ -- __int64_t (*key_diff)(struct xfs_btree_cur *cur, -+ int64_t (*key_diff)(struct xfs_btree_cur *cur, - union xfs_btree_key *key); - - /* - * Difference between key2 and key1 -- positive if key1 > key2, - * negative if key1 < key2, and zero if equal. - */ -- __int64_t (*diff_two_keys)(struct xfs_btree_cur *cur, -+ int64_t (*diff_two_keys)(struct xfs_btree_cur *cur, - union xfs_btree_key *key1, - union xfs_btree_key *key2); - -@@ -213,11 +213,11 @@ typedef struct xfs_btree_cur - union xfs_btree_irec bc_rec; /* current insert/search record value */ - struct xfs_buf *bc_bufs[XFS_BTREE_MAXLEVELS]; /* buf ptr per level */ - int bc_ptrs[XFS_BTREE_MAXLEVELS]; /* key/record # */ -- __uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */ -+ uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */ - #define XFS_BTCUR_LEFTRA 1 /* left sibling has been read-ahead */ - #define XFS_BTCUR_RIGHTRA 2 /* right sibling has been read-ahead */ -- __uint8_t bc_nlevels; /* number of levels in the tree */ -- __uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ -+ uint8_t bc_nlevels; /* number of levels in the tree */ -+ uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ - xfs_btnum_t bc_btnum; /* identifies which btree type */ - int bc_statoff; /* offset of btre stats array */ - union { -@@ -330,7 +330,7 @@ xfs_btree_islastblock( - */ - void - xfs_btree_offsets( -- __int64_t fields, /* bitmask of fields */ -+ int64_t fields, /* bitmask of fields */ - const short *offsets,/* table of field offsets */ - int nbits, /* number of bits to inspect */ - int *first, /* output: first byte offset */ -@@ -408,7 +408,7 @@ int xfs_btree_new_iroot(struct xfs_btree_cur *, int *, int *); - int xfs_btree_insert(struct xfs_btree_cur *, int *); - int xfs_btree_delete(struct xfs_btree_cur *, int *); - int xfs_btree_get_rec(struct xfs_btree_cur *, union xfs_btree_rec **, int *); --int xfs_btree_change_owner(struct xfs_btree_cur *cur, __uint64_t new_owner, -+int xfs_btree_change_owner(struct xfs_btree_cur *cur, uint64_t new_owner, - struct list_head *buffer_list); - - /* -@@ -434,7 +434,7 @@ static inline int xfs_btree_get_numrecs(struct xfs_btree_block *block) - } - - static inline void xfs_btree_set_numrecs(struct xfs_btree_block *block, -- __uint16_t numrecs) -+ uint16_t numrecs) - { - block->bb_numrecs = cpu_to_be16(numrecs); - } -diff --git a/libxfs/xfs_cksum.h b/libxfs/xfs_cksum.h -index a416c7cb..8211f48b 100644 ---- a/libxfs/xfs_cksum.h -+++ b/libxfs/xfs_cksum.h -@@ -1,7 +1,7 @@ - #ifndef _XFS_CKSUM_H - #define _XFS_CKSUM_H 1 - --#define XFS_CRC_SEED (~(__uint32_t)0) -+#define XFS_CRC_SEED (~(uint32_t)0) - - /* - * Calculate the intermediate checksum for a buffer that has the CRC field -@@ -9,11 +9,11 @@ - * cksum_offset parameter. We do not modify the buffer during verification, - * hence we have to split the CRC calculation across the cksum_offset. - */ --static inline __uint32_t -+static inline uint32_t - xfs_start_cksum_safe(char *buffer, size_t length, unsigned long cksum_offset) - { -- __uint32_t zero = 0; -- __uint32_t crc; -+ uint32_t zero = 0; -+ uint32_t crc; - - /* Calculate CRC up to the checksum. */ - crc = crc32c(XFS_CRC_SEED, buffer, cksum_offset); -@@ -30,7 +30,7 @@ xfs_start_cksum_safe(char *buffer, size_t length, unsigned long cksum_offset) - * Fast CRC method where the buffer is modified. Callers must have exclusive - * access to the buffer while the calculation takes place. - */ --static inline __uint32_t -+static inline uint32_t - xfs_start_cksum_update(char *buffer, size_t length, unsigned long cksum_offset) - { - /* zero the CRC field */ -@@ -48,7 +48,7 @@ xfs_start_cksum_update(char *buffer, size_t length, unsigned long cksum_offset) - * so that it is consistent on disk. - */ - static inline __le32 --xfs_end_cksum(__uint32_t crc) -+xfs_end_cksum(uint32_t crc) - { - return ~cpu_to_le32(crc); - } -@@ -62,7 +62,7 @@ xfs_end_cksum(__uint32_t crc) - static inline void - xfs_update_cksum(char *buffer, size_t length, unsigned long cksum_offset) - { -- __uint32_t crc = xfs_start_cksum_update(buffer, length, cksum_offset); -+ uint32_t crc = xfs_start_cksum_update(buffer, length, cksum_offset); - - *(__le32 *)(buffer + cksum_offset) = xfs_end_cksum(crc); - } -@@ -73,7 +73,7 @@ xfs_update_cksum(char *buffer, size_t length, unsigned long cksum_offset) - static inline int - xfs_verify_cksum(char *buffer, size_t length, unsigned long cksum_offset) - { -- __uint32_t crc = xfs_start_cksum_safe(buffer, length, cksum_offset); -+ uint32_t crc = xfs_start_cksum_safe(buffer, length, cksum_offset); - - return *(__le32 *)(buffer + cksum_offset) == xfs_end_cksum(crc); - } -diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c -index bc12f58f..08447be8 100644 ---- a/libxfs/xfs_da_btree.c -+++ b/libxfs/xfs_da_btree.c -@@ -1947,7 +1947,7 @@ xfs_da3_path_shift( - * This is implemented with some source-level loop unrolling. - */ - xfs_dahash_t --xfs_da_hashname(const __uint8_t *name, int namelen) -+xfs_da_hashname(const uint8_t *name, int namelen) - { - xfs_dahash_t hash; - -diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h -index 4e29cb6a..ae6de174 100644 ---- a/libxfs/xfs_da_btree.h -+++ b/libxfs/xfs_da_btree.h -@@ -60,10 +60,10 @@ enum xfs_dacmp { - */ - typedef struct xfs_da_args { - struct xfs_da_geometry *geo; /* da block geometry */ -- const __uint8_t *name; /* string (maybe not NULL terminated) */ -+ const uint8_t *name; /* string (maybe not NULL terminated) */ - int namelen; /* length of string (maybe no NULL) */ -- __uint8_t filetype; /* filetype of inode for directories */ -- __uint8_t *value; /* set of bytes (maybe contain NULLs) */ -+ uint8_t filetype; /* filetype of inode for directories */ -+ uint8_t *value; /* set of bytes (maybe contain NULLs) */ - int valuelen; /* length of value */ - int flags; /* argument flags (eg: ATTR_NOCREATE) */ - xfs_dahash_t hashval; /* hash value of name */ -@@ -207,7 +207,7 @@ int xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno, - int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno, - struct xfs_buf *dead_buf); - --uint xfs_da_hashname(const __uint8_t *name_string, int name_length); -+uint xfs_da_hashname(const uint8_t *name_string, int name_length); - enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args, - const unsigned char *name, int len); - -diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c -index 2b732b3c..f30004f6 100644 ---- a/libxfs/xfs_da_format.c -+++ b/libxfs/xfs_da_format.c -@@ -49,7 +49,7 @@ xfs_dir3_sf_entsize( - struct xfs_dir2_sf_hdr *hdr, - int len) - { -- return xfs_dir2_sf_entsize(hdr, len) + sizeof(__uint8_t); -+ return xfs_dir2_sf_entsize(hdr, len) + sizeof(uint8_t); - } - - static struct xfs_dir2_sf_entry * -@@ -77,7 +77,7 @@ xfs_dir3_sf_nextentry( - * not necessary. For non-filetype enable directories, the type is always - * unknown and we never store the value. - */ --static __uint8_t -+static uint8_t - xfs_dir2_sfe_get_ftype( - struct xfs_dir2_sf_entry *sfep) - { -@@ -87,16 +87,16 @@ xfs_dir2_sfe_get_ftype( - static void - xfs_dir2_sfe_put_ftype( - struct xfs_dir2_sf_entry *sfep, -- __uint8_t ftype) -+ uint8_t ftype) - { - ASSERT(ftype < XFS_DIR3_FT_MAX); - } - --static __uint8_t -+static uint8_t - xfs_dir3_sfe_get_ftype( - struct xfs_dir2_sf_entry *sfep) - { -- __uint8_t ftype; -+ uint8_t ftype; - - ftype = sfep->name[sfep->namelen]; - if (ftype >= XFS_DIR3_FT_MAX) -@@ -107,7 +107,7 @@ xfs_dir3_sfe_get_ftype( - static void - xfs_dir3_sfe_put_ftype( - struct xfs_dir2_sf_entry *sfep, -- __uint8_t ftype) -+ uint8_t ftype) - { - ASSERT(ftype < XFS_DIR3_FT_MAX); - -@@ -124,7 +124,7 @@ xfs_dir3_sfe_put_ftype( - static xfs_ino_t - xfs_dir2_sf_get_ino( - struct xfs_dir2_sf_hdr *hdr, -- __uint8_t *from) -+ uint8_t *from) - { - if (hdr->i8count) - return get_unaligned_be64(from) & 0x00ffffffffffffffULL; -@@ -135,7 +135,7 @@ xfs_dir2_sf_get_ino( - static void - xfs_dir2_sf_put_ino( - struct xfs_dir2_sf_hdr *hdr, -- __uint8_t *to, -+ uint8_t *to, - xfs_ino_t ino) - { - ASSERT((ino & 0xff00000000000000ULL) == 0); -@@ -225,7 +225,7 @@ xfs_dir3_sfe_put_ino( - - #define XFS_DIR3_DATA_ENTSIZE(n) \ - round_up((offsetof(struct xfs_dir2_data_entry, name[0]) + (n) + \ -- sizeof(xfs_dir2_data_off_t) + sizeof(__uint8_t)), \ -+ sizeof(xfs_dir2_data_off_t) + sizeof(uint8_t)), \ - XFS_DIR2_DATA_ALIGN) - - static int -@@ -242,7 +242,7 @@ xfs_dir3_data_entsize( - return XFS_DIR3_DATA_ENTSIZE(n); - } - --static __uint8_t -+static uint8_t - xfs_dir2_data_get_ftype( - struct xfs_dir2_data_entry *dep) - { -@@ -252,16 +252,16 @@ xfs_dir2_data_get_ftype( - static void - xfs_dir2_data_put_ftype( - struct xfs_dir2_data_entry *dep, -- __uint8_t ftype) -+ uint8_t ftype) - { - ASSERT(ftype < XFS_DIR3_FT_MAX); - } - --static __uint8_t -+static uint8_t - xfs_dir3_data_get_ftype( - struct xfs_dir2_data_entry *dep) - { -- __uint8_t ftype = dep->name[dep->namelen]; -+ uint8_t ftype = dep->name[dep->namelen]; - - if (ftype >= XFS_DIR3_FT_MAX) - return XFS_DIR3_FT_UNKNOWN; -@@ -271,7 +271,7 @@ xfs_dir3_data_get_ftype( - static void - xfs_dir3_data_put_ftype( - struct xfs_dir2_data_entry *dep, -- __uint8_t type) -+ uint8_t type) - { - ASSERT(type < XFS_DIR3_FT_MAX); - ASSERT(dep->namelen != 0); -diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h -index 9a492a9e..3771edcb 100644 ---- a/libxfs/xfs_da_format.h -+++ b/libxfs/xfs_da_format.h -@@ -111,11 +111,11 @@ struct xfs_da3_intnode { - * appropriate. - */ - struct xfs_da3_icnode_hdr { -- __uint32_t forw; -- __uint32_t back; -- __uint16_t magic; -- __uint16_t count; -- __uint16_t level; -+ uint32_t forw; -+ uint32_t back; -+ uint16_t magic; -+ uint16_t count; -+ uint16_t level; - }; - - /* -@@ -187,14 +187,14 @@ struct xfs_da3_icnode_hdr { - /* - * Byte offset in data block and shortform entry. - */ --typedef __uint16_t xfs_dir2_data_off_t; -+typedef uint16_t xfs_dir2_data_off_t; - #define NULLDATAOFF 0xffffU - typedef uint xfs_dir2_data_aoff_t; /* argument form */ - - /* - * Offset in data space of a data entry. - */ --typedef __uint32_t xfs_dir2_dataptr_t; -+typedef uint32_t xfs_dir2_dataptr_t; - #define XFS_DIR2_MAX_DATAPTR ((xfs_dir2_dataptr_t)0xffffffff) - #define XFS_DIR2_NULL_DATAPTR ((xfs_dir2_dataptr_t)0) - -@@ -206,7 +206,7 @@ typedef xfs_off_t xfs_dir2_off_t; - /* - * Directory block number (logical dirblk in file) - */ --typedef __uint32_t xfs_dir2_db_t; -+typedef uint32_t xfs_dir2_db_t; - - #define XFS_INO32_SIZE 4 - #define XFS_INO64_SIZE 8 -@@ -226,9 +226,9 @@ typedef __uint32_t xfs_dir2_db_t; - * over them. - */ - typedef struct xfs_dir2_sf_hdr { -- __uint8_t count; /* count of entries */ -- __uint8_t i8count; /* count of 8-byte inode #s */ -- __uint8_t parent[8]; /* parent dir inode number */ -+ uint8_t count; /* count of entries */ -+ uint8_t i8count; /* count of 8-byte inode #s */ -+ uint8_t parent[8]; /* parent dir inode number */ - } __packed xfs_dir2_sf_hdr_t; - - typedef struct xfs_dir2_sf_entry { -@@ -447,11 +447,11 @@ struct xfs_dir3_leaf_hdr { - }; - - struct xfs_dir3_icleaf_hdr { -- __uint32_t forw; -- __uint32_t back; -- __uint16_t magic; -- __uint16_t count; -- __uint16_t stale; -+ uint32_t forw; -+ uint32_t back; -+ uint16_t magic; -+ uint16_t count; -+ uint16_t stale; - }; - - /* -@@ -538,10 +538,10 @@ struct xfs_dir3_free { - * xfs_dir3_free_hdr_from_disk/xfs_dir3_free_hdr_to_disk. - */ - struct xfs_dir3_icfree_hdr { -- __uint32_t magic; -- __uint32_t firstdb; -- __uint32_t nvalid; -- __uint32_t nused; -+ uint32_t magic; -+ uint32_t firstdb; -+ uint32_t nvalid; -+ uint32_t nused; - - }; - -@@ -632,10 +632,10 @@ typedef struct xfs_attr_shortform { - __u8 padding; - } hdr; - struct xfs_attr_sf_entry { -- __uint8_t namelen; /* actual length of name (no NULL) */ -- __uint8_t valuelen; /* actual length of value (no NULL) */ -- __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ -- __uint8_t nameval[1]; /* name & value bytes concatenated */ -+ uint8_t namelen; /* actual length of name (no NULL) */ -+ uint8_t valuelen; /* actual length of value (no NULL) */ -+ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ -+ uint8_t nameval[1]; /* name & value bytes concatenated */ - } list[1]; /* variable sized array */ - } xfs_attr_shortform_t; - -@@ -725,22 +725,22 @@ struct xfs_attr3_leafblock { - * incore, neutral version of the attribute leaf header - */ - struct xfs_attr3_icleaf_hdr { -- __uint32_t forw; -- __uint32_t back; -- __uint16_t magic; -- __uint16_t count; -- __uint16_t usedbytes; -+ uint32_t forw; -+ uint32_t back; -+ uint16_t magic; -+ uint16_t count; -+ uint16_t usedbytes; - /* - * firstused is 32-bit here instead of 16-bit like the on-disk variant - * to support maximum fsb size of 64k without overflow issues throughout - * the attr code. Instead, the overflow condition is handled on - * conversion to/from disk. - */ -- __uint32_t firstused; -+ uint32_t firstused; - __u8 holes; - struct { -- __uint16_t base; -- __uint16_t size; -+ uint16_t base; -+ uint16_t size; - } freemap[XFS_ATTR_LEAF_MAPSIZE]; - }; - -diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h -index d6e6d9d1..21c8f8bf 100644 ---- a/libxfs/xfs_dir2.h -+++ b/libxfs/xfs_dir2.h -@@ -47,9 +47,9 @@ struct xfs_dir_ops { - struct xfs_dir2_sf_entry * - (*sf_nextentry)(struct xfs_dir2_sf_hdr *hdr, - struct xfs_dir2_sf_entry *sfep); -- __uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep); -+ uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep); - void (*sf_put_ftype)(struct xfs_dir2_sf_entry *sfep, -- __uint8_t ftype); -+ uint8_t ftype); - xfs_ino_t (*sf_get_ino)(struct xfs_dir2_sf_hdr *hdr, - struct xfs_dir2_sf_entry *sfep); - void (*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr, -@@ -60,9 +60,9 @@ struct xfs_dir_ops { - xfs_ino_t ino); - - int (*data_entsize)(int len); -- __uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep); -+ uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep); - void (*data_put_ftype)(struct xfs_dir2_data_entry *dep, -- __uint8_t ftype); -+ uint8_t ftype); - __be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep); - struct xfs_dir2_data_free * - (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr); -diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c -index f80d91fc..40a35b84 100644 ---- a/libxfs/xfs_dir2_leaf.c -+++ b/libxfs/xfs_dir2_leaf.c -@@ -142,7 +142,7 @@ xfs_dir3_leaf_check_int( - static bool - xfs_dir3_leaf_verify( - struct xfs_buf *bp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_mount *mp = bp->b_target->bt_mount; - struct xfs_dir2_leaf *leaf = bp->b_addr; -@@ -151,7 +151,7 @@ xfs_dir3_leaf_verify( - - if (xfs_sb_version_hascrc(&mp->m_sb)) { - struct xfs_dir3_leaf_hdr *leaf3 = bp->b_addr; -- __uint16_t magic3; -+ uint16_t magic3; - - magic3 = (magic == XFS_DIR2_LEAF1_MAGIC) ? XFS_DIR3_LEAF1_MAGIC - : XFS_DIR3_LEAFN_MAGIC; -@@ -175,7 +175,7 @@ xfs_dir3_leaf_verify( - static void - __read_verify( - struct xfs_buf *bp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_mount *mp = bp->b_target->bt_mount; - -@@ -192,7 +192,7 @@ __read_verify( - static void - __write_verify( - struct xfs_buf *bp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_mount *mp = bp->b_target->bt_mount; - struct xfs_buf_log_item *bip = bp->b_fspriv; -@@ -296,7 +296,7 @@ xfs_dir3_leaf_init( - struct xfs_trans *tp, - struct xfs_buf *bp, - xfs_ino_t owner, -- __uint16_t type) -+ uint16_t type) - { - struct xfs_dir2_leaf *leaf = bp->b_addr; - -@@ -340,7 +340,7 @@ xfs_dir3_leaf_get_buf( - xfs_da_args_t *args, - xfs_dir2_db_t bno, - struct xfs_buf **bpp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_inode *dp = args->dp; - struct xfs_trans *tp = args->trans; -diff --git a/libxfs/xfs_dir2_priv.h b/libxfs/xfs_dir2_priv.h -index 39f8604f..011df4da 100644 ---- a/libxfs/xfs_dir2_priv.h -+++ b/libxfs/xfs_dir2_priv.h -@@ -69,7 +69,7 @@ extern void xfs_dir3_leaf_compact_x1(struct xfs_dir3_icleaf_hdr *leafhdr, - struct xfs_dir2_leaf_entry *ents, int *indexp, - int *lowstalep, int *highstalep, int *lowlogp, int *highlogp); - extern int xfs_dir3_leaf_get_buf(struct xfs_da_args *args, xfs_dir2_db_t bno, -- struct xfs_buf **bpp, __uint16_t magic); -+ struct xfs_buf **bpp, uint16_t magic); - extern void xfs_dir3_leaf_log_ents(struct xfs_da_args *args, - struct xfs_buf *bp, int first, int last); - extern void xfs_dir3_leaf_log_header(struct xfs_da_args *args, -diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c -index 195f816d..0c453988 100644 ---- a/libxfs/xfs_dir2_sf.c -+++ b/libxfs/xfs_dir2_sf.c -@@ -125,7 +125,7 @@ xfs_dir2_block_sfsize( - * Calculate the new size, see if we should give up yet. - */ - size = xfs_dir2_sf_hdr_size(i8count) + /* header */ -- count * 3 * sizeof(__u8) + /* namelen + offset */ -+ count * 3 * sizeof(u8) + /* namelen + offset */ - namelen + /* name */ - (i8count ? /* inumber */ - count * XFS_INO64_SIZE : -@@ -645,7 +645,7 @@ xfs_dir2_sf_verify( - int offset; - int size; - int error; -- __uint8_t filetype; -+ uint8_t filetype; - - ASSERT(ip->i_d.di_format == XFS_DINODE_FMT_LOCAL); - /* -diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h -index 4c3ed1fd..a53f035f 100644 ---- a/libxfs/xfs_format.h -+++ b/libxfs/xfs_format.h -@@ -103,8 +103,8 @@ struct xfs_ifork; - * Must be padded to 64 bit alignment. - */ - typedef struct xfs_sb { -- __uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */ -- __uint32_t sb_blocksize; /* logical block size, bytes */ -+ uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */ -+ uint32_t sb_blocksize; /* logical block size, bytes */ - xfs_rfsblock_t sb_dblocks; /* number of data blocks */ - xfs_rfsblock_t sb_rblocks; /* number of realtime blocks */ - xfs_rtblock_t sb_rextents; /* number of realtime extents */ -@@ -118,45 +118,45 @@ typedef struct xfs_sb { - xfs_agnumber_t sb_agcount; /* number of allocation groups */ - xfs_extlen_t sb_rbmblocks; /* number of rt bitmap blocks */ - xfs_extlen_t sb_logblocks; /* number of log blocks */ -- __uint16_t sb_versionnum; /* header version == XFS_SB_VERSION */ -- __uint16_t sb_sectsize; /* volume sector size, bytes */ -- __uint16_t sb_inodesize; /* inode size, bytes */ -- __uint16_t sb_inopblock; /* inodes per block */ -+ uint16_t sb_versionnum; /* header version == XFS_SB_VERSION */ -+ uint16_t sb_sectsize; /* volume sector size, bytes */ -+ uint16_t sb_inodesize; /* inode size, bytes */ -+ uint16_t sb_inopblock; /* inodes per block */ - char sb_fname[12]; /* file system name */ -- __uint8_t sb_blocklog; /* log2 of sb_blocksize */ -- __uint8_t sb_sectlog; /* log2 of sb_sectsize */ -- __uint8_t sb_inodelog; /* log2 of sb_inodesize */ -- __uint8_t sb_inopblog; /* log2 of sb_inopblock */ -- __uint8_t sb_agblklog; /* log2 of sb_agblocks (rounded up) */ -- __uint8_t sb_rextslog; /* log2 of sb_rextents */ -- __uint8_t sb_inprogress; /* mkfs is in progress, don't mount */ -- __uint8_t sb_imax_pct; /* max % of fs for inode space */ -+ uint8_t sb_blocklog; /* log2 of sb_blocksize */ -+ uint8_t sb_sectlog; /* log2 of sb_sectsize */ -+ uint8_t sb_inodelog; /* log2 of sb_inodesize */ -+ uint8_t sb_inopblog; /* log2 of sb_inopblock */ -+ uint8_t sb_agblklog; /* log2 of sb_agblocks (rounded up) */ -+ uint8_t sb_rextslog; /* log2 of sb_rextents */ -+ uint8_t sb_inprogress; /* mkfs is in progress, don't mount */ -+ uint8_t sb_imax_pct; /* max % of fs for inode space */ - /* statistics */ - /* - * These fields must remain contiguous. If you really - * want to change their layout, make sure you fix the - * code in xfs_trans_apply_sb_deltas(). - */ -- __uint64_t sb_icount; /* allocated inodes */ -- __uint64_t sb_ifree; /* free inodes */ -- __uint64_t sb_fdblocks; /* free data blocks */ -- __uint64_t sb_frextents; /* free realtime extents */ -+ uint64_t sb_icount; /* allocated inodes */ -+ uint64_t sb_ifree; /* free inodes */ -+ uint64_t sb_fdblocks; /* free data blocks */ -+ uint64_t sb_frextents; /* free realtime extents */ - /* - * End contiguous fields. - */ - xfs_ino_t sb_uquotino; /* user quota inode */ - xfs_ino_t sb_gquotino; /* group quota inode */ -- __uint16_t sb_qflags; /* quota flags */ -- __uint8_t sb_flags; /* misc. flags */ -- __uint8_t sb_shared_vn; /* shared version number */ -+ uint16_t sb_qflags; /* quota flags */ -+ uint8_t sb_flags; /* misc. flags */ -+ uint8_t sb_shared_vn; /* shared version number */ - xfs_extlen_t sb_inoalignmt; /* inode chunk alignment, fsblocks */ -- __uint32_t sb_unit; /* stripe or raid unit */ -- __uint32_t sb_width; /* stripe or raid width */ -- __uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */ -- __uint8_t sb_logsectlog; /* log2 of the log sector size */ -- __uint16_t sb_logsectsize; /* sector size for the log, bytes */ -- __uint32_t sb_logsunit; /* stripe unit size for the log */ -- __uint32_t sb_features2; /* additional feature bits */ -+ uint32_t sb_unit; /* stripe or raid unit */ -+ uint32_t sb_width; /* stripe or raid width */ -+ uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */ -+ uint8_t sb_logsectlog; /* log2 of the log sector size */ -+ uint16_t sb_logsectsize; /* sector size for the log, bytes */ -+ uint32_t sb_logsunit; /* stripe unit size for the log */ -+ uint32_t sb_features2; /* additional feature bits */ - - /* - * bad features2 field as a result of failing to pad the sb structure to -@@ -167,17 +167,17 @@ typedef struct xfs_sb { - * the value in sb_features2 when formatting the incore superblock to - * the disk buffer. - */ -- __uint32_t sb_bad_features2; -+ uint32_t sb_bad_features2; - - /* version 5 superblock fields start here */ - - /* feature masks */ -- __uint32_t sb_features_compat; -- __uint32_t sb_features_ro_compat; -- __uint32_t sb_features_incompat; -- __uint32_t sb_features_log_incompat; -+ uint32_t sb_features_compat; -+ uint32_t sb_features_ro_compat; -+ uint32_t sb_features_incompat; -+ uint32_t sb_features_log_incompat; - -- __uint32_t sb_crc; /* superblock crc */ -+ uint32_t sb_crc; /* superblock crc */ - xfs_extlen_t sb_spino_align; /* sparse inode chunk alignment */ - - xfs_ino_t sb_pquotino; /* project quota inode */ -@@ -449,7 +449,7 @@ static inline void xfs_sb_version_addprojid32bit(struct xfs_sb *sbp) - static inline bool - xfs_sb_has_compat_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_compat & feature) != 0; - } -@@ -465,7 +465,7 @@ xfs_sb_has_compat_feature( - static inline bool - xfs_sb_has_ro_compat_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_ro_compat & feature) != 0; - } -@@ -482,7 +482,7 @@ xfs_sb_has_ro_compat_feature( - static inline bool - xfs_sb_has_incompat_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_incompat & feature) != 0; - } -@@ -492,7 +492,7 @@ xfs_sb_has_incompat_feature( - static inline bool - xfs_sb_has_incompat_log_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_log_incompat & feature) != 0; - } -@@ -594,8 +594,8 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino) - */ - #define XFS_FSB_TO_B(mp,fsbno) ((xfs_fsize_t)(fsbno) << (mp)->m_sb.sb_blocklog) - #define XFS_B_TO_FSB(mp,b) \ -- ((((__uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog) --#define XFS_B_TO_FSBT(mp,b) (((__uint64_t)(b)) >> (mp)->m_sb.sb_blocklog) -+ ((((uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog) -+#define XFS_B_TO_FSBT(mp,b) (((uint64_t)(b)) >> (mp)->m_sb.sb_blocklog) - #define XFS_B_FSB_OFFSET(mp,b) ((b) & (mp)->m_blockmask) - - /* -@@ -1072,7 +1072,7 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) - * next agno_log bits - ag number - * high agno_log-agblklog-inopblog bits - 0 - */ --#define XFS_INO_MASK(k) (__uint32_t)((1ULL << (k)) - 1) -+#define XFS_INO_MASK(k) (uint32_t)((1ULL << (k)) - 1) - #define XFS_INO_OFFSET_BITS(mp) (mp)->m_sb.sb_inopblog - #define XFS_INO_AGBNO_BITS(mp) (mp)->m_sb.sb_agblklog - #define XFS_INO_AGINO_BITS(mp) (mp)->m_agino_log -@@ -1269,16 +1269,16 @@ typedef __be32 xfs_alloc_ptr_t; - #define XFS_FIBT_MAGIC 0x46494254 /* 'FIBT' */ - #define XFS_FIBT_CRC_MAGIC 0x46494233 /* 'FIB3' */ - --typedef __uint64_t xfs_inofree_t; -+typedef uint64_t xfs_inofree_t; - #define XFS_INODES_PER_CHUNK (NBBY * sizeof(xfs_inofree_t)) - #define XFS_INODES_PER_CHUNK_LOG (XFS_NBBYLOG + 3) - #define XFS_INOBT_ALL_FREE ((xfs_inofree_t)-1) - #define XFS_INOBT_MASK(i) ((xfs_inofree_t)1 << (i)) - - #define XFS_INOBT_HOLEMASK_FULL 0 /* holemask for full chunk */ --#define XFS_INOBT_HOLEMASK_BITS (NBBY * sizeof(__uint16_t)) -+#define XFS_INOBT_HOLEMASK_BITS (NBBY * sizeof(uint16_t)) - #define XFS_INODES_PER_HOLEMASK_BIT \ -- (XFS_INODES_PER_CHUNK / (NBBY * sizeof(__uint16_t))) -+ (XFS_INODES_PER_CHUNK / (NBBY * sizeof(uint16_t))) - - static inline xfs_inofree_t xfs_inobt_maskn(int i, int n) - { -@@ -1312,9 +1312,9 @@ typedef struct xfs_inobt_rec { - - typedef struct xfs_inobt_rec_incore { - xfs_agino_t ir_startino; /* starting inode number */ -- __uint16_t ir_holemask; /* hole mask for sparse chunks */ -- __uint8_t ir_count; /* total inode count */ -- __uint8_t ir_freecount; /* count of free inodes (set bits) */ -+ uint16_t ir_holemask; /* hole mask for sparse chunks */ -+ uint8_t ir_count; /* total inode count */ -+ uint8_t ir_freecount; /* count of free inodes (set bits) */ - xfs_inofree_t ir_free; /* free inode mask */ - } xfs_inobt_rec_incore_t; - -@@ -1397,15 +1397,15 @@ struct xfs_rmap_rec { - * rm_offset:54-60 aren't used and should be zero - * rm_offset:0-53 is the block offset within the inode - */ --#define XFS_RMAP_OFF_ATTR_FORK ((__uint64_t)1ULL << 63) --#define XFS_RMAP_OFF_BMBT_BLOCK ((__uint64_t)1ULL << 62) --#define XFS_RMAP_OFF_UNWRITTEN ((__uint64_t)1ULL << 61) -+#define XFS_RMAP_OFF_ATTR_FORK ((uint64_t)1ULL << 63) -+#define XFS_RMAP_OFF_BMBT_BLOCK ((uint64_t)1ULL << 62) -+#define XFS_RMAP_OFF_UNWRITTEN ((uint64_t)1ULL << 61) - --#define XFS_RMAP_LEN_MAX ((__uint32_t)~0U) -+#define XFS_RMAP_LEN_MAX ((uint32_t)~0U) - #define XFS_RMAP_OFF_FLAGS (XFS_RMAP_OFF_ATTR_FORK | \ - XFS_RMAP_OFF_BMBT_BLOCK | \ - XFS_RMAP_OFF_UNWRITTEN) --#define XFS_RMAP_OFF_MASK ((__uint64_t)0x3FFFFFFFFFFFFFULL) -+#define XFS_RMAP_OFF_MASK ((uint64_t)0x3FFFFFFFFFFFFFULL) - - #define XFS_RMAP_OFF(off) ((off) & XFS_RMAP_OFF_MASK) - -@@ -1431,8 +1431,8 @@ struct xfs_rmap_rec { - struct xfs_rmap_irec { - xfs_agblock_t rm_startblock; /* extent start block */ - xfs_extlen_t rm_blockcount; /* extent length */ -- __uint64_t rm_owner; /* extent owner */ -- __uint64_t rm_offset; /* offset within the owner */ -+ uint64_t rm_owner; /* extent owner */ -+ uint64_t rm_offset; /* offset within the owner */ - unsigned int rm_flags; /* state flags */ - }; - -@@ -1544,11 +1544,11 @@ typedef struct xfs_bmbt_rec { - __be64 l0, l1; - } xfs_bmbt_rec_t; - --typedef __uint64_t xfs_bmbt_rec_base_t; /* use this for casts */ -+typedef uint64_t xfs_bmbt_rec_base_t; /* use this for casts */ - typedef xfs_bmbt_rec_t xfs_bmdr_rec_t; - - typedef struct xfs_bmbt_rec_host { -- __uint64_t l0, l1; -+ uint64_t l0, l1; - } xfs_bmbt_rec_host_t; - - /* -diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h -index 99f7f881..8a0c0eec 100644 ---- a/libxfs/xfs_fs.h -+++ b/libxfs/xfs_fs.h -@@ -323,10 +323,10 @@ typedef struct xfs_bstat { - * and using two 16bit values to hold new 32bit projid was choosen - * to retain compatibility with "old" filesystems). - */ --static inline __uint32_t -+static inline uint32_t - bstat_get_projid(struct xfs_bstat *bs) - { -- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; -+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; - } - - /* -@@ -472,10 +472,10 @@ typedef struct xfs_handle { - */ - typedef struct xfs_swapext - { -- __int64_t sx_version; /* version */ -+ int64_t sx_version; /* version */ - #define XFS_SX_VERSION 0 -- __int64_t sx_fdtarget; /* fd of target file */ -- __int64_t sx_fdtmp; /* fd of tmp file */ -+ int64_t sx_fdtarget; /* fd of target file */ -+ int64_t sx_fdtmp; /* fd of tmp file */ - xfs_off_t sx_offset; /* offset into file */ - xfs_off_t sx_length; /* leng from offset */ - char sx_pad[16]; /* pad space, unused */ -@@ -562,7 +562,7 @@ typedef struct xfs_swapext - #define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq) - #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq) - #define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom) --#define XFS_IOC_GOINGDOWN _IOR ('X', 125, __uint32_t) -+#define XFS_IOC_GOINGDOWN _IOR ('X', 125, uint32_t) - /* XFS_IOC_GETFSUUID ---------- deprecated 140 */ - - /* reflink ioctls; these MUST match the btrfs ioctl definitions */ -diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c -index 55cc4507..8d245184 100644 ---- a/libxfs/xfs_ialloc.c -+++ b/libxfs/xfs_ialloc.c -@@ -134,9 +134,9 @@ xfs_inobt_get_rec( - STATIC int - xfs_inobt_insert_rec( - struct xfs_btree_cur *cur, -- __uint16_t holemask, -- __uint8_t count, -- __int32_t freecount, -+ uint16_t holemask, -+ uint8_t count, -+ int32_t freecount, - xfs_inofree_t free, - int *stat) - { -diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c -index 7b4be766..5b281054 100644 ---- a/libxfs/xfs_ialloc_btree.c -+++ b/libxfs/xfs_ialloc_btree.c -@@ -218,12 +218,12 @@ xfs_finobt_init_ptr_from_cur( - ptr->s = agi->agi_free_root; - } - --STATIC __int64_t -+STATIC int64_t - xfs_inobt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) - { -- return (__int64_t)be32_to_cpu(key->inobt.ir_startino) - -+ return (int64_t)be32_to_cpu(key->inobt.ir_startino) - - cur->bc_rec.i.ir_startino; - } - -diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c -index 2972701d..fcc6fb8e 100644 ---- a/libxfs/xfs_inode_buf.c -+++ b/libxfs/xfs_inode_buf.c -@@ -442,7 +442,7 @@ xfs_dinode_calc_crc( - struct xfs_mount *mp, - struct xfs_dinode *dip) - { -- __uint32_t crc; -+ uint32_t crc; - - if (dip->di_version < 3) - return; -diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h -index 6848a0af..0827d7de 100644 ---- a/libxfs/xfs_inode_buf.h -+++ b/libxfs/xfs_inode_buf.h -@@ -28,26 +28,26 @@ struct xfs_dinode; - * format specific structures at the appropriate time. - */ - struct xfs_icdinode { -- __int8_t di_version; /* inode version */ -- __int8_t di_format; /* format of di_c data */ -- __uint16_t di_flushiter; /* incremented on flush */ -- __uint32_t di_uid; /* owner's user id */ -- __uint32_t di_gid; /* owner's group id */ -- __uint16_t di_projid_lo; /* lower part of owner's project id */ -- __uint16_t di_projid_hi; /* higher part of owner's project id */ -+ int8_t di_version; /* inode version */ -+ int8_t di_format; /* format of di_c data */ -+ uint16_t di_flushiter; /* incremented on flush */ -+ uint32_t di_uid; /* owner's user id */ -+ uint32_t di_gid; /* owner's group id */ -+ uint16_t di_projid_lo; /* lower part of owner's project id */ -+ uint16_t di_projid_hi; /* higher part of owner's project id */ - xfs_fsize_t di_size; /* number of bytes in file */ - xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */ - xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ - xfs_extnum_t di_nextents; /* number of extents in data fork */ - xfs_aextnum_t di_anextents; /* number of extents in attribute fork*/ -- __uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -- __int8_t di_aformat; /* format of attr fork's data */ -- __uint32_t di_dmevmask; /* DMIG event mask */ -- __uint16_t di_dmstate; /* DMIG state info */ -- __uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ -+ uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -+ int8_t di_aformat; /* format of attr fork's data */ -+ uint32_t di_dmevmask; /* DMIG event mask */ -+ uint16_t di_dmstate; /* DMIG state info */ -+ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ - -- __uint64_t di_flags2; /* more random flags */ -- __uint32_t di_cowextsize; /* basic cow extent size for file */ -+ uint64_t di_flags2; /* more random flags */ -+ uint32_t di_cowextsize; /* basic cow extent size for file */ - - xfs_ictimestamp_t di_crtime; /* time created */ - }; -diff --git a/libxfs/xfs_log_format.h b/libxfs/xfs_log_format.h -index 7ae571f8..8372e9bc 100644 ---- a/libxfs/xfs_log_format.h -+++ b/libxfs/xfs_log_format.h -@@ -31,7 +31,7 @@ struct xfs_trans_res; - * through all the log items definitions and everything they encode into the - * log. - */ --typedef __uint32_t xlog_tid_t; -+typedef uint32_t xlog_tid_t; - - #define XLOG_MIN_ICLOGS 2 - #define XLOG_MAX_ICLOGS 8 -@@ -211,7 +211,7 @@ typedef struct xfs_log_iovec { - typedef struct xfs_trans_header { - uint th_magic; /* magic number */ - uint th_type; /* transaction type */ -- __int32_t th_tid; /* transaction id (unused) */ -+ int32_t th_tid; /* transaction id (unused) */ - uint th_num_items; /* num items logged by trans */ - } xfs_trans_header_t; - -@@ -265,52 +265,52 @@ typedef struct xfs_trans_header { - * must be added on to the end. - */ - typedef struct xfs_inode_log_format { -- __uint16_t ilf_type; /* inode log item type */ -- __uint16_t ilf_size; /* size of this item */ -- __uint32_t ilf_fields; /* flags for fields logged */ -- __uint16_t ilf_asize; /* size of attr d/ext/root */ -- __uint16_t ilf_dsize; /* size of data/ext/root */ -- __uint64_t ilf_ino; /* inode number */ -+ uint16_t ilf_type; /* inode log item type */ -+ uint16_t ilf_size; /* size of this item */ -+ uint32_t ilf_fields; /* flags for fields logged */ -+ uint16_t ilf_asize; /* size of attr d/ext/root */ -+ uint16_t ilf_dsize; /* size of data/ext/root */ -+ uint64_t ilf_ino; /* inode number */ - union { -- __uint32_t ilfu_rdev; /* rdev value for dev inode*/ -+ uint32_t ilfu_rdev; /* rdev value for dev inode*/ - uuid_t ilfu_uuid; /* mount point value */ - } ilf_u; -- __int64_t ilf_blkno; /* blkno of inode buffer */ -- __int32_t ilf_len; /* len of inode buffer */ -- __int32_t ilf_boffset; /* off of inode in buffer */ -+ int64_t ilf_blkno; /* blkno of inode buffer */ -+ int32_t ilf_len; /* len of inode buffer */ -+ int32_t ilf_boffset; /* off of inode in buffer */ - } xfs_inode_log_format_t; - - typedef struct xfs_inode_log_format_32 { -- __uint16_t ilf_type; /* inode log item type */ -- __uint16_t ilf_size; /* size of this item */ -- __uint32_t ilf_fields; /* flags for fields logged */ -- __uint16_t ilf_asize; /* size of attr d/ext/root */ -- __uint16_t ilf_dsize; /* size of data/ext/root */ -- __uint64_t ilf_ino; /* inode number */ -+ uint16_t ilf_type; /* inode log item type */ -+ uint16_t ilf_size; /* size of this item */ -+ uint32_t ilf_fields; /* flags for fields logged */ -+ uint16_t ilf_asize; /* size of attr d/ext/root */ -+ uint16_t ilf_dsize; /* size of data/ext/root */ -+ uint64_t ilf_ino; /* inode number */ - union { -- __uint32_t ilfu_rdev; /* rdev value for dev inode*/ -+ uint32_t ilfu_rdev; /* rdev value for dev inode*/ - uuid_t ilfu_uuid; /* mount point value */ - } ilf_u; -- __int64_t ilf_blkno; /* blkno of inode buffer */ -- __int32_t ilf_len; /* len of inode buffer */ -- __int32_t ilf_boffset; /* off of inode in buffer */ -+ int64_t ilf_blkno; /* blkno of inode buffer */ -+ int32_t ilf_len; /* len of inode buffer */ -+ int32_t ilf_boffset; /* off of inode in buffer */ - } __attribute__((packed)) xfs_inode_log_format_32_t; - - typedef struct xfs_inode_log_format_64 { -- __uint16_t ilf_type; /* inode log item type */ -- __uint16_t ilf_size; /* size of this item */ -- __uint32_t ilf_fields; /* flags for fields logged */ -- __uint16_t ilf_asize; /* size of attr d/ext/root */ -- __uint16_t ilf_dsize; /* size of data/ext/root */ -- __uint32_t ilf_pad; /* pad for 64 bit boundary */ -- __uint64_t ilf_ino; /* inode number */ -+ uint16_t ilf_type; /* inode log item type */ -+ uint16_t ilf_size; /* size of this item */ -+ uint32_t ilf_fields; /* flags for fields logged */ -+ uint16_t ilf_asize; /* size of attr d/ext/root */ -+ uint16_t ilf_dsize; /* size of data/ext/root */ -+ uint32_t ilf_pad; /* pad for 64 bit boundary */ -+ uint64_t ilf_ino; /* inode number */ - union { -- __uint32_t ilfu_rdev; /* rdev value for dev inode*/ -+ uint32_t ilfu_rdev; /* rdev value for dev inode*/ - uuid_t ilfu_uuid; /* mount point value */ - } ilf_u; -- __int64_t ilf_blkno; /* blkno of inode buffer */ -- __int32_t ilf_len; /* len of inode buffer */ -- __int32_t ilf_boffset; /* off of inode in buffer */ -+ int64_t ilf_blkno; /* blkno of inode buffer */ -+ int32_t ilf_len; /* len of inode buffer */ -+ int32_t ilf_boffset; /* off of inode in buffer */ - } xfs_inode_log_format_64_t; - - -@@ -379,8 +379,8 @@ static inline int xfs_ilog_fdata(int w) - * information. - */ - typedef struct xfs_ictimestamp { -- __int32_t t_sec; /* timestamp seconds */ -- __int32_t t_nsec; /* timestamp nanoseconds */ -+ int32_t t_sec; /* timestamp seconds */ -+ int32_t t_nsec; /* timestamp nanoseconds */ - } xfs_ictimestamp_t; - - /* -@@ -388,18 +388,18 @@ typedef struct xfs_ictimestamp { - * kept identical to struct xfs_dinode except for the endianness annotations. - */ - struct xfs_log_dinode { -- __uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */ -- __uint16_t di_mode; /* mode and type of file */ -- __int8_t di_version; /* inode version */ -- __int8_t di_format; /* format of di_c data */ -- __uint8_t di_pad3[2]; /* unused in v2/3 inodes */ -- __uint32_t di_uid; /* owner's user id */ -- __uint32_t di_gid; /* owner's group id */ -- __uint32_t di_nlink; /* number of links to file */ -- __uint16_t di_projid_lo; /* lower part of owner's project id */ -- __uint16_t di_projid_hi; /* higher part of owner's project id */ -- __uint8_t di_pad[6]; /* unused, zeroed space */ -- __uint16_t di_flushiter; /* incremented on flush */ -+ uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */ -+ uint16_t di_mode; /* mode and type of file */ -+ int8_t di_version; /* inode version */ -+ int8_t di_format; /* format of di_c data */ -+ uint8_t di_pad3[2]; /* unused in v2/3 inodes */ -+ uint32_t di_uid; /* owner's user id */ -+ uint32_t di_gid; /* owner's group id */ -+ uint32_t di_nlink; /* number of links to file */ -+ uint16_t di_projid_lo; /* lower part of owner's project id */ -+ uint16_t di_projid_hi; /* higher part of owner's project id */ -+ uint8_t di_pad[6]; /* unused, zeroed space */ -+ uint16_t di_flushiter; /* incremented on flush */ - xfs_ictimestamp_t di_atime; /* time last accessed */ - xfs_ictimestamp_t di_mtime; /* time last modified */ - xfs_ictimestamp_t di_ctime; /* time created/inode modified */ -@@ -408,23 +408,23 @@ struct xfs_log_dinode { - xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ - xfs_extnum_t di_nextents; /* number of extents in data fork */ - xfs_aextnum_t di_anextents; /* number of extents in attribute fork*/ -- __uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -- __int8_t di_aformat; /* format of attr fork's data */ -- __uint32_t di_dmevmask; /* DMIG event mask */ -- __uint16_t di_dmstate; /* DMIG state info */ -- __uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ -- __uint32_t di_gen; /* generation number */ -+ uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -+ int8_t di_aformat; /* format of attr fork's data */ -+ uint32_t di_dmevmask; /* DMIG event mask */ -+ uint16_t di_dmstate; /* DMIG state info */ -+ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ -+ uint32_t di_gen; /* generation number */ - - /* di_next_unlinked is the only non-core field in the old dinode */ - xfs_agino_t di_next_unlinked;/* agi unlinked list ptr */ - - /* start of the extended dinode, writable fields */ -- __uint32_t di_crc; /* CRC of the inode */ -- __uint64_t di_changecount; /* number of attribute changes */ -+ uint32_t di_crc; /* CRC of the inode */ -+ uint64_t di_changecount; /* number of attribute changes */ - xfs_lsn_t di_lsn; /* flush sequence */ -- __uint64_t di_flags2; /* more random flags */ -- __uint32_t di_cowextsize; /* basic cow extent size for file */ -- __uint8_t di_pad2[12]; /* more padding for future expansion */ -+ uint64_t di_flags2; /* more random flags */ -+ uint32_t di_cowextsize; /* basic cow extent size for file */ -+ uint8_t di_pad2[12]; /* more padding for future expansion */ - - /* fields only written to during inode creation */ - xfs_ictimestamp_t di_crtime; /* time created */ -@@ -483,7 +483,7 @@ typedef struct xfs_buf_log_format { - unsigned short blf_size; /* size of this item */ - unsigned short blf_flags; /* misc state */ - unsigned short blf_len; /* number of blocks in this buf */ -- __int64_t blf_blkno; /* starting blkno of this buf */ -+ int64_t blf_blkno; /* starting blkno of this buf */ - unsigned int blf_map_size; /* used size of data bitmap in words */ - unsigned int blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */ - } xfs_buf_log_format_t; -@@ -533,7 +533,7 @@ xfs_blft_to_flags(struct xfs_buf_log_format *blf, enum xfs_blft type) - blf->blf_flags |= ((type << XFS_BLFT_SHIFT) & XFS_BLFT_MASK); - } - --static inline __uint16_t -+static inline uint16_t - xfs_blft_from_flags(struct xfs_buf_log_format *blf) - { - return (blf->blf_flags & XFS_BLFT_MASK) >> XFS_BLFT_SHIFT; -@@ -554,14 +554,14 @@ typedef struct xfs_extent { - * conversion routine. - */ - typedef struct xfs_extent_32 { -- __uint64_t ext_start; -- __uint32_t ext_len; -+ uint64_t ext_start; -+ uint32_t ext_len; - } __attribute__((packed)) xfs_extent_32_t; - - typedef struct xfs_extent_64 { -- __uint64_t ext_start; -- __uint32_t ext_len; -- __uint32_t ext_pad; -+ uint64_t ext_start; -+ uint32_t ext_len; -+ uint32_t ext_pad; - } xfs_extent_64_t; - - /* -@@ -570,26 +570,26 @@ typedef struct xfs_extent_64 { - * size is given by efi_nextents. - */ - typedef struct xfs_efi_log_format { -- __uint16_t efi_type; /* efi log item type */ -- __uint16_t efi_size; /* size of this item */ -- __uint32_t efi_nextents; /* # extents to free */ -- __uint64_t efi_id; /* efi identifier */ -+ uint16_t efi_type; /* efi log item type */ -+ uint16_t efi_size; /* size of this item */ -+ uint32_t efi_nextents; /* # extents to free */ -+ uint64_t efi_id; /* efi identifier */ - xfs_extent_t efi_extents[1]; /* array of extents to free */ - } xfs_efi_log_format_t; - - typedef struct xfs_efi_log_format_32 { -- __uint16_t efi_type; /* efi log item type */ -- __uint16_t efi_size; /* size of this item */ -- __uint32_t efi_nextents; /* # extents to free */ -- __uint64_t efi_id; /* efi identifier */ -+ uint16_t efi_type; /* efi log item type */ -+ uint16_t efi_size; /* size of this item */ -+ uint32_t efi_nextents; /* # extents to free */ -+ uint64_t efi_id; /* efi identifier */ - xfs_extent_32_t efi_extents[1]; /* array of extents to free */ - } __attribute__((packed)) xfs_efi_log_format_32_t; - - typedef struct xfs_efi_log_format_64 { -- __uint16_t efi_type; /* efi log item type */ -- __uint16_t efi_size; /* size of this item */ -- __uint32_t efi_nextents; /* # extents to free */ -- __uint64_t efi_id; /* efi identifier */ -+ uint16_t efi_type; /* efi log item type */ -+ uint16_t efi_size; /* size of this item */ -+ uint32_t efi_nextents; /* # extents to free */ -+ uint64_t efi_id; /* efi identifier */ - xfs_extent_64_t efi_extents[1]; /* array of extents to free */ - } xfs_efi_log_format_64_t; - -@@ -599,26 +599,26 @@ typedef struct xfs_efi_log_format_64 { - * size is given by efd_nextents; - */ - typedef struct xfs_efd_log_format { -- __uint16_t efd_type; /* efd log item type */ -- __uint16_t efd_size; /* size of this item */ -- __uint32_t efd_nextents; /* # of extents freed */ -- __uint64_t efd_efi_id; /* id of corresponding efi */ -+ uint16_t efd_type; /* efd log item type */ -+ uint16_t efd_size; /* size of this item */ -+ uint32_t efd_nextents; /* # of extents freed */ -+ uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_t efd_extents[1]; /* array of extents freed */ - } xfs_efd_log_format_t; - - typedef struct xfs_efd_log_format_32 { -- __uint16_t efd_type; /* efd log item type */ -- __uint16_t efd_size; /* size of this item */ -- __uint32_t efd_nextents; /* # of extents freed */ -- __uint64_t efd_efi_id; /* id of corresponding efi */ -+ uint16_t efd_type; /* efd log item type */ -+ uint16_t efd_size; /* size of this item */ -+ uint32_t efd_nextents; /* # of extents freed */ -+ uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_32_t efd_extents[1]; /* array of extents freed */ - } __attribute__((packed)) xfs_efd_log_format_32_t; - - typedef struct xfs_efd_log_format_64 { -- __uint16_t efd_type; /* efd log item type */ -- __uint16_t efd_size; /* size of this item */ -- __uint32_t efd_nextents; /* # of extents freed */ -- __uint64_t efd_efi_id; /* id of corresponding efi */ -+ uint16_t efd_type; /* efd log item type */ -+ uint16_t efd_size; /* size of this item */ -+ uint32_t efd_nextents; /* # of extents freed */ -+ uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_64_t efd_extents[1]; /* array of extents freed */ - } xfs_efd_log_format_64_t; - -@@ -626,11 +626,11 @@ typedef struct xfs_efd_log_format_64 { - * RUI/RUD (reverse mapping) log format definitions - */ - struct xfs_map_extent { -- __uint64_t me_owner; -- __uint64_t me_startblock; -- __uint64_t me_startoff; -- __uint32_t me_len; -- __uint32_t me_flags; -+ uint64_t me_owner; -+ uint64_t me_startblock; -+ uint64_t me_startoff; -+ uint32_t me_len; -+ uint32_t me_flags; - }; - - /* rmap me_flags: upper bits are flags, lower byte is type code */ -@@ -659,10 +659,10 @@ struct xfs_map_extent { - * size is given by rui_nextents. - */ - struct xfs_rui_log_format { -- __uint16_t rui_type; /* rui log item type */ -- __uint16_t rui_size; /* size of this item */ -- __uint32_t rui_nextents; /* # extents to free */ -- __uint64_t rui_id; /* rui identifier */ -+ uint16_t rui_type; /* rui log item type */ -+ uint16_t rui_size; /* size of this item */ -+ uint32_t rui_nextents; /* # extents to free */ -+ uint64_t rui_id; /* rui identifier */ - struct xfs_map_extent rui_extents[]; /* array of extents to rmap */ - }; - -@@ -680,19 +680,19 @@ xfs_rui_log_format_sizeof( - * size is given by rud_nextents; - */ - struct xfs_rud_log_format { -- __uint16_t rud_type; /* rud log item type */ -- __uint16_t rud_size; /* size of this item */ -- __uint32_t __pad; -- __uint64_t rud_rui_id; /* id of corresponding rui */ -+ uint16_t rud_type; /* rud log item type */ -+ uint16_t rud_size; /* size of this item */ -+ uint32_t __pad; -+ uint64_t rud_rui_id; /* id of corresponding rui */ - }; - - /* - * CUI/CUD (refcount update) log format definitions - */ - struct xfs_phys_extent { -- __uint64_t pe_startblock; -- __uint32_t pe_len; -- __uint32_t pe_flags; -+ uint64_t pe_startblock; -+ uint32_t pe_len; -+ uint32_t pe_flags; - }; - - /* refcount pe_flags: upper bits are flags, lower byte is type code */ -@@ -707,10 +707,10 @@ struct xfs_phys_extent { - * size is given by cui_nextents. - */ - struct xfs_cui_log_format { -- __uint16_t cui_type; /* cui log item type */ -- __uint16_t cui_size; /* size of this item */ -- __uint32_t cui_nextents; /* # extents to free */ -- __uint64_t cui_id; /* cui identifier */ -+ uint16_t cui_type; /* cui log item type */ -+ uint16_t cui_size; /* size of this item */ -+ uint32_t cui_nextents; /* # extents to free */ -+ uint64_t cui_id; /* cui identifier */ - struct xfs_phys_extent cui_extents[]; /* array of extents */ - }; - -@@ -728,10 +728,10 @@ xfs_cui_log_format_sizeof( - * size is given by cud_nextents; - */ - struct xfs_cud_log_format { -- __uint16_t cud_type; /* cud log item type */ -- __uint16_t cud_size; /* size of this item */ -- __uint32_t __pad; -- __uint64_t cud_cui_id; /* id of corresponding cui */ -+ uint16_t cud_type; /* cud log item type */ -+ uint16_t cud_size; /* size of this item */ -+ uint32_t __pad; -+ uint64_t cud_cui_id; /* id of corresponding cui */ - }; - - /* -@@ -755,10 +755,10 @@ struct xfs_cud_log_format { - * size is given by bui_nextents. - */ - struct xfs_bui_log_format { -- __uint16_t bui_type; /* bui log item type */ -- __uint16_t bui_size; /* size of this item */ -- __uint32_t bui_nextents; /* # extents to free */ -- __uint64_t bui_id; /* bui identifier */ -+ uint16_t bui_type; /* bui log item type */ -+ uint16_t bui_size; /* size of this item */ -+ uint32_t bui_nextents; /* # extents to free */ -+ uint64_t bui_id; /* bui identifier */ - struct xfs_map_extent bui_extents[]; /* array of extents to bmap */ - }; - -@@ -776,10 +776,10 @@ xfs_bui_log_format_sizeof( - * size is given by bud_nextents; - */ - struct xfs_bud_log_format { -- __uint16_t bud_type; /* bud log item type */ -- __uint16_t bud_size; /* size of this item */ -- __uint32_t __pad; -- __uint64_t bud_bui_id; /* id of corresponding bui */ -+ uint16_t bud_type; /* bud log item type */ -+ uint16_t bud_size; /* size of this item */ -+ uint32_t __pad; -+ uint64_t bud_bui_id; /* id of corresponding bui */ - }; - - /* -@@ -789,12 +789,12 @@ struct xfs_bud_log_format { - * 32 bits : log_recovery code assumes that. - */ - typedef struct xfs_dq_logformat { -- __uint16_t qlf_type; /* dquot log item type */ -- __uint16_t qlf_size; /* size of this item */ -+ uint16_t qlf_type; /* dquot log item type */ -+ uint16_t qlf_size; /* size of this item */ - xfs_dqid_t qlf_id; /* usr/grp/proj id : 32 bits */ -- __int64_t qlf_blkno; /* blkno of dquot buffer */ -- __int32_t qlf_len; /* len of dquot buffer */ -- __uint32_t qlf_boffset; /* off of dquot in buffer */ -+ int64_t qlf_blkno; /* blkno of dquot buffer */ -+ int32_t qlf_len; /* len of dquot buffer */ -+ uint32_t qlf_boffset; /* off of dquot in buffer */ - } xfs_dq_logformat_t; - - /* -@@ -853,8 +853,8 @@ typedef struct xfs_qoff_logformat { - * decoding can be done correctly. - */ - struct xfs_icreate_log { -- __uint16_t icl_type; /* type of log format structure */ -- __uint16_t icl_size; /* size of log format structure */ -+ uint16_t icl_type; /* type of log format structure */ -+ uint16_t icl_size; /* size of log format structure */ - __be32 icl_ag; /* ag being allocated in */ - __be32 icl_agbno; /* start block of inode range */ - __be32 icl_count; /* number of inodes to initialise */ -diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h -index 8eed5127..d69c7722 100644 ---- a/libxfs/xfs_quota_defs.h -+++ b/libxfs/xfs_quota_defs.h -@@ -27,8 +27,8 @@ - * they may need 64-bit accounting. Hence, 64-bit quota-counters, - * and quota-limits. This is a waste in the common case, but hey ... - */ --typedef __uint64_t xfs_qcnt_t; --typedef __uint16_t xfs_qwarncnt_t; -+typedef uint64_t xfs_qcnt_t; -+typedef uint16_t xfs_qwarncnt_t; - - /* - * flags for q_flags field in the dquot. -diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c -index 2814f94f..bd1a8f2d 100644 ---- a/libxfs/xfs_refcount_btree.c -+++ b/libxfs/xfs_refcount_btree.c -@@ -201,7 +201,7 @@ xfs_refcountbt_init_ptr_from_cur( - ptr->s = agf->agf_refcount_root; - } - --STATIC __int64_t -+STATIC int64_t - xfs_refcountbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) -@@ -209,16 +209,16 @@ xfs_refcountbt_key_diff( - struct xfs_refcount_irec *rec = &cur->bc_rec.rc; - struct xfs_refcount_key *kp = &key->refc; - -- return (__int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock; -+ return (int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock; - } - --STATIC __int64_t -+STATIC int64_t - xfs_refcountbt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- return (__int64_t)be32_to_cpu(k1->refc.rc_startblock) - -+ return (int64_t)be32_to_cpu(k1->refc.rc_startblock) - - be32_to_cpu(k2->refc.rc_startblock); - } - -diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c -index f78771d1..0d6b5d41 100644 ---- a/libxfs/xfs_rmap.c -+++ b/libxfs/xfs_rmap.c -@@ -2059,7 +2059,7 @@ int - xfs_rmap_finish_one( - struct xfs_trans *tp, - enum xfs_rmap_intent_type type, -- __uint64_t owner, -+ uint64_t owner, - int whichfork, - xfs_fileoff_t startoff, - xfs_fsblock_t startblock, -@@ -2180,7 +2180,7 @@ __xfs_rmap_add( - struct xfs_mount *mp, - struct xfs_defer_ops *dfops, - enum xfs_rmap_intent_type type, -- __uint64_t owner, -+ uint64_t owner, - int whichfork, - struct xfs_bmbt_irec *bmap) - { -@@ -2264,7 +2264,7 @@ xfs_rmap_alloc_extent( - xfs_agnumber_t agno, - xfs_agblock_t bno, - xfs_extlen_t len, -- __uint64_t owner) -+ uint64_t owner) - { - struct xfs_bmbt_irec bmap; - -@@ -2288,7 +2288,7 @@ xfs_rmap_free_extent( - xfs_agnumber_t agno, - xfs_agblock_t bno, - xfs_extlen_t len, -- __uint64_t owner) -+ uint64_t owner) - { - struct xfs_bmbt_irec bmap; - -diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h -index 98f908fe..265116d0 100644 ---- a/libxfs/xfs_rmap.h -+++ b/libxfs/xfs_rmap.h -@@ -179,7 +179,7 @@ enum xfs_rmap_intent_type { - struct xfs_rmap_intent { - struct list_head ri_list; - enum xfs_rmap_intent_type ri_type; -- __uint64_t ri_owner; -+ uint64_t ri_owner; - int ri_whichfork; - struct xfs_bmbt_irec ri_bmap; - }; -@@ -196,15 +196,15 @@ int xfs_rmap_convert_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops, - struct xfs_bmbt_irec *imap); - int xfs_rmap_alloc_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, -- __uint64_t owner); -+ uint64_t owner); - int xfs_rmap_free_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, -- __uint64_t owner); -+ uint64_t owner); - - void xfs_rmap_finish_one_cleanup(struct xfs_trans *tp, - struct xfs_btree_cur *rcur, int error); - int xfs_rmap_finish_one(struct xfs_trans *tp, enum xfs_rmap_intent_type type, -- __uint64_t owner, int whichfork, xfs_fileoff_t startoff, -+ uint64_t owner, int whichfork, xfs_fileoff_t startoff, - xfs_fsblock_t startblock, xfs_filblks_t blockcount, - xfs_exntst_t state, struct xfs_btree_cur **pcur); - -diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c -index a186c872..45ac436f 100644 ---- a/libxfs/xfs_rmap_btree.c -+++ b/libxfs/xfs_rmap_btree.c -@@ -197,7 +197,7 @@ xfs_rmapbt_init_high_key_from_rec( - union xfs_btree_key *key, - union xfs_btree_rec *rec) - { -- __uint64_t off; -+ uint64_t off; - int adj; - - adj = be32_to_cpu(rec->rmap.rm_blockcount) - 1; -@@ -239,7 +239,7 @@ xfs_rmapbt_init_ptr_from_cur( - ptr->s = agf->agf_roots[cur->bc_btnum]; - } - --STATIC __int64_t -+STATIC int64_t - xfs_rmapbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) -@@ -247,9 +247,9 @@ xfs_rmapbt_key_diff( - struct xfs_rmap_irec *rec = &cur->bc_rec.r; - struct xfs_rmap_key *kp = &key->rmap; - __u64 x, y; -- __int64_t d; -+ int64_t d; - -- d = (__int64_t)be32_to_cpu(kp->rm_startblock) - rec->rm_startblock; -+ d = (int64_t)be32_to_cpu(kp->rm_startblock) - rec->rm_startblock; - if (d) - return d; - -@@ -269,7 +269,7 @@ xfs_rmapbt_key_diff( - return 0; - } - --STATIC __int64_t -+STATIC int64_t - xfs_rmapbt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, -@@ -277,10 +277,10 @@ xfs_rmapbt_diff_two_keys( - { - struct xfs_rmap_key *kp1 = &k1->rmap; - struct xfs_rmap_key *kp2 = &k2->rmap; -- __int64_t d; -+ int64_t d; - __u64 x, y; - -- d = (__int64_t)be32_to_cpu(kp1->rm_startblock) - -+ d = (int64_t)be32_to_cpu(kp1->rm_startblock) - - be32_to_cpu(kp2->rm_startblock); - if (d) - return d; -@@ -382,10 +382,10 @@ xfs_rmapbt_keys_inorder( - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- __uint32_t x; -- __uint32_t y; -- __uint64_t a; -- __uint64_t b; -+ uint32_t x; -+ uint32_t y; -+ uint64_t a; -+ uint64_t b; - - x = be32_to_cpu(k1->rmap.rm_startblock); - y = be32_to_cpu(k2->rmap.rm_startblock); -@@ -412,10 +412,10 @@ xfs_rmapbt_recs_inorder( - union xfs_btree_rec *r1, - union xfs_btree_rec *r2) - { -- __uint32_t x; -- __uint32_t y; -- __uint64_t a; -- __uint64_t b; -+ uint32_t x; -+ uint32_t y; -+ uint64_t a; -+ uint64_t b; - - x = be32_to_cpu(r1->rmap.rm_startblock); - y = be32_to_cpu(r2->rmap.rm_startblock); -diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c -index dbd2f881..8f8a99d6 100644 ---- a/libxfs/xfs_rtbitmap.c -+++ b/libxfs/xfs_rtbitmap.c -@@ -1006,7 +1006,7 @@ xfs_rtfree_extent( - mp->m_sb.sb_rextents) { - if (!(mp->m_rbmip->i_d.di_flags & XFS_DIFLAG_NEWRTBM)) - mp->m_rbmip->i_d.di_flags |= XFS_DIFLAG_NEWRTBM; -- *(__uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0; -+ *(uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0; - xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE); - } - return 0; -diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c -index 93a18190..51f69704 100644 ---- a/libxfs/xfs_sb.c -+++ b/libxfs/xfs_sb.c -@@ -430,7 +430,7 @@ xfs_sb_quota_to_disk( - struct xfs_dsb *to, - struct xfs_sb *from) - { -- __uint16_t qflags = from->sb_qflags; -+ uint16_t qflags = from->sb_qflags; - - to->sb_uquotino = cpu_to_be64(from->sb_uquotino); - if (xfs_sb_version_has_pquotino(from)) { -@@ -738,7 +738,7 @@ xfs_sb_mount_common( - mp->m_refc_mnr[1] = mp->m_refc_mxr[1] / 2; - - mp->m_bsize = XFS_FSB_TO_BB(mp, 1); -- mp->m_ialloc_inos = (int)MAX((__uint16_t)XFS_INODES_PER_CHUNK, -+ mp->m_ialloc_inos = (int)MAX((uint16_t)XFS_INODES_PER_CHUNK, - sbp->sb_inopblock); - mp->m_ialloc_blks = mp->m_ialloc_inos >> sbp->sb_inopblog; - -diff --git a/libxfs/xfs_types.h b/libxfs/xfs_types.h -index 717909f2..0220159b 100644 ---- a/libxfs/xfs_types.h -+++ b/libxfs/xfs_types.h -@@ -18,34 +18,34 @@ - #ifndef __XFS_TYPES_H__ - #define __XFS_TYPES_H__ - --typedef __uint32_t prid_t; /* project ID */ -+typedef uint32_t prid_t; /* project ID */ - --typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */ --typedef __uint32_t xfs_agino_t; /* inode # within allocation grp */ --typedef __uint32_t xfs_extlen_t; /* extent length in blocks */ --typedef __uint32_t xfs_agnumber_t; /* allocation group number */ --typedef __int32_t xfs_extnum_t; /* # of extents in a file */ --typedef __int16_t xfs_aextnum_t; /* # extents in an attribute fork */ --typedef __int64_t xfs_fsize_t; /* bytes in a file */ --typedef __uint64_t xfs_ufsize_t; /* unsigned bytes in a file */ -+typedef uint32_t xfs_agblock_t; /* blockno in alloc. group */ -+typedef uint32_t xfs_agino_t; /* inode # within allocation grp */ -+typedef uint32_t xfs_extlen_t; /* extent length in blocks */ -+typedef uint32_t xfs_agnumber_t; /* allocation group number */ -+typedef int32_t xfs_extnum_t; /* # of extents in a file */ -+typedef int16_t xfs_aextnum_t; /* # extents in an attribute fork */ -+typedef int64_t xfs_fsize_t; /* bytes in a file */ -+typedef uint64_t xfs_ufsize_t; /* unsigned bytes in a file */ - --typedef __int32_t xfs_suminfo_t; /* type of bitmap summary info */ --typedef __int32_t xfs_rtword_t; /* word type for bitmap manipulations */ -+typedef int32_t xfs_suminfo_t; /* type of bitmap summary info */ -+typedef int32_t xfs_rtword_t; /* word type for bitmap manipulations */ - --typedef __int64_t xfs_lsn_t; /* log sequence number */ --typedef __int32_t xfs_tid_t; /* transaction identifier */ -+typedef int64_t xfs_lsn_t; /* log sequence number */ -+typedef int32_t xfs_tid_t; /* transaction identifier */ - --typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ --typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */ -+typedef uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ -+typedef uint32_t xfs_dahash_t; /* dir/attr hash value */ - --typedef __uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ --typedef __uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ --typedef __uint64_t xfs_rtblock_t; /* extent (block) in realtime area */ --typedef __uint64_t xfs_fileoff_t; /* block number in a file */ --typedef __uint64_t xfs_filblks_t; /* number of blocks in a file */ -+typedef uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ -+typedef uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ -+typedef uint64_t xfs_rtblock_t; /* extent (block) in realtime area */ -+typedef uint64_t xfs_fileoff_t; /* block number in a file */ -+typedef uint64_t xfs_filblks_t; /* number of blocks in a file */ - --typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ --typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */ -+typedef int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ -+typedef int64_t xfs_sfiloff_t; /* signed block number in a file */ - - /* - * Null values for the types. -@@ -125,7 +125,7 @@ struct xfs_name { - * uid_t and gid_t are hard-coded to 32 bits in the inode. - * Hence, an 'id' in a dquot is 32 bits.. - */ --typedef __uint32_t xfs_dqid_t; -+typedef uint32_t xfs_dqid_t; - - /* - * Constants for bit manipulations. --- -2.14.1 - diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch deleted file mode 100644 index 5e08f0d840..0000000000 --- a/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch +++ /dev/null @@ -1,3800 +0,0 @@ -From 14f8b6810bd240cc58131483790a099fcf56c073 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" <darrick.wong@oracle.com> -Date: Fri, 4 Aug 2017 16:33:51 -0500 -Subject: [PATCH] xfsprogs: remove double-underscore integer types - -This is a purely mechanical patch that removes the private -__{u,}int{8,16,32,64}_t typedefs in favor of using the system -{u,}int{8,16,32,64}_t typedefs. This is the sed script used to perform -the transformation and fix the resulting whitespace and indentation -errors: - -s/typedef\t__uint8_t/typedef __uint8_t\t/g -s/typedef\t__uint/typedef __uint/g -s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g -s/__uint8_t\t/__uint8_t\t\t/g -s/__uint/uint/g -s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g -s/__int/int/g -/^typedef.*int[0-9]*_t;$/d - -Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> -Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> -[sandeen: fix whitespace incidentals] -Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> -Signed-off-by: Eric Sandeen <sandeen@sandeen.net> ---- - copy/xfs_copy.c | 14 ++++----- - copy/xfs_copy.h | 2 +- - db/attr.c | 8 ++--- - db/attrshort.c | 4 +-- - db/bit.c | 4 +-- - db/bit.h | 2 +- - db/block.c | 8 ++--- - db/check.c | 18 +++++------ - db/convert.c | 28 ++++++++--------- - db/faddr.c | 14 ++++----- - db/field.c | 44 +++++++++++++-------------- - db/fprint.c | 8 ++--- - db/frag.c | 8 ++--- - db/inode.c | 34 ++++++++++----------- - db/io.c | 2 +- - db/io.h | 6 ++-- - db/metadump.c | 12 ++++---- - db/sb.c | 6 ++-- - fsr/xfs_fsr.c | 2 +- - include/darwin.h | 18 +++++------ - include/freebsd.h | 6 ++-- - include/gnukfreebsd.h | 6 ++-- - include/libxcmd.h | 6 ++-- - include/linux.h | 8 ++--- - include/xfs_arch.h | 22 +++++++------- - include/xfs_inode.h | 4 +-- - include/xfs_log_recover.h | 2 +- - include/xfs_metadump.h | 4 +-- - include/xfs_mount.h | 22 +++++++------- - libhandle/handle.c | 2 +- - libhandle/jdm.c | 2 +- - libxcmd/topology.c | 14 ++++----- - libxfs/darwin.c | 2 +- - libxfs/freebsd.c | 2 +- - libxfs/init.c | 2 +- - libxfs/irix.c | 2 +- - libxfs/libxfs_priv.h | 4 +-- - libxfs/linux.c | 2 +- - libxfs/logitem.c | 2 +- - libxfs/radix-tree.c | 8 ++--- - libxfs/rdwr.c | 6 ++-- - libxfs/util.c | 8 ++--- - logprint/log_misc.c | 6 ++-- - mdrestore/xfs_mdrestore.c | 2 +- - mkfs/proto.c | 2 +- - mkfs/xfs_mkfs.c | 76 +++++++++++++++++++++++------------------------ - quota/edit.c | 64 +++++++++++++++++++-------------------- - quota/free.c | 44 +++++++++++++-------------- - quota/quot.c | 24 +++++++-------- - quota/quota.c | 4 +-- - quota/quota.h | 12 ++++---- - quota/report.c | 4 +-- - quota/state.c | 2 +- - quota/util.c | 66 ++++++++++++++++++++-------------------- - repair/README | 2 +- - repair/agheader.h | 14 ++++----- - repair/attr_repair.h | 26 ++++++++-------- - repair/avl64.c | 38 ++++++++++++------------ - repair/avl64.h | 18 +++++------ - repair/dinode.c | 38 ++++++++++++------------ - repair/dinode.h | 4 +-- - repair/dir2.c | 2 +- - repair/globals.h | 18 +++++------ - repair/incore.c | 10 +++---- - repair/incore.h | 46 ++++++++++++++-------------- - repair/incore_ext.c | 6 ++-- - repair/incore_ino.c | 72 ++++++++++++++++++++++---------------------- - repair/phase2.c | 2 +- - repair/phase3.c | 6 ++-- - repair/phase4.c | 4 +-- - repair/phase5.c | 28 ++++++++--------- - repair/phase6.c | 16 +++++----- - repair/phase7.c | 6 ++-- - repair/progress.c | 30 +++++++++---------- - repair/progress.h | 4 +-- - repair/rmap.c | 18 +++++------ - repair/rmap.h | 2 +- - repair/sb.c | 24 +++++++-------- - repair/scan.c | 50 +++++++++++++++---------------- - repair/scan.h | 12 ++++---- - 80 files changed, 590 insertions(+), 590 deletions(-) - -diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c -index a7da824f..33e05dfd 100644 ---- a/copy/xfs_copy.c -+++ b/copy/xfs_copy.c -@@ -43,7 +43,7 @@ unsigned int source_sectorsize; /* source disk sectorsize */ - - xfs_agblock_t first_agbno; - --__uint64_t barcount[11]; -+uint64_t barcount[11]; - - unsigned int num_targets; - target_control *target; -@@ -313,7 +313,7 @@ usage(void) - } - - void --init_bar(__uint64_t source_blocks) -+init_bar(uint64_t source_blocks) - { - int i; - -@@ -322,7 +322,7 @@ init_bar(__uint64_t source_blocks) - } - - int --bump_bar(int tenths, __uint64_t numblocks) -+bump_bar(int tenths, uint64_t numblocks) - { - static char *bar[11] = { - " 0% ", -@@ -534,8 +534,8 @@ main(int argc, char **argv) - xfs_off_t pos; - size_t length; - int c; -- __uint64_t size, sizeb; -- __uint64_t numblocks = 0; -+ uint64_t size, sizeb; -+ uint64_t numblocks = 0; - int wblocks = 0; - int num_threads = 0; - struct dioattr d; -@@ -951,8 +951,8 @@ main(int argc, char **argv) - num_ags = mp->m_sb.sb_agcount; - - init_bar(mp->m_sb.sb_blocksize / BBSIZE -- * ((__uint64_t)mp->m_sb.sb_dblocks -- - (__uint64_t)mp->m_sb.sb_fdblocks + 10 * num_ags)); -+ * ((uint64_t)mp->m_sb.sb_dblocks -+ - (uint64_t)mp->m_sb.sb_fdblocks + 10 * num_ags)); - - kids = num_targets; - -diff --git a/copy/xfs_copy.h b/copy/xfs_copy.h -index 27370688..53c6e42c 100644 ---- a/copy/xfs_copy.h -+++ b/copy/xfs_copy.h -@@ -76,7 +76,7 @@ typedef struct { - - typedef int thread_id; - typedef int tm_index; /* index into thread mask array */ --typedef __uint32_t thread_mask; /* a thread mask */ -+typedef uint32_t thread_mask; /* a thread mask */ - - typedef struct { - char *name; -diff --git a/db/attr.c b/db/attr.c -index 31536a8b..23ffcd5f 100644 ---- a/db/attr.c -+++ b/db/attr.c -@@ -77,16 +77,16 @@ const field_t attr_leaf_entry_flds[] = { - { "nameidx", FLDT_UINT16D, OI(LEOFF(nameidx)), C1, 0, TYP_NONE }, - { "flags", FLDT_UINT8X, OI(LEOFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, - { "incomplete", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_INCOMPLETE_BIT - 1), C1, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_INCOMPLETE_BIT - 1), C1, - 0, TYP_NONE }, - { "root", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, - TYP_NONE }, - { "secure", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, - TYP_NONE }, - { "local", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_LOCAL_BIT - 1), C1, 0, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_LOCAL_BIT - 1), C1, 0, - TYP_NONE }, - { "pad2", FLDT_UINT8X, OI(LEOFF(pad2)), C1, FLD_SKIPALL, TYP_NONE }, - { NULL } -diff --git a/db/attrshort.c b/db/attrshort.c -index d82559cc..2ef358f5 100644 ---- a/db/attrshort.c -+++ b/db/attrshort.c -@@ -51,10 +51,10 @@ const field_t attr_sf_entry_flds[] = { - { "valuelen", FLDT_UINT8D, OI(EOFF(valuelen)), C1, 0, TYP_NONE }, - { "flags", FLDT_UINT8X, OI(EOFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, - { "root", FLDT_UINT1, -- OI(EOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, -+ OI(EOFF(flags) + bitsz(uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, - TYP_NONE }, - { "secure", FLDT_UINT1, -- OI(EOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, -+ OI(EOFF(flags) + bitsz(uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, - TYP_NONE }, - { "name", FLDT_CHARNS, OI(EOFF(nameval)), attr_sf_entry_name_count, - FLD_COUNT, TYP_NONE }, -diff --git a/db/bit.c b/db/bit.c -index 24872bf7..f5ebf681 100644 ---- a/db/bit.c -+++ b/db/bit.c -@@ -60,7 +60,7 @@ setbit( - } - } - --__int64_t -+int64_t - getbitval( - void *obj, - int bitoff, -@@ -70,7 +70,7 @@ getbitval( - int bit; - int i; - char *p; -- __int64_t rval; -+ int64_t rval; - int signext; - int z1, z2, z3, z4; - -diff --git a/db/bit.h b/db/bit.h -index 80ba24c4..9fd71f4b 100644 ---- a/db/bit.h -+++ b/db/bit.h -@@ -25,5 +25,5 @@ - #define BVUNSIGNED 0 - #define BVSIGNED 1 - --extern __int64_t getbitval(void *obj, int bitoff, int nbits, int flags); -+extern int64_t getbitval(void *obj, int bitoff, int nbits, int flags); - extern void setbitval(void *obuf, int bitoff, int nbits, void *ibuf); -diff --git a/db/block.c b/db/block.c -index 4a357ced..5ecd687a 100644 ---- a/db/block.c -+++ b/db/block.c -@@ -98,7 +98,7 @@ ablock_f( - } - dfsbno = bm.startblock + (bno - bm.startoff); - ASSERT(typtab[TYP_ATTR].typnm == TYP_ATTR); -- set_cur(&typtab[TYP_ATTR], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), -+ set_cur(&typtab[TYP_ATTR], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - blkbb, DB_RING_ADD, NULL); - return 0; - } -@@ -128,14 +128,14 @@ daddr_f( - int argc, - char **argv) - { -- __int64_t d; -+ int64_t d; - char *p; - - if (argc == 1) { - dbprintf(_("current daddr is %lld\n"), iocur_top->off >> BBSHIFT); - return 0; - } -- d = (__int64_t)strtoull(argv[1], &p, 0); -+ d = (int64_t)strtoull(argv[1], &p, 0); - if (*p != '\0' || - d >= mp->m_sb.sb_dblocks << (mp->m_sb.sb_blocklog - BBSHIFT)) { - dbprintf(_("bad daddr %s\n"), argv[1]); -@@ -197,7 +197,7 @@ dblock_f( - ASSERT(typtab[type].typnm == type); - if (nex > 1) - make_bbmap(&bbmap, nex, bmp); -- set_cur(&typtab[type], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), -+ set_cur(&typtab[type], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - nb * blkbb, DB_RING_ADD, nex > 1 ? &bbmap : NULL); - free(bmp); - return 0; -diff --git a/db/check.c b/db/check.c -index 8e618a23..81ba63a6 100644 ---- a/db/check.c -+++ b/db/check.c -@@ -114,8 +114,8 @@ typedef struct dirhash { - - static xfs_extlen_t agffreeblks; - static xfs_extlen_t agflongest; --static __uint64_t agf_aggr_freeblks; /* aggregate count over all */ --static __uint32_t agfbtreeblks; -+static uint64_t agf_aggr_freeblks; /* aggregate count over all */ -+static uint32_t agfbtreeblks; - static int lazycount; - static xfs_agino_t agicount; - static xfs_agino_t agifreecount; -@@ -124,10 +124,10 @@ static int blist_size; - static char **dbmap; /* really dbm_t:8 */ - static dirhash_t **dirhash; - static int error; --static __uint64_t fdblocks; --static __uint64_t frextents; --static __uint64_t icount; --static __uint64_t ifree; -+static uint64_t fdblocks; -+static uint64_t frextents; -+static uint64_t icount; -+static uint64_t ifree; - static inodata_t ***inodata; - static int inodata_hash_size; - static inodata_t ***inomap; -@@ -1187,7 +1187,7 @@ blocktrash_f( - goto out; - } - for (i = 0; i < count; i++) { -- randb = (xfs_rfsblock_t)((((__int64_t)random() << 32) | -+ randb = (xfs_rfsblock_t)((((int64_t)random() << 32) | - random()) % blocks); - for (bi = 0, agno = 0, done = 0; - !done && agno < mp->m_sb.sb_agcount; -@@ -3032,7 +3032,7 @@ process_leaf_node_dir_v2( - } - if (v) - dbprintf(_("dir inode %lld block %u=%llu\n"), id->ino, -- (__uint32_t)dbno, -+ (uint32_t)dbno, - (xfs_fsblock_t)bmp->startblock); - push_cur(); - if (nex > 1) -@@ -3045,7 +3045,7 @@ process_leaf_node_dir_v2( - if (!sflag || v) - dbprintf(_("can't read block %u for directory " - "inode %lld\n"), -- (__uint32_t)dbno, id->ino); -+ (uint32_t)dbno, id->ino); - error++; - pop_cur(); - dbno += mp->m_dir_geo->fsbcount - 1; -diff --git a/db/convert.c b/db/convert.c -index a337abea..fa4f9623 100644 ---- a/db/convert.c -+++ b/db/convert.c -@@ -24,13 +24,13 @@ - - #define M(A) (1 << CT_ ## A) - #define agblock_to_bytes(x) \ -- ((__uint64_t)(x) << mp->m_sb.sb_blocklog) -+ ((uint64_t)(x) << mp->m_sb.sb_blocklog) - #define agino_to_bytes(x) \ -- ((__uint64_t)(x) << mp->m_sb.sb_inodelog) -+ ((uint64_t)(x) << mp->m_sb.sb_inodelog) - #define agnumber_to_bytes(x) \ -- agblock_to_bytes((__uint64_t)(x) * mp->m_sb.sb_agblocks) -+ agblock_to_bytes((uint64_t)(x) * mp->m_sb.sb_agblocks) - #define daddr_to_bytes(x) \ -- ((__uint64_t)(x) << BBSHIFT) -+ ((uint64_t)(x) << BBSHIFT) - #define fsblock_to_bytes(x) \ - (agnumber_to_bytes(XFS_FSB_TO_AGNO(mp, (x))) + \ - agblock_to_bytes(XFS_FSB_TO_AGBNO(mp, (x)))) -@@ -38,7 +38,7 @@ - (agnumber_to_bytes(XFS_INO_TO_AGNO(mp, (x))) + \ - agino_to_bytes(XFS_INO_TO_AGINO(mp, (x)))) - #define inoidx_to_bytes(x) \ -- ((__uint64_t)(x) << mp->m_sb.sb_inodelog) -+ ((uint64_t)(x) << mp->m_sb.sb_inodelog) - - typedef enum { - CT_NONE = -1, -@@ -68,7 +68,7 @@ typedef union { - xfs_agnumber_t agnumber; - int bboff; - int blkoff; -- __uint64_t byte; -+ uint64_t byte; - xfs_daddr_t daddr; - xfs_fsblock_t fsblock; - xfs_ino_t ino; -@@ -76,7 +76,7 @@ typedef union { - int inooff; - } cval_t; - --static __uint64_t bytevalue(ctype_t ctype, cval_t *val); -+static uint64_t bytevalue(ctype_t ctype, cval_t *val); - static int convert_f(int argc, char **argv); - static int getvalue(char *s, ctype_t ctype, cval_t *val); - static ctype_t lookupcty(char *ctyname); -@@ -118,7 +118,7 @@ static const cmdinfo_t convert_cmd = - { "convert", NULL, convert_f, 3, 9, 0, "type num [type num]... type", - "convert from one address form to another", NULL }; - --static __uint64_t -+static uint64_t - bytevalue(ctype_t ctype, cval_t *val) - { - switch (ctype) { -@@ -129,9 +129,9 @@ bytevalue(ctype_t ctype, cval_t *val) - case CT_AGNUMBER: - return agnumber_to_bytes(val->agnumber); - case CT_BBOFF: -- return (__uint64_t)val->bboff; -+ return (uint64_t)val->bboff; - case CT_BLKOFF: -- return (__uint64_t)val->blkoff; -+ return (uint64_t)val->blkoff; - case CT_BYTE: - return val->byte; - case CT_DADDR: -@@ -143,7 +143,7 @@ bytevalue(ctype_t ctype, cval_t *val) - case CT_INOIDX: - return inoidx_to_bytes(val->inoidx); - case CT_INOOFF: -- return (__uint64_t)val->inooff; -+ return (uint64_t)val->inooff; - case CT_NONE: - case NCTS: - break; -@@ -160,7 +160,7 @@ convert_f(int argc, char **argv) - cval_t cvals[NCTS] = {}; - int i; - int mask; -- __uint64_t v; -+ uint64_t v; - ctype_t wtype; - - /* move past the "convert" command */ -@@ -262,7 +262,7 @@ static int - getvalue(char *s, ctype_t ctype, cval_t *val) - { - char *p; -- __uint64_t v; -+ uint64_t v; - - v = strtoull(s, &p, 0); - if (*p != '\0') { -@@ -286,7 +286,7 @@ getvalue(char *s, ctype_t ctype, cval_t *val) - val->blkoff = (int)v; - break; - case CT_BYTE: -- val->byte = (__uint64_t)v; -+ val->byte = (uint64_t)v; - break; - case CT_DADDR: - val->daddr = (xfs_daddr_t)v; -diff --git a/db/faddr.c b/db/faddr.c -index 877200bf..56207648 100644 ---- a/db/faddr.c -+++ b/db/faddr.c -@@ -79,11 +79,11 @@ fa_attrblock( - typnm_t next) - { - bmap_ext_t bm; -- __uint32_t bno; -+ uint32_t bno; - xfs_fsblock_t dfsbno; - int nex; - -- bno = (__uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); -+ bno = (uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); - if (bno == 0) { - dbprintf(_("null attribute block number, cannot set new addr\n")); - return; -@@ -96,7 +96,7 @@ fa_attrblock( - } - dfsbno = bm.startblock + (bno - bm.startoff); - ASSERT(typtab[next].typnm == next); -- set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), blkbb, -+ set_cur(&typtab[next], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), blkbb, - DB_RING_ADD, NULL); - } - -@@ -276,11 +276,11 @@ fa_dirblock( - { - bbmap_t bbmap; - bmap_ext_t *bmp; -- __uint32_t bno; -+ uint32_t bno; - xfs_fsblock_t dfsbno; - int nex; - -- bno = (__uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); -+ bno = (uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); - if (bno == 0) { - dbprintf(_("null directory block number, cannot set new addr\n")); - return; -@@ -297,7 +297,7 @@ fa_dirblock( - ASSERT(typtab[next].typnm == next); - if (nex > 1) - make_bbmap(&bbmap, nex, bmp); -- set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), -+ set_cur(&typtab[next], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - XFS_FSB_TO_BB(mp, mp->m_dir_geo->fsbcount), DB_RING_ADD, - nex > 1 ? &bbmap : NULL); - free(bmp); -@@ -317,7 +317,7 @@ fa_drfsbno( - return; - } - ASSERT(typtab[next].typnm == next); -- set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_BB(mp, bno), blkbb, -+ set_cur(&typtab[next], (int64_t)XFS_FSB_TO_BB(mp, bno), blkbb, - DB_RING_ADD, NULL); - } - -diff --git a/db/field.c b/db/field.c -index 865b0b71..f1e5f35e 100644 ---- a/db/field.c -+++ b/db/field.c -@@ -83,7 +83,7 @@ const ftattr_t ftattrtab[] = { - attr_sf_entry_size, FTARG_SIZE, NULL, attr_sf_entry_flds }, - { FLDT_ATTR_SF_HDR, "attr_sf_hdr", NULL, (char *)attr_sf_hdr_flds, - SI(bitsz(struct xfs_attr_sf_hdr)), 0, NULL, attr_sf_hdr_flds }, -- { FLDT_ATTRBLOCK, "attrblock", fp_num, "%u", SI(bitsz(__uint32_t)), 0, -+ { FLDT_ATTRBLOCK, "attrblock", fp_num, "%u", SI(bitsz(uint32_t)), 0, - fa_attrblock, NULL }, - { FLDT_ATTRSHORT, "attrshort", NULL, (char *)attr_shortform_flds, - attrshort_size, FTARG_SIZE, NULL, attr_shortform_flds }, -@@ -199,7 +199,7 @@ const ftattr_t ftattrtab[] = { - SI(bitsz(struct xfs_refcount_rec)), 0, NULL, refcbt_rec_flds }, - - /* CRC field */ -- { FLDT_CRC, "crc", fp_crc, "%#x (%s)", SI(bitsz(__uint32_t)), -+ { FLDT_CRC, "crc", fp_crc, "%#x (%s)", SI(bitsz(uint32_t)), - 0, NULL, NULL }, - - { FLDT_DEV, "dev", fp_num, "%#x", SI(bitsz(xfs_dev_t)), 0, NULL, NULL }, -@@ -214,7 +214,7 @@ const ftattr_t ftattrtab[] = { - { FLDT_DINODE_CORE, "dinode_core", NULL, (char *)inode_core_flds, - SI(bitsz(xfs_dinode_t)), 0, NULL, inode_core_flds }, - { FLDT_DINODE_FMT, "dinode_fmt", fp_dinode_fmt, NULL, -- SI(bitsz(__int8_t)), 0, NULL, NULL }, -+ SI(bitsz(int8_t)), 0, NULL, NULL }, - { FLDT_DINODE_U, "dinode_u", NULL, (char *)inode_u_flds, inode_u_size, - FTARG_SIZE|FTARG_OKEMPTY, NULL, inode_u_flds }, - { FLDT_DINODE_V3, "dinode_v3", NULL, (char *)inode_v3_flds, -@@ -295,7 +295,7 @@ const ftattr_t ftattrtab[] = { - { FLDT_DA3_NODE_HDR, "dir_node_hdr", NULL, (char *)da3_node_hdr_flds, - SI(bitsz(struct xfs_da3_node_hdr)), 0, NULL, da3_node_hdr_flds }, - -- { FLDT_DIRBLOCK, "dirblock", fp_num, "%u", SI(bitsz(__uint32_t)), 0, -+ { FLDT_DIRBLOCK, "dirblock", fp_num, "%u", SI(bitsz(uint32_t)), 0, - fa_dirblock, NULL }, - { FLDT_DISK_DQUOT, "disk_dquot", NULL, (char *)disk_dquot_flds, - SI(bitsz(xfs_disk_dquot_t)), 0, NULL, disk_dquot_flds }, -@@ -335,15 +335,15 @@ const ftattr_t ftattrtab[] = { - FTARG_SIZE, NULL, inode_crc_flds }, - { FLDT_INOFREE, "inofree", fp_num, "%#llx", SI(bitsz(xfs_inofree_t)), 0, - NULL, NULL }, -- { FLDT_INT16D, "int16d", fp_num, "%d", SI(bitsz(__int16_t)), -+ { FLDT_INT16D, "int16d", fp_num, "%d", SI(bitsz(int16_t)), - FTARG_SIGNED, NULL, NULL }, -- { FLDT_INT32D, "int32d", fp_num, "%d", SI(bitsz(__int32_t)), -+ { FLDT_INT32D, "int32d", fp_num, "%d", SI(bitsz(int32_t)), - FTARG_SIGNED, NULL, NULL }, -- { FLDT_INT64D, "int64d", fp_num, "%lld", SI(bitsz(__int64_t)), -+ { FLDT_INT64D, "int64d", fp_num, "%lld", SI(bitsz(int64_t)), - FTARG_SIGNED, NULL, NULL }, -- { FLDT_INT8D, "int8d", fp_num, "%d", SI(bitsz(__int8_t)), FTARG_SIGNED, -+ { FLDT_INT8D, "int8d", fp_num, "%d", SI(bitsz(int8_t)), FTARG_SIGNED, - NULL, NULL }, -- { FLDT_NSEC, "nsec", fp_num, "%09d", SI(bitsz(__int32_t)), FTARG_SIGNED, -+ { FLDT_NSEC, "nsec", fp_num, "%09d", SI(bitsz(int32_t)), FTARG_SIGNED, - NULL, NULL }, - { FLDT_QCNT, "qcnt", fp_num, "%llu", SI(bitsz(xfs_qcnt_t)), 0, NULL, - NULL }, -@@ -356,34 +356,34 @@ const ftattr_t ftattrtab[] = { - { FLDT_SYMLINK_CRC, "symlink", NULL, (char *)symlink_crc_flds, - symlink_size, FTARG_SIZE, NULL, symlink_crc_flds }, - -- { FLDT_TIME, "time", fp_time, NULL, SI(bitsz(__int32_t)), FTARG_SIGNED, -+ { FLDT_TIME, "time", fp_time, NULL, SI(bitsz(int32_t)), FTARG_SIGNED, - NULL, NULL }, - { FLDT_TIMESTAMP, "timestamp", NULL, (char *)timestamp_flds, - SI(bitsz(xfs_timestamp_t)), 0, NULL, timestamp_flds }, - { FLDT_UINT1, "uint1", fp_num, "%u", SI(1), 0, NULL, NULL }, -- { FLDT_UINT16D, "uint16d", fp_num, "%u", SI(bitsz(__uint16_t)), 0, NULL, -+ { FLDT_UINT16D, "uint16d", fp_num, "%u", SI(bitsz(uint16_t)), 0, NULL, - NULL }, -- { FLDT_UINT16O, "uint16o", fp_num, "%#o", SI(bitsz(__uint16_t)), 0, -+ { FLDT_UINT16O, "uint16o", fp_num, "%#o", SI(bitsz(uint16_t)), 0, - NULL, NULL }, -- { FLDT_UINT16X, "uint16x", fp_num, "%#x", SI(bitsz(__uint16_t)), 0, -+ { FLDT_UINT16X, "uint16x", fp_num, "%#x", SI(bitsz(uint16_t)), 0, - NULL, NULL }, -- { FLDT_UINT32D, "uint32d", fp_num, "%u", SI(bitsz(__uint32_t)), 0, NULL, -+ { FLDT_UINT32D, "uint32d", fp_num, "%u", SI(bitsz(uint32_t)), 0, NULL, - NULL }, -- { FLDT_UINT32O, "uint32o", fp_num, "%#o", SI(bitsz(__uint32_t)), 0, -+ { FLDT_UINT32O, "uint32o", fp_num, "%#o", SI(bitsz(uint32_t)), 0, - NULL, NULL }, -- { FLDT_UINT32X, "uint32x", fp_num, "%#x", SI(bitsz(__uint32_t)), 0, -+ { FLDT_UINT32X, "uint32x", fp_num, "%#x", SI(bitsz(uint32_t)), 0, - NULL, NULL }, -- { FLDT_UINT64D, "uint64d", fp_num, "%llu", SI(bitsz(__uint64_t)), 0, -+ { FLDT_UINT64D, "uint64d", fp_num, "%llu", SI(bitsz(uint64_t)), 0, - NULL, NULL }, -- { FLDT_UINT64O, "uint64o", fp_num, "%#llo", SI(bitsz(__uint64_t)), 0, -+ { FLDT_UINT64O, "uint64o", fp_num, "%#llo", SI(bitsz(uint64_t)), 0, - NULL, NULL }, -- { FLDT_UINT64X, "uint64x", fp_num, "%#llx", SI(bitsz(__uint64_t)), 0, -+ { FLDT_UINT64X, "uint64x", fp_num, "%#llx", SI(bitsz(uint64_t)), 0, - NULL, NULL }, -- { FLDT_UINT8D, "uint8d", fp_num, "%u", SI(bitsz(__uint8_t)), 0, NULL, -+ { FLDT_UINT8D, "uint8d", fp_num, "%u", SI(bitsz(uint8_t)), 0, NULL, - NULL }, -- { FLDT_UINT8O, "uint8o", fp_num, "%#o", SI(bitsz(__uint8_t)), 0, NULL, -+ { FLDT_UINT8O, "uint8o", fp_num, "%#o", SI(bitsz(uint8_t)), 0, NULL, - NULL }, -- { FLDT_UINT8X, "uint8x", fp_num, "%#x", SI(bitsz(__uint8_t)), 0, NULL, -+ { FLDT_UINT8X, "uint8x", fp_num, "%#x", SI(bitsz(uint8_t)), 0, NULL, - NULL }, - { FLDT_UUID, "uuid", fp_uuid, NULL, SI(bitsz(uuid_t)), 0, NULL, NULL }, - { FLDT_ZZZ, NULL } -diff --git a/db/fprint.c b/db/fprint.c -index fd7e7f45..261a31ef 100644 ---- a/db/fprint.c -+++ b/db/fprint.c -@@ -80,7 +80,7 @@ fp_num( - int bitpos; - int i; - int isnull; -- __int64_t val; -+ int64_t val; - - for (i = 0, bitpos = bit; - i < count && !seenint(); -@@ -100,7 +100,7 @@ fp_num( - else if (size > 32) - dbprintf(fmtstr, val); - else -- dbprintf(fmtstr, (__int32_t)val); -+ dbprintf(fmtstr, (int32_t)val); - if (i < count - 1) - dbprintf(" "); - } -@@ -203,7 +203,7 @@ fp_crc( - { - int bitpos; - int i; -- __int64_t val; -+ int64_t val; - char *ok; - - switch (iocur_crc_valid()) { -@@ -230,7 +230,7 @@ fp_crc( - if (size > 32) - dbprintf(fmtstr, val, ok); - else -- dbprintf(fmtstr, (__int32_t)val, ok); -+ dbprintf(fmtstr, (int32_t)val, ok); - if (i < count - 1) - dbprintf(" "); - } -diff --git a/db/frag.c b/db/frag.c -index 8005e45d..d224f0c2 100644 ---- a/db/frag.c -+++ b/db/frag.c -@@ -42,8 +42,8 @@ typedef struct extmap { - - static int aflag; - static int dflag; --static __uint64_t extcount_actual; --static __uint64_t extcount_ideal; -+static uint64_t extcount_actual; -+static uint64_t extcount_ideal; - static int fflag; - static int lflag; - static int qflag; -@@ -310,8 +310,8 @@ process_inode( - xfs_agino_t agino, - xfs_dinode_t *dip) - { -- __uint64_t actual; -- __uint64_t ideal; -+ uint64_t actual; -+ uint64_t ideal; - xfs_ino_t ino; - int skipa; - int skipd; -diff --git a/db/inode.c b/db/inode.c -index 8b7a41e4..6cc47d6a 100644 ---- a/db/inode.c -+++ b/db/inode.c -@@ -119,49 +119,49 @@ const field_t inode_core_flds[] = { - { "dmstate", FLDT_UINT16D, OI(COFF(dmstate)), C1, 0, TYP_NONE }, - { "flags", FLDT_UINT16X, OI(COFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, - { "newrtbm", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NEWRTBM_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NEWRTBM_BIT - 1), C1, - 0, TYP_NONE }, - { "prealloc", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_PREALLOC_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_PREALLOC_BIT - 1), C1, - 0, TYP_NONE }, - { "realtime", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_REALTIME_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_REALTIME_BIT - 1), C1, - 0, TYP_NONE }, - { "immutable", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_IMMUTABLE_BIT-1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_IMMUTABLE_BIT-1), C1, - 0, TYP_NONE }, - { "append", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_APPEND_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_APPEND_BIT - 1), C1, - 0, TYP_NONE }, - { "sync", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_SYNC_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_SYNC_BIT - 1), C1, - 0, TYP_NONE }, - { "noatime", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NOATIME_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NOATIME_BIT - 1), C1, - 0, TYP_NONE }, - { "nodump", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NODUMP_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NODUMP_BIT - 1), C1, - 0, TYP_NONE }, - { "rtinherit", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_RTINHERIT_BIT-1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_RTINHERIT_BIT-1), C1, - 0, TYP_NONE }, - { "projinherit", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_PROJINHERIT_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_PROJINHERIT_BIT-1), C1, - 0, TYP_NONE }, - { "nosymlinks", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NOSYMLINKS_BIT-1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NOSYMLINKS_BIT-1), C1, - 0, TYP_NONE }, - { "extsz", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_EXTSIZE_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_EXTSIZE_BIT-1), C1, - 0, TYP_NONE }, - { "extszinherit", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_EXTSZINHERIT_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_EXTSZINHERIT_BIT-1), C1, - 0, TYP_NONE }, - { "nodefrag", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NODEFRAG_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NODEFRAG_BIT-1), C1, - 0, TYP_NONE }, - { "filestream", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_FILESTREAM_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_FILESTREAM_BIT-1), C1, - 0, TYP_NONE }, - { "gen", FLDT_UINT32D, OI(COFF(gen)), C1, 0, TYP_NONE }, - { NULL } -@@ -177,10 +177,10 @@ const field_t inode_v3_flds[] = { - { "inumber", FLDT_INO, OI(COFF(ino)), C1, 0, TYP_NONE }, - { "uuid", FLDT_UUID, OI(COFF(uuid)), C1, 0, TYP_NONE }, - { "reflink", FLDT_UINT1, -- OI(COFF(flags2) + bitsz(__uint64_t) - XFS_DIFLAG2_REFLINK_BIT-1), C1, -+ OI(COFF(flags2) + bitsz(uint64_t) - XFS_DIFLAG2_REFLINK_BIT-1), C1, - 0, TYP_NONE }, - { "cowextsz", FLDT_UINT1, -- OI(COFF(flags2) + bitsz(__uint64_t) - XFS_DIFLAG2_COWEXTSIZE_BIT-1), C1, -+ OI(COFF(flags2) + bitsz(uint64_t) - XFS_DIFLAG2_COWEXTSIZE_BIT-1), C1, - 0, TYP_NONE }, - { NULL } - }; -diff --git a/db/io.c b/db/io.c -index 1f27f6b3..fd9b9f4b 100644 ---- a/db/io.c -+++ b/db/io.c -@@ -545,7 +545,7 @@ set_cur( - struct xfs_buf *bp; - xfs_ino_t dirino; - xfs_ino_t ino; -- __uint16_t mode; -+ uint16_t mode; - const struct xfs_buf_ops *ops = type ? type->bops : NULL; - - if (iocur_sp < 0) { -diff --git a/db/io.h b/db/io.h -index 99730048..df0fdd75 100644 ---- a/db/io.h -+++ b/db/io.h -@@ -25,7 +25,7 @@ typedef struct bbmap { - } bbmap_t; - - typedef struct iocur { -- __int64_t bb; /* BB number in filesystem of buf */ -+ int64_t bb; /* BB number in filesystem of buf */ - int blen; /* length of "buf", bb's */ - int boff; /* data - buf */ - void *buf; /* base address of buffer */ -@@ -33,7 +33,7 @@ typedef struct iocur { - xfs_ino_t dirino; /* current directory inode number */ - xfs_ino_t ino; /* current inode number */ - int len; /* length of "data", bytes */ -- __uint16_t mode; /* current inode's mode */ -+ uint16_t mode; /* current inode's mode */ - xfs_off_t off; /* fs offset of "data" in bytes */ - const struct typ *typ; /* type of "data" */ - bbmap_t *bbmap; /* map daddr if fragmented */ -@@ -57,7 +57,7 @@ extern void off_cur(int off, int len); - extern void pop_cur(void); - extern void print_iocur(char *tag, iocur_t *ioc); - extern void push_cur(void); --extern int read_buf(__int64_t daddr, int count, void *bufp); -+extern int read_buf(int64_t daddr, int count, void *bufp); - extern void write_cur(void); - extern void set_cur(const struct typ *type, xfs_daddr_t blknum, - int len, int ring_add, bbmap_t *bbmap); -diff --git a/db/metadump.c b/db/metadump.c -index 31bb5959..67bdf14e 100644 ---- a/db/metadump.c -+++ b/db/metadump.c -@@ -175,7 +175,7 @@ write_index(void) - static int - write_buf_segment( - char *data, -- __int64_t off, -+ int64_t off, - int len) - { - int i; -@@ -1256,7 +1256,7 @@ process_sf_dir( - { - struct xfs_dir2_sf_hdr *sfp; - xfs_dir2_sf_entry_t *sfep; -- __uint64_t ino_dir_size; -+ uint64_t ino_dir_size; - int i; - - sfp = (struct xfs_dir2_sf_hdr *)XFS_DFORK_DPTR(dip); -@@ -1322,7 +1322,7 @@ process_sf_dir( - static void - obfuscate_path_components( - char *buf, -- __uint64_t len) -+ uint64_t len) - { - unsigned char *comp = (unsigned char *)buf; - unsigned char *end = comp + len; -@@ -1359,7 +1359,7 @@ static void - process_sf_symlink( - xfs_dinode_t *dip) - { -- __uint64_t len; -+ uint64_t len; - char *buf; - - len = be64_to_cpu(dip->di_size); -@@ -1631,7 +1631,7 @@ process_attr_block( - xfs_attr_leaf_entry_t *entry; - xfs_attr_leaf_name_local_t *local; - xfs_attr_leaf_name_remote_t *remote; -- __uint32_t bs = mp->m_sb.sb_blocksize; -+ uint32_t bs = mp->m_sb.sb_blocksize; - char *first_name; - - -@@ -2270,7 +2270,7 @@ done: - return success; - } - --static __uint32_t inodes_copied = 0; -+static uint32_t inodes_copied; - - static int - copy_inode_chunk( -diff --git a/db/sb.c b/db/sb.c -index 8e7722cd..f19248d7 100644 ---- a/db/sb.c -+++ b/db/sb.c -@@ -606,7 +606,7 @@ version_help(void) - } - - static int --do_version(xfs_agnumber_t agno, __uint16_t version, __uint32_t features) -+do_version(xfs_agnumber_t agno, uint16_t version, uint32_t features) - { - xfs_sb_t tsb; - -@@ -710,8 +710,8 @@ version_f( - int argc, - char **argv) - { -- __uint16_t version = 0; -- __uint32_t features = 0; -+ uint16_t version = 0; -+ uint32_t features = 0; - xfs_agnumber_t ag; - - if (argc == 2) { /* WRITE VERSION */ -diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c -index 517b75f0..d4846a32 100644 ---- a/fsr/xfs_fsr.c -+++ b/fsr/xfs_fsr.c -@@ -54,7 +54,7 @@ struct getbmap *outmap = NULL; - int outmap_size = 0; - int RealUid; - int tmp_agi; --static __int64_t minimumfree = 2048; -+static int64_t minimumfree = 2048; - - #define MNTTYPE_XFS "xfs" - -diff --git a/include/darwin.h b/include/darwin.h -index 7bbd5764..51031c42 100644 ---- a/include/darwin.h -+++ b/include/darwin.h -@@ -125,15 +125,15 @@ typedef signed int __s32; - typedef unsigned long long int __u64; - typedef signed long long int __s64; - --#define __int8_t int8_t --#define __int16_t int16_t --#define __int32_t int32_t --#define __int32_t int32_t --#define __int64_t int64_t --#define __uint8_t u_int8_t --#define __uint16_t u_int16_t --#define __uint32_t u_int32_t --#define __uint64_t u_int64_t -+#define int8_t int8_t -+#define int16_t int16_t -+#define int32_t int32_t -+#define int32_t int32_t -+#define int64_t int64_t -+#define uint8_t u_int8_t -+#define uint16_t u_int16_t -+#define uint32_t u_int32_t -+#define uint64_t u_int64_t - - typedef off_t xfs_off_t; - typedef u_int64_t xfs_ino_t; -diff --git a/include/freebsd.h b/include/freebsd.h -index fb318b89..f52ed0a9 100644 ---- a/include/freebsd.h -+++ b/include/freebsd.h -@@ -50,9 +50,9 @@ typedef unsigned long long int __u64; - typedef signed long long int __s64; - - typedef off_t xfs_off_t; --typedef __uint64_t xfs_ino_t; --typedef __uint32_t xfs_dev_t; --typedef __int64_t xfs_daddr_t; -+typedef uint64_t xfs_ino_t; -+typedef uint32_t xfs_dev_t; -+typedef int64_t xfs_daddr_t; - typedef __u32 xfs_nlink_t; - - #define O_LARGEFILE 0 -diff --git a/include/gnukfreebsd.h b/include/gnukfreebsd.h -index 6916e65a..1db3f4f0 100644 ---- a/include/gnukfreebsd.h -+++ b/include/gnukfreebsd.h -@@ -46,9 +46,9 @@ typedef unsigned long long int __u64; - typedef signed long long int __s64; - - typedef off_t xfs_off_t; --typedef __uint64_t xfs_ino_t; --typedef __uint32_t xfs_dev_t; --typedef __int64_t xfs_daddr_t; -+typedef uint64_t xfs_ino_t; -+typedef uint32_t xfs_dev_t; -+typedef int64_t xfs_daddr_t; - typedef __u32 xfs_nlink_t; - - #define HAVE_FID 1 -diff --git a/include/libxcmd.h b/include/libxcmd.h -index e8d2ffc8..6806380c 100644 ---- a/include/libxcmd.h -+++ b/include/libxcmd.h -@@ -42,10 +42,10 @@ get_topology( - extern void - calc_default_ag_geometry( - int blocklog, -- __uint64_t dblocks, -+ uint64_t dblocks, - int multidisk, -- __uint64_t *agsize, -- __uint64_t *agcount); -+ uint64_t *agsize, -+ uint64_t *agcount); - - extern int - check_overwrite( -diff --git a/include/linux.h b/include/linux.h -index 9611a37f..6ce344c5 100644 ---- a/include/linux.h -+++ b/include/linux.h -@@ -132,7 +132,7 @@ static __inline__ void platform_uuid_copy(uuid_t *dst, uuid_t *src) - static __inline__ int - platform_discard_blocks(int fd, uint64_t start, uint64_t len) - { -- __uint64_t range[2] = { start, len }; -+ uint64_t range[2] = { start, len }; - - if (ioctl(fd, BLKDISCARD, &range) < 0) - return errno; -@@ -144,9 +144,9 @@ platform_discard_blocks(int fd, uint64_t start, uint64_t len) - #define EFSBADCRC EBADMSG /* Bad CRC detected */ - - typedef off_t xfs_off_t; --typedef __uint64_t xfs_ino_t; --typedef __uint32_t xfs_dev_t; --typedef __int64_t xfs_daddr_t; -+typedef uint64_t xfs_ino_t; -+typedef uint32_t xfs_dev_t; -+typedef int64_t xfs_daddr_t; - typedef __u32 xfs_nlink_t; - - /** -diff --git a/include/xfs_arch.h b/include/xfs_arch.h -index 12cd43e6..186cadba 100644 ---- a/include/xfs_arch.h -+++ b/include/xfs_arch.h -@@ -244,39 +244,39 @@ static inline void be64_add_cpu(__be64 *a, __s64 b) - *a = cpu_to_be64(be64_to_cpu(*a) + b); - } - --static inline __uint16_t get_unaligned_be16(void *p) -+static inline uint16_t get_unaligned_be16(void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - return __p[0] << 8 | __p[1]; - } - --static inline __uint32_t get_unaligned_be32(void *p) -+static inline uint32_t get_unaligned_be32(void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - return __p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3]; - } - --static inline __uint64_t get_unaligned_be64(void *p) -+static inline uint64_t get_unaligned_be64(void *p) - { -- return (__uint64_t)get_unaligned_be32(p) << 32 | -+ return (uint64_t)get_unaligned_be32(p) << 32 | - get_unaligned_be32(p + 4); - } - --static inline void put_unaligned_be16(__uint16_t val, void *p) -+static inline void put_unaligned_be16(uint16_t val, void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - *__p++ = val >> 8; - *__p++ = val; - } - --static inline void put_unaligned_be32(__uint32_t val, void *p) -+static inline void put_unaligned_be32(uint32_t val, void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - put_unaligned_be16(val >> 16, __p); - put_unaligned_be16(val, __p + 2); - } - --static inline void put_unaligned_be64(__uint64_t val, void *p) -+static inline void put_unaligned_be64(uint64_t val, void *p) - { - put_unaligned_be32(val >> 32, p); - put_unaligned_be32(val, p + 4); -diff --git a/include/xfs_inode.h b/include/xfs_inode.h -index fb6b5429..8766024e 100644 ---- a/include/xfs_inode.h -+++ b/include/xfs_inode.h -@@ -123,8 +123,8 @@ xfs_get_projid(struct xfs_icdinode *id) - static inline void - xfs_set_projid(struct xfs_icdinode *id, prid_t projid) - { -- id->di_projid_hi = (__uint16_t) (projid >> 16); -- id->di_projid_lo = (__uint16_t) (projid & 0xffff); -+ id->di_projid_hi = (uint16_t) (projid >> 16); -+ id->di_projid_lo = (uint16_t) (projid & 0xffff); - } - - static inline bool xfs_is_reflink_inode(struct xfs_inode *ip) -diff --git a/include/xfs_log_recover.h b/include/xfs_log_recover.h -index 7582676b..0d098628 100644 ---- a/include/xfs_log_recover.h -+++ b/include/xfs_log_recover.h -@@ -26,7 +26,7 @@ - #define XLOG_RHASH_SIZE 16 - #define XLOG_RHASH_SHIFT 2 - #define XLOG_RHASH(tid) \ -- ((((__uint32_t)tid)>>XLOG_RHASH_SHIFT) & (XLOG_RHASH_SIZE-1)) -+ ((((uint32_t)tid)>>XLOG_RHASH_SHIFT) & (XLOG_RHASH_SIZE-1)) - - #define XLOG_MAX_REGIONS_IN_ITEM (XFS_MAX_BLOCKSIZE / XFS_BLF_CHUNK / 2 + 1) - -diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h -index 7f3039eb..13afb8dd 100644 ---- a/include/xfs_metadump.h -+++ b/include/xfs_metadump.h -@@ -24,8 +24,8 @@ - typedef struct xfs_metablock { - __be32 mb_magic; - __be16 mb_count; -- __uint8_t mb_blocklog; -- __uint8_t mb_info; -+ uint8_t mb_blocklog; -+ uint8_t mb_info; - /* followed by an array of xfs_daddr_t */ - } xfs_metablock_t; - -diff --git a/include/xfs_mount.h b/include/xfs_mount.h -index 5ff24ebf..5b323bb1 100644 ---- a/include/xfs_mount.h -+++ b/include/xfs_mount.h -@@ -48,12 +48,12 @@ typedef struct xfs_mount { - #define m_dev m_ddev_targp - #define m_logdev m_logdev_targp - #define m_rtdev m_rtdev_targp -- __uint8_t m_dircook_elog; /* log d-cookie entry bits */ -- __uint8_t m_blkbit_log; /* blocklog + NBBY */ -- __uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ -- __uint8_t m_sectbb_log; /* sectorlog - BBSHIFT */ -- __uint8_t m_agno_log; /* log #ag's */ -- __uint8_t m_agino_log; /* #bits for agino in inum */ -+ uint8_t m_dircook_elog; /* log d-cookie entry bits */ -+ uint8_t m_blkbit_log; /* blocklog + NBBY */ -+ uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ -+ uint8_t m_sectbb_log; /* sectorlog - BBSHIFT */ -+ uint8_t m_agno_log; /* log #ag's */ -+ uint8_t m_agino_log; /* #bits for agino in inum */ - uint m_inode_cluster_size;/* min inode buf size */ - uint m_blockmask; /* sb_blocksize-1 */ - uint m_blockwsize; /* sb_blocksize in words */ -@@ -88,7 +88,7 @@ typedef struct xfs_mount { - int m_litino; /* size of inode union area */ - int m_inoalign_mask;/* mask sb_inoalignmt if used */ - struct xfs_trans_resv m_resv; /* precomputed res values */ -- __uint64_t m_maxicount; /* maximum inode count */ -+ uint64_t m_maxicount; /* maximum inode count */ - int m_dalign; /* stripe unit */ - int m_swidth; /* stripe width */ - int m_sinoalign; /* stripe unit inode alignmnt */ -@@ -144,12 +144,12 @@ typedef struct xfs_perag { - char pagi_init; /* this agi's entry is initialized */ - char pagf_metadata; /* the agf is preferred to be metadata */ - char pagi_inodeok; /* The agi is ok for inodes */ -- __uint8_t pagf_levels[XFS_BTNUM_AGF]; -+ uint8_t pagf_levels[XFS_BTNUM_AGF]; - /* # of levels in bno & cnt btree */ -- __uint32_t pagf_flcount; /* count of blocks in freelist */ -+ uint32_t pagf_flcount; /* count of blocks in freelist */ - xfs_extlen_t pagf_freeblks; /* total free blocks */ - xfs_extlen_t pagf_longest; /* longest free space */ -- __uint32_t pagf_btreeblks; /* # of blocks held in AGF btrees */ -+ uint32_t pagf_btreeblks; /* # of blocks held in AGF btrees */ - xfs_agino_t pagi_freecount; /* number of free inodes */ - xfs_agino_t pagi_count; /* number of allocated inodes */ - -@@ -169,7 +169,7 @@ typedef struct xfs_perag { - struct xfs_ag_resv pag_agfl_resv; - - /* reference count */ -- __uint8_t pagf_refcount_level; -+ uint8_t pagf_refcount_level; - } xfs_perag_t; - - static inline struct xfs_ag_resv * -diff --git a/libhandle/handle.c b/libhandle/handle.c -index 236ed22a..00127b3c 100644 ---- a/libhandle/handle.c -+++ b/libhandle/handle.c -@@ -232,7 +232,7 @@ obj_to_handle( - { - char hbuf [MAXHANSIZ]; - int ret; -- __uint32_t handlen; -+ uint32_t handlen; - xfs_fsop_handlereq_t hreq; - - if (opcode == XFS_IOC_FD_TO_HANDLE) { -diff --git a/libhandle/jdm.c b/libhandle/jdm.c -index e52f5d83..821061b4 100644 ---- a/libhandle/jdm.c -+++ b/libhandle/jdm.c -@@ -36,7 +36,7 @@ typedef struct filehandle { - fshandle_t fh_fshandle; /* handle of fs containing this inode */ - int16_t fh_sz_following; /* bytes in handle after this member */ - char fh_pad[FILEHANDLE_SZ_PAD]; /* padding, must be zeroed */ -- __uint32_t fh_gen; /* generation count */ -+ uint32_t fh_gen; /* generation count */ - xfs_ino_t fh_ino; /* 64 bit ino */ - } filehandle_t; - -diff --git a/libxcmd/topology.c b/libxcmd/topology.c -index 8b0276a7..f66dd1bc 100644 ---- a/libxcmd/topology.c -+++ b/libxcmd/topology.c -@@ -23,19 +23,19 @@ - #endif /* ENABLE_BLKID */ - #include "xfs_multidisk.h" - --#define TERABYTES(count, blog) ((__uint64_t)(count) << (40 - (blog))) --#define GIGABYTES(count, blog) ((__uint64_t)(count) << (30 - (blog))) --#define MEGABYTES(count, blog) ((__uint64_t)(count) << (20 - (blog))) -+#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) -+#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) -+#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog))) - - void - calc_default_ag_geometry( - int blocklog, -- __uint64_t dblocks, -+ uint64_t dblocks, - int multidisk, -- __uint64_t *agsize, -- __uint64_t *agcount) -+ uint64_t *agsize, -+ uint64_t *agcount) - { -- __uint64_t blocks = 0; -+ uint64_t blocks = 0; - int shift = 0; - - /* -diff --git a/libxfs/darwin.c b/libxfs/darwin.c -index 74507e81..16d2c35c 100644 ---- a/libxfs/darwin.c -+++ b/libxfs/darwin.c -@@ -68,7 +68,7 @@ platform_flush_device(int fd, dev_t device) - void - platform_findsizes(char *path, int fd, long long *sz, int *bsz) - { -- __uint64_t size; -+ uint64_t size; - struct stat st; - - if (fstat(fd, &st) < 0) { -diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c -index 4667d1f5..d7bca142 100644 ---- a/libxfs/freebsd.c -+++ b/libxfs/freebsd.c -@@ -109,7 +109,7 @@ void - platform_findsizes(char *path, int fd, long long *sz, int *bsz) - { - struct stat st; -- __int64_t size; -+ int64_t size; - u_int ssize; - - if (fstat(fd, &st) < 0) { -diff --git a/libxfs/init.c b/libxfs/init.c -index fc14c5e4..0f41a853 100644 ---- a/libxfs/init.c -+++ b/libxfs/init.c -@@ -546,7 +546,7 @@ libxfs_initialize_perag( - * the max inode percentage. - */ - if (mp->m_maxicount) { -- __uint64_t icount; -+ uint64_t icount; - - icount = sbp->sb_dblocks * sbp->sb_imax_pct; - do_div(icount, 100); -diff --git a/libxfs/irix.c b/libxfs/irix.c -index 32fcb3e5..0f14aec7 100644 ---- a/libxfs/irix.c -+++ b/libxfs/irix.c -@@ -22,7 +22,7 @@ - - int platform_has_uuid = 0; - extern char *progname; --extern __int64_t findsize(char *); -+extern int64_t findsize(char *); - - int - platform_check_ismounted(char *name, char *block, struct stat *s, int verbose) -diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h -index b4f766db..d525b667 100644 ---- a/libxfs/libxfs_priv.h -+++ b/libxfs/libxfs_priv.h -@@ -296,8 +296,8 @@ roundup_pow_of_two(uint v) - return 0; - } - --static inline __uint64_t --roundup_64(__uint64_t x, __uint32_t y) -+static inline uint64_t -+roundup_64(uint64_t x, uint32_t y) - { - x += y - 1; - do_div(x, y); -diff --git a/libxfs/linux.c b/libxfs/linux.c -index 69f04ad9..0bace3eb 100644 ---- a/libxfs/linux.c -+++ b/libxfs/linux.c -@@ -163,7 +163,7 @@ void - platform_findsizes(char *path, int fd, long long *sz, int *bsz) - { - struct stat st; -- __uint64_t size; -+ uint64_t size; - int error; - - if (fstat(fd, &st) < 0) { -diff --git a/libxfs/logitem.c b/libxfs/logitem.c -index 7e93f609..466b4421 100644 ---- a/libxfs/logitem.c -+++ b/libxfs/logitem.c -@@ -121,7 +121,7 @@ xfs_buf_item_init( - bip->bli_item.li_mountp = mp; - bip->bli_buf = bp; - bip->bli_format.blf_type = XFS_LI_BUF; -- bip->bli_format.blf_blkno = (__int64_t)XFS_BUF_ADDR(bp); -+ bip->bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp); - bip->bli_format.blf_len = (unsigned short)BTOBB(XFS_BUF_COUNT(bp)); - XFS_BUF_SET_FSPRIVATE(bp, bip); - } -diff --git a/libxfs/radix-tree.c b/libxfs/radix-tree.c -index eef9c36d..3f0257fe 100644 ---- a/libxfs/radix-tree.c -+++ b/libxfs/radix-tree.c -@@ -66,21 +66,21 @@ static unsigned long height_to_maxindex[RADIX_TREE_MAX_PATH]; - static inline void tag_set(struct radix_tree_node *node, unsigned int tag, - int offset) - { -- *((__uint32_t *)node->tags[tag] + (offset >> 5)) |= (1 << (offset & 31)); -+ *((uint32_t *)node->tags[tag] + (offset >> 5)) |= (1 << (offset & 31)); - } - - static inline void tag_clear(struct radix_tree_node *node, unsigned int tag, - int offset) - { -- __uint32_t *p = (__uint32_t*)node->tags[tag] + (offset >> 5); -- __uint32_t m = 1 << (offset & 31); -+ uint32_t *p = (uint32_t*)node->tags[tag] + (offset >> 5); -+ uint32_t m = 1 << (offset & 31); - *p &= ~m; - } - - static inline int tag_get(struct radix_tree_node *node, unsigned int tag, - int offset) - { -- return 1 & (((const __uint32_t *)node->tags[tag])[offset >> 5] >> (offset & 31)); -+ return 1 & (((const uint32_t *)node->tags[tag])[offset >> 5] >> (offset & 31)); - } - - /* -diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c -index 21c42f14..474e5ebc 100644 ---- a/libxfs/rdwr.c -+++ b/libxfs/rdwr.c -@@ -118,9 +118,9 @@ static void unmount_record(void *p) - xlog_op_header_t *op = (xlog_op_header_t *)p; - /* the data section must be 32 bit size aligned */ - struct { -- __uint16_t magic; -- __uint16_t pad1; -- __uint32_t pad2; /* may as well make it 64 bits */ -+ uint16_t magic; -+ uint16_t pad1; -+ uint32_t pad2; /* may as well make it 64 bits */ - } magic = { XLOG_UNMOUNT_TYPE, 0, 0 }; - - memset(p, 0, BBSIZE); -diff --git a/libxfs/util.c b/libxfs/util.c -index dcfca397..7938e317 100644 ---- a/libxfs/util.c -+++ b/libxfs/util.c -@@ -170,8 +170,8 @@ libxfs_trans_ichgtime( - if (flags & XFS_ICHGTIME_CHG) - VFS_I(ip)->i_ctime = tv; - if (flags & XFS_ICHGTIME_CREATE) { -- ip->i_d.di_crtime.t_sec = (__int32_t)tv.tv_sec; -- ip->i_d.di_crtime.t_nsec = (__int32_t)tv.tv_nsec; -+ ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec; -+ ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec; - } - } - -@@ -261,8 +261,8 @@ libxfs_ialloc( - ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid)); - VFS_I(ip)->i_version = 1; - ip->i_d.di_flags2 = 0; -- ip->i_d.di_crtime.t_sec = (__int32_t)VFS_I(ip)->i_mtime.tv_sec; -- ip->i_d.di_crtime.t_nsec = (__int32_t)VFS_I(ip)->i_mtime.tv_nsec; -+ ip->i_d.di_crtime.t_sec = (int32_t)VFS_I(ip)->i_mtime.tv_sec; -+ ip->i_d.di_crtime.t_nsec = (int32_t)VFS_I(ip)->i_mtime.tv_nsec; - } - - flags = XFS_ILOG_CORE; -diff --git a/logprint/log_misc.c b/logprint/log_misc.c -index 0dfcfd19..2fd01ceb 100644 ---- a/logprint/log_misc.c -+++ b/logprint/log_misc.c -@@ -166,12 +166,12 @@ xlog_print_trans_header(char **ptr, int len) - { - xfs_trans_header_t *h; - char *cptr = *ptr; -- __uint32_t magic; -+ uint32_t magic; - char *magic_c = (char *)&magic; - - *ptr += len; - -- magic=*(__uint32_t*)cptr; /* XXX be32_to_cpu soon */ -+ magic = *(uint32_t *)cptr; /* XXX be32_to_cpu soon */ - - if (len >= 4) { - #if __BYTE_ORDER == __LITTLE_ENDIAN -@@ -201,7 +201,7 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops) - int num, skip; - int super_block = 0; - int bucket, col, buckets; -- __int64_t blkno; -+ int64_t blkno; - xfs_buf_log_format_t lbuf; - int size, blen, map_size, struct_size; - __be64 x, y; -diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c -index 9d1b4e80..c49c13aa 100644 ---- a/mdrestore/xfs_mdrestore.c -+++ b/mdrestore/xfs_mdrestore.c -@@ -66,7 +66,7 @@ perform_restore( - int mb_count; - xfs_metablock_t tmb; - xfs_sb_t sb; -- __int64_t bytes_read; -+ int64_t bytes_read; - - /* - * read in first blocks (superblock 0), set "inprogress" flag for it, -diff --git a/mkfs/proto.c b/mkfs/proto.c -index 89cd2379..cf8cc391 100644 ---- a/mkfs/proto.c -+++ b/mkfs/proto.c -@@ -667,7 +667,7 @@ rtinit( - mp->m_sb.sb_rbmino = rbmip->i_ino; - rbmip->i_d.di_size = mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize; - rbmip->i_d.di_flags = XFS_DIFLAG_NEWRTBM; -- *(__uint64_t *)&VFS_I(rbmip)->i_atime = 0; -+ *(uint64_t *)&VFS_I(rbmip)->i_atime = 0; - libxfs_trans_log_inode(tp, rbmip, XFS_ILOG_CORE); - libxfs_log_sb(tp); - mp->m_rbmip = rbmip; -diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c -index b5c3a57e..7bb6408f 100644 ---- a/mkfs/xfs_mkfs.c -+++ b/mkfs/xfs_mkfs.c -@@ -705,9 +705,9 @@ struct opt_params mopts = { - }, - }; - --#define TERABYTES(count, blog) ((__uint64_t)(count) << (40 - (blog))) --#define GIGABYTES(count, blog) ((__uint64_t)(count) << (30 - (blog))) --#define MEGABYTES(count, blog) ((__uint64_t)(count) << (20 - (blog))) -+#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) -+#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) -+#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog))) - - /* - * Use this macro before we have superblock and mount structure -@@ -878,7 +878,7 @@ fixup_log_stripe_unit( - xfs_rfsblock_t *logblocks, - int blocklog) - { -- __uint64_t tmp_logblocks; -+ uint64_t tmp_logblocks; - - /* - * Make sure that the log size is a multiple of the stripe unit -@@ -910,7 +910,7 @@ fixup_internal_log_stripe( - xfs_mount_t *mp, - int lsflag, - xfs_fsblock_t logstart, -- __uint64_t agsize, -+ uint64_t agsize, - int sunit, - xfs_rfsblock_t *logblocks, - int blocklog, -@@ -934,7 +934,7 @@ fixup_internal_log_stripe( - } - - void --validate_log_size(__uint64_t logblocks, int blocklog, int min_logblocks) -+validate_log_size(uint64_t logblocks, int blocklog, int min_logblocks) - { - if (logblocks < min_logblocks) { - fprintf(stderr, -@@ -959,7 +959,7 @@ validate_log_size(__uint64_t logblocks, int blocklog, int min_logblocks) - static int - calc_default_imaxpct( - int blocklog, -- __uint64_t dblocks) -+ uint64_t dblocks) - { - /* - * This returns the % of the disk space that is used for -@@ -981,9 +981,9 @@ calc_default_imaxpct( - static void - validate_ag_geometry( - int blocklog, -- __uint64_t dblocks, -- __uint64_t agsize, -- __uint64_t agcount) -+ uint64_t dblocks, -+ uint64_t agsize, -+ uint64_t agcount) - { - if (agsize < XFS_AG_MIN_BLOCKS(blocklog)) { - fprintf(stderr, -@@ -1059,7 +1059,7 @@ zero_old_xfs_structures( - { - void *buf; - xfs_sb_t sb; -- __uint32_t bsize; -+ uint32_t bsize; - int i; - xfs_off_t off; - -@@ -1112,8 +1112,8 @@ zero_old_xfs_structures( - i != sb.sb_blocklog) - goto done; - -- if (sb.sb_dblocks > ((__uint64_t)sb.sb_agcount * sb.sb_agblocks) || -- sb.sb_dblocks < ((__uint64_t)(sb.sb_agcount - 1) * -+ if (sb.sb_dblocks > ((uint64_t)sb.sb_agcount * sb.sb_agblocks) || -+ sb.sb_dblocks < ((uint64_t)(sb.sb_agcount - 1) * - sb.sb_agblocks + XFS_MIN_AG_BLOCKS)) - goto done; - -@@ -1133,7 +1133,7 @@ done: - } - - static void --discard_blocks(dev_t dev, __uint64_t nsectors) -+discard_blocks(dev_t dev, uint64_t nsectors) - { - int fd; - -@@ -1395,11 +1395,11 @@ main( - int argc, - char **argv) - { -- __uint64_t agcount; -+ uint64_t agcount; - xfs_agf_t *agf; - xfs_agi_t *agi; - xfs_agnumber_t agno; -- __uint64_t agsize; -+ uint64_t agsize; - xfs_alloc_rec_t *arec; - struct xfs_btree_block *block; - int blflag; -@@ -1475,10 +1475,10 @@ main( - char *rtsize; - xfs_sb_t *sbp; - int sectorlog; -- __uint64_t sector_mask; -+ uint64_t sector_mask; - int slflag; - int ssflag; -- __uint64_t tmp_agsize; -+ uint64_t tmp_agsize; - uuid_t uuid; - int worst_freelist; - libxfs_init_t xi; -@@ -2167,7 +2167,7 @@ _("rmapbt not supported with realtime devices\n")); - - - if (dsize) { -- __uint64_t dbytes; -+ uint64_t dbytes; - - dbytes = getnum(dsize, &dopts, D_SIZE); - if (dbytes % XFS_MIN_BLOCKSIZE) { -@@ -2199,7 +2199,7 @@ _("rmapbt not supported with realtime devices\n")); - } - - if (logsize) { -- __uint64_t logbytes; -+ uint64_t logbytes; - - logbytes = getnum(logsize, &lopts, L_SIZE); - if (logbytes % XFS_MIN_BLOCKSIZE) { -@@ -2216,7 +2216,7 @@ _("rmapbt not supported with realtime devices\n")); - (long long)(logblocks << blocklog)); - } - if (rtsize) { -- __uint64_t rtbytes; -+ uint64_t rtbytes; - - rtbytes = getnum(rtsize, &ropts, R_SIZE); - if (rtbytes % XFS_MIN_BLOCKSIZE) { -@@ -2236,7 +2236,7 @@ _("rmapbt not supported with realtime devices\n")); - * If specified, check rt extent size against its constraints. - */ - if (rtextsize) { -- __uint64_t rtextbytes; -+ uint64_t rtextbytes; - - rtextbytes = getnum(rtextsize, &ropts, R_EXTSIZE); - if (rtextbytes % blocksize) { -@@ -2252,8 +2252,8 @@ _("rmapbt not supported with realtime devices\n")); - * and the underlying volume is striped, then set rtextblocks - * to the stripe width. - */ -- __uint64_t rswidth; -- __uint64_t rtextbytes; -+ uint64_t rswidth; -+ uint64_t rtextbytes; - - if (!norsflag && !xi.risfile && !(!rtsize && xi.disfile)) - rswidth = ft.rtswidth; -@@ -2335,10 +2335,10 @@ _("rmapbt not supported with realtime devices\n")); - * multiple of the sector size, or 1024, whichever is larger. - */ - -- sector_mask = (__uint64_t)-1 << (MAX(sectorlog, 10) - BBSHIFT); -+ sector_mask = (uint64_t)-1 << (MAX(sectorlog, 10) - BBSHIFT); - xi.dsize &= sector_mask; - xi.rtsize &= sector_mask; -- xi.logBBsize &= (__uint64_t)-1 << (MAX(lsectorlog, 10) - BBSHIFT); -+ xi.logBBsize &= (uint64_t)-1 << (MAX(lsectorlog, 10) - BBSHIFT); - - - /* don't do discards on print-only runs or on files */ -@@ -2696,9 +2696,9 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), - mp = &mbuf; - sbp = &mp->m_sb; - memset(mp, 0, sizeof(xfs_mount_t)); -- sbp->sb_blocklog = (__uint8_t)blocklog; -- sbp->sb_sectlog = (__uint8_t)sectorlog; -- sbp->sb_agblklog = (__uint8_t)libxfs_log2_roundup((unsigned int)agsize); -+ sbp->sb_blocklog = (uint8_t)blocklog; -+ sbp->sb_sectlog = (uint8_t)sectorlog; -+ sbp->sb_agblklog = (uint8_t)libxfs_log2_roundup((unsigned int)agsize); - sbp->sb_agblocks = (xfs_agblock_t)agsize; - mp->m_blkbb_log = sbp->sb_blocklog - BBSHIFT; - mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT; -@@ -2805,14 +2805,14 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), - sbp->sb_agcount = (xfs_agnumber_t)agcount; - sbp->sb_rbmblocks = nbmblocks; - sbp->sb_logblocks = (xfs_extlen_t)logblocks; -- sbp->sb_sectsize = (__uint16_t)sectorsize; -- sbp->sb_inodesize = (__uint16_t)isize; -- sbp->sb_inopblock = (__uint16_t)(blocksize / isize); -- sbp->sb_sectlog = (__uint8_t)sectorlog; -- sbp->sb_inodelog = (__uint8_t)inodelog; -- sbp->sb_inopblog = (__uint8_t)(blocklog - inodelog); -+ sbp->sb_sectsize = (uint16_t)sectorsize; -+ sbp->sb_inodesize = (uint16_t)isize; -+ sbp->sb_inopblock = (uint16_t)(blocksize / isize); -+ sbp->sb_sectlog = (uint8_t)sectorlog; -+ sbp->sb_inodelog = (uint8_t)inodelog; -+ sbp->sb_inopblog = (uint8_t)(blocklog - inodelog); - sbp->sb_rextslog = -- (__uint8_t)(rtextents ? -+ (uint8_t)(rtextents ? - libxfs_highbit32((unsigned int)rtextents) : 0); - sbp->sb_inprogress = 1; /* mkfs is in progress */ - sbp->sb_imax_pct = imaxpct; -@@ -2840,8 +2840,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), - } else - sbp->sb_inoalignmt = 0; - if (lsectorsize != BBSIZE || sectorsize != BBSIZE) { -- sbp->sb_logsectlog = (__uint8_t)lsectorlog; -- sbp->sb_logsectsize = (__uint16_t)lsectorsize; -+ sbp->sb_logsectlog = (uint8_t)lsectorlog; -+ sbp->sb_logsectsize = (uint16_t)lsectorsize; - } else { - sbp->sb_logsectlog = 0; - sbp->sb_logsectsize = 0; -diff --git a/quota/edit.c b/quota/edit.c -index 36b327a5..8418e858 100644 ---- a/quota/edit.c -+++ b/quota/edit.c -@@ -115,16 +115,16 @@ warn_help(void) - - static void - set_limits( -- __uint32_t id, -+ uint32_t id, - uint type, - uint mask, - char *dev, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - fs_disk_quota_t d; - -@@ -152,12 +152,12 @@ set_user_limits( - char *name, - uint type, - uint mask, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - uid_t uid = uid_from_string(name); - -@@ -175,12 +175,12 @@ set_group_limits( - char *name, - uint type, - uint mask, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - gid_t gid = gid_from_string(name); - -@@ -198,12 +198,12 @@ set_project_limits( - char *name, - uint type, - uint mask, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - prid_t prid = prid_from_string(name); - -@@ -224,7 +224,7 @@ extractb( - int length, - uint blocksize, - uint sectorsize, -- __uint64_t *value) -+ uint64_t *value) - { - long long v; - char *s = string; -@@ -238,7 +238,7 @@ extractb( - progname, s); - return 0; - } -- *value = (__uint64_t)v >> 9; /* syscalls use basic blocks */ -+ *value = (uint64_t)v >> 9; /* syscalls use basic blocks */ - if (v > 0 && *value == 0) - fprintf(stderr, _("%s: Warning: `%s' in quota blocks is 0 (unlimited).\n"), progname, s); - return 1; -@@ -252,7 +252,7 @@ extracti( - char *string, - const char *prefix, - int length, -- __uint64_t *value) -+ uint64_t *value) - { - char *sp, *s = string; - -@@ -270,7 +270,7 @@ limit_f( - char **argv) - { - char *name; -- __uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; -+ uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; - int c, type = 0, mask = 0, flags = 0; - uint bsize, ssize, endoptions; - -@@ -384,8 +384,8 @@ restore_file( - char *dev = NULL; - uint mask; - int cnt; -- __uint32_t id; -- __uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; -+ uint32_t id; -+ uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; - - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - if (strncmp("fs = ", buffer, 5) == 0) { -@@ -546,7 +546,7 @@ timer_f( - - static void - set_warnings( -- __uint32_t id, -+ uint32_t id, - uint type, - uint mask, - char *dev, -diff --git a/quota/free.c b/quota/free.c -index cee15ee9..1f8378d2 100644 ---- a/quota/free.c -+++ b/quota/free.c -@@ -49,20 +49,20 @@ free_help(void) - static int - mount_free_space_data( - struct fs_path *mount, -- __uint64_t *bcount, -- __uint64_t *bused, -- __uint64_t *bfree, -- __uint64_t *icount, -- __uint64_t *iused, -- __uint64_t *ifree, -- __uint64_t *rcount, -- __uint64_t *rused, -- __uint64_t *rfree) -+ uint64_t *bcount, -+ uint64_t *bused, -+ uint64_t *bfree, -+ uint64_t *icount, -+ uint64_t *iused, -+ uint64_t *ifree, -+ uint64_t *rcount, -+ uint64_t *rused, -+ uint64_t *rfree) - { - struct xfs_fsop_counts fscounts; - struct xfs_fsop_geom fsgeo; - struct statfs st; -- __uint64_t logsize, count, free; -+ uint64_t logsize, count, free; - int fd; - - if ((fd = open(mount->fs_dir, O_RDONLY)) < 0) { -@@ -132,15 +132,15 @@ mount_free_space_data( - static int - projects_free_space_data( - struct fs_path *path, -- __uint64_t *bcount, -- __uint64_t *bused, -- __uint64_t *bfree, -- __uint64_t *icount, -- __uint64_t *iused, -- __uint64_t *ifree, -- __uint64_t *rcount, -- __uint64_t *rused, -- __uint64_t *rfree) -+ uint64_t *bcount, -+ uint64_t *bused, -+ uint64_t *bfree, -+ uint64_t *icount, -+ uint64_t *iused, -+ uint64_t *ifree, -+ uint64_t *rcount, -+ uint64_t *rused, -+ uint64_t *rfree) - { - fs_quota_stat_t qfs; - fs_disk_quota_t d; -@@ -226,9 +226,9 @@ free_space( - fs_path_t *path, - uint flags) - { -- __uint64_t bcount, bused, bfree; -- __uint64_t icount, iused, ifree; -- __uint64_t rcount, rused, rfree; -+ uint64_t bcount, bused, bfree; -+ uint64_t icount, iused, ifree; -+ uint64_t rcount, rused, rfree; - char a[8], s[8], u[8], p[8]; - int count; - -diff --git a/quota/quot.c b/quota/quot.c -index ccc154f5..6378fbb7 100644 ---- a/quota/quot.c -+++ b/quota/quot.c -@@ -26,17 +26,17 @@ - - typedef struct du { - struct du *next; -- __uint64_t blocks; -- __uint64_t blocks30; -- __uint64_t blocks60; -- __uint64_t blocks90; -- __uint64_t nfiles; -- __uint32_t id; -+ uint64_t blocks; -+ uint64_t blocks30; -+ uint64_t blocks60; -+ uint64_t blocks90; -+ uint64_t nfiles; -+ uint32_t id; - } du_t; - - #define TSIZE 500 --static __uint64_t sizes[TSIZE]; --static __uint64_t overflow; -+static uint64_t sizes[TSIZE]; -+static uint64_t overflow; - - #define NDU 60000 - #define DUHASH 8209 -@@ -84,8 +84,8 @@ quot_bulkstat_add( - { - du_t *dp; - du_t **hp; -- __uint64_t size; -- __uint32_t i, id; -+ uint64_t size; -+ uint32_t i, id; - - if ((p->bs_mode & S_IFMT) == 0) - return; -@@ -203,7 +203,7 @@ qcompare( - return 0; - } - --typedef char *(*idtoname_t)(__uint32_t); -+typedef char *(*idtoname_t)(uint32_t); - - static void - quot_report_mount_any_type( -@@ -291,7 +291,7 @@ quot_histogram_mount( - fs_path_t *mount, - uint flags) - { -- __uint64_t t = 0; -+ uint64_t t = 0; - int i; - - fprintf(fp, _("%s (%s):\n"), mount->fs_name, mount->fs_dir); -diff --git a/quota/quota.c b/quota/quota.c -index d09e239b..479b970e 100644 ---- a/quota/quota.c -+++ b/quota/quota.c -@@ -52,7 +52,7 @@ quota_help(void) - static int - quota_mount( - FILE *fp, -- __uint32_t id, -+ uint32_t id, - char *name, - uint form, - uint type, -@@ -181,7 +181,7 @@ quota_mount( - static void - quota( - FILE *fp, -- __uint32_t id, -+ uint32_t id, - char *name, - uint form, - uint type, -diff --git a/quota/quota.h b/quota/quota.h -index 4bde3513..9ed28bee 100644 ---- a/quota/quota.h -+++ b/quota/quota.h -@@ -53,9 +53,9 @@ enum { - extern char *type_to_string(uint __type); - extern char *form_to_string(uint __form); - extern char *time_to_string(time_t __time, uint __flags); --extern char *bbs_to_string(__uint64_t __v, char *__c, uint __size); --extern char *num_to_string(__uint64_t __v, char *__c, uint __size); --extern char *pct_to_string(__uint64_t __v, __uint64_t __t, char *__c, uint __s); -+extern char *bbs_to_string(uint64_t __v, char *__c, uint __size); -+extern char *num_to_string(uint64_t __v, char *__c, uint __size); -+extern char *pct_to_string(uint64_t __v, uint64_t __t, char *__c, uint __s); - - extern FILE *fopen_write_secure(char *__filename); - -@@ -81,7 +81,7 @@ enum { - * Identifier (uid/gid/prid) cache routines - */ - #define NMAX 32 --extern char *uid_to_name(__uint32_t __uid); --extern char *gid_to_name(__uint32_t __gid); --extern char *prid_to_name(__uint32_t __prid); -+extern char *uid_to_name(uint32_t __uid); -+extern char *gid_to_name(uint32_t __gid); -+extern char *prid_to_name(uint32_t __prid); - extern bool isdigits_only(const char *); -diff --git a/quota/report.c b/quota/report.c -index d0509c25..b2ea3bbe 100644 ---- a/quota/report.c -+++ b/quota/report.c -@@ -333,9 +333,9 @@ report_header( - static int - report_mount( - FILE *fp, -- __uint32_t id, -+ uint32_t id, - char *name, -- __uint32_t *oid, -+ uint32_t *oid, - uint form, - uint type, - fs_path_t *mount, -diff --git a/quota/state.c b/quota/state.c -index 09dfa705..b08bf50b 100644 ---- a/quota/state.c -+++ b/quota/state.c -@@ -135,7 +135,7 @@ static void - state_timelimit( - FILE *fp, - uint form, -- __uint32_t timelimit) -+ uint32_t timelimit) - { - fprintf(fp, _("%s grace time: %s\n"), - form_to_string(form), -diff --git a/quota/util.c b/quota/util.c -index cafd45f5..37840a86 100644 ---- a/quota/util.c -+++ b/quota/util.c -@@ -94,8 +94,8 @@ round_snprintf( - size_t size, - const char *fmt_round, - const char *fmt_not_round, -- __uint64_t value, -- __uint64_t divisor) -+ uint64_t value, -+ uint64_t divisor) - { - double v = (double)value / divisor; - -@@ -107,23 +107,23 @@ round_snprintf( - } - - /* Basic blocks (512) bytes are returned from quotactl */ --#define BBS_TO_EXABYTES(bbs) ((__uint64_t)(bbs)>>51) --#define BBS_TO_PETABYTES(bbs) ((__uint64_t)(bbs)>>41) --#define BBS_TO_TERABYTES(bbs) ((__uint64_t)(bbs)>>31) --#define BBS_TO_GIGABYTES(bbs) ((__uint64_t)(bbs)>>21) --#define BBS_TO_MEGABYTES(bbs) ((__uint64_t)(bbs)>>11) --#define BBS_TO_KILOBYTES(bbs) ((__uint64_t)(bbs)>>1) -- --#define BBEXABYTE ((__uint64_t)1<<51) --#define BBPETABYTE ((__uint64_t)1<<41) --#define BBTERABYTE ((__uint64_t)1<<31) --#define BBGIGABYTE ((__uint64_t)1<<21) --#define BBMEGABYTE ((__uint64_t)1<<11) --#define BBKILOBYTE ((__uint64_t)1<< 1) -+#define BBS_TO_EXABYTES(bbs) ((uint64_t)(bbs)>>51) -+#define BBS_TO_PETABYTES(bbs) ((uint64_t)(bbs)>>41) -+#define BBS_TO_TERABYTES(bbs) ((uint64_t)(bbs)>>31) -+#define BBS_TO_GIGABYTES(bbs) ((uint64_t)(bbs)>>21) -+#define BBS_TO_MEGABYTES(bbs) ((uint64_t)(bbs)>>11) -+#define BBS_TO_KILOBYTES(bbs) ((uint64_t)(bbs)>>1) -+ -+#define BBEXABYTE ((uint64_t)1<<51) -+#define BBPETABYTE ((uint64_t)1<<41) -+#define BBTERABYTE ((uint64_t)1<<31) -+#define BBGIGABYTE ((uint64_t)1<<21) -+#define BBMEGABYTE ((uint64_t)1<<11) -+#define BBKILOBYTE ((uint64_t)1<< 1) - - char * - bbs_to_string( -- __uint64_t v, -+ uint64_t v, - char *sp, - uint size) - { -@@ -146,17 +146,17 @@ bbs_to_string( - return sp; - } - --#define THOUSAND ((__uint64_t)1000) --#define MILLION ((__uint64_t)1000*1000) --#define BILLION ((__uint64_t)1000*1000*1000) --#define TRILLION ((__uint64_t)1000*1000*1000*1000) --#define GAZILLION ((__uint64_t)1000*1000*1000*1000*1000) --#define RIDICULOUS ((__uint64_t)1000*1000*1000*1000*1000*1000) --#define STOPALREADY ((__uint64_t)1000*1000*1000*1000*1000*1000*1000) -+#define THOUSAND ((uint64_t)1000) -+#define MILLION ((uint64_t)1000*1000) -+#define BILLION ((uint64_t)1000*1000*1000) -+#define TRILLION ((uint64_t)1000*1000*1000*1000) -+#define GAZILLION ((uint64_t)1000*1000*1000*1000*1000) -+#define RIDICULOUS ((uint64_t)1000*1000*1000*1000*1000*1000) -+#define STOPALREADY ((uint64_t)1000*1000*1000*1000*1000*1000*1000) - - char * - num_to_string( -- __uint64_t v, -+ uint64_t v, - char *sp, - uint size) - { -@@ -183,8 +183,8 @@ num_to_string( - - char * - pct_to_string( -- __uint64_t portion, -- __uint64_t whole, -+ uint64_t portion, -+ uint64_t whole, - char *buf, - uint size) - { -@@ -237,7 +237,7 @@ type_to_string( - #define IDMASK (NID-1) - - typedef struct { -- __uint32_t id; -+ uint32_t id; - char name[NMAX+1]; - } idcache_t; - -@@ -250,7 +250,7 @@ static int pentriesleft = NID; - - static idcache_t * - getnextpwent( -- __uint32_t id, -+ uint32_t id, - int byid) - { - struct passwd *pw; -@@ -266,7 +266,7 @@ getnextpwent( - - static idcache_t * - getnextgrent( -- __uint32_t id, -+ uint32_t id, - int byid) - { - struct group *gr; -@@ -281,7 +281,7 @@ getnextgrent( - - static idcache_t * - getnextprent( -- __uint32_t id, -+ uint32_t id, - int byid) - { - fs_project_t *pr; -@@ -296,7 +296,7 @@ getnextprent( - - char * - uid_to_name( -- __uint32_t id) -+ uint32_t id) - { - idcache_t *ncp, *idp; - -@@ -333,7 +333,7 @@ uid_to_name( - - char * - gid_to_name( -- __uint32_t id) -+ uint32_t id) - { - idcache_t *ncp, *idp; - -@@ -370,7 +370,7 @@ gid_to_name( - - char * - prid_to_name( -- __uint32_t id) -+ uint32_t id) - { - idcache_t *ncp, *idp; - -diff --git a/repair/README b/repair/README -index 7f168e69..4692463d 100644 ---- a/repair/README -+++ b/repair/README -@@ -189,7 +189,7 @@ D - 0) look at usage of XFS_MAKE_IPTR(). It does the right - - - D - 0) look at references to XFS_INODES_PER_CHUNK. change the -- ones that really mean sizeof(__uint64_t)*NBBY to -+ ones that really mean sizeof(uint64_t)*NBBY to - something else (like that only defined as a constant - INOS_PER_IREC. this isn't as important since - XFS_INODES_PER_CHUNK will never chang -diff --git a/repair/agheader.h b/repair/agheader.h -index 6b2974ca..2f7246d2 100644 ---- a/repair/agheader.h -+++ b/repair/agheader.h -@@ -20,7 +20,7 @@ typedef struct fs_geometry { - /* - * these types should match the superblock types - */ -- __uint32_t sb_blocksize; /* blocksize (bytes) */ -+ uint32_t sb_blocksize; /* blocksize (bytes) */ - xfs_rfsblock_t sb_dblocks; /* # data blocks */ - xfs_rfsblock_t sb_rblocks; /* # realtime blocks */ - xfs_rtblock_t sb_rextents; /* # realtime extents */ -@@ -30,9 +30,9 @@ typedef struct fs_geometry { - xfs_agnumber_t sb_agcount; /* # of ags */ - xfs_extlen_t sb_rbmblocks; /* # of rt bitmap blocks */ - xfs_extlen_t sb_logblocks; /* # of log blocks */ -- __uint16_t sb_sectsize; /* volume sector size (bytes) */ -- __uint16_t sb_inodesize; /* inode size (bytes) */ -- __uint8_t sb_imax_pct; /* max % of fs for inode space */ -+ uint16_t sb_sectsize; /* volume sector size (bytes) */ -+ uint16_t sb_inodesize; /* inode size (bytes) */ -+ uint8_t sb_imax_pct; /* max % of fs for inode space */ - - /* - * these don't have to match the superblock types but are placed -@@ -49,10 +49,10 @@ typedef struct fs_geometry { - /* - * fields after this point have to be checked manually in compare_sb() - */ -- __uint8_t sb_shared_vn; /* shared version number */ -+ uint8_t sb_shared_vn; /* shared version number */ - xfs_extlen_t sb_inoalignmt; /* inode chunk alignment, fsblocks */ -- __uint32_t sb_unit; /* stripe or raid unit */ -- __uint32_t sb_width; /* stripe or width unit */ -+ uint32_t sb_unit; /* stripe or raid unit */ -+ uint32_t sb_width; /* stripe or width unit */ - - /* - * these don't have to match, they track superblock properties -diff --git a/repair/attr_repair.h b/repair/attr_repair.h -index 7010e4ff..294fad44 100644 ---- a/repair/attr_repair.h -+++ b/repair/attr_repair.h -@@ -32,10 +32,10 @@ - #define ACL_WRITE 02 - #define ACL_EXECUTE 01 - --typedef __uint16_t xfs_acl_perm_t; --typedef __int32_t xfs_acl_type_t; --typedef __int32_t xfs_acl_tag_t; --typedef __int32_t xfs_acl_id_t; -+typedef uint16_t xfs_acl_perm_t; -+typedef int32_t xfs_acl_type_t; -+typedef int32_t xfs_acl_tag_t; -+typedef int32_t xfs_acl_id_t; - - /* - * "icacl" = in-core ACL. There is no equivalent in the XFS kernel code, -@@ -50,7 +50,7 @@ struct xfs_icacl_entry { - }; - - struct xfs_icacl { -- __int32_t acl_cnt; -+ int32_t acl_cnt; - struct xfs_icacl_entry acl_entry[0]; - }; - -@@ -59,14 +59,14 @@ struct xfs_icacl { - */ - #define XFS_MAC_MAX_SETS 250 - typedef struct xfs_mac_label { -- __uint8_t ml_msen_type; /* MSEN label type */ -- __uint8_t ml_mint_type; /* MINT label type */ -- __uint8_t ml_level; /* Hierarchical level */ -- __uint8_t ml_grade; /* Hierarchical grade */ -- __uint16_t ml_catcount; /* Category count */ -- __uint16_t ml_divcount; /* Division count */ -+ uint8_t ml_msen_type; /* MSEN label type */ -+ uint8_t ml_mint_type; /* MINT label type */ -+ uint8_t ml_level; /* Hierarchical level */ -+ uint8_t ml_grade; /* Hierarchical grade */ -+ uint16_t ml_catcount; /* Category count */ -+ uint16_t ml_divcount; /* Division count */ - /* Category set, then Division set */ -- __uint16_t ml_list[XFS_MAC_MAX_SETS]; -+ uint16_t ml_list[XFS_MAC_MAX_SETS]; - } xfs_mac_label_t; - - /* MSEN label type names. Choose an upper case ASCII character. */ -@@ -93,7 +93,7 @@ typedef struct xfs_mac_label { - /* - * Capabilities (IRIX) - */ --typedef __uint64_t xfs_cap_value_t; -+typedef uint64_t xfs_cap_value_t; - - typedef struct xfs_cap_set { - xfs_cap_value_t cap_effective; /* use in capability checks */ -diff --git a/repair/avl64.c b/repair/avl64.c -index 51cd624c..8f4a1211 100644 ---- a/repair/avl64.c -+++ b/repair/avl64.c -@@ -70,8 +70,8 @@ avl64_checktree( - avl64node_t *root) - { - avl64node_t *nlast, *nnext, *np; -- __uint64_t offset = 0; -- __uint64_t end; -+ uint64_t offset = 0; -+ uint64_t end; - - nlast = nnext = root; - -@@ -583,8 +583,8 @@ attach: - avl64node_t * - avl64_findanyrange( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - int checklen) - { - avl64node_t *np = tree->avl_root; -@@ -655,7 +655,7 @@ avl64_findanyrange( - avl64node_t * - avl64_findrange( - avl64tree_desc_t *tree, -- __uint64_t value) -+ uint64_t value) - { - avl64node_t *np = tree->avl_root; - -@@ -682,10 +682,10 @@ avl64_findrange( - avl64node_t * - avl64_find( - avl64tree_desc_t *tree, -- __uint64_t value) -+ uint64_t value) - { - avl64node_t *np = tree->avl_root; -- __uint64_t nvalue; -+ uint64_t nvalue; - - while (np) { - nvalue = AVL_START(tree, np); -@@ -909,8 +909,8 @@ static - avl64node_t * - avl64_insert_find_growth( - avl64tree_desc_t *tree, -- __uint64_t start, /* range start at start, */ -- __uint64_t end, /* exclusive */ -+ uint64_t start, /* range start at start, */ -+ uint64_t end, /* exclusive */ - int *growthp) /* OUT */ - { - avl64node_t *root = tree->avl_root; -@@ -963,7 +963,7 @@ avl64_insert_grow( - int growth) - { - avl64node_t *nnext; -- __uint64_t start = AVL_START(tree, newnode); -+ uint64_t start = AVL_START(tree, newnode); - - if (growth == AVL_BACK) { - -@@ -1005,8 +1005,8 @@ avl64_insert( - avl64node_t *newnode) - { - avl64node_t *np; -- __uint64_t start = AVL_START(tree, newnode); -- __uint64_t end = AVL_END(tree, newnode); -+ uint64_t start = AVL_START(tree, newnode); -+ uint64_t end = AVL_END(tree, newnode); - int growth; - - ASSERT(newnode); -@@ -1159,16 +1159,16 @@ avl64ops_t avl_debug_ops = { - avl_debug_end, - } - --static __uint64_t -+static uint64_t - avl64_debug_start(avl64node_t *node) - { -- return (__uint64_t)(struct avl_debug_node *)node->avl_start; -+ return (uint64_t)(struct avl_debug_node *)node->avl_start; - } - --static __uint64_t -+static uint64_t - avl64_debug_end(avl64node_t *node) - { -- return (__uint64_t) -+ return (uint64_t) - ((struct avl_debug_node *)node->avl_start + - (struct avl_debug_node *)node->avl_size); - } -@@ -1304,7 +1304,7 @@ main() - avl64node_t * - avl64_findadjacent( - avl64tree_desc_t *tree, -- __uint64_t value, -+ uint64_t value, - int dir) - { - avl64node_t *np = tree->avl_root; -@@ -1378,8 +1378,8 @@ avl64_findadjacent( - void - avl64_findranges( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - avl64node_t **startp, - avl64node_t **endp) - { -diff --git a/repair/avl64.h b/repair/avl64.h -index fd193218..cd079a00 100644 ---- a/repair/avl64.h -+++ b/repair/avl64.h -@@ -32,8 +32,8 @@ typedef struct avl64node { - * avl-tree operations - */ - typedef struct avl64ops { -- __uint64_t (*avl_start)(avl64node_t *); -- __uint64_t (*avl_end)(avl64node_t *); -+ uint64_t (*avl_start)(avl64node_t *); -+ uint64_t (*avl_end)(avl64node_t *); - } avl64ops_t; - - /* -@@ -89,32 +89,32 @@ avl64_init_tree( - avl64node_t * - avl64_findrange( - avl64tree_desc_t *tree, -- __uint64_t value); -+ uint64_t value); - - avl64node_t * - avl64_find( - avl64tree_desc_t *tree, -- __uint64_t value); -+ uint64_t value); - - avl64node_t * - avl64_findanyrange( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - int checklen); - - - avl64node_t * - avl64_findadjacent( - avl64tree_desc_t *tree, -- __uint64_t value, -+ uint64_t value, - int dir); - - void - avl64_findranges( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - avl64node_t **startp, - avl64node_t **endp); - -diff --git a/repair/dinode.c b/repair/dinode.c -index d664f87a..da872178 100644 ---- a/repair/dinode.c -+++ b/repair/dinode.c -@@ -746,7 +746,7 @@ _("%s fork in ino %" PRIu64 " claims dup extent, " - case XR_E_FREE1: - do_warn( - _("%s fork in ino %" PRIu64 " claims free block %" PRIu64 "\n"), -- forkname, ino, (__uint64_t) b); -+ forkname, ino, (uint64_t) b); - /* fall through ... */ - case XR_E_INUSE1: /* seen by rmap */ - case XR_E_UNKNOWN: -@@ -923,7 +923,7 @@ process_btinode( - int type, - int *dirty, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - int whichfork, - int check_dups) -@@ -939,7 +939,7 @@ process_btinode( - int level; - int numrecs; - bmap_cursor_t cursor; -- __uint64_t magic; -+ uint64_t magic; - - dib = (xfs_bmdr_block_t *)XFS_DFORK_PTR(dip, whichfork); - lino = XFS_AGINO_TO_INO(mp, agno, ino); -@@ -1098,7 +1098,7 @@ process_exinode( - int type, - int *dirty, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - int whichfork, - int check_dups) -@@ -1200,14 +1200,14 @@ process_symlink_extlist(xfs_mount_t *mp, xfs_ino_t lino, xfs_dinode_t *dino) - do_warn( - _("mismatch between format (%d) and size (%" PRId64 ") in symlink ino %" PRIu64 "\n"), - dino->di_format, -- (__int64_t)be64_to_cpu(dino->di_size), lino); -+ (int64_t)be64_to_cpu(dino->di_size), lino); - return 1; - } - if (dino->di_format == XFS_DINODE_FMT_LOCAL) { - do_warn( - _("mismatch between format (%d) and size (%" PRId64 ") in symlink inode %" PRIu64 "\n"), - dino->di_format, -- (__int64_t)be64_to_cpu(dino->di_size), lino); -+ (int64_t)be64_to_cpu(dino->di_size), lino); - return 1; - } - -@@ -1454,22 +1454,22 @@ _("inode %" PRIu64 " has bad inode type (IFMNT)\n"), lino); - case XR_INO_CHRDEV: - do_warn( - _("size of character device inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - case XR_INO_BLKDEV: - do_warn( - _("size of block device inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - case XR_INO_SOCK: - do_warn( - _("size of socket inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - case XR_INO_FIFO: - do_warn( - _("size of fifo inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - default: - do_warn(_("Internal error - process_misc_ino_types, " -@@ -1743,12 +1743,12 @@ _("found inode %" PRIu64 " claiming to be a real-time file\n"), lino); - break; - - case XR_INO_RTBITMAP: -- if (size != (__int64_t)mp->m_sb.sb_rbmblocks * -+ if (size != (int64_t)mp->m_sb.sb_rbmblocks * - mp->m_sb.sb_blocksize) { - do_warn( - _("realtime bitmap inode %" PRIu64 " has bad size %" PRId64 " (should be %" PRIu64 ")\n"), - lino, size, -- (__int64_t) mp->m_sb.sb_rbmblocks * -+ (int64_t) mp->m_sb.sb_rbmblocks * - mp->m_sb.sb_blocksize); - return 1; - } -@@ -1817,8 +1817,8 @@ static int - process_inode_blocks_and_extents( - xfs_dinode_t *dino, - xfs_rfsblock_t nblocks, -- __uint64_t nextents, -- __uint64_t anextents, -+ uint64_t nextents, -+ uint64_t anextents, - xfs_ino_t lino, - int *dirty) - { -@@ -1908,7 +1908,7 @@ process_inode_data_fork( - int type, - int *dirty, - xfs_rfsblock_t *totblocks, -- __uint64_t *nextents, -+ uint64_t *nextents, - blkmap_t **dblkmap, - int check_dups) - { -@@ -2017,7 +2017,7 @@ process_inode_attr_fork( - int type, - int *dirty, - xfs_rfsblock_t *atotblocks, -- __uint64_t *anextents, -+ uint64_t *anextents, - int check_dups, - int extra_attr_check, - int *retval) -@@ -2228,8 +2228,8 @@ process_dinode_int(xfs_mount_t *mp, - int di_mode; - int type; - int retval = 0; -- __uint64_t nextents; -- __uint64_t anextents; -+ uint64_t nextents; -+ uint64_t anextents; - xfs_ino_t lino; - const int is_free = 0; - const int is_used = 1; -@@ -2346,7 +2346,7 @@ _("inode identifier %llu mismatch on inode %" PRIu64 "\n"), - if (!uncertain) - do_warn( - _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"), -- (__int64_t)be64_to_cpu(dino->di_size), -+ (int64_t)be64_to_cpu(dino->di_size), - lino); - if (verify_mode) - return 1; -diff --git a/repair/dinode.h b/repair/dinode.h -index 61d07363..39d6a72f 100644 ---- a/repair/dinode.h -+++ b/repair/dinode.h -@@ -46,8 +46,8 @@ process_bmbt_reclist(xfs_mount_t *mp, - xfs_ino_t ino, - xfs_rfsblock_t *tot, - struct blkmap **blkmapp, -- __uint64_t *first_key, -- __uint64_t *last_key, -+ uint64_t *first_key, -+ uint64_t *last_key, - int whichfork); - - int -diff --git a/repair/dir2.c b/repair/dir2.c -index e6415e49..73dff902 100644 ---- a/repair/dir2.c -+++ b/repair/dir2.c -@@ -160,7 +160,7 @@ process_sf_dir2( - int bad_sfnamelen; - int i; - int i8; -- __int64_t ino_dir_size; -+ int64_t ino_dir_size; - int ino_off; - ino_tree_node_t *irec_p; - int junkit; -diff --git a/repair/globals.h b/repair/globals.h -index 4085ccc4..c7bbe6f1 100644 ---- a/repair/globals.h -+++ b/repair/globals.h -@@ -141,7 +141,7 @@ EXTERN int inodes_per_cluster; - EXTERN unsigned int glob_agcount; - EXTERN int chunks_pblock; /* # of 64-ino chunks per allocation */ - EXTERN int max_symlink_blocks; --EXTERN __int64_t fs_max_file_offset; -+EXTERN int64_t fs_max_file_offset; - - /* realtime info */ - -@@ -161,24 +161,24 @@ EXTERN int full_ino_ex_data;/* - - /* superblock counters */ - --EXTERN __uint64_t sb_icount; /* allocated (made) inodes */ --EXTERN __uint64_t sb_ifree; /* free inodes */ --EXTERN __uint64_t sb_fdblocks; /* free data blocks */ --EXTERN __uint64_t sb_frextents; /* free realtime extents */ -+EXTERN uint64_t sb_icount; /* allocated (made) inodes */ -+EXTERN uint64_t sb_ifree; /* free inodes */ -+EXTERN uint64_t sb_fdblocks; /* free data blocks */ -+EXTERN uint64_t sb_frextents; /* free realtime extents */ - - /* superblock geometry info */ - - EXTERN xfs_extlen_t sb_inoalignmt; --EXTERN __uint32_t sb_unit; --EXTERN __uint32_t sb_width; -+EXTERN uint32_t sb_unit; -+EXTERN uint32_t sb_width; - - struct aglock { - pthread_mutex_t lock __attribute__((__aligned__(64))); - }; - EXTERN struct aglock *ag_locks; - --EXTERN int report_interval; --EXTERN __uint64_t *prog_rpt_done; -+EXTERN int report_interval; -+EXTERN uint64_t *prog_rpt_done; - - EXTERN int ag_stride; - EXTERN int thread_count; -diff --git a/repair/incore.c b/repair/incore.c -index cb573165..a9191ae2 100644 ---- a/repair/incore.c -+++ b/repair/incore.c -@@ -179,7 +179,7 @@ get_bmap_ext( - static uint64_t *rt_bmap; - static size_t rt_bmap_size; - --/* block records fit into __uint64_t's units */ -+/* block records fit into uint64_t's units */ - #define XR_BB_UNIT 64 /* number of bits/unit */ - #define XR_BB 4 /* bits per block record */ - #define XR_BB_NUM (XR_BB_UNIT/XR_BB) /* number of records per unit */ -@@ -203,8 +203,8 @@ set_rtbmap( - { - *(rt_bmap + bno / XR_BB_NUM) = - ((*(rt_bmap + bno / XR_BB_NUM) & -- (~((__uint64_t) XR_BB_MASK << ((bno % XR_BB_NUM) * XR_BB)))) | -- (((__uint64_t) state) << ((bno % XR_BB_NUM) * XR_BB))); -+ (~((uint64_t) XR_BB_MASK << ((bno % XR_BB_NUM) * XR_BB)))) | -+ (((uint64_t) state) << ((bno % XR_BB_NUM) * XR_BB))); - } - - static void -@@ -222,9 +222,9 @@ init_rt_bmap( - return; - - rt_bmap_size = roundup(mp->m_sb.sb_rextents / (NBBY / XR_BB), -- sizeof(__uint64_t)); -+ sizeof(uint64_t)); - -- rt_bmap = memalign(sizeof(__uint64_t), rt_bmap_size); -+ rt_bmap = memalign(sizeof(uint64_t), rt_bmap_size); - if (!rt_bmap) { - do_error( - _("couldn't allocate realtime block map, size = %" PRIu64 "\n"), -diff --git a/repair/incore.h b/repair/incore.h -index c23a3a3c..fd66084f 100644 ---- a/repair/incore.h -+++ b/repair/incore.h -@@ -257,7 +257,7 @@ typedef xfs_ino_t parent_entry_t; - struct nlink_ops; - - typedef struct parent_list { -- __uint64_t pmask; -+ uint64_t pmask; - parent_entry_t *pentries; - #ifdef DEBUG - short cnt; -@@ -265,14 +265,14 @@ typedef struct parent_list { - } parent_list_t; - - union ino_nlink { -- __uint8_t *un8; -- __uint16_t *un16; -- __uint32_t *un32; -+ uint8_t *un8; -+ uint16_t *un16; -+ uint32_t *un32; - }; - - typedef struct ino_ex_data { -- __uint64_t ino_reached; /* bit == 1 if reached */ -- __uint64_t ino_processed; /* reference checked bit mask */ -+ uint64_t ino_reached; /* bit == 1 if reached */ -+ uint64_t ino_processed; /* reference checked bit mask */ - parent_list_t *parents; - union ino_nlink counted_nlinks;/* counted nlinks in P6 */ - } ino_ex_data_t; -@@ -281,22 +281,22 @@ typedef struct ino_tree_node { - avlnode_t avl_node; - xfs_agino_t ino_startnum; /* starting inode # */ - xfs_inofree_t ir_free; /* inode free bit mask */ -- __uint64_t ir_sparse; /* sparse inode bitmask */ -- __uint64_t ino_confirmed; /* confirmed bitmask */ -- __uint64_t ino_isa_dir; /* bit == 1 if a directory */ -- __uint64_t ino_was_rl; /* bit == 1 if reflink flag set */ -- __uint64_t ino_is_rl; /* bit == 1 if reflink flag should be set */ -- __uint8_t nlink_size; -+ uint64_t ir_sparse; /* sparse inode bitmask */ -+ uint64_t ino_confirmed; /* confirmed bitmask */ -+ uint64_t ino_isa_dir; /* bit == 1 if a directory */ -+ uint64_t ino_was_rl; /* bit == 1 if reflink flag set */ -+ uint64_t ino_is_rl; /* bit == 1 if reflink flag should be set */ -+ uint8_t nlink_size; - union ino_nlink disk_nlinks; /* on-disk nlinks, set in P3 */ - union { - ino_ex_data_t *ex_data; /* phases 6,7 */ - parent_list_t *plist; /* phases 2-5 */ - } ino_un; -- __uint8_t *ftypes; /* phases 3,6 */ -+ uint8_t *ftypes; /* phases 3,6 */ - } ino_tree_node_t; - --#define INOS_PER_IREC (sizeof(__uint64_t) * NBBY) --#define IREC_MASK(i) ((__uint64_t)1 << (i)) -+#define INOS_PER_IREC (sizeof(uint64_t) * NBBY) -+#define IREC_MASK(i) ((uint64_t)1 << (i)) - - void add_ino_ex_data(xfs_mount_t *mp); - -@@ -543,10 +543,10 @@ static inline int inode_is_rl(struct ino_tree_node *irec, int offset) - */ - void add_inode_ref(struct ino_tree_node *irec, int offset); - void drop_inode_ref(struct ino_tree_node *irec, int offset); --__uint32_t num_inode_references(struct ino_tree_node *irec, int offset); -+uint32_t num_inode_references(struct ino_tree_node *irec, int offset); - --void set_inode_disk_nlinks(struct ino_tree_node *irec, int offset, __uint32_t nlinks); --__uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int offset); -+void set_inode_disk_nlinks(struct ino_tree_node *irec, int offset, uint32_t nlinks); -+uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int offset); - - static inline int is_inode_reached(struct ino_tree_node *irec, int offset) - { -@@ -567,13 +567,13 @@ static inline void add_inode_reached(struct ino_tree_node *irec, int offset) - static inline void - set_inode_ftype(struct ino_tree_node *irec, - int ino_offset, -- __uint8_t ftype) -+ uint8_t ftype) - { - if (irec->ftypes) - irec->ftypes[ino_offset] = ftype; - } - --static inline __uint8_t -+static inline uint8_t - get_inode_ftype( - struct ino_tree_node *irec, - int ino_offset) -@@ -606,11 +606,11 @@ typedef struct bm_level_state { - xfs_fsblock_t fsbno; - xfs_fsblock_t left_fsbno; - xfs_fsblock_t right_fsbno; -- __uint64_t first_key; -- __uint64_t last_key; -+ uint64_t first_key; -+ uint64_t last_key; - /* - int level; -- __uint64_t prev_last_key; -+ uint64_t prev_last_key; - xfs_buf_t *bp; - xfs_bmbt_block_t *block; - */ -diff --git a/repair/incore_ext.c b/repair/incore_ext.c -index 7e6786c5..0a8138a9 100644 ---- a/repair/incore_ext.c -+++ b/repair/incore_ext.c -@@ -721,13 +721,13 @@ search_rt_dup_extent(xfs_mount_t *mp, xfs_rtblock_t bno) - return(ret); - } - --static __uint64_t -+static uint64_t - avl64_rt_ext_start(avl64node_t *node) - { - return(((rt_extent_tree_node_t *) node)->rt_startblock); - } - --static __uint64_t -+static uint64_t - avl64_ext_end(avl64node_t *node) - { - return(((rt_extent_tree_node_t *) node)->rt_startblock + -@@ -834,7 +834,7 @@ count_extents(xfs_agnumber_t agno, avltree_desc_t *tree, int whichtree) - int - count_bno_extents_blocks(xfs_agnumber_t agno, uint *numblocks) - { -- __uint64_t nblocks; -+ uint64_t nblocks; - extent_tree_node_t *node; - int i = 0; - -diff --git a/repair/incore_ino.c b/repair/incore_ino.c -index 2ec17657..3b6b44d4 100644 ---- a/repair/incore_ino.c -+++ b/repair/incore_ino.c -@@ -38,7 +38,7 @@ static avltree_desc_t **inode_uncertain_tree_ptrs; - /* memory optimised nlink counting for all inodes */ - - static void * --alloc_nlink_array(__uint8_t nlink_size) -+alloc_nlink_array(uint8_t nlink_size) - { - void *ptr; - -@@ -51,10 +51,10 @@ alloc_nlink_array(__uint8_t nlink_size) - static void - nlink_grow_8_to_16(ino_tree_node_t *irec) - { -- __uint16_t *new_nlinks; -+ uint16_t *new_nlinks; - int i; - -- irec->nlink_size = sizeof(__uint16_t); -+ irec->nlink_size = sizeof(uint16_t); - - new_nlinks = alloc_nlink_array(irec->nlink_size); - for (i = 0; i < XFS_INODES_PER_CHUNK; i++) -@@ -76,10 +76,10 @@ nlink_grow_8_to_16(ino_tree_node_t *irec) - static void - nlink_grow_16_to_32(ino_tree_node_t *irec) - { -- __uint32_t *new_nlinks; -+ uint32_t *new_nlinks; - int i; - -- irec->nlink_size = sizeof(__uint32_t); -+ irec->nlink_size = sizeof(uint32_t); - - new_nlinks = alloc_nlink_array(irec->nlink_size); - for (i = 0; i < XFS_INODES_PER_CHUNK; i++) -@@ -104,21 +104,21 @@ void add_inode_ref(struct ino_tree_node *irec, int ino_offset) - ASSERT(irec->ino_un.ex_data != NULL); - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - if (irec->ino_un.ex_data->counted_nlinks.un8[ino_offset] < 0xff) { - irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]++; - break; - } - nlink_grow_8_to_16(irec); - /*FALLTHRU*/ -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - if (irec->ino_un.ex_data->counted_nlinks.un16[ino_offset] < 0xffff) { - irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]++; - break; - } - nlink_grow_16_to_32(irec); - /*FALLTHRU*/ -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]++; - break; - default: -@@ -128,20 +128,20 @@ void add_inode_ref(struct ino_tree_node *irec, int ino_offset) - - void drop_inode_ref(struct ino_tree_node *irec, int ino_offset) - { -- __uint32_t refs = 0; -+ uint32_t refs = 0; - - ASSERT(irec->ino_un.ex_data != NULL); - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - ASSERT(irec->ino_un.ex_data->counted_nlinks.un8[ino_offset] > 0); - refs = --irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]; - break; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - ASSERT(irec->ino_un.ex_data->counted_nlinks.un16[ino_offset] > 0); - refs = --irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]; - break; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - ASSERT(irec->ino_un.ex_data->counted_nlinks.un32[ino_offset] > 0); - refs = --irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]; - break; -@@ -153,16 +153,16 @@ void drop_inode_ref(struct ino_tree_node *irec, int ino_offset) - irec->ino_un.ex_data->ino_reached &= ~IREC_MASK(ino_offset); - } - --__uint32_t num_inode_references(struct ino_tree_node *irec, int ino_offset) -+uint32_t num_inode_references(struct ino_tree_node *irec, int ino_offset) - { - ASSERT(irec->ino_un.ex_data != NULL); - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - return irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - return irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - return irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]; - default: - ASSERT(0); -@@ -171,24 +171,24 @@ __uint32_t num_inode_references(struct ino_tree_node *irec, int ino_offset) - } - - void set_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset, -- __uint32_t nlinks) -+ uint32_t nlinks) - { - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - if (nlinks < 0xff) { - irec->disk_nlinks.un8[ino_offset] = nlinks; - break; - } - nlink_grow_8_to_16(irec); - /*FALLTHRU*/ -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - if (nlinks < 0xffff) { - irec->disk_nlinks.un16[ino_offset] = nlinks; - break; - } - nlink_grow_16_to_32(irec); - /*FALLTHRU*/ -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - irec->disk_nlinks.un32[ino_offset] = nlinks; - break; - default: -@@ -196,14 +196,14 @@ void set_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset, - } - } - --__uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset) -+uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset) - { - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - return irec->disk_nlinks.un8[ino_offset]; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - return irec->disk_nlinks.un16[ino_offset]; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - return irec->disk_nlinks.un32[ino_offset]; - default: - ASSERT(0); -@@ -211,11 +211,11 @@ __uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset) - return 0; - } - --static __uint8_t * -+static uint8_t * - alloc_ftypes_array( - struct xfs_mount *mp) - { -- __uint8_t *ptr; -+ uint8_t *ptr; - - if (!xfs_sb_version_hasftype(&mp->m_sb)) - return NULL; -@@ -262,23 +262,23 @@ alloc_ino_node( - irec->ir_free = (xfs_inofree_t) - 1; - irec->ir_sparse = 0; - irec->ino_un.ex_data = NULL; -- irec->nlink_size = sizeof(__uint8_t); -+ irec->nlink_size = sizeof(uint8_t); - irec->disk_nlinks.un8 = alloc_nlink_array(irec->nlink_size); - irec->ftypes = alloc_ftypes_array(mp); - return irec; - } - - static void --free_nlink_array(union ino_nlink nlinks, __uint8_t nlink_size) -+free_nlink_array(union ino_nlink nlinks, uint8_t nlink_size) - { - switch (nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - free(nlinks.un8); - break; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - free(nlinks.un16); - break; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - free(nlinks.un32); - break; - default: -@@ -609,7 +609,7 @@ set_inode_parent( - int i; - int cnt; - int target; -- __uint64_t bitmask; -+ uint64_t bitmask; - parent_entry_t *tmp; - - if (full_ino_ex_data) -@@ -699,7 +699,7 @@ set_inode_parent( - xfs_ino_t - get_inode_parent(ino_tree_node_t *irec, int offset) - { -- __uint64_t bitmask; -+ uint64_t bitmask; - parent_list_t *ptbl; - int i; - int target; -@@ -740,15 +740,15 @@ alloc_ex_data(ino_tree_node_t *irec) - irec->ino_un.ex_data->parents = ptbl; - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - irec->ino_un.ex_data->counted_nlinks.un8 = - alloc_nlink_array(irec->nlink_size); - break; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - irec->ino_un.ex_data->counted_nlinks.un16 = - alloc_nlink_array(irec->nlink_size); - break; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - irec->ino_un.ex_data->counted_nlinks.un32 = - alloc_nlink_array(irec->nlink_size); - break; -diff --git a/repair/phase2.c b/repair/phase2.c -index c21778b8..0085732b 100644 ---- a/repair/phase2.c -+++ b/repair/phase2.c -@@ -179,7 +179,7 @@ phase2( - - bad_ino_btree = 0; - -- set_progress_msg(PROG_FMT_SCAN_AG, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_SCAN_AG, (uint64_t) glob_agcount); - - scan_ags(mp, scan_threads); - -diff --git a/repair/phase3.c b/repair/phase3.c -index 0890a27d..17b1c28d 100644 ---- a/repair/phase3.c -+++ b/repair/phase3.c -@@ -122,7 +122,7 @@ phase3( - else - do_log(_(" - scan (but don't clear) agi unlinked lists...\n")); - -- set_progress_msg(PROG_FMT_AGI_UNLINKED, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_AGI_UNLINKED, (uint64_t) glob_agcount); - - /* first clear the agi unlinked AGI list */ - if (!no_modify) { -@@ -142,7 +142,7 @@ phase3( - do_log(_( - " - process known inodes and perform inode discovery...\n")); - -- set_progress_msg(PROG_FMT_PROCESS_INO, (__uint64_t) mp->m_sb.sb_icount); -+ set_progress_msg(PROG_FMT_PROCESS_INO, (uint64_t) mp->m_sb.sb_icount); - - process_ags(mp); - -@@ -152,7 +152,7 @@ phase3( - * process newly discovered inode chunks - */ - do_log(_(" - process newly discovered inodes...\n")); -- set_progress_msg(PROG_FMT_NEW_INODES, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_NEW_INODES, (uint64_t) glob_agcount); - - counts = calloc(sizeof(*counts), mp->m_sb.sb_agcount); - if (!counts) { -diff --git a/repair/phase4.c b/repair/phase4.c -index e59464b1..cc17ec03 100644 ---- a/repair/phase4.c -+++ b/repair/phase4.c -@@ -290,7 +290,7 @@ phase4(xfs_mount_t *mp) - do_log(_("Phase 4 - check for duplicate blocks...\n")); - do_log(_(" - setting up duplicate extent list...\n")); - -- set_progress_msg(PROG_FMT_DUP_EXTENT, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_DUP_EXTENT, (uint64_t) glob_agcount); - - irec = find_inode_rec(mp, XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rootino), - XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rootino)); -@@ -404,7 +404,7 @@ phase4(xfs_mount_t *mp) - reset_bmaps(mp); - - do_log(_(" - check for inodes claiming duplicate blocks...\n")); -- set_progress_msg(PROG_FMT_DUP_BLOCKS, (__uint64_t) mp->m_sb.sb_icount); -+ set_progress_msg(PROG_FMT_DUP_BLOCKS, (uint64_t) mp->m_sb.sb_icount); - - /* - * ok, now process the inodes -- signal 2-pass check per inode. -diff --git a/repair/phase5.c b/repair/phase5.c -index 0b833f13..21dce67a 100644 ---- a/repair/phase5.c -+++ b/repair/phase5.c -@@ -86,9 +86,9 @@ struct agi_stat { - xfs_agino_t freecount; - }; - --static __uint64_t *sb_icount_ag; /* allocated inodes per ag */ --static __uint64_t *sb_ifree_ag; /* free inodes per ag */ --static __uint64_t *sb_fdblocks_ag; /* free data blocks per ag */ -+static uint64_t *sb_icount_ag; /* allocated inodes per ag */ -+static uint64_t *sb_ifree_ag; /* free inodes per ag */ -+static uint64_t *sb_fdblocks_ag; /* free data blocks per ag */ - - static int - mk_incore_fstree(xfs_mount_t *mp, xfs_agnumber_t agno) -@@ -886,10 +886,10 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno, - */ - static void - init_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, -- __uint64_t *num_inos, __uint64_t *num_free_inos, int finobt) -+ uint64_t *num_inos, uint64_t *num_free_inos, int finobt) - { -- __uint64_t ninos; -- __uint64_t nfinos; -+ uint64_t ninos; -+ uint64_t nfinos; - int rec_nfinos; - int rec_ninos; - ino_tree_node_t *ino_rec; -@@ -2193,10 +2193,10 @@ phase5_func( - xfs_agnumber_t agno, - struct xfs_slab *lost_fsb) - { -- __uint64_t num_inos; -- __uint64_t num_free_inos; -- __uint64_t finobt_num_inos; -- __uint64_t finobt_num_free_inos; -+ uint64_t num_inos; -+ uint64_t num_free_inos; -+ uint64_t finobt_num_inos; -+ uint64_t finobt_num_free_inos; - bt_status_t bno_btree_curs; - bt_status_t bcnt_btree_curs; - bt_status_t ino_btree_curs; -@@ -2471,7 +2471,7 @@ phase5(xfs_mount_t *mp) - int error; - - do_log(_("Phase 5 - rebuild AG headers and trees...\n")); -- set_progress_msg(PROG_FMT_REBUILD_AG, (__uint64_t )glob_agcount); -+ set_progress_msg(PROG_FMT_REBUILD_AG, (uint64_t)glob_agcount); - - #ifdef XR_BLD_FREE_TRACE - fprintf(stderr, "inobt level 1, maxrec = %d, minrec = %d\n", -@@ -2497,15 +2497,15 @@ phase5(xfs_mount_t *mp) - keep_fsinos(mp); - - /* allocate per ag counters */ -- sb_icount_ag = calloc(mp->m_sb.sb_agcount, sizeof(__uint64_t)); -+ sb_icount_ag = calloc(mp->m_sb.sb_agcount, sizeof(uint64_t)); - if (sb_icount_ag == NULL) - do_error(_("cannot alloc sb_icount_ag buffers\n")); - -- sb_ifree_ag = calloc(mp->m_sb.sb_agcount, sizeof(__uint64_t)); -+ sb_ifree_ag = calloc(mp->m_sb.sb_agcount, sizeof(uint64_t)); - if (sb_ifree_ag == NULL) - do_error(_("cannot alloc sb_ifree_ag buffers\n")); - -- sb_fdblocks_ag = calloc(mp->m_sb.sb_agcount, sizeof(__uint64_t)); -+ sb_fdblocks_ag = calloc(mp->m_sb.sb_agcount, sizeof(uint64_t)); - if (sb_fdblocks_ag == NULL) - do_error(_("cannot alloc sb_fdblocks_ag buffers\n")); - -diff --git a/repair/phase6.c b/repair/phase6.c -index 08636dcf..373b1a5b 100644 ---- a/repair/phase6.c -+++ b/repair/phase6.c -@@ -82,7 +82,7 @@ typedef struct dir_hash_ent { - struct dir_hash_ent *nextbyhash; /* next in name bucket */ - struct dir_hash_ent *nextbyorder; /* next in order added */ - xfs_dahash_t hashval; /* hash value of name */ -- __uint32_t address; /* offset of data entry */ -+ uint32_t address; /* offset of data entry */ - xfs_ino_t inum; /* inode num of entry */ - short junkit; /* name starts with / */ - short seen; /* have seen leaf entry */ -@@ -170,11 +170,11 @@ static int - dir_hash_add( - xfs_mount_t *mp, - dir_hash_tab_t *hashtab, -- __uint32_t addr, -+ uint32_t addr, - xfs_ino_t inum, - int namelen, - unsigned char *name, -- __uint8_t ftype) -+ uint8_t ftype) - { - xfs_dahash_t hash = 0; - int byaddr; -@@ -357,7 +357,7 @@ static void - dir_hash_update_ftype( - dir_hash_tab_t *hashtab, - xfs_dir2_dataptr_t addr, -- __uint8_t ftype) -+ uint8_t ftype) - { - int i; - dir_hash_ent_t *p; -@@ -1791,8 +1791,8 @@ longform_dir2_entry_check_data( - - /* validate ftype field if supported */ - if (xfs_sb_version_hasftype(&mp->m_sb)) { -- __uint8_t dir_ftype; -- __uint8_t ino_ftype; -+ uint8_t dir_ftype; -+ uint8_t ino_ftype; - - dir_ftype = M_DIROPS(mp)->data_get_ftype(dep); - ino_ftype = get_inode_ftype(irec, ino_offset); -@@ -2703,8 +2703,8 @@ _("entry \"%s\" (ino %" PRIu64 ") in dir %" PRIu64 " is a duplicate name"), - - /* validate ftype field if supported */ - if (xfs_sb_version_hasftype(&mp->m_sb)) { -- __uint8_t dir_ftype; -- __uint8_t ino_ftype; -+ uint8_t dir_ftype; -+ uint8_t ino_ftype; - - dir_ftype = M_DIROPS(mp)->sf_get_ftype(sfep); - ino_ftype = get_inode_ftype(irec, ino_offset); -diff --git a/repair/phase7.c b/repair/phase7.c -index 8bce117d..4ffb81a8 100644 ---- a/repair/phase7.c -+++ b/repair/phase7.c -@@ -32,7 +32,7 @@ static void - update_inode_nlinks( - xfs_mount_t *mp, - xfs_ino_t ino, -- __uint32_t nlinks) -+ uint32_t nlinks) - { - xfs_trans_t *tp; - xfs_inode_t *ip; -@@ -104,7 +104,7 @@ do_link_updates( - { - ino_tree_node_t *irec; - int j; -- __uint32_t nrefs; -+ uint32_t nrefs; - - for (irec = findfirst_inode_rec(agno); irec; - irec = next_ino_rec(irec)) { -@@ -143,7 +143,7 @@ phase7( - else - do_log(_("Phase 7 - verify link counts...\n")); - -- set_progress_msg(PROGRESS_FMT_CORR_LINK, (__uint64_t) glob_agcount); -+ set_progress_msg(PROGRESS_FMT_CORR_LINK, (uint64_t) glob_agcount); - - create_work_queue(&wq, mp, scan_threads); - -diff --git a/repair/progress.c b/repair/progress.c -index 2a09b239..99d2658c 100644 ---- a/repair/progress.c -+++ b/repair/progress.c -@@ -85,8 +85,8 @@ pthread_t report_thread; - typedef struct msg_block_s { - pthread_mutex_t mutex; - progress_rpt_t *format; -- __uint64_t *done; -- __uint64_t *total; -+ uint64_t *done; -+ uint64_t *total; - int count; - int interval; - } msg_block_t; -@@ -96,14 +96,14 @@ typedef struct phase_times_s { - time_t start; - time_t end; - time_t duration; -- __uint64_t item_counts[4]; -+ uint64_t item_counts[4]; - } phase_times_t; - static phase_times_t phase_times[8]; - - static void *progress_rpt_thread(void *); - static int current_phase; - static int running; --static __uint64_t prog_rpt_total; -+static uint64_t prog_rpt_total; - - void - init_progress_rpt (void) -@@ -113,11 +113,11 @@ init_progress_rpt (void) - * allocate the done vector - */ - -- if ((prog_rpt_done = (__uint64_t *) -- malloc(sizeof(__uint64_t)*glob_agcount)) == NULL ) { -+ if ((prog_rpt_done = (uint64_t *) -+ malloc(sizeof(uint64_t)*glob_agcount)) == NULL) { - do_error(_("cannot malloc pointer to done vector\n")); - } -- bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount); -+ bzero(prog_rpt_done, sizeof(uint64_t)*glob_agcount); - - /* - * Setup comm block, start the thread -@@ -165,10 +165,10 @@ progress_rpt_thread (void *p) - timer_t timerid; - struct itimerspec timespec; - char *msgbuf; -- __uint64_t *donep; -- __uint64_t sum; -+ uint64_t *donep; -+ uint64_t sum; - msg_block_t *msgp = (msg_block_t *)p; -- __uint64_t percent; -+ uint64_t percent; - - /* It's possible to get here very early w/ no progress msg set */ - if (!msgp->format) -@@ -286,7 +286,7 @@ progress_rpt_thread (void *p) - } - - int --set_progress_msg (int report, __uint64_t total) -+set_progress_msg(int report, uint64_t total) - { - - if (!ag_stride) -@@ -300,7 +300,7 @@ set_progress_msg (int report, __uint64_t total) - - /* reset all the accumulative totals */ - if (prog_rpt_done) -- bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount); -+ bzero(prog_rpt_done, sizeof(uint64_t)*glob_agcount); - - if (pthread_mutex_unlock(&global_msgs.mutex)) - do_error(_("set_progress_msg: cannot unlock progress mutex\n")); -@@ -308,14 +308,14 @@ set_progress_msg (int report, __uint64_t total) - return (0); - } - --__uint64_t -+uint64_t - print_final_rpt(void) - { - int i; - struct tm *tmp; - time_t now; -- __uint64_t *donep; -- __uint64_t sum; -+ uint64_t *donep; -+ uint64_t sum; - msg_block_t *msgp = &global_msgs; - char msgbuf[DURATION_BUF_SIZE]; - -diff --git a/repair/progress.h b/repair/progress.h -index 33db8344..51526483 100644 ---- a/repair/progress.h -+++ b/repair/progress.h -@@ -32,8 +32,8 @@ - extern void init_progress_rpt(void); - extern void stop_progress_rpt(void); - extern void summary_report(void); --extern int set_progress_msg(int report, __uint64_t total); --extern __uint64_t print_final_rpt(void); -+extern int set_progress_msg(int report, uint64_t total); -+extern uint64_t print_final_rpt(void); - extern char *timestamp(int end, int phase, char *buf); - extern char *duration(int val, char *buf); - extern int do_parallel; -diff --git a/repair/rmap.c b/repair/rmap.c -index ab6e5839..01d6f0fc 100644 ---- a/repair/rmap.c -+++ b/repair/rmap.c -@@ -343,7 +343,7 @@ err: - - static int - find_first_zero_bit( -- __uint64_t mask) -+ uint64_t mask) - { - int n; - int b = 0; -@@ -356,7 +356,7 @@ find_first_zero_bit( - - static int - popcnt( -- __uint64_t mask) -+ uint64_t mask) - { - int n; - int b = 0; -@@ -1064,14 +1064,14 @@ err: - * Compare the key fields of two rmap records -- positive if key1 > key2, - * negative if key1 < key2, and zero if equal. - */ --__int64_t -+int64_t - rmap_diffkeys( - struct xfs_rmap_irec *kp1, - struct xfs_rmap_irec *kp2) - { - __u64 oa; - __u64 ob; -- __int64_t d; -+ int64_t d; - struct xfs_rmap_irec tmp; - - tmp = *kp1; -@@ -1081,7 +1081,7 @@ rmap_diffkeys( - tmp.rm_flags &= ~XFS_RMAP_REC_FLAGS; - ob = libxfs_rmap_irec_offset_pack(&tmp); - -- d = (__int64_t)kp1->rm_startblock - kp2->rm_startblock; -+ d = (int64_t)kp1->rm_startblock - kp2->rm_startblock; - if (d) - return d; - -@@ -1192,10 +1192,10 @@ fix_inode_reflink_flags( - { - struct ino_tree_node *irec; - int bit; -- __uint64_t was; -- __uint64_t is; -- __uint64_t diff; -- __uint64_t mask; -+ uint64_t was; -+ uint64_t is; -+ uint64_t diff; -+ uint64_t mask; - int error = 0; - xfs_agino_t agino; - -diff --git a/repair/rmap.h b/repair/rmap.h -index 752ece82..1616ab7d 100644 ---- a/repair/rmap.h -+++ b/repair/rmap.h -@@ -44,7 +44,7 @@ extern int rmap_init_cursor(xfs_agnumber_t, struct xfs_slab_cursor **); - extern void rmap_avoid_check(void); - extern int rmaps_verify_btree(struct xfs_mount *, xfs_agnumber_t); - --extern __int64_t rmap_diffkeys(struct xfs_rmap_irec *kp1, -+extern int64_t rmap_diffkeys(struct xfs_rmap_irec *kp1, - struct xfs_rmap_irec *kp2); - extern void rmap_high_key_from_rec(struct xfs_rmap_irec *rec, - struct xfs_rmap_irec *key); -diff --git a/repair/sb.c b/repair/sb.c -index 77e51546..acc92839 100644 ---- a/repair/sb.c -+++ b/repair/sb.c -@@ -40,7 +40,7 @@ copy_sb(xfs_sb_t *source, xfs_sb_t *dest) - xfs_ino_t uquotino; - xfs_ino_t gquotino; - xfs_ino_t pquotino; -- __uint16_t versionnum; -+ uint16_t versionnum; - - rootino = dest->sb_rootino; - rbmino = dest->sb_rbmino; -@@ -106,8 +106,8 @@ verify_sb_blocksize(xfs_sb_t *sb) - static int - __find_secondary_sb( - xfs_sb_t *rsb, -- __uint64_t start, -- __uint64_t skip) -+ uint64_t start, -+ uint64_t skip) - { - xfs_off_t off; - xfs_sb_t *sb; -@@ -187,13 +187,13 @@ __find_secondary_sb( - - static int - guess_default_geometry( -- __uint64_t *agsize, -- __uint64_t *agcount, -+ uint64_t *agsize, -+ uint64_t *agcount, - libxfs_init_t *x) - { - struct fs_topology ft; - int blocklog; -- __uint64_t dblocks; -+ uint64_t dblocks; - int multidisk; - - memset(&ft, 0, sizeof(ft)); -@@ -216,9 +216,9 @@ int - find_secondary_sb(xfs_sb_t *rsb) - { - int retval = 0; -- __uint64_t agcount; -- __uint64_t agsize; -- __uint64_t skip; -+ uint64_t agcount; -+ uint64_t agsize; -+ uint64_t skip; - int blocklog; - - /* -@@ -229,7 +229,7 @@ find_secondary_sb(xfs_sb_t *rsb) - do_warn(_("\nattempting to find secondary superblock...\n")); - - if (verify_sb_blocksize(rsb) == 0) { -- skip = (__uint64_t)rsb->sb_agblocks * rsb->sb_blocksize; -+ skip = (uint64_t)rsb->sb_agblocks * rsb->sb_blocksize; - if (skip >= XFS_AG_MIN_BYTES && skip <= XFS_AG_MAX_BYTES) - retval = __find_secondary_sb(rsb, skip, skip); - } -@@ -343,7 +343,7 @@ sb_validate_ino_align(struct xfs_sb *sb) - int - verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb) - { -- __uint32_t bsize; -+ uint32_t bsize; - int i; - int ret; - -@@ -399,7 +399,7 @@ verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb) - sb->sb_dblocks < XFS_MIN_DBLOCKS(sb)) - return(XR_BAD_FS_SIZE_DATA); - -- if (sb->sb_agblklog != (__uint8_t)libxfs_log2_roundup(sb->sb_agblocks)) -+ if (sb->sb_agblklog != (uint8_t)libxfs_log2_roundup(sb->sb_agblocks)) - return(XR_BAD_FS_SIZE_DATA); - - if (sb->sb_inodesize < XFS_DINODE_MIN_SIZE || -diff --git a/repair/scan.c b/repair/scan.c -index b9ef4dc3..447611ac 100644 ---- a/repair/scan.c -+++ b/repair/scan.c -@@ -42,13 +42,13 @@ struct aghdr_cnts { - xfs_agnumber_t agno; - xfs_extlen_t agffreeblks; - xfs_extlen_t agflongest; -- __uint64_t agfbtreeblks; -- __uint32_t agicount; -- __uint32_t agifreecount; -- __uint64_t fdblocks; -- __uint64_t usedblocks; -- __uint64_t ifreecount; -- __uint32_t fibtfreecount; -+ uint64_t agfbtreeblks; -+ uint32_t agicount; -+ uint32_t agifreecount; -+ uint64_t fdblocks; -+ uint64_t usedblocks; -+ uint64_t ifreecount; -+ uint32_t fibtfreecount; - }; - - void -@@ -70,10 +70,10 @@ scan_sbtree( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv), - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv, - const struct xfs_buf_ops *ops) - { -@@ -110,23 +110,23 @@ scan_lbtree( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic), -+ uint64_t magic), - int type, - int whichfork, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, -- __uint64_t magic, -+ uint64_t magic, - const struct xfs_buf_ops *ops) - { - xfs_buf_t *bp; -@@ -179,13 +179,13 @@ scan_bmapbt( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic) -+ uint64_t magic) - { - int i; - int err; -@@ -548,7 +548,7 @@ scan_allocbt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - struct aghdr_cnts *agcnts = priv; -@@ -930,7 +930,7 @@ scan_rmapbt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - const char *name = "rmap"; -@@ -1233,7 +1233,7 @@ scan_refcbt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - const char *name = "refcount"; -@@ -1939,7 +1939,7 @@ scan_inobt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - struct aghdr_cnts *agcnts = priv; -@@ -2176,7 +2176,7 @@ validate_agf( - struct aghdr_cnts *agcnts) - { - xfs_agblock_t bno; -- __uint32_t magic; -+ uint32_t magic; - - bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]); - if (bno != 0 && verify_agbno(mp, agno, bno)) { -@@ -2274,7 +2274,7 @@ validate_agi( - { - xfs_agblock_t bno; - int i; -- __uint32_t magic; -+ uint32_t magic; - - bno = be32_to_cpu(agi->agi_root); - if (bno != 0 && verify_agbno(mp, agno, bno)) { -@@ -2499,10 +2499,10 @@ scan_ags( - int scan_threads) - { - struct aghdr_cnts *agcnts; -- __uint64_t fdblocks = 0; -- __uint64_t icount = 0; -- __uint64_t ifreecount = 0; -- __uint64_t usedblocks = 0; -+ uint64_t fdblocks = 0; -+ uint64_t icount = 0; -+ uint64_t ifreecount = 0; -+ uint64_t usedblocks = 0; - xfs_agnumber_t i; - work_queue_t wq; - -diff --git a/repair/scan.h b/repair/scan.h -index ea8c0bf2..9bbe1e69 100644 ---- a/repair/scan.h -+++ b/repair/scan.h -@@ -30,23 +30,23 @@ int scan_lbtree( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - struct blkmap **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic), -+ uint64_t magic), - int type, - int whichfork, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - struct blkmap **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, -- __uint64_t magic, -+ uint64_t magic, - const struct xfs_buf_ops *ops); - - int scan_bmapbt( -@@ -57,13 +57,13 @@ int scan_bmapbt( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - struct blkmap **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic); -+ uint64_t magic); - - void - scan_ags( --- -2.14.1 - diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch index bba9a25c24..bd2d025635 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch +++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch @@ -1,13 +1,13 @@ -Index: xfsprogs-4.12.0/include/builddefs.in +Index: xfsprogs-4.14.0/include/builddefs.in =================================================================== ---- xfsprogs-4.12.0.orig/include/builddefs.in -+++ xfsprogs-4.12.0/include/builddefs.in -@@ -164,7 +164,7 @@ ifeq ($(ENABLE_GETTEXT),yes) +--- xfsprogs-4.14.0.orig/include/builddefs.in ++++ xfsprogs-4.14.0/include/builddefs.in +@@ -168,7 +168,7 @@ ifeq ($(ENABLE_GETTEXT),yes) GCFLAGS += -DENABLE_GETTEXT endif -BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) +BUILD_CFLAGS += $(GCFLAGS) - # First, Global, Platform, Local CFLAGS - CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) + # First, Sanitizer, Global, Platform, Local CFLAGS + CFLAGS += $(FCFLAGS) $(SANITIZER_CFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch deleted file mode 100644 index efc57e4f69..0000000000 --- a/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" <darrick.wong@oracle.com> -Date: Tue, 25 Jul 2017 13:45:01 -0500 -Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when - metadumping to stdout"), we solved the problem of xfs_db printfs ending up in - the metadump stream by reassigning stdout for the duration of a stdout - metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in - their view "extern FILE *stdout" means "extern FILE * const stdout"), so we - abandon the old approach in favor of playing games with dup() to switch the - raw file descriptors. - -While we're at it, fix a regression where an unconverted outf test -allows progress info to end up in the metadump stream. - -Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> ---- - db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 36 insertions(+), 11 deletions(-) - -diff --git a/db/metadump.c b/db/metadump.c -index 96641e0..4e2f648 100644 ---- a/db/metadump.c -+++ b/db/metadump.c -@@ -78,6 +78,7 @@ static int obfuscate = 1; - static int zero_stale_data = 1; - static int show_warnings = 0; - static int progress_since_warning = 0; -+static bool stdout_metadump; - - void - metadump_init(void) -@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...) - va_end(ap); - buf[sizeof(buf)-1] = '\0'; - -- f = (outf == stdout) ? stderr : stdout; -+ f = stdout_metadump ? stderr : stdout; - fprintf(f, "\r%-59s", buf); - fflush(f); - progress_since_warning = 1; -@@ -2750,7 +2751,8 @@ metadump_f( - xfs_agnumber_t agno; - int c; - int start_iocur_sp; -- bool stdout_metadump = false; -+ int outfd = -1; -+ int ret; - char *p; - - exitcode = 1; -@@ -2870,16 +2872,35 @@ metadump_f( - * metadump operation so that dbprintf and other messages - * are sent to the console instead of polluting the - * metadump stream. -+ * -+ * We get to do this the hard way because musl doesn't -+ * allow reassignment of stdout. - */ -- outf = stdout; -- stdout = stderr; -+ fflush(stdout); -+ outfd = dup(STDOUT_FILENO); -+ if (outfd < 0) { -+ perror("opening dump stream"); -+ goto out; -+ } -+ ret = dup2(STDERR_FILENO, STDOUT_FILENO); -+ if (ret < 0) { -+ perror("redirecting stdout"); -+ close(outfd); -+ goto out; -+ } -+ outf = fdopen(outfd, "a"); -+ if (outf == NULL) { -+ fprintf(stderr, "cannot create dump stream\n"); -+ dup2(outfd, 1); -+ close(outfd); -+ goto out; -+ } - stdout_metadump = true; - } else { - outf = fopen(argv[optind], "wb"); - if (outf == NULL) { - print_warning("cannot create dump file"); -- free(metablock); -- return 0; -+ goto out; - } - } - -@@ -2907,15 +2928,19 @@ metadump_f( - if (progress_since_warning) - fputc('\n', stdout_metadump ? stderr : stdout); - -- if (stdout_metadump) -- stdout = outf; -- else -- fclose(outf); -+ if (stdout_metadump) { -+ fflush(outf); -+ fflush(stdout); -+ ret = dup2(outfd, STDOUT_FILENO); -+ if (ret < 0) -+ perror("un-redirecting stdout"); -+ } -+ fclose(outf); - - /* cleanup iocur stack */ - while (iocur_sp > start_iocur_sp) - pop_cur(); -- -+out: - free(metablock); - - return 0; --- -2.13.3 diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb index 0788695ee6..5d76afe000 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb @@ -6,13 +6,11 @@ LICENSE_libhandle = "LGPLv2.1" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8" DEPENDS = "util-linux util-linux-native" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://0001-xfsprogs-remove-double-underscore-integer-types.patch \ - file://0001-xfs-remove-double-underscore-integer-types.patch \ file://remove_flags_from_build_flags.patch \ - file://xfsprogs-4.12.0-fix_musl.patch \ + file://0001-build-Check-for-sync_file_range-libc-function.patch \ " -SRC_URI[md5sum] = "e348b0e1d7bd1cd82d64b91ff37e727e" -SRC_URI[sha256sum] = "b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df" +SRC_URI[md5sum] = "2d50e3751cc98e6c9364bc3d2297b9fd" +SRC_URI[sha256sum] = "b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec" inherit autotools-brokensep diff --git a/meta-gnome/README b/meta-gnome/README index 0c4fbd2a54..2a682e72d3 100644 --- a/meta-gnome/README +++ b/meta-gnome/README @@ -1,3 +1,25 @@ +meta-gnome +=========== + +The recipe in this layer needs to have 'x11' in DISTRO_FEATURES +to have effect. To enable them, add in configuration file the following line. + + DISTRO_FEATURES_append = " x11" + +If meta-gnome is included, but x11 is not enabled as a +distro feature a warning is printed at parse time: + + You have included the meta-gnome layer, but + 'x11' has not been enabled in your DISTRO_FEATURES. + +If you know what you are doing, this warning can be disabled by setting the following +variable in your configuration: + + SKIP_META_GNOME_SANITY_CHECK = 1 + + +Dependencies +------------ This layer depends on: URI: git://github.com/openembedded/oe-core.git @@ -13,4 +35,4 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnom When sending single patches, please using something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' -Interim layer maintainer: Martin Jansa <Martin.Jansa@gmail.com> +Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> diff --git a/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-gnome/classes/sanity-meta-gnome.bbclass new file mode 100644 index 0000000000..331ea193d9 --- /dev/null +++ b/meta-gnome/classes/sanity-meta-gnome.bbclass @@ -0,0 +1,10 @@ +addhandler gnome_bbappend_distrocheck +gnome_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck" +python gnome_bbappend_distrocheck() { + skip_check = e.data.getVar('SKIP_META_GNOME_SANITY_CHECK') == "1" + if 'x11' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: + bb.warn("You have included the meta-gnome layer, but \ +'x11' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ +may not take effect. See the meta-gnome README for details on enabling \ +meta-gnome support.") +} diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index a13881848d..e6e9532b41 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -14,4 +14,8 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -AVAHI_GTK_pn-avahi-ui = "gtk gtk3" +LAYERSERIES_COMPAT_gnome-layer = "sumo" + +# Sanity check for meta-gnome layer. +# Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. +INHERIT += "sanity-meta-gnome" diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb index 14b336a1e4..dc2b964be5 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb @@ -7,17 +7,19 @@ DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ intltool-native \ " -inherit gnomebase gsettings gtk-icon-cache gobject-introspection +inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection -GNOME_COMPRESS_TYPE = "xz" +REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "3f82cedc4703df0277c76d9feb5bf2c8" -SRC_URI[archive.sha256sum] = "693846eeae0986e79eb1cedfbc499f132f27a9976ef189a0f16938ac59ec3226" +SRC_URI[archive.md5sum] = "eae3be75e77ff1a7ea3174be25e62d03" +SRC_URI[archive.sha256sum] = "0adc4bfae8b49f7a1d929c22ef20933bd41fb4a8b458280f44c65f9e45b4c9c3" PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" PACKAGECONFIG ??= "" -GI_DATA_ENABLED_libc-musl = "False" +EXTRA_OECONF = " \ + --without-selinux \ +" do_configure_append() { # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror @@ -26,6 +28,13 @@ do_configure_append() { done } +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" +} + RDEPENDS_${PN} =+ "networkmanager" FILES_${PN} += " \ diff --git a/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch index 2009dcd228..570cb9ef37 100644 --- a/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch +++ b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch @@ -1,4 +1,7 @@ -include unistd.h to get ssize_t definitions +From fb5056fea9559b3ec3bb61967a112b6c793b700d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jan 2013 21:33:34 -0800 +Subject: [PATCH] include unistd.h to get ssize_t definitions Fixes errors like @@ -18,15 +21,20 @@ Fixes errors like Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: obexd-0.44/plugins/mas.c -=================================================================== ---- obexd-0.44.orig/plugins/mas.c 2012-01-11 14:53:53.000000000 -0800 -+++ obexd-0.44/plugins/mas.c 2013-01-08 12:51:12.681882174 -0800 -@@ -29,6 +29,7 @@ + +--- + plugins/mas.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/mas.c b/plugins/mas.c +index 1b18059..b519507 100644 +--- a/plugins/mas.c ++++ b/plugins/mas.c +@@ -30,6 +30,7 @@ #include <glib.h> #include <fcntl.h> #include <inttypes.h> +#include <unistd.h> - #include "obexd.h" - #include "plugin.h" + #include <gobex/gobex.h> + #include <gobex/gobex-apparam.h> diff --git a/meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch index 03cb762ce0..03cb762ce0 100644 --- a/meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch +++ b/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch diff --git a/meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch index 1b24c39ce8..1b24c39ce8 100644 --- a/meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch +++ b/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch diff --git a/meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch index f735ff8190..f735ff8190 100644 --- a/meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch +++ b/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend deleted file mode 100644 index 3abacfb866..0000000000 --- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG ??= "gnome" diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb b/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb index c4f600095d..c3da3e9b90 100644 --- a/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb +++ b/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" -inherit autotools pkgconfig pythonnative gtk-icon-cache +inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \ @@ -18,7 +20,4 @@ SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b EXTRA_OECONF += "--disable-scrollkeeper" -PACKAGECONFIG ??= "" -PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui" - FILES_${PN} += "${datadir}/icons" diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.30.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb index cea0e3aef9..58beaf6c57 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_0.30.0.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb @@ -3,15 +3,17 @@ HOMEPAGE = "http://gparted.org/index.php" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit autotools pkgconfig gtk-icon-cache +inherit distro_features_check autotools pkgconfig gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://org.yoctoproject.pkexec.run-gparted.policy \ file://gparted_polkit \ " -SRC_URI[md5sum] = "09b12d3831e91b26ec8726b00eecd43d" -SRC_URI[sha256sum] = "d31193effe058bdaeb2a4cd4b514ec753191179a0bc3abefda68a2b7975ecf4a" +SRC_URI[md5sum] = "c554cc5734c50459dd551bd3fa10710e" +SRC_URI[sha256sum] = "3b7b49a434d9e4b397bc41a1f5acab8539b9ff402b472dfd83ad77b2decd07ba" DEPENDS = "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb index 2a13e48393..d2c0186b5a 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb @@ -8,7 +8,6 @@ DEPENDS = " \ gtk+ \ gtkmathview \ wv \ - libglade \ libfribidi \ jpeg \ libpng \ @@ -38,7 +37,9 @@ SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090 #want 3.x from 3.x.y for the installation directory SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -inherit autotools-brokensep pkgconfig +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= " \ collab-backend-xmpp collab-backend-tcp \ diff --git a/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch b/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch deleted file mode 100644 index e9aebb853e..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b75879e8c3e24d338c0e5843d616bc9b02da4d04 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 09:52:17 -0700 -Subject: [PATCH] bonobo-ui-node: qualify functions with G_GNUC_PRINTF - -This helps compiler in doing format checking correctly -Fixes -bonobo-ui-node.c:864:38: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| g_logv ("XML", G_LOG_LEVEL_ERROR, msg, args); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - bonobo/bonobo-ui-node.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bonobo/bonobo-ui-node.c b/bonobo/bonobo-ui-node.c -index 9bab5e5..6ec66e2 100644 ---- a/bonobo/bonobo-ui-node.c -+++ b/bonobo/bonobo-ui-node.c -@@ -835,7 +835,7 @@ uiCharacters (ParseState *ps, const xmlChar *chars, int len) - g_string_append_len (ps->content, chars, len); - } - --static void -+static G_GNUC_PRINTF(2, 3) void - uiWarning (ParseState *ps, const char *msg, ...) - { - va_list args; -@@ -845,7 +845,7 @@ uiWarning (ParseState *ps, const char *msg, ...) - va_end (args); - } - --static void -+static G_GNUC_PRINTF(2, 3) void - uiError (ParseState *ps, const char *msg, ...) - { - va_list args; -@@ -855,7 +855,7 @@ uiError (ParseState *ps, const char *msg, ...) - va_end (args); - } - --static void -+static G_GNUC_PRINTF(2, 3) void - uiFatalError (ParseState *ps, const char *msg, ...) - { - va_list args; --- -2.14.1 - diff --git a/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch b/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch deleted file mode 100644 index f7528adad4..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libbonoboui-2.24.5/tools/browser/Makefile.am -=================================================================== ---- libbonoboui-2.24.5.orig/tools/browser/Makefile.am -+++ libbonoboui-2.24.5/tools/browser/Makefile.am -@@ -2,7 +2,6 @@ INCLUDES = \ - -DBONOBO_BROWSER_DATADIR=\""$(datadir)"\" \ - -DBONOBO_SUPPORT_LOCALEDIR=\""$(datadir)/locale"\" \ - -I$(srcdir) -I$(top_srcdir) \ -- -I$(top_srcdir)/bonobo-browser \ - $(BONOBOUI_CFLAGS) \ - $(WARN_CFLAGS) - diff --git a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make deleted file mode 100644 index 354ffb7c66..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make +++ /dev/null @@ -1,173 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -tmpl/*.sgml: - @true - - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - -install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc deleted file mode 100644 index e4759a87c0..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Bonobo CORBA interfaces library" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" -SECTION = "x11/gnome/libs" -DEPENDS = "gnome-common-native glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" - -inherit gnomebase gtk-doc lib_package - -EXTRA_OECONF += "'PERL_PATH=${USRBINPATH}/env perl'" -ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" - -RDEPENDS_${PN}-bin = "${PN} perl" -FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" -FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \ - ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" -FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples" -FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a" - -LEAD_SONAME = "libbonobo-2.so" - -PARALLEL_MAKE = "" - -do_compile() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" -} - -do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install -} diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch deleted file mode 100644 index 44cf1f9fa0..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 2 May 2013 14:17:38 -0400 -Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This now trips up on GStaticRecMutex; I'm not going to bother to port, -realistically no one is actively maintaining this code anymore. - -Upstream-Status: Applied - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - activation-server/Makefile.am | 1 - - configure.in | 2 +- - 2 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am -index efb18a8..ffa90f6 100644 ---- a/activation-server/Makefile.am -+++ b/activation-server/Makefile.am -@@ -17,7 +17,6 @@ INCLUDES= \ - $(SERVER_CFLAGS) \ - $(WARN_CFLAGS) \ - -DSERVER_CONFDIR=\"$(sysconfdir)\" \ -- -DG_DISABLE_DEPRECATED \ - -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \ - $(NULL) - -diff --git a/configure.in b/configure.in -index 70a4e26..6be2bca 100644 ---- a/configure.in -+++ b/configure.in -@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS) - AC_SUBST(SERVER_CFLAGS) - - if test "$enable_maintainer_mode" = "yes"; then -- DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" -+ DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - fi - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch deleted file mode 100644 index a20edda841..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch +++ /dev/null @@ -1,24 +0,0 @@ -| tests/Makefile.am:55: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/te -st-properties.sh' -| tests/test-activation/Makefile.am:76: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS -' (or '*_CPPFLAGS') -| utils/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS -') -| autoreconf: automake failed with exit status: 1 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Not Submitted - -Index: libbonobo-2.32.1/tests/Makefile.am -=================================================================== ---- libbonobo-2.32.1.orig/tests/Makefile.am 2010-08-29 04:56:00.000000000 -0700 -+++ libbonobo-2.32.1/tests/Makefile.am 2014-04-25 15:38:22.024744384 -0700 -@@ -55,7 +55,7 @@ - MODELS_DIR="$(srcdir)/models" - - TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \ -- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \ -+ test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \ - test-main-loop$(EXEEXT) - - # TESTS += test-generic-factory.sh diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch deleted file mode 100644 index 20db671e05..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch +++ /dev/null @@ -1,26 +0,0 @@ -This checks whether the format string is a literal on the calling function. As bonobo_debug_print() -takes already a va_list, we specify the format on the functions that call it -The second number, which is 0 here, should then be the argument index of the variadic argument - -Fixed warning with clang - -| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| vfprintf (_bonobo_debug_file, fmt, args); -| ^~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libbonobo-2.32.1/bonobo/bonobo-debug.c -=================================================================== ---- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c -+++ libbonobo-2.32.1/bonobo/bonobo-debug.c -@@ -47,6 +47,7 @@ bonobo_debug_init(void) - _bonobo_debug_file = stderr; - } - -+__attribute__((__format__ (printf, 2, 0))) - void - bonobo_debug_print (const char *name, char *fmt, ...) - { diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb deleted file mode 100644 index 8e00eb4d2d..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require libbonobo.inc - -SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ - file://do-not-use-srcdir-variable.patch \ - file://fix-nonliteral-in-string.patch \ - " -SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" -SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b" -GNOME_COMPRESS_TYPE="bz2" diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb deleted file mode 100644 index b3ca0a4657..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "x11/gnome/libs" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" - -inherit gnomebase pkgconfig gtk-doc - -SRC_URI += "file://gcc5.patch \ - file://0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch \ - " - -SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4" -SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade gnome-common intltool-native" - -FILES_${PN} += "${libdir}/libglade/2.0/*.so" -FILES_${PN}-dev += "${libdir}/libglade/2.0/*.la ${datadir}/gnome-2.0/ui \ - ${libdir}/bonobo-2.0/samples" -FILES_${PN}-staticdev += "${libdir}/libglade/2.0/*.a" -FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \ - ${libdir}/libglade/2.0/.debug" diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.42.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb index ae2ec5a596..6ef8e8a62e 100644 --- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.42.bb +++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb @@ -11,10 +11,12 @@ SRC_URI = " \ file://default.lua \ file://devilspie2.desktop \ " -SRC_URI[md5sum] = "f205409e921aa2d86481f1b8d518da45" -SRC_URI[sha256sum] = "11f5bc310fba4df404c057461ffb3fadac8ef51d211008c665c48f587a5a3f85" +SRC_URI[md5sum] = "26eed0b5b4af5c7e13c551eceaeab832" +SRC_URI[sha256sum] = "ecffc17c62b41e196b72340192a90c4223329df041f135e74c0990860595f828" -inherit pkgconfig gettext +inherit distro_features_check pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" do_compile() { export GTK2=1 diff --git a/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop b/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop index e34e881cd4..b80904a0de 100644 --- a/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop +++ b/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Type=Application Name=Devilspie2 +Comment=Perform scripted actions on windows as they are created Exec=devilspie2 -f /etc/devilspie2 diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch new file mode 100644 index 0000000000..d3b0ac6735 --- /dev/null +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch @@ -0,0 +1,46 @@ +From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 May 2018 17:46:52 -0700 +Subject: [PATCH] Use recommended way to handle the icu namespace + +Fixes build with icu >= 61 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libedataserver/e-alphabet-index-private.cpp | 2 ++ + src/libedataserver/e-transliterator-private.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp +index d3e44f4..ddffd99 100644 +--- a/src/libedataserver/e-alphabet-index-private.cpp ++++ b/src/libedataserver/e-alphabet-index-private.cpp +@@ -33,9 +33,11 @@ + + /* ICU headers */ + #include <unicode/alphaindex.h> ++#include <unicode/ustring.h> + + using icu::AlphabeticIndex; + using icu::Locale; ++using U_ICU_NAMESPACE::UnicodeString; + + struct _EAlphabetIndex { + AlphabeticIndex *priv; +diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp +index bb15593..573446f 100644 +--- a/src/libedataserver/e-transliterator-private.cpp ++++ b/src/libedataserver/e-transliterator-private.cpp +@@ -33,8 +33,10 @@ + + /* ICU headers */ + #include <unicode/translit.h> ++#include <unicode/ustring.h> + + using icu::Transliterator; ++using U_ICU_NAMESPACE::UnicodeString; + + struct _ETransliterator { + Transliterator *priv; diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb index 2d410e246c..db5dca95b9 100644 --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb @@ -11,19 +11,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ DEPENDS = " \ intltool-native gperf-native \ glib-2.0 gtk+3 gconf libgnome-keyring libgdata \ - dbus db virtual/libiconv zlib libsoup-2.4 libglade libical nss libsecret \ + dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ " -inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative +inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative -SRC_URI += " \ - file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ - file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ - file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ - file://iconv-detect.h \ -" -SRC_URI[archive.md5sum] = "568a21a4df4e0ec985c849b38fc66908" -SRC_URI[archive.sha256sum] = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5" +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ + file://iconv-detect.h \ + file://0004-Use-recommended-way-to-handle-the-icu-namespace.patch \ + " +SRC_URI[archive.md5sum] = "ae7bbf543b2c3ff79af27e0edea5d472" +SRC_URI[archive.sha256sum] = "e43aa1847ddc02965f560261ef88d18fb8704eddaa55555bf96b884a33e510ec" LKSTRFTIME = "HAVE_LKSTRFTIME=ON" LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" diff --git a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb b/meta-gnome/recipes-gnome/evince/evince_3.28.1.bb index 78a949526b..ce73620b09 100644 --- a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb +++ b/meta-gnome/recipes-gnome/evince/evince_3.28.1.bb @@ -7,18 +7,19 @@ PR = "r5" inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0001-help-remove-YELP-macro.patch \ file://0001-Add-format-attribute-to-_synctex_malloc.patch \ " -SRC_URI[archive.md5sum] = "3fb65ff46de191dc49c481f1fc66201c" -SRC_URI[archive.sha256sum] = "043895af7bbd6f1b57f9ab8778e78cf9c0af5dfcc347eaa94a17bf864c04dc8f" +SRC_URI[archive.md5sum] = "27107b60ecc78b698e7902906f16ce82" +SRC_URI[archive.sha256sum] = "caaa3100548b704068efb33f592b53accaf2154090ca68933d841f318d3c4d9e" -EXTRA_OECONF = " --enable-thumbnailer \ -" +EXTRA_OECONF = "--enable-thumbnailer" do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" } @@ -50,7 +51,7 @@ PACKAGES =+ "${PN}-nautilus-extension" PACKAGES =+ "${PN}-browser-plugin" FILES_${PN} += "${datadir}/dbus-1 \ - ${datadir}/appdata \ + ${datadir}/metainfo \ ${datadir}/thumbnailers \ ${systemd_unitdir}/systemd/user/evince.service \ " diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 5d244de642..ba425ad6b9 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -7,7 +7,10 @@ DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-c LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit gnome gettext pythonnative +inherit distro_features_check gnome gettext pythonnative + +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0001-workaround-void-pointer-arithmetic.patch \ file://0001-Remove-help-directory-from-build.patch \ diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch new file mode 100644 index 0000000000..aa11e8a62e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch @@ -0,0 +1,45 @@ +From 96753d85d8b53dd8f87b8f444892efffdbfab388 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 5 Oct 2017 14:54:17 +0300 +Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) + +Upstream forgot to make it optional, and it is not currently used in Yocto + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + configure.ac | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 118d04f..47c8894 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -151,26 +151,6 @@ fi + + SECCOMP_PKG="" + enable_seccomp="no" +-dnl Check for bubblewrap compatible platform +-case $host_os in +- linux*) +- case $host_cpu in +- alpha|ia64|m68k|sh4|sparc64) +- enable_seccomp="no (not available on this architecture)" +- AC_MSG_WARN("seccomp not available on this architecture") +- ;; +- *) +- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) +- SECCOMP_PKG="libseccomp" +- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) +- enable_seccomp="yes" +- ;; +- esac +- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) +- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) +- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) +- ;; +-esac + + dnl pkg-config dependency checks + diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch new file mode 100644 index 0000000000..fcc152fdef --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch @@ -0,0 +1,61 @@ +From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 13 Dec 2016 20:39:51 -0700 +Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long + +Explicitly use strftime+strptime rather than snprintf+atol. This fixes the +build for X32, where long's size doesn't match that of time_t. + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> + + +Modify patch described above to eliminate replacement of + +g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime) + +which is not necessary. Retain replacement of atol(). + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- + libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c +index e56c3d7..5d96bf3 100644 +--- a/libgnome-desktop/gnome-desktop-thumbnail.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail.c +@@ -120,6 +120,8 @@ + * Since: 2.2 + */ + ++#define _XOPEN_SOURCE ++ + #include <config.h> + + #include <glib.h> +@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, + { + const char *thumb_uri, *thumb_mtime_str; + time_t thumb_mtime; ++ struct tm tmp_mtime; + + thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); + if (g_strcmp0 (uri, thumb_uri) != 0) +@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, + thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); + if (!thumb_mtime_str) + return FALSE; +- thumb_mtime = atol (thumb_mtime_str); ++ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime)) ++ return FALSE; ++ thumb_mtime = mktime (&tmp_mtime); ++ if (!thumb_mtime) ++ return FALSE; + if (mtime != thumb_mtime) + return FALSE; + +-- +2.14.1 + diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb new file mode 100644 index 0000000000..39b3491fdb --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "gnome-desktop" + +inherit gnome pkgconfig upstream-version-is-even gobject-introspection +SRC_URI[archive.md5sum] = "bcbf906d94eb08060c60a7364384d678" +SRC_URI[archive.sha256sum] = "78a397a2be47586e6dc075d6a7fc5659aae3d10713d76994ce1b46086e7ecb9a" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \ + " + +DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" + +inherit distro_features_check gtk-doc +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = "--disable-desktop-docs" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch deleted file mode 100644 index ad8a40ccf8..0000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fixed build error with gcc 4.8 - -Errors like below - -egg-asn1x.c: In function 'anode_encode_build': -egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable] -egg-asn1x.c: In function 'traverse_and_prepare': -egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default] -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *' -egg-asn1x.c: At top level: -egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here -egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here -egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here -make[4]: *** [libegg_la-egg-asn1x.lo] Error 1 - - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: gnome-keyring-2.32.1/egg/egg-asn1x.h -=================================================================== ---- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 19:11:38.000000000 -0700 -+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 15:15:00.675399263 -0700 -@@ -25,6 +25,7 @@ - #define EGG_ASN1X_H_ - - #include <glib.h> -+#include <libtasn1.h> - - #ifndef HAVE_EGG_ALLOCATOR - typedef void* (*EggAllocator) (void* p, gsize); -@@ -35,13 +36,13 @@ - - struct static_struct_asn; - --GNode* egg_asn1x_create (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs, - const gchar *type); - --GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs, - GQuark type); - --GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs, - const gchar *type, - gconstpointer data, - gsize n_data); diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb deleted file mode 100644 index fd6ca73a41..0000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Password and keyring managing daemon" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \ - file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \ - file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \ - file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439" - -SECTION = "x11/gnome" - -PR = "r12" - -inherit autotools gnome gtk-doc pkgconfig gsettings - -SRC_URI += "file://egg-asn1x.patch \ - file://musl.patch \ -" - -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" - -LDFLAGS += "-lgmodule-2.0" - -EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" - -SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" -SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \ - ${base_libdir}/security/*${SOLIBSDEV} \ - " - -FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ - ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ - ${libdir}/${BPN}/standalone/*.la \ - ${base_libdir}/security/*.la \ - " - -INSANE_SKIP_${PN}-dev += "dev-elf" - -FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ - ${libdir}/${BPN}/devel/.debug/ \ - ${base_libdir}/security/.debug/" - -# Make compatible with gcr version 3 or newer by removing -# org.gnome.crypto.pgp.*, which is the provider for this optional -# functionality. - -do_install_append() { - rm ${D}${datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert - rm ${D}${datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml -} diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb new file mode 100644 index 0000000000..55640625d2 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Password and keyring managing daemon" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome" + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit distro_features_check gnomebase remove-libtool + +DEPENDS = " \ + intltool-native \ + glib-2.0-native \ + gtk+3 \ + gcr \ + libgcrypt \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ +" + +SRC_URI[archive.md5sum] = "e09efe8021944dae404736b5a2adb98e" +SRC_URI[archive.sha256sum] = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99" +SRC_URI += "file://musl.patch" + +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" + +EXTRA_OECONF = " \ + --disable-doc \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ +" + + +FILES_${PN} += " \ + ${datadir}/dbus-1/services \ + ${datadir}/p11-kit \ + ${base_libdir}/security/*${SOLIBSDEV} \ + ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ +" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb deleted file mode 100644 index e241882327..0000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Compatibility library for accessing secrets" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \ - file://library/gnome-keyring.h;endline=25;md5=68ea64f81c160d670c37da5f137be4fb \ - file://library/gnome-keyring.c;endline=26;md5=8d7a4fb674aaa012ea5a98e7c368b4a5 \ - file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08" - -SECTION = "x11/gnome/libs" -PR = "r3" - -inherit gnomebase gtk-doc - -DEPENDS = "dbus libgcrypt glib-2.0 intltool-native" - -SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6" -SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c" -GNOME_COMPRESS_TYPE="bz2" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb new file mode 100644 index 0000000000..82abe33491 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Compatibility library for accessing secrets" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \ + file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ +" +SECTION = "x11/gnome/libs" + +inherit gnomebase gtk-doc gobject-introspection + +DEPENDS = "dbus libgcrypt glib-2.0 glib-2.0-native intltool-native" + +SRC_URI[archive.md5sum] = "6696e4f2e9aed4625cdc3af30bd8c238" +SRC_URI[archive.sha256sum] = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783" diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index 01da347bde..647ae914ff 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native gnome-common-native" -inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection +inherit distro_features_check gnomebase pkgconfig python-dir pythonnative gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" BPN = "gnome-menus" diff --git a/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch b/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch deleted file mode 100644 index 09034255d8..0000000000 --- a/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: gnome-mime-data-2.18.0/Makefile.am -=================================================================== ---- gnome-mime-data-2.18.0.orig/Makefile.am 2009-06-11 17:27:48.000000000 +0100 -+++ gnome-mime-data-2.18.0/Makefile.am 2009-06-11 17:27:59.000000000 +0100 -@@ -1,6 +1,6 @@ - SUBDIRS = man po - --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gnome-mime-data-2.0.pc - - NULL= diff --git a/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb b/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb deleted file mode 100644 index eeac1bb4a2..0000000000 --- a/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Base MIME and Application database for GNOME" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://check-mime.pl;endline=26;md5=a95b63c92c33d4ca1af61a315888f450" - -inherit gnomebase mime -PR = "r4" - -SRC_URI += "file://pkgconfig.patch" - -SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" -SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS += "shared-mime-info intltool-native glib-2.0-native" -RDEPENDS_${PN} = "shared-mime-info" diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch new file mode 100644 index 0000000000..57b60a0d56 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch @@ -0,0 +1,28 @@ +From 4a3ee8b46d25b3d310448bfa4446e15a686fc685 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 23 Mar 2018 13:50:18 +0100 +Subject: [PATCH] help: remove YELP macro +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + help/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/help/Makefile.am b/help/Makefile.am +index c5cd0d3..4b83adf 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -1,5 +1,3 @@ +-@YELP_HELP_RULES@ +- + HELP_ID = gnome-system-monitor + + HELP_FILES = \ +-- +2.14.3 + diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb new file mode 100644 index 0000000000..9b6ce17cae --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "Gnome system monitor" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = " \ + intltool-native \ + gnome-common-native \ + glib-2.0-native \ + gtkmm3 \ + libgtop \ + librsvg \ + libwnck3 \ +" + +inherit gnomebase distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "fcd59867c07f8c4853b1e28d60cbc037" +SRC_URI[archive.sha256sum] = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3" +SRC_URI += "file://0001-help-remove-YELP-macro.patch" + +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/gnome/autostart \ +" + +FILES_${PN}-doc += " \ + ${datadir}/omf \ + ${datadir}/gnome/help \ +" diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch deleted file mode 100644 index 3833299708..0000000000 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 7 May 2013 14:56:06 +0200 -Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix - build with glib-2.36 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - daemon/Makefile.am | 1 - - libgnomevfs/Makefile.am | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -Index: gnome-vfs-2.24.4/daemon/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/daemon/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -8,7 +8,6 @@ - -D_LARGEFILE64_SOURCE \ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_REENTRANT \ -- -DG_DISABLE_DEPRECATED \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ - -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ -Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -19,7 +19,6 @@ - -D_LARGEFILE64_SOURCE \ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_REENTRANT \ -- -DG_DISABLE_DEPRECATED \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_BINDIR=\"$(bindir)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ -Index: gnome-vfs-2.24.4/modules/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/modules/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/modules/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -18,7 +18,6 @@ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_REENTRANT \ - -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ -- -DG_DISABLE_DEPRECATED \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ - -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ -Index: gnome-vfs-2.24.4/programs/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/programs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/programs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -4,8 +4,7 @@ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(TEST_CFLAGS) \ -- $(VFS_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(VFS_CFLAGS) - - libraries = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ -Index: gnome-vfs-2.24.4/test/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/test/Makefile.am 2010-02-09 04:16:14.000000000 -0800 -+++ gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:42:49.109019172 -0700 -@@ -6,7 +6,6 @@ - -I$(top_builddir)/libgnomevfs \ - $(TEST_CFLAGS) \ - $(VFS_CFLAGS) \ -- -DG_DISABLE_DEPRECATED \ - -DMODULES_PATH=\"$(libdir)/vfs/modules\" - - if OS_WIN32 diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch deleted file mode 100644 index 30ca29b104..0000000000 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fixes errors with new autotools - -| automake: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/auto-test' -| autoreconf: automake failed with exit status: 1 -| ERROR: autoreconf execution failed. - -Upstream-Status: Not Submitted -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gnome-vfs-2.24.4/test/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/test/Makefile.am 2013-10-17 16:43:36.677017764 -0700 -+++ gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:48:47.369008566 -0700 -@@ -64,7 +64,7 @@ - test-async-cancel \ - test-escape \ - test-uri \ -- $(srcdir)/auto-test -+ auto-test - - libraries = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch deleted file mode 100644 index 0f52136e30..0000000000 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 -+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 -@@ -154,7 +154,7 @@ - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - - if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) - fi - - AM_GCONF_SOURCE_2 diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch deleted file mode 100644 index dabec32c6a..0000000000 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -removes kerberos completely to avoid conflicts with installed kerberos ---- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 -+++ configure.in 2007-01-05 19:42:56.604261797 +0200 -@@ -436,47 +436,6 @@ - ]) - AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) - AC_SUBST(CDDA_LIBS) -- --dnl GSSAPI --dnl Check for Kerberos installation --have_gssapi=no --AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) -- --if test "x$KRB5_CONFIG" != "xnone"; then -- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" -- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" -- -- saved_CPPFLAGS="$CPPFLAGS" -- saved_LIBS="$LIBS" -- LIBS="$LIBS $GSSAPI_LIBS" -- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" -- # MIT and Heimdal put gssapi.h in different places -- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ -- AC_CHECK_FUNCS(gss_init_sec_context, [ -- AC_MSG_NOTICE([GSSAPI authentication support enabled]) -- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) -- AC_CHECK_HEADERS(gssapi/gssapi_generic.h) -- have_gssapi=yes -- -- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE -- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, -- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, -- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) -- ], [ -- #ifdef HAVE_GSSAPI_GSSAPI_H -- #include <gssapi/gssapi.h> -- #else -- #include <gssapi.h> -- #endif -- ]) -- ]) -- break -- ]) -- LIBS="$saved_LIBS" -- CPPFLAGS="$saved_CPPFLAGS" --fi --AC_SUBST(GSSAPI_LIBS) --AC_SUBST(GSSAPI_CFLAGS) - - dnl ****************************** - dnl http-method (neon checks) diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb deleted file mode 100644 index 3ec646697f..0000000000 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "a userspace virtual filesystem" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \ - file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \ - file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \ - file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54" - -DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib intltool-native gnome-common-native" -RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" -# Some legacy packages will require gnome-mime-data to be installed, but use of -# it is deprecated. -PR = "r3" - -inherit gnome - -# This is to provide compatibility with the gnome-vfs DBus fork -RPROVIDES_${PN} = "gnome-vfs-plugin-dbus" - -SRC_URI += " \ - file://gconftool-lossage.patch \ - file://gnome-vfs-no-kerberos.patch;striplevel=0 \ - file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \ - file://do-not-use-srcdir-variable.patch \ -" - -SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" -SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" -GNOME_COMPRESS_TYPE="bz2" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin" - -EXTRA_OECONF = " --disable-hal \ - --disable-openssl \ - --disable-samba \ - ac_cv_lib_acl_acl_get_file=no \ - ac_cv_lib_sec_acl=no \ - gvfs_cv_HAVE_SOLARIS_ACLS=no \ - gvfs_cv_HAVE_POSIX_ACLS=no \ -" - -FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services" -FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" -FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/include/* ${libdir}/gnome-vfs-2.0/modules/*.la" -FILES_${PN}-staticdev += "${libdir}/gnome-vfs-2.0/modules/*.a" -FILES_${PN}-doc += "${datadir}/gtk-doc" - -PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*" - -python populate_packages_prepend () { - plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/') - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') -} diff --git a/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch b/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch deleted file mode 100644 index f0b878d376..0000000000 --- a/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <dimstar@opensuse.org> -Date: Sun, 27 Nov 2011 14:24:57 +0000 -Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 - -Upstream-Status: Backport - ---- -diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c -index 1f7a41f..56a9286 100644 ---- a/engines/clearlooks/src/animation.c -+++ b/engines/clearlooks/src/animation.c -@@ -28,7 +28,7 @@ - #include "animation.h" - - #ifdef HAVE_WORKING_ANIMATION --#include <glib/gtimer.h> -+#include <glib.h> - - struct _AnimationInfo { - GTimer *timer; --- -cgit v0.9.0.2 diff --git a/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch b/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch deleted file mode 100644 index 5c557ba689..0000000000 --- a/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac ---- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300 -+++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300 -@@ -166,6 +166,9 @@ - - AC_SUBST(DEVELOPMENT_CFLAGS) - -+AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) -+AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) -+ - AM_CONFIG_HEADER([engines/support/config.h]) - - AC_CONFIG_FILES([ -diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am ---- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300 -+++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300 -@@ -66,7 +66,7 @@ - # Prefix with exported_ - EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) - --TESTS += $(EXPORTED_SYMBOLS_TESTS) -+TESTS += @exported_symbols_tests@ - - - ############################################################# -@@ -88,7 +88,7 @@ - TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) - - # Add TORTURE_TEST_ENGINES to list of tests --TESTS += $(TORTURE_TEST_TESTS) -+TESTS += @torture_test_tests@ - - # Possible other tests: - # - An extensive theme switch tests that loads/unloads the engine diff --git a/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb deleted file mode 100644 index 83aa749685..0000000000 --- a/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "GTK+ theme engines" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SECTION = "x11/base" -DEPENDS = "intltool-native gtk+ gettext-native glib-2.0-native" - -PR = "r3" - -PACKAGES += "${PN}-schemas" -PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*" - -RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" -RDEPENDS_gtk-theme-metal = "gtk-engine-metal" -RDEPENDS_gtk-theme-mist = "gtk-engine-mist" -RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" -RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" -RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" -RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" -RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks" - -FILES_${PN} = "" -FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la" -FILES_${PN}-schemas = "${datadir}/gtk-engines/*.xml" - -CFLAGS_prepend = "-DHAVE_ANIMATION " - -RDEPENDS_${PN}-dev = "" - -inherit gnomebase -GNOME_COMPRESS_TYPE="bz2" - -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -# This picks stable releases in the 2.x series (but not 2.90 onwards, -# which were GNOME 3 betas). -UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)" - -python populate_packages_prepend() { - engines_root = os.path.join(d.getVar('libdir'), "gtk-2.0/2.10.0/engines") - themes_root = os.path.join(d.getVar('datadir'), "themes") - - do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') - do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') - # TODO: mark theme packages as arch all -} - -SRC_URI += "file://glib-2.32.patch \ - file://substitute-tests.patch" -SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" -SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb index 8d7865fd6f..5f7391285f 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb @@ -8,8 +8,13 @@ DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit sha SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "44012824aa75797a7d272cd60f07b488" -SRC_URI[archive.sha256sum] = "7ef9b2aec234004271a575118a0e35b3c36ce3309e5f9da109635651843372b4" +SRC_URI[archive.md5sum] = "216d461c5e96e2cea74253be407af6dc" +SRC_URI[archive.sha256sum] = "9ec388afeb373a213f2cc489184f76a17ae273a000e8a4ec720c1995943256bb" + +do_configure_prepend() { + # make automake happy.. + touch ${S}/ABOUT-NLS +} EXTRA_OECONF = " \ --disable-gdu \ diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb index c2157df0cb..80cbae39f0 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb @@ -9,12 +9,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ DEPENDS = "gnome-common-native libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" -inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala gobject-introspection +inherit distro_features_check gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend_class-target () { # introspection.m4 pre-packaged with upstream tarballs does not yet # have our fixes rm -f ${S}/introspection.m4 + + # remove the pre-built gtk-doc files, as they're installed (or attempted to be installed) + # even if gtk-doc is explicitly disabled + rm -rf ${S}/docs/reference/html } do_compile_prepend() { diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch b/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch deleted file mode 100644 index b6583034f2..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ce1cd20fceea7dbcc5b983d94de771461eccf7cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 29 Apr 2013 14:17:13 +0200 -Subject: [PATCH] libgnome/Makefile.am: allow deprecated symbols -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes: - -| gnome-program.c: In function 'gnome_program_init_common': -| gnome-program.c:2067:2: error: implicit declaration of function 'g_atexit' [-Werror=implicit-function-declaration] - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - libgnome/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am -index 9c8cd3e..aa01f6c 100644 ---- a/libgnome/Makefile.am -+++ b/libgnome/Makefile.am -@@ -17,7 +17,6 @@ INCLUDES = \ - -I$(srcdir)/.. \ - $(WARN_CFLAGS) \ - $(LIBGNOME_CFLAGS) \ -- -DG_DISABLE_DEPRECATED \ - -DLIBGNOME_PREFIX=\""$(prefix)"\" \ - -DLIBGNOME_LIBDIR=\""$(libdir)"\" \ - -DLIBGNOME_DATADIR=\""$(datadir)"\" \ --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome/05_fix_invalid_utf8.patch b/meta-gnome/recipes-gnome/libgnome/libgnome/05_fix_invalid_utf8.patch deleted file mode 100644 index cd90b8ed98..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnome/05_fix_invalid_utf8.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Mon, 7 Aug 2017 12:57:43 -0400 -Subject: gnome-config.h: Fix invalid UTF-8 in header - -This breaks the new Python `glib-mkenums`. ---- -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - libgnome/gnome-config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h -index 0c3dfe6..b9d659d 100644 ---- a/libgnome/gnome-config.h -+++ b/libgnome/gnome-config.h -@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv); - #define gnome_config_private_clean_key(path) \ - (gnome_config_clean_key_((path),TRUE)) - --/* returns the true filename of the config file*/ -+/* returns the true filename of the config file */ - #define gnome_config_get_real_path(path) \ - (g_build_filename (gnome_user_dir_get(),(path),NULL)) - #define gnome_config_private_get_real_path(path) \ diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb deleted file mode 100644 index 94fcf2e8c5..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Gnome application programming libraries" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -SECTION = "x11/gnome/libs" - -inherit gnome lib_package - -PR = "r2" - -SRC_URI[archive.md5sum] = "a4345e6087ae6195d65a4674ffdca559" -SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4" -SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch \ - file://05_fix_invalid_utf8.patch \ -" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native gnome-common-native" - -EXTRA_OECONF += "--disable-gtk-doc" - -do_configure_prepend() { - sed -i -e s:docs::g ${S}/Makefile.am - echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make - echo "EXTRA_DIST = version.xml" > gtk-doc.make -} - -FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \ - ${datadir}/gnome-background-properties ${datadir}/pixmaps" -FILES_${PN}-dev += "${libdir}/bonobo/monikers/*.la" -FILES_${PN}-staticdev += "${libdir}/bonobo/monikers/*.a" - -PACKAGES =+ "gnome-common-schemas" - -FILES_gnome-common-schemas = "${datadir}/gnome-background-properties ${datadir}/pixmaps ${sysconfdir}" - -RDEPENDS_${PN} = "gnome-common-schemas" - -FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug" diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb deleted file mode 100644 index 41a89cedee..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A powerful object-oriented display" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -SECTION = "x11/gnome/libs" - -inherit gnomebase gtk-doc - -# intltool to provide IT_PROG_INTLTOOL -# configure: line 12654: syntax error near unexpected token `0.35.0' -# configure: line 12654: `IT_PROG_INTLTOOL(0.35.0)' -DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native gnome-common-native" - -SRC_URI[archive.md5sum] = "ffcbb719c671ff5cd86e59aeba8d0b92" -SRC_URI[archive.sha256sum] = "859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" -FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/" -FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas*.la" -FILES_${PN}-staticdev += "${libdir}/libglade/*/libcanvas*.a" diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb index 12ed81d4fd..40249fdfb9 100644 --- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb +++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb @@ -6,7 +6,9 @@ SECTION = "x11/gnome/libs" DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" -inherit gnome gobject-introspection gettext +inherit distro_features_check gnome gobject-introspection gettext + +REQUIRED_DISTRO_FEATURES = "x11" GNOME_COMPRESS_TYPE = "xz" diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch deleted file mode 100644 index abc9bdfbab..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 6697fcf9d7f53126b442bf19890640b5f88c8aa4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 29 Jul 2016 21:24:20 +0200 -Subject: [PATCH] suppress string format literal warning to fix build with gcc6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -works around: -| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'day_selected': -| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:156:9: error: format not a string literal, format string not checked [-Werror=format-nonliteral] -| strftime_date_format, &mtm) == 0) -| ^~~~~~~~~~~~~~~~~~~~ -| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'gnome_date_edit_set_time': -| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:704:2: error: format not a string literal, format string not checked [-Werror=format-nonliteral] -| if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0) -| ^~ - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - libgnomeui/gnome-dateedit.c | 6 ++++++ - libgnomeui/gnome-gconf-ui.c | 3 +++ - 2 files changed, 9 insertions(+) - -diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c -index 69ab699..41541c3 100644 ---- a/libgnomeui/gnome-dateedit.c -+++ b/libgnomeui/gnome-dateedit.c -@@ -152,9 +152,12 @@ day_selected (GtkCalendar *calendar, GnomeDateEdit *gde) - else - mtm.tm_year = year; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - if (strftime (buffer, sizeof (buffer), - strftime_date_format, &mtm) == 0) - strcpy (buffer, "???"); -+#pragma GCC diagnostic pop - buffer[sizeof(buffer)-1] = '\0'; - - /* FIXME: what about set time */ -@@ -701,8 +704,11 @@ gnome_date_edit_set_time (GnomeDateEdit *gde, time_t the_time) - mytm = localtime (&the_time); - - /* Set the date */ -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0) - strcpy (buffer, "???"); -+#pragma GCC diagnostic pop - buffer[sizeof(buffer)-1] = '\0'; - - str_utf8 = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL); -diff --git a/libgnomeui/gnome-gconf-ui.c b/libgnomeui/gnome-gconf-ui.c -index 43c0f44..a84b2c0 100644 ---- a/libgnomeui/gnome-gconf-ui.c -+++ b/libgnomeui/gnome-gconf-ui.c -@@ -180,12 +180,15 @@ error_idle_func (gpointer data) - "configuration settings may not work properly."); - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - dialog = gtk_message_dialog_new (NULL /* parent */, - 0 /* flags */, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - fmt, - gnome_program_get_human_readable_name(gnome_program_get())); -+#pragma GCC diagnostic pop - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), --- -2.5.5 - diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/05_fix_invalid_utf8.patch b/meta-gnome/recipes-gnome/libgnome/libgnomeui/05_fix_invalid_utf8.patch deleted file mode 100644 index bb09b47951..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomeui/05_fix_invalid_utf8.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Fix FTBFS with glib 2.54 - glib-mkenums now expects input files to be UTF-8, - fix the encoding of libgnomeui/gnome-scores.h -Author: Adrian Bunk <bunk@debian.org> - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: libgnomeui-2.24.5/libgnomeui/gnome-scores.h -=================================================================== ---- libgnomeui-2.24.5.orig/libgnomeui/gnome-scores.h -+++ libgnomeui-2.24.5/libgnomeui/gnome-scores.h -@@ -27,7 +27,7 @@ - * "High Scores" Widget - * - * AUTHOR: -- * Horacio J. Pea <horape@compendium.com.ar> -+ * Horacio J. Peña <horape@compendium.com.ar> - * - * This is free software (under the terms of the GNU LGPL) - * diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h b/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h deleted file mode 100644 index 953a8aeb06..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h +++ /dev/null @@ -1,4030 +0,0 @@ -/* gnome stock icons in GdmPixbuf usable rgb data - * - * Copyright (C) 1997 the Free Software Foundation - * - * the pixmaps for button_cancel, save_as, trash, mail_receive, stop - * right_arrow, home, save, book_blue, trash_full, undo, search, mail_forward - * revert, mail_compose, mic, copy, jump_to, convert, button_apply, timer - * mail, book_red, book_yellow, help, redo, new, mail_send, button_yes, cut - * properties, print, mail_reply, refresh, search_replace, open, preferences - * left_arrow, undelete, close, volume, button_no, exit, book_green - * book_open, paste, line_in, spellcheck, timer_stopped - * are Copyright (C) 1998 Tuomas Kuosmanen - */ - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_attach) -#endif -#ifdef __GNUC__ -static const guint8 stock_attach[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_attach[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0c\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\21\0\0\0\2\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\26\0" - "\0\0\"\0\0\0$\0\0\0%\0\0\0%\0\0\0\377\0\0\0l\0\0\0\377\0\0\0\377\0\0" - "\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\"\0\0\0\20\0" - "\0\0$\0\0\0~\1\1\1\377QQQ\377\232\232\232\377\317\317\317\377ooo\377" - "\0\0\0\377\0\0\0\16\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0x\0\0\0" - "\377FFF\377\245\245\245\377\342\342\342\377\377\377\377\377\377\377\377" - "\377\366\366\366\377\212\212\212\377999\377\0\0\0(\0\0\0\10\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\34\0\0\0" - "B\0\0\0\377\34\34\34\377\213\213\213\377\346\346\346\377\356\356\356" - "\377\341\341\341\377\377\377\377\377\370\370\370\377\367\367\367\377" - "\366\366\366\377\314\314\314\377VVV\377\0\0\0^\0\0\0\12\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\377>>>\377\201\201\201" - "\377\324\324\324\377\34\34\34\377\347\347\347\377\327\327\327\377\372" - "\372\372\377\371\371\371\377\370\370\370\377\302\302\302\377\313\313" - "\313\377\365\365\365\377\331\331\331\377\201\201\201\377\0\0\0\377\0" - "\0\0\25\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0:\3\3\3\377TTT\377\346\346" - "\346\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\327" - "\327\327\377\336\336\336\377\263\263\263\377yyy\377\0\0\0\377\342\342" - "\342\377\366\366\366\377\365\365\365\377\364\364\364\377\235\235\235" - "\377(((\377\0\0\0)\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\366\366" - "\366\377\377\377\377\377\377\377\377\377\372\372\372\377\372\372\372" - "\377\373\373\373\377\0\0\0\377\246\246\246\377\305\305\305\377\360\360" - "\360\377\370\370\370\377\0\0\0\377\342\342\342\377\302\302\302\377\312" - "\312\312\377\364\364\364\377\307\307\307\377VVV\377\0\0\0^\0\0\0\12\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\362\362\362\377\370\370\370\377\371" - "\371\371\377\316\316\316\377\304\304\304\377\305\305\305\377\0\0\0\377" - "\325\325\325\377\371\371\371\377\370\370\370\377\370\370\370\377\0\0" - "\0\377\263\263\263\377\332\332\332\377\364\364\364\377\363\363\363\377" - "\363\363\363\377yyy\377\0\0\0\377\0\0\0\25\0\0\0\3\0\0\0\0\0\0\0\0\0" - "\0\0h\205\205\205\377\377\377\377\377\370\370\370\377\276\276\276\377" - "\371\371\371\377\371\371\371\377\0\0\0\377\323\323\323\377\334\334\334" - "\377\302\302\302\377\302\302\302\377\0\0\0\377\342\342\342\377\365\365" - "\365\377\364\364\364\377\363\363\363\377\362\362\362\377\234\234\234" - "\377(((\377\0\0\0)\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\40HHH\377\377\377\377" - "\377\367\367\367\377\367\367\367\377\370\370\370\377\370\370\370\377" - "\0\0\0\377\247\247\247\377\326\326\326\377\367\367\367\377\366\366\366" - "\377\0\0\0\377\342\342\342\377\364\364\364\377\304\304\304\377\310\310" - "\310\377\362\362\362\377\306\306\306\377LLL\377\0\0\0^\0\0\0\12\0\0\0" - "\0\0\0\0\0\0\0\0\1\0\0\0\377\352\352\352\377\377\377\377\377\366\366" - "\366\377\276\276\276\377\302\302\302\377\0\0\0\377\345\345\345\377\330" - "\330\330\377\366\366\366\377\365\365\365\377\0\0\0\377\255\255\255\377" - "\274\274\274\377\352\352\352\377\340\340\340\377\361\361\361\377\352" - "\352\352\377\220\220\220\377\0\0\0\377\0\0\0\25\0\0\0\3\0\0\0\0\0\0\0" - "\0\0\0\0ihhh\377\377\377\377\377\365\365\365\377\366\366\366\377\366" - "\366\366\377\242\242\242\377\0\0\0\377\300\300\300\377\301\301\301\377" - "\0\0\0\377xxx\377\326\326\326\377\363\363\363\377\362\362\362\377\361" - "\361\361\377\361\361\361\377\325\325\325\377\256\256\256\377\25\25\25" - "\377\0\0\0)\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\4""999\377\377\377\377\377" - "\364\364\364\377\365\365\365\377\365\365\365\377\332\332\332\377\232" - "\232\232\377\0\0\0\377\0\0\0\377yyy\377\326\326\326\377\362\362\362\377" - "\362\362\362\377\361\361\361\377\326\326\326\377\320\320\320\377\227" - "\227\227\377rrr\377JJJ\377\0\0\0.\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\354\354\354\377\377\377\377\377\364\364\364\377\254\254\254" - "\377\272\272\272\377\335\335\335\377\363\363\363\377\316\316\316\377" - "\333\333\333\377\354\354\354\377\327\327\327\377\326\326\326\377\261" - "\261\261\377\201\201\201\377VVV\377###\377\0\0\0\377\0\0\0q\0\0\0)\0" - "\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0hiii\377\377\377\377\377\363\363" - "\363\377\363\363\363\377\363\363\363\377\363\363\363\377\362\362\362" - "\377\362\362\362\377\327\327\327\377\267\267\267\377\202\202\202\377" - "@@@\377###\377\0\0\0\377\0\0\0\204\0\0\0""2\0\0\0.\0\0\0)\0\0\0\25\0" - "\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4(((\377\377\377\377\377\363\363" - "\363\377\362\362\362\377\362\362\362\377\327\327\327\377\276\276\276" - "\377\226\226\226\377222\377###\377\0\0\0\377\0\0\0u\0\0\0H\0\0\0/\0\0" - "\0*\0\0\0\31\0\0\0\13\0\0\0\10\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\377\346\346\346\377\350\350\350\377\314\314\314\377" - "\232\232\232\377@@@\377###\377\0\0\0\377\0\0\0\221\0\0\0I\0\0\0/\0\0" - "\0*\0\0\0\30\0\0\0\16\0\0\0\11\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0;999\377\202\202\202\377999\377" - "\22\22\22\377\0\0\0\204\0\0\0I\0\0\0/\0\0\0*\0\0\0\33\0\0\0\16\0\0\0" - "\11\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\377\0\0\0\377\0\0\0u\0\0" - "\0""1\0\0\0*\0\0\0\31\0\0\0\16\0\0\0\11\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\11\0\0\0&\0\0\0)\0\0\0\27\0\0\0" - "\12\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\7\0\0\0\10\0\0\0\3\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_book_blue) -#endif -#ifdef __GNUC__ -static const guint8 stock_book_blue[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_book_blue[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\21\26\35\377\227" - "\250\276\377}\223\254\377s\212\243\377l\204\234\377d|\226\377^v\217\377" - "Wo\210\377Pi\202\377Pi\202\377Pi\202\377Pi\202\377Pi\202\377Vn\206\377" - "IXi\377\21\30\"\376\0\0\0.\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\273v\213\242\377\216\242\270\377v\215\247\377Vr\220\377" - "Nj\210\377Fb\200\377=Zx\3775Rp\3771Nk\3771Nk\3776Ro\3776Ro\377<Ws\377" - "6Ro\3773@O\377\25\34%\372\0\0\0N\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\22\12\15\21\377\231\254\300\377\200\226\256\377[v\224\377" - "So\215\377Jg\205\377B_}\377:Wu\3772Om\3771Nk\3771Nk\3771Nk\3771Nk\377" - ";Wr\377-D\\\377#/6\377\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\255[iy\377\231\254\300\377u\215\246\377Ws\221\377Ok\210" - "\377Gc\201\377\77[y\3776Sq\3771Nk\3771Nk\3771Nk\3771Nk\3774Pm\377;Wr" - "\377)\77V\3775<A\375\0\0\0\377\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\21\0\0\0\377\231\254\300\377\200\227\260\377\\x\226\377Tp\216" - "\377Kh\206\377C`~\377;Xv\3773Pn\3771Nk\3771Nk\3773Pk\3771Nk\3779Uq\377" - "-D\\\377\27\",\377~\202\205\377578\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\232[iy\377\217\243\271\377u\215\246\377Xt\222\377Pl" - "\212\377Hd\202\377@\\z\3778Tr\3771Nk\3771Nk\3771Nk\3771Nk\3772Ol\377" - "=Yt\377)\77V\377!'.\376JLM\377\216\220\222\377\0\0\0Q\0\0\0\20\0\0\0" - "\0\0\0\0\0\0\0\0\20\0\0\0\377\230\253\277\375\177\226\257\377]y\227\377" - "Uq\217\377Mi\207\377Da\177\377<Yw\3774Qo\3771Nk\3771Nk\3771Nk\3771Nk" - "\3778Tp\377/F]\377\30$-\377TWY\366eij\377334\377\0\0\0Q\0\0\0\20\0\0" - "\0\0\0\0\0\0\0\0\0\335eu\203\377\215\242\271\377v\215\247\377Zu\223\377" - "Qm\213\377Ie\203\377A]{\3779Us\3771Nk\3771Nk\3771Nk\3771Nk\3771Nk\377" - "<Ws\377*BZ\377#+2\377FHJ\377\220\222\225\377\0\0\0\377\0\0\0c\0\0\0\21" - "\0\0\0\0\0\0\0!\0\0\0\377\233\254\273\377\207\234\264\377c~\233\377V" - "r\220\377Nj\210\377Fb\200\377=Zx\3775Rp\3771Nk\3771Nk\3771Nk\3771Nk\377" - "5Rn\3774Kb\377\31$-\377dhk\377mop\3770G]\377\0\0\0\373\0\0\0R\0\0\0\25" - "\0\0\0\0\0\0\0\245ep}\377\221\245\274\377q\213\246\377\\x\226\377Tp\216" - "\377Kh\206\377C`~\377;Xv\3773Pn\3771Nk\3771Nk\3771Nk\3771Nk\377=Yt\377" - ")\77V\377&.3\377WXY\377\213\217\225\377\11\15\21\372\0\0\0\234\0\0\0" - "I\0\0\0\17\0\0\0\13\0\0\0\377~\216\237\337\212\237\266\377l\205\241\377" - "Xt\222\377Pl\212\377Hd\202\377@\\z\3778Tr\3771Nk\3771Nk\3771Nk\3771N" - "k\3771Nk\3775Lc\377\32%0\377HLN\377suv\377C[s\370\0\0\0\364\0\0\0U\0" - "\0\0+\0\0\0\7\0\0\0\206uww\377\275\306\323\375\256\276\314\377\247\266" - "\306\377\243\262\302\377\236\255\275\377\232\252\271\377\220\240\260" - "\377{\217\241\377y\214\237\377y\214\237\377y\214\237\377y\214\237\377" - "p\204\231\377Ufy\37725;\377[^a\377\216\223\230\377\12\16\21\372\0\0\0" - "\233\0\0\0G\0\0\0\21\0\0\0\1\2\7\11\331\260\272\304\377,>Q\377$6J\377" - "$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377" - "$6J\377+5\77\377^bh\377wxz\377F`z\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6" - "\0\0\0\0\15\17\21\377\207\223\235\377@AE\377_``\373ttt\377\226\226\226" - "\377\261\261\261\377\257\257\260\377\305\305\306\377\316\316\317\377" - "\264\273\301\377\274\302\311\377\275\304\312\377\304\313\322\377\313" - "\322\331\377\326\332\336\377\220\226\233\377\205\212\217\377\24\33!\371" - "\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\14\16\17\377k{\213\377WWW" - "\377}~\200\377\342\344\346\377\342\344\346\377\341\341\341\377\337\337" - "\340\377\337\337\340\377\362\362\362\377\375\375\376\377\361\363\365" - "\377\361\363\365\377\361\363\365\377\247\250\252\377\262\265\271\377" - "imq\377F`z\377\0\1\2\370\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\0\0\0\0$%'\377" - "cr\201\377i|\216\377Tk\203\377E]x\377\326\334\341\377\347\352\355\377" - "\355\357\361\377\355\357\362\377\345\346\347\377\336\336\337\377\341" - "\341\342\377\341\341\342\377\337\337\340\377\341\342\343\377rz\203\377" - "\213\217\224\377\25\33!\367\0\0\0\234\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0""9\0\0\0\377\4\6\12\3548J]\363Mbx\351Th\177\357Sj\202" - "\377Wo\206\377\207\227\247\377\327\335\341\377\342\346\351\377\351\354" - "\356\377\370\371\372\377\370\371\372\377\201\205\212\377\245\247\250" - "\377\234\242\250\377\1\2\3\370\0\0\0U\0\0\0*\0\0\0\7\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e\0\0\0\276\0\0\0\346\0\0\0\360\0\0\0\363" - ";K^\371DVi\371Tg}\367Uk\200\366Vl\203\377\254\270\303\377\334\341\345" - "\377\350\353\355\377\237\243\246\377\25\35$\373\0\0\0\234\0\0\0H\0\0" - "\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0" - "\34\0\0\0""4\0\0\0C\0\0\0g\0\0\0\251\0\0\0\344\0\0\0\361\0\0\0\3560>" - "M\365=N`\371O_s\372Se{\367Lc|\357\1\3\5\367\0\0\0U\0\0\0+\0\0\0\7\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12" - "\0\0\0\15\0\0\0\20\0\0\0\33\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327" - "\0\0\0\356\0\0\0\354\0\0\0\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\3\0\0\0\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0" - "\77\0\0\0H\0\0\0H\0\0\0@\0\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0" - "\0\0\16\0\0\0\14\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_book_green) -#endif -#ifdef __GNUC__ -static const guint8 stock_book_green[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_book_green[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\21\34\21\377\225" - "\276\225\377y\255y\377n\246n\377e\241e\377^\233^\377Y\222Y\377S\212S" - "\377O\202O\377O\202O\377O\202O\377O\202O\377O\202O\377R\210R\377CnC\377" - "\22\36\22\376\0\0\0.\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\273o\247o\377\214\271\214\377r\251r\377V\216V\377P\204P\377Jz" - "J\377CoC\377=e=\377:`:\377:`:\377=e=\377=e=\377AkA\377=e=\3770P0\377" - "\26#\26\372\0\0\0N\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22" - "\11\17\11\377\227\277\227\377}\260}\377Y\223Y\377T\213T\377M\177M\377" - "GuG\377AkA\377;a;\377:`:\377:`:\377:`:\377:`:\377@j@\3773T3\377!6!\377" - "\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\255O\203" - "O\377\227\277\227\377q\250q\377W\217W\377P\204P\377K|K\377ErE\377>f>" - "\377:`:\377:`:\377:`:\377:`:\377<c<\377@j@\377/N/\377,I,\375\0\0\0\377" - "\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\21\0\0\0\377\227\277\227" - "\377~\260~\377[\226[\377U\214U\377N\201N\377HwH\377BmB\377<c<\377:`:" - "\377:`:\377;a;\377:`:\377@i@\3773T3\377\30(\30\377\201\201\201\377(B" - "(\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\232O\203O\377\215" - "\271\215\377q\250q\377X\221X\377R\207R\377L}L\377FsF\377@i@\377:`:\377" - ":`:\377:`:\377:`:\377;a;\377BmB\377/N/\377\35""0\35\376KKK\377\220\220" - "\220\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\20\0\0\0\377\226\277\226" - "\375}\260}\377\\\227\\\377V\215V\377O\203O\377IxI\377CnC\377=d=\377:" - "`:\377:`:\377:`:\377:`:\377\77h\77\3774V4\377\31*\31\377VVV\366ggg\377" - "333\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\335W\217W\377\214\271\214" - "\377r\251r\377Y\222Y\377R\210R\377L~L\377FtF\377@j@\377:`:\377:`:\377" - ":`:\377:`:\377:`:\377AkA\3771Q1\377\37""3\37\377HHH\377w\254w\377\0\0" - "\0\377\0\0\0c\0\0\0\21\0\0\0\0\0\0\0!\0\0\0\377\226\277\226\377\204\264" - "\204\377_\235_\377V\216V\377P\204P\377JzJ\377CoC\377=e=\377:`:\377:`" - ":\377:`:\377:`:\377=d=\3778]8\377\32+\32\377ggg\377nnn\3774V4\377\0\0" - "\0\373\0\0\0R\0\0\0\25\0\0\0\0\0\0\0\245U\214U\377\220\273\220\377n\246" - "n\377[\226[\377U\214U\377N\201N\377HwH\377BmB\377<c<\377:`:\377:`:\377" - ":`:\377:`:\377BmB\377/N/\377!6!\377XXX\377t\253t\377\11\17\11\372\0\0" - "\0\234\0\0\0I\0\0\0\17\0\0\0\13\0\0\0\377t\247t\337\210\266\210\377h" - "\243h\377X\221X\377R\207R\377L}L\377FsF\377@i@\377:`:\377:`:\377:`:\377" - ":`:\377:`:\3779^9\377\33.\33\377KKK\377ttt\377EpE\370\0\0\0\364\0\0\0" - "U\0\0\0+\0\0\0\7\0\0\0\206Y\222Y\377\272\325\272\375\254\314\254\377" - "\243\307\243\377\237\304\237\377\230\300\230\377\223\275\223\377\210" - "\266\210\377r\251r\377o\247o\377o\247o\377o\247o\377o\247o\377e\241e" - "\377M\177M\377(B(\377^^^\377x\255x\377\11\17\11\372\0\0\0\233\0\0\0G" - "\0\0\0\21\0\0\0\1\3\5\3\331\250\312\250\377.L.\377)D)\377)D)\377)D)\377" - ")D)\377)D)\377)D)\377)D)\377)D)\377)D)\377)D)\377)D)\377)D)\377'A'\377" - "ccc\377xxx\377HwH\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\13\22\13" - "\377w\254w\3771Q1\377___\373ttt\377\226\226\226\377\261\261\261\377\257" - "\257\257\377\305\305\305\377\316\316\316\377\272\272\272\377\302\302" - "\302\377\303\303\303\377\313\313\313\377\322\322\322\377\332\332\332" - "\377\225\225\225\377m\246m\377\23\37\23\371\0\0\0\234\0\0\0H\0\0\0\22" - "\0\0\0\1\0\0\0\0\11\17\11\377\\\230\\\377AkA\377~~~\377\344\344\344\377" - "\344\344\344\377\341\341\341\377\337\337\337\377\337\337\337\377\362" - "\362\362\377\375\375\375\377\363\363\363\377\363\363\363\377\363\363" - "\363\377\250\250\250\377\265\265\265\377mmm\377HwH\377\0\1\0\370\0\0" - "\0U\0\0\0*\0\0\0\6\0\0\0\0\0\0\0\0\33.\33\377V\215V\377\\\230\\\377P" - "\204P\377FtF\377\333\333\333\377\352\352\352\377\357\357\357\377\357" - "\357\357\377\346\346\346\377\336\336\336\377\341\341\341\377\341\341" - "\341\377\337\337\337\377\342\342\342\377zzz\377s\252s\377\24\40\24\367" - "\0\0\0\234\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\377" - "\5\10\5\3548[8\363MxM\351Q\200Q\357O\203O\377R\210R\377\227\227\227\377" - "\334\334\334\377\345\345\345\377\353\353\353\377\371\371\371\377\371" - "\371\371\377\205\205\205\377\246\246\246\377\213\270\213\377\1\2\1\370" - "\0\0\0U\0\0\0*\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e" - "\0\0\0\276\0\0\0\346\0\0\0\360\0\0\0\3639]9\371AjA\371O\200O\367Q\203" - "Q\366Q\206Q\377\245\310\245\377\340\340\340\377\352\352\352\377\213\270" - "\213\377\25\"\25\373\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0\34\0\0\0""4\0\0\0C\0\0\0g\0" - "\0\0\251\0\0\0\344\0\0\0\361\0\0\0\356/L/\365;a;\371HvH\372M}M\367Lz" - "L\357\2\3\2\367\0\0\0U\0\0\0+\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12\0\0\0\15\0\0\0\20\0\0\0\33" - "\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327\0\0\0\356\0\0\0\354\0\0\0" - "\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0" - "\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0\77\0\0\0H\0\0\0H\0\0\0@\0" - "\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0\0\0\16\0\0\0\14\0\0\0\5\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_book_open) -#endif -#ifdef __GNUC__ -static const guint8 stock_book_open[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_book_open[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3OOOD\0\0\0\377\4\5\6" - "\377\0\0\0;\0\0\0\20\0\0\0\6\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\3NNNE\13\17\22\377\225\237\252\377\303\306" - "\312\356\0\0\0\377\0\0\0&\0\0\0\22\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0.\13\17\22\377\202\220\236\377\361\361" - "\361\377\325\327\330\377\12\15\20\377\0\0\0_\0\0\0\40\0\0\0\13\0\0\0" - "\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0.\21\27\34\377\206\223\240" - "\377\357\360\360\377\336\336\336\377\325\325\325\377\233\237\244\324" - "\0\0\0\377\0\0\0/\0\0\0\24\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0" - ".\16\23\27\377\205\222\237\377\357\360\360\377\333\333\333\377\312\312" - "\312\377\310\310\310\377\310\311\312\377\14\17\23\377\0\0\0[\0\0\0\40" - "\0\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0.\24\32\40\377y\210\225\370\361\361" - "\361\377\325\325\325\377\312\312\312\377\322\322\322\377\303\303\303" - "\377\315\315\315\377ty~\275\0\0\0\377\0\0\0-\0\0\0\24\0\0\0\6\0\0\0\2" - "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0-\27\37&\377\177\215\232\361\357\360\360\377\332\332\332\377\323\323" - "\323\377\304\304\304\377\316\316\316\377\300\300\300\377\312\312\312" - "\377\261\261\261\336\15\21\25\377\0\0\0Y\0\0\0#\0\0\0\22\0\0\0\14\0\0" - "\0\12\0\0\0\12\0\0\0\12\0\0\0\11\0\0\0\7\0\0\0\4\0\0\0\1\0\0\0\0\0\0" - "\0\377v\205\222\350\356\357\357\377\331\331\331\377\323\323\323\377\320" - "\320\320\377\302\302\302\377\313\313\313\377\311\311\311\377\274\274" - "\274\377\244\247\251\344hkl\351333\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\352\0\0\0\177\0\0\0=\0\0\0\20\0\0\0\6\0\0" - "\0\1AO]\377\255\265\274\363\352\352\352\377\322\322\322\377\277\277\277" - "\377\315\315\315\377\313\313\313\377\275\275\275\377\306\306\306\377" - "\265\266\267\365\211\220\226\370\270\270\270\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377@AB\342\0\0\0\177\0\0\0%\0\0\0\20\0\0\0\4\0\0" - "\0\377M`t\340\353\353\353\377\321\321\321\377\303\303\303\377\301\301" - "\301\377\310\310\310\377\267\267\267\377\303\303\303\377\227\237\247" - "\347\241\243\244\376\374\375\375\377\363\364\364\377\353\354\355\377" - "\352\353\354\377\351\352\353\377\356\357\361\377\366\367\370\377\344" - "\345\346\376\222\223\225\375\0\0\0\377\0\0\0""9\0\0\0\33\0\0\0\7\0\0" - "\0=2AO\377\214\230\242\362\347\347\347\377\311\311\311\377\273\273\273" - "\377\304\304\304\377\302\302\302\377\244\247\253\346\223\226\231\375" - "\327\330\330\377\374\375\375\377\372\374\374\377\371\372\373\377\370" - "\371\372\377\367\370\371\377\365\366\370\377\367\367\371\377\306\307" - "\307\377O^j\375\0\0\0\360\0\0\0B\0\0\0\37\0\0\0\11\0\0\0\23\0\0\0\377" - "L_r\340\350\350\350\377\306\306\306\377\276\276\276\377\270\270\270\377" - "\265\265\266\361\227\236\244\356\250\250\250\377\375\376\376\377\365" - "\366\366\377\347\351\351\377\353\354\355\377\352\353\354\377\360\361" - "\362\377\370\371\372\377\340\342\343\377\217\226\235\376\25\34\"\377" - "\0\0\0\201\0\0\0>\0\0\0\34\0\0\0\10\0\0\0\13\0\0\0A5DS\377\215\231\242" - "\363\343\343\343\377\301\301\301\377\276\276\276\377\216\224\232\316" - "\235\237\237\376\377\377\377\377\375\376\376\377\374\375\375\377\372" - "\374\374\377\362\363\364\377\361\362\363\377\367\370\371\377\366\366" - "\367\377\246\250\253\377s\177\212\376\4\5\6\377\0\0\0P\0\0\0""1\0\0\0" - "\24\0\0\0\5\0\0\0\5\0\0\0\24\0\0\0\377K_q\340\345\345\345\377\301\301" - "\301\377\236\237\240\326\227\231\233\375\331\331\331\377\377\377\377" - "\377\347\350\350\377\356\357\357\377\364\365\365\377\371\372\373\377" - "\370\371\372\377\373\373\373\377\330\330\332\377\223\233\243\377\17\24" - "\30\377\0\0\0t\0\0\0B\0\0\0\"\0\0\0\14\0\0\0\3\0\0\0\2\0\0\0\13\0\0\0" - "A9IW\377\202\217\227\360\333\333\333\370\212\216\222\347\264\264\264" - "\377\377\377\377\377\377\377\377\377\375\376\376\377\365\366\366\377" - "\354\356\356\377\346\347\350\377\372\372\373\377\365\365\367\377\256" - "\262\266\377\\l|\377\0\0\0\377\0\0\0P\0\0\0""1\0\0\0\25\0\0\0\6\0\0\0" - "\1\0\0\0\0\0\0\0\5\0\0\0\24\0\0\0\377J]p\336\273\273\273\321\253\253" - "\253\377\377\377\377\377\370\370\370\377\361\361\361\377\357\360\360" - "\377\374\375\375\377\372\373\373\377\371\372\373\377\373\374\374\377" - "\336\341\343\377\235\246\256\377\12\15\20\377\0\0\0t\0\0\0A\0\0\0\"\0" - "\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\13\0\0\0A$/:\377imq\346" - "wxy\377\362\363\363\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\360\360\360\377\363\363\363\377\373\374\374\377\371\371\372\377\273" - "\277\304\377Vgy\377\0\0\0\377\0\0\0P\0\0\0""1\0\0\0\25\0\0\0\6\0\0\0" - "\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\0\24\0\0\0\377J_t\3701>K\376\263" - "\275\306\375\321\327\335\377\331\336\343\377\366\367\367\377\365\365" - "\365\377\377\377\377\377\377\377\377\377\321\322\324\377\232\243\254" - "\377\4\5\6\377\0\0\0t\0\0\0A\0\0\0!\0\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\13\0\0\0""7\0\0\0\256+4<\366)2;\377O_" - "p\377^q\204\376\221\236\253\375\237\253\266\375\277\307\320\377\350\354" - "\356\377\262\270\276\377q}\210\376\0\0\0\377\0\0\0P\0\0\0""1\0\0\0\25" - "\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0" - "\0\22\0\0\0&\0\0\0:\0\0\0Y\0\0\0\200\0\0\0\301%-5\377Qar\377Vgy\375z" - "\206\225\375v\205\224\374\0\0\0\377\0\0\0r\0\0\0\77\0\0\0!\0\0\0\13\0" - "\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0" - "\6\0\0\0\20\0\0\0\34\0\0\0%\0\0\0-\0\0\0""8\0\0\0X\0\0\0\200\0\0\0\275" - ",4=\377!'.\377\0\0\0p\0\0\0D\0\0\0*\0\0\0\23\0\0\0\5\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0" - "\0\10\0\0\0\14\0\0\0\21\0\0\0\31\0\0\0\"\0\0\0,\0\0\0""7\0\0\0A\0\0\0" - "C\0\0\0;\0\0\0)\0\0\0\26\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2" - "\0\0\0\4\0\0\0\6\0\0\0\13\0\0\0\20\0\0\0\30\0\0\0\37\0\0\0\40\0\0\0\33" - "\0\0\0\21\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\6\0\0\0\10\0\0\0\11\0\0\0\7\0\0\0\4" - "\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_book_red) -#endif -#ifdef __GNUC__ -static const guint8 stock_book_red[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_book_red[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\37\21\16\377\310" - "\225\213\377\272ym\377\264n`\377\260fW\377\252^O\377\240YK\377\226SF" - "\377\216OC\377\216OC\377\216OC\377\216OC\377\216OC\377\225RF\377xC8\377" - "!\22\17\376\0\0\0.\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\273\265pb\377\303\214\201\377\266re\377\234WI\377\221PD\377\206" - "J>\377zD9\377o>4\377i;1\377i;1\377o>4\377o>4\377vA7\377o>4\377X0)\377" - "'\26\22\372\0\0\0N\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22" - "\21\11\10\377\311\227\215\377\274}q\377\241ZK\377\230TG\377\214MA\377" - "\201G<\377vA7\377k;2\377i;1\377i;1\377i;1\377i;1\377tA6\377\\3+\377;" - "!\33\377\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\255\217OC\377\311\227\215\377\265qc\377\235WI\377\221PD\377\210K\77" - "\377|E:\377p>4\377i;1\377i;1\377i;1\377i;1\377l<3\377tA6\377U/(\377O" - ",%\375\0\0\0\377\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\21\0\0" - "\0\377\311\227\215\377\275~r\377\244[L\377\231UH\377\215NB\377\202H<" - "\377wB8\377l<3\377i;1\377i;1\377k;2\377i;1\377s@6\377\\3+\377,\30\24" - "\377\201\201\201\377I(\"\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\232\217OC\377\304\215\202\377\265qc\377\237XJ\377\223RE\377\211" - "L@\377~F;\377s@6\377i;1\377i;1\377i;1\377i;1\377k;2\377wB8\377U/(\377" - "4\35\30\376KKK\377\220\220\220\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0" - "\0\0\20\0\0\0\377\310\226\214\375\274}q\377\245\\M\377\232VH\377\217" - "OC\377\203I=\377xC8\377m=3\377i;1\377i;1\377i;1\377i;1\377q\77""5\377" - "_4,\377-\31\25\377VVV\366ggg\377333\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0" - "\0\0\0\0\335\235WI\377\303\214\201\377\266re\377\240YK\377\225RF\377" - "\212L@\377\177G;\377tA6\377i;1\377i;1\377i;1\377i;1\377i;1\377vA7\377" - "Y1)\3778\37\32\377HHH\377\270wj\377\0\0\0\377\0\0\0c\0\0\0\21\0\0\0\0" - "\0\0\0!\0\0\0\377\310\226\214\377\300\205y\377\254`P\377\234WI\377\221" - "PD\377\206J>\377zD9\377o>4\377i;1\377i;1\377i;1\377i;1\377m=3\377f8/" - "\377/\32\26\377ggg\377nnn\377_4,\377\0\0\0\373\0\0\0R\0\0\0\25\0\0\0" - "\0\0\0\0\245\231UH\377\305\220\205\377\264n`\377\244[L\377\231UH\377" - "\215NB\377\202H<\377wB8\377l<3\377i;1\377i;1\377i;1\377i;1\377wB8\377" - "U/(\377;!\33\377XXX\377\267tg\377\21\11\10\372\0\0\0\234\0\0\0I\0\0\0" - "\17\0\0\0\13\0\0\0\377\262th\337\302\210}\377\261hY\377\237XJ\377\223" - "RE\377\211L@\377~F;\377s@6\377i;1\377i;1\377i;1\377i;1\377i;1\377g90" - "\3772\33\27\377KKK\377ttt\377zE:\370\0\0\0\364\0\0\0U\0\0\0+\0\0\0\7" - "\0\0\0\206\240YK\377\333\272\264\375\324\254\244\377\320\243\233\377" - "\315\237\226\377\312\231\217\377\307\224\211\377\302\210}\377\266re\377" - "\265pb\377\265pb\377\265pb\377\265pb\377\260fW\377\214MA\377I(\"\377" - "^^^\377\271xk\377\21\11\10\372\0\0\0\233\0\0\0G\0\0\0\21\0\0\0\1\6\3" - "\3\331\322\250\240\377T.'\377J)#\377J)#\377J)#\377J)#\377J)#\377J)#\377" - "J)#\377J)#\377J)#\377J)#\377J)#\377J)#\377G'!\377ccc\377xxx\377\202H" - "<\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\24\13\11\377\270wj\377" - "Y1)\377___\373ttt\377\226\226\226\377\261\261\261\377\257\257\257\377" - "\305\305\305\377\316\316\316\377\272\272\272\377\302\302\302\377\303" - "\303\303\377\313\313\313\377\322\322\322\377\332\332\332\377\225\225" - "\225\377\264m_\377\"\23\20\371\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0" - "\0\0\21\11\10\377\247]N\377vA7\377~~~\377\344\344\344\377\344\344\344" - "\377\341\341\341\377\337\337\337\377\337\337\337\377\362\362\362\377" - "\375\375\375\377\363\363\363\377\363\363\363\377\363\363\363\377\250" - "\250\250\377\265\265\265\377mmm\377\202H<\377\1\0\0\370\0\0\0U\0\0\0" - "*\0\0\0\6\0\0\0\0\0\0\0\0""2\33\27\377\232VH\377\247]N\377\221PD\377" - "\177G;\377\333\333\333\377\352\352\352\377\357\357\357\377\357\357\357" - "\377\346\346\346\377\336\336\336\377\341\341\341\377\341\341\341\377" - "\337\337\337\377\342\342\342\377zzz\377\267sf\377$\24\21\367\0\0\0\234" - "\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\377\11\5\4\354" - "c80\363\203MB\351\214QE\357\217OC\377\225RF\377\227\227\227\377\334\334" - "\334\377\345\345\345\377\353\353\353\377\371\371\371\377\371\371\371" - "\377\205\205\205\377\246\246\246\377\303\213\200\377\2\1\1\370\0\0\0" - "U\0\0\0*\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e\0\0\0" - "\276\0\0\0\346\0\0\0\360\0\0\0\363f:1\371sA7\371\214OC\367\217QE\366" - "\222QD\377\320\245\234\377\340\340\340\377\352\352\352\377\303\213\200" - "\377%\25\21\373\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0\34\0\0\0""4\0\0\0C\0\0\0g\0\0\0\251" - "\0\0\0\344\0\0\0\361\0\0\0\356S/(\365j;2\371\201I=\372\211MB\367\205" - "LA\357\3\2\1\367\0\0\0U\0\0\0+\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12\0\0\0\15\0\0\0\20\0\0\0\33" - "\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327\0\0\0\356\0\0\0\354\0\0\0" - "\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0" - "\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0\77\0\0\0H\0\0\0H\0\0\0@\0" - "\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0\0\0\16\0\0\0\14\0\0\0\5\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_book_yellow) -#endif -#ifdef __GNUC__ -static const guint8 stock_book_yellow[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_book_yellow[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32(\40\5\377\352\315" - "i\377\344\300C\377\342\2733\377\341\267&\377\333\261\36\377\317\247\34" - "\377\303\235\32\377\270\224\31\377\270\224\31\377\270\224\31\377\270" - "\224\31\377\270\224\31\377\301\234\32\377\234~\25\377*\"\6\376\0\0\0" - ".\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\273\343\274" - "4\377\350\311]\377\343\2758\377\312\243\33\377\273\227\32\377\255\214" - "\30\377\236\177\25\377\220t\23\377\211n\22\377\211n\22\377\220t\23\377" - "\220t\23\377\230{\25\377\220t\23\377r\\\17\3771(\7\372\0\0\0N\0\0\0\20" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\26\22\3\377\352\316m\377\345" - "\302H\377\321\250\34\377\304\236\33\377\264\222\31\377\246\206\27\377" - "\230{\25\377\212p\23\377\211n\22\377\211n\22\377\211n\22\377\211n\22" - "\377\227y\24\377w`\20\377M>\12\377\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\255\272\226\31\377\352\316m\377\343\2746\377" - "\313\244\34\377\273\227\32\377\257\215\30\377\241\202\26\377\221u\24" - "\377\211n\22\377\211n\22\377\211n\22\377\211n\22\377\214q\23\377\227" - "y\24\377nY\17\377fR\16\375\0\0\0\377\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\21\0\0\0\377\352\316m\377\345\303J\377\324\253\35\377\306" - "\240\33\377\266\223\31\377\250\210\27\377\232|\25\377\214q\23\377\211" - "n\22\377\211n\22\377\212p\23\377\211n\22\377\225x\24\377w`\20\3779.\10" - "\377\201\201\201\377^L\15\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\232\272\226\31\377\350\312_\377\343\2746\377\315\245\34\377\277" - "\232\32\377\261\217\30\377\243\203\26\377\225x\24\377\211n\22\377\211" - "n\22\377\211n\22\377\211n\22\377\212p\23\377\232|\25\377nY\17\377C6\11" - "\376KKK\377\220\220\220\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\20" - "\0\0\0\377\351\315k\375\345\302H\377\326\255\35\377\310\241\33\377\272" - "\226\31\377\252\211\27\377\234~\25\377\216r\23\377\211n\22\377\211n\22" - "\377\211n\22\377\211n\22\377\223w\24\377zc\21\377;0\10\377VVV\366ggg" - "\377333\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\335\313\244\34\377" - "\350\311]\377\343\2758\377\317\247\34\377\301\234\32\377\263\220\30\377" - "\245\205\26\377\227y\24\377\211n\22\377\211n\22\377\211n\22\377\211n" - "\22\377\211n\22\377\230{\25\377s]\20\377I;\12\377HHH\377\344\277\77\377" - "\0\0\0\377\0\0\0c\0\0\0\21\0\0\0\0\0\0\0!\0\0\0\377\352\316k\377\347" - "\306R\377\337\264\36\377\312\243\33\377\273\227\32\377\255\214\30\377" - "\236\177\25\377\220t\23\377\211n\22\377\211n\22\377\211n\22\377\211n" - "\22\377\216r\23\377\203j\22\377=1\10\377ggg\377nnn\377zc\21\377\0\0\0" - "\373\0\0\0R\0\0\0\25\0\0\0\0\0\0\0\245\306\240\33\377\351\313b\377\342" - "\2733\377\324\253\35\377\306\240\33\377\266\223\31\377\250\210\27\377" - "\232|\25\377\214q\23\377\211n\22\377\211n\22\377\211n\22\377\211n\22" - "\377\232|\25\377nY\17\377M>\12\377XXX\377\344\276;\377\25\21\3\372\0" - "\0\0\234\0\0\0I\0\0\0\17\0\0\0\13\0\0\0\377\326\266D\337\347\307X\377" - "\341\270*\377\315\245\34\377\277\232\32\377\261\217\30\377\243\203\26" - "\377\225x\24\377\211n\22\377\211n\22\377\211n\22\377\211n\22\377\211" - "n\22\377\205k\22\377A4\10\377KKK\377ttt\377\234\177\30\370\0\0\0\364" - "\0\0\0U\0\0\0+\0\0\0\7\0\0\0\206\317\247\34\377\360\336\236\375\356\330" - "\213\377\355\324~\377\354\322w\377\353\317n\377\352\314g\377\347\307" - "X\377\343\2758\377\343\2744\377\343\2744\377\343\2744\377\343\2744\377" - "\341\267&\377\264\222\31\377^L\15\377^^^\377\344\300A\377\25\21\3\372" - "\0\0\0\233\0\0\0G\0\0\0\21\0\0\0\1\7\6\1\331\356\326\205\377lW\17\377" - "`N\15\377`N\15\377`N\15\377`N\15\377`N\15\377`N\15\377`N\15\377`N\15" - "\377`N\15\377`N\15\377`N\15\377`N\15\377]K\14\377ccc\377xxx\377\250\210" - "\27\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\32\25\3\377\344\277\77" - "\377s]\20\377___\373ttt\377\226\226\226\377\261\261\261\377\257\257\257" - "\377\305\305\305\377\316\316\316\377\272\272\272\377\302\302\302\377" - "\303\303\303\377\313\313\313\377\322\322\322\377\332\332\332\377\225" - "\225\225\377\342\2721\377,#\6\371\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0" - "\0\0\0\26\22\3\377\330\256\35\377\230{\25\377~~~\377\344\344\344\377" - "\344\344\344\377\341\341\341\377\337\337\337\377\337\337\337\377\362" - "\362\362\377\375\375\375\377\363\363\363\377\363\363\363\377\363\363" - "\363\377\250\250\250\377\265\265\265\377mmm\377\250\210\27\377\1\1\0" - "\370\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\0\0\0\0A4\10\377\310\241\33\377\330" - "\256\35\377\273\227\32\377\245\205\26\377\333\333\333\377\352\352\352" - "\377\357\357\357\377\357\357\357\377\346\346\346\377\336\336\336\377" - "\341\341\341\377\341\341\341\377\337\337\337\377\342\342\342\377zzz\377" - "\343\275:\377-%\7\367\0\0\0\234\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0" - "\0\0\0\0""9\0\0\0\377\13\10\1\354~e\25\363\243\206!\351\260\220\40\357" - "\272\226\31\377\301\234\32\377\227\227\227\377\334\334\334\377\345\345" - "\345\377\353\353\353\377\371\371\371\377\371\371\371\377\205\205\205" - "\377\246\246\246\377\350\310[\377\2\2\0\370\0\0\0U\0\0\0*\0\0\0\7\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e\0\0\0\276\0\0\0\346\0\0\0" - "\360\0\0\0\363\202i\24\371\224w\26\371\262\220\35\367\266\224\36\366" - "\275\231\32\377\355\325\200\377\340\340\340\377\352\352\352\377\350\310" - "[\3770&\6\373\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0\34\0\0\0""4\0\0\0C\0\0\0g\0\0\0\251" - "\0\0\0\344\0\0\0\361\0\0\0\356iU\21\365\207n\25\371\245\206\31\372\257" - "\215\33\367\250\211\36\357\4\3\0\367\0\0\0U\0\0\0+\0\0\0\7\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12\0\0\0" - "\15\0\0\0\20\0\0\0\33\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327\0\0" - "\0\356\0\0\0\354\0\0\0\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\3\0\0\0\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0\77" - "\0\0\0H\0\0\0H\0\0\0@\0\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0\0" - "\0\16\0\0\0\14\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_line_in) -#endif -#ifdef __GNUC__ -static const guint8 stock_line_in[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_line_in[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0-..\257###\377\10\10\10x\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\25\25\25\377\345\345\346\377###\377\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0fff\315\356\356\356\377MMM\217\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\2\2\2\337\277\277\277\377\3\3\3\325\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\33\0\0\0i\0\0\0s\0\0\0_\0\0" - "\0=\0\0\0!\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\21" - "\21\22\377\354\354\355\377\22\22\22\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0`\0\0\0\262\216\216\216\260\210\210\210" - "\233TTT\210$$$v\0\0\0b\0\0\0F\0\0\0&\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0$$%\243\273\273\273\377\0\0\0O\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\212lll\326\316\316\316\311\245\245\245\274\0" - "\0\0\242\0\0\0\214\0\0\0v\0\0\0U\0\0\0;\0\0\0+\0\0\0\"\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\377\352\352\352\377\0\0\0\377\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\230mmm\347\316\316\316\345\10\10\10" - "\313\10\10\10\231\0\0\0G\0\0\0=\0\0\0""1\0\0\0:\0\0\0""2\0\0\0#\0\0\0" - "\37\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377RRR\377\332\332\334\377===\377\0" - "\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\343\265\265\265\363KK" - "K\351\0\0\0M\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\33" - "\0\0\0\35\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\373\373\373\377\234\233" - "\234\377\324\324\324\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\231" - "GGG\361\244\244\244\365\0\0\0\242\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\0\0\0\0\0\0\0\0\377\221\221" - "\221\377===\377===\377\36\36\36\377\77\77\77\377\0\0\0\377\0\0\0\0\0" - "\0\0\0\0\0\0\331___\367###\362\0\0\0B\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\377\221" - "\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377\0\0\0\0\0\0" - "\0\0\0\0\0\342SSS\355\0\0\0\353\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" - "\221\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377\0\0\0\0" - "\0\0\0\0\0\0\0\330SSS\353\0\0\0\355\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\377\221\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377\0\0" - "\0\0\0\0\0\0\0\0\0\262'''\332\"\"\"\367\0\0\0<\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\221\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377" - "\0\0\0\0\0\0\0\0\0\0\0D\0\0\0\315UUU\362\0\0\0\313\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\377\221\221\221\377===\377===\377\36\36\36\377EEE\377\0\0\0" - "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\241LLL\322FFF\336\0\0\0\234\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\377AAA\377ddd\377%%%\377,,,\377<<<\377\0\0\0\377\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\35\0\0\0\236XXX\257FFF\273\0\0\0q\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\377\25\25\25\377\7\7\7\377(((\377\0\0\0\377\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\205ZZZ\233\0\0\0\236\0\0\0b\0\0" - "\0\"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\377+++\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0cXXX{\0\0\0{\0\0\0""3\0\0\0%\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\324" - "+++\324\0\0\0\324\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0""7\0\0\0T\0\0\0_\0\0\0^\0\0\0#\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\252+++\252\0\0\0\252" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\13\0\0\0@\0\0\0F\0\0\0J\0\0\0""2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\177+++\177\0\0\0\177\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""1" - "\0\0\0:\7\7\7@\0\0\0,\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0U+++U\0\0\0U\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\27\0\0\0/\0\0\0""2\10\10\10""5\0" - "\0\0+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0*+++*\0\0\0*\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\23\0\0\0""0\0\0\0-\14\14\14-\0\0\0+\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mail) -#endif -#ifdef __GNUC__ -static const guint8 stock_mail[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mail[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2" - "\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0" - "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0" - "\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377SSS\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377" - "\375\375\375\377\374\374\374\377\373\373\373\377\371\371\371\377\370" - "\370\370\377\367\367\367\377\366\366\366\377\365\365\365\377\364\364" - "\364\377\343\343\343\377SSS\377\0\0\0\377\0\0\0\31\0\0\0\10\0\0\0\1\0" - "\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377OOO\377\377\377\377\377\365\365" - "\365\377\364\364\364\377\363\363\363\377\362\362\362\377\362\362\362" - "\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357\357\377" - "\356\356\356\377\355\355\355\377\343\343\343\377OOO\377\256\256\256\377" - "\0\0\0\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377" - "\377\377\344\344\344\377CCC\377\375\375\375\377\363\363\363\377\362\362" - "\362\377\362\362\362\377\361\361\361\377\360\360\360\377\357\357\357" - "\377\356\356\356\377\356\356\356\377\355\355\355\377\343\343\343\377" - "OOO\377\254\254\254\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0" - "\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\344\344" - "\344\377OOO\377\373\373\373\377\361\361\361\377\360\360\360\377\360\360" - "\360\377\357\357\357\377\356\356\356\377\355\355\355\377\355\355\355" - "\377\343\343\343\377CCC\377\240\240\240\377\324\324\324\377\310\310\310" - "\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377" - "\377\377\377\373\373\373\377\365\365\365\377\344\344\344\377CCC\377\370" - "\370\370\377\360\360\360\377\357\357\357\377\356\356\356\377\355\355" - "\355\377\354\354\354\377\343\343\343\377OOO\377\225\225\225\377\324\324" - "\324\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0" - "\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365" - "\365\365\377\365\365\365\377\344\344\344\377>>>\377\365\365\365\377\356" - "\356\356\377\355\355\355\377\354\354\354\377\343\343\343\377MMM\377\201" - "\201\201\377\306\306\306\377\344\344\344\377\344\344\344\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377" - "\377\377\377\377\373\373\373\377\365\365\365\377\365\365\365\377\344" - "\344\344\377jjj\377CCC\377\363\363\363\377\354\354\354\377\343\343\343" - "\377OOO\377jjj\377\306\306\306\377\306\306\306\377\365\365\365\377\344" - "\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0" - "\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365\377" - "\344\344\344\377ccc\377\377\377\377\377\271\271\271\377OOO\377\360\360" - "\360\377OOO\377\225\225\225\377\306\306\306\377sss\377\306\306\306\377" - "\365\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0" - "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377" - "\344\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344\344\377" - "\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344\344\377" - "\344\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310\310\377" - "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377" - "\377\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365" - "\365\377\365\365\365\377\365\365\365\377\344\344\344\377\344\344\344" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377" - "|||\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0" - "\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377|||\377\377\377\377\377" - "\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344" - "\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344" - "\344\377\344\344\344\377\344\344\344\377\344\344\344\377|||\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377" - "sss\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377" - "\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274" - "\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274" - "\274\377\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0" - "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\207\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\31" - "\0\0\0(\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0" - "-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0(\0\0\0\31\0\0\0\10" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21" - "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0" - "\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\16\0\0\0\10\0" - "\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0" - "\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0" - "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mail_compose) -#endif -#ifdef __GNUC__ -static const guint8 stock_mail_compose[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mail_compose[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\321\257" - "a\377\361\343\254\377\373\251\17\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0V\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\265\265" - "\265\377\240k\11\377\361\343\254\377\373\251\17\377\201`\0\377\0\0\0" - "\377\340\340\340\377\301\301\301\377\0\0\0\377\0\0\0D\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\364\364\364\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\375\375\375\377\375\375\375\377\0\0\0\377\346\303p\377\361\323\207\377" - "\325\217\14\377\0\0\0\377\262\262\262\377\303\303\303\377\373\373\373" - "\377\250\250\250\377\0\0\0\377\0\0\0V\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" - "\377\377\377\377\366\366\366\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\375\375\375\377\375\375\375\377\375\375\375\377\263\263" - "\263\377\240k\11\377\361\343\254\377\373\251\17\377\201`\0\377\0\0\0" - "\377\372\372\372\377\255\255\255\377vvv\377]]]\377@@@\377\0\0\0\377\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\377" - "\377\377\377\373\373\373\377\373\373\373\377\373\373\373\377\373\373" - "\373\377\370\370\370\377\0\0\0\377\346\303p\377\361\320~\377\325\217" - "\14\377\0\0\0\377\254\254\254\377\370\370\366\377\342\342\342\377\205" - "\205\205\377KKI\377\26\26\26\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\377\377\377\377\364\364\364\377\375\375\375\377\375\375\375" - "\377\373\373\373\377\373\373\373\377\373\373\372\377}}}\377\240k\11\377" - "\361\343\254\377\373\251\17\377\201`\0\377\0\0\0\377\364\364\364\377" - "\362\362\362\377\360\360\360\377\357\357\357\377\325\325\325\377\255" - "\255\255\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377" - "\377\362\362\362\377\371\371\371\377\366\366\366\377\366\366\366\377" - "\366\366\363\377\363\363\363\377\0\0\0\377\346\303p\377\361\320~\377" - "\325\217\14\377\0\0\0\377\207\207\206\377\345\345\345\377\342\342\342" - "\377\337\337\337\377\353\353\353\377\342\342\342\377\301\301\301\377" - "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\360\360" - "\360\377\370\370\370\377\370\370\370\377\370\370\370\377\370\370\366" - "\377\256\256\256\377{S\7\377\361\343\254\377\373\251\17\377\201`\0\377" - "\0\0\0\377\355\355\355\377\353\353\353\377\353\353\351\377\351\351\347" - "\377\351\351\347\377\340\340\336\377\277\277\277\377\0\0\0\377\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\357\357\357\377\363\363" - "\363\377\360\360\360\377\360\360\355\377\355\355\355\377\0\0\0\377\346" - "\303p\377\361\322\204\377\312\207\13\377\0\0\0\377\236\236\234\377\334" - "\334\331\377\331\331\331\377\331\331\326\377\326\326\324\377\345\345" - "\344\377\331\331\327\377\272\272\272\377\0\0\0\377\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\377\377\377\377\377\355\355\355\377\364\364\364\377\364" - "\364\364\377\362\362\362\377\252\252\252\377\240k\11\377\361\343\254" - "\377\373\251\17\377\201`\0\377\0\0\0\377\347\347\345\377\345\345\344" - "\377\345\345\344\377\344\344\342\377\340\340\336\377\342\342\340\377" - "\331\331\327\377\272\272\272\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\377\377\377\377\353\353\353\377\356\356\354\377\347\347\345" - "\377\345\345\345\377\0\0\0\377\346\303p\377\361\322\204\377\312\207\13" - "\377\0\0\0\377\227\227\226\377\324\324\321\377\342\342\340\377\340\340" - "\336\377\336\336\334\377\336\336\333\377\336\336\334\377\331\331\327" - "\377\275\275\274\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377" - "\377\377\377\347\347\347\377\357\357\355\377\353\353\353\377\246\246" - "\245\377\272|\12\377\373\251\17\377\373\251\17\377z[\0\377\0\0\0\377" - "\342\342\340\377\340\340\336\377\336\336\334\377\336\336\333\377\334" - "\334\331\377\333\333\331\377\333\333\331\377\325\325\323\377\274\274" - "\274\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377" - "\345\345\345\377\343\343\343\377\331\331\331\377\0\0\0\377\362\346\266" - "\377{{{\377pK\5\377\0\0\0\377ggd\377\313\313\307\377\311\311\307\377" - "\334\334\331\377\333\333\327\377\331\331\327\377\327\327\325\377\331" - "\331\327\377\327\327\323\377\264\264\264\377\0\0\0\377\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\377\377\377\377\377\342\342\340\377\345\345\344\377" - "\344\344\344\377\0\0\0\377\333\325\301\377~oW\377uX\0\377\0\0\0\377\334" - "\334\331\377\333\333\331\377\333\333\327\377\331\331\325\377\327\327" - "\323\377\325\325\323\377\325\325\321\377\327\327\323\377\320\320\316" - "\377\272\272\270\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377" - "\377\377\377\336\336\334\377\335\335\333\377\321\321\317\377\16\16\16" - "\377SSS\377\0\0\0\377\0\0\0\377\215\215\213\377\304\304\301\377\304\304" - "\277\377\301\301\274\377\325\325\321\377\325\325\321\377\323\323\320" - "\377\321\321\320\377\323\323\320\377\320\320\316\377\272\272\270\377" - "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\334\334" - "\333\377\340\340\334\377\335\335\333\377\0\0\0\377\0\0\0\377\211\211" - "\207\377\311\311\306\377\315\315\312\377\320\320\315\377\316\316\313" - "\377\320\320\315\377\320\320\315\377\320\320\315\377\320\320\315\377" - "\317\317\314\377\320\320\315\377\320\320\314\377\266\266\266\377\0\0" - "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\333\333\331" - "\377\324\324\320\377\303\303\300\377[[[\377\221\221\215\377\221\221\217" - "\377\237\237\235\377\257\257\254\377\271\271\266\377\276\276\273\377" - "\303\303\300\377\305\305\302\377\310\310\305\377\312\312\307\377\313" - "\313\310\377\314\314\311\377\314\314\310\377\262\262\262\377\0\0\0\377" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\322\322\320\377\322" - "\322\317\377\317\317\314\377\277\277\275\377\237\237\234\377\210\210" - "\206\377\207\207\205\377\214\214\212\377\225\225\223\377\234\234\232" - "\377\250\250\245\377\261\261\256\377\265\265\263\377\273\273\270\377" - "\276\276\273\377\277\277\274\377\302\302\276\377\262\262\262\377\0\0" - "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\321\321\316" - "\377\320\320\314\377\314\314\311\377\317\317\314\377\303\303\300\377" - "\256\256\253\377\235\235\232\377\227\227\224\377\227\227\224\377\224" - "\224\221\377\232\232\227\377\237\237\234\377\243\243\240\377\250\250" - "\245\377\252\252\247\377\260\260\254\377\270\270\265\377\260\260\256" - "\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\322" - "\322\317\377\321\321\316\377\321\321\316\377\321\321\316\377\317\317" - "\315\377\313\313\310\377\276\276\274\377\264\264\260\377\254\254\250" - "\377\244\244\242\377\240\240\234\377\240\240\234\377\244\244\240\377" - "\244\244\242\377\250\250\246\377\253\253\247\377\262\262\256\377\244" - "\244\244\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377" - "\377\321\321\320\377\321\321\316\377\320\320\316\377\316\316\314\377" - "\316\316\312\377\316\316\312\377\314\314\310\377\306\306\302\377\274" - "\274\271\377\263\263\257\377\264\264\260\377\253\253\251\377\246\246" - "\243\377\240\240\235\377\246\246\243\377\252\252\247\377\254\254\251" - "\377\241\241\241\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377" - "\377\377\377\261\261\257\377\264\264\263\377\264\264\261\377\264\264" - "\261\377\264\264\261\377\263\263\261\377\263\263\261\377\262\262\256" - "\377\256\256\252\377\247\247\244\377\242\242\240\377\245\245\241\377" - "\245\245\241\377\231\231\227\377\222\222\220\377\224\224\220\377\235" - "\235\233\377\205\205\203\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0r\0\0" - "\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mail_forward) -#endif -#ifdef __GNUC__ -static const guint8 stock_mail_forward[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mail_forward[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1" - "\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0" - "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0m\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377" - "SSS\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\376\376\376\377\375\375\375\377\374\374\374\377\373\373\373\377\371" - "\371\371\377\370\370\370\377\367\367\367\377\366\366\366\377\365\365" - "\365\377\364\364\364\377\343\343\343\377SSS\377\0\0\0\377\0\0\0\31\0" - "\0\0\10\0\0\0\1\0\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377OOO\377\377" - "\377\377\377\365\365\365\377\364\364\364\377\363\363\363\377\362\362" - "\362\377\362\362\362\377\361\361\361\377\360\360\360\377\360\360\360" - "\377\357\357\357\377\356\356\356\377\355\355\355\377\343\343\343\377" - "OOO\377\256\256\256\377\0\0\0\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0" - "\0\2\0\0\0\377\377\377\377\377\344\344\344\377CCC\377\375\375\375\377" - "\363\363\363\377\362\362\362\377\362\362\362\377\361\361\361\377\360" - "\360\360\377\357\357\357\377\356\356\356\377\356\356\356\377\355\355" - "\355\377\343\343\343\377OOO\377\254\254\254\377\310\310\310\377\0\0\0" - "\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377" - "\365\365\365\377\344\344\344\377OOO\377\373\373\373\377\361\361\361\377" - "\360\360\360\377\360\360\360\377\357\357\357\377\356\356\356\377\355" - "\355\355\377\355\355\355\377\343\343\343\377CCC\377\240\240\240\377\324" - "\324\324\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0" - "\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\365\365\365\377" - "\344\344\344\377CCC\377\370\370\370\377\360\360\360\377\357\357\357\377" - "\356\356\356\377\355\355\355\377\354\354\354\377\343\343\343\377OOO\377" - "\225\225\225\377\324\324\324\377\344\344\344\377\310\310\310\377\0\0" - "\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377" - ">>>\377\365\365\365\377\356\356\356\377\355\355\355\377\354\354\354\377" - "\343\343\343\377MMM\377\201\201\201\377\306\306\306\377\344\344\344\377" - "\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0" - "\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\365\365\365" - "\377\365\365\365\377\344\344\344\377jjj\377CCC\377\363\363\363\377\354" - "\354\354\377\343\343\343\377OOO\377jjj\377\306\306\306\377\306\306\306" - "\377\365\365\365\377\0\0\0\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0" - "\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377" - "\365\365\365\377\344\344\344\377ccc\377\377\377\377\377\271\271\271\377" - "OOO\377\360\360\360\377OOO\377\225\225\225\377\306\306\306\377sss\377" - "\306\306\306\377\365\365\365\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" - "-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373" - "\373\377\344\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344" - "\344\377\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344" - "\344\377\344\344\344\377|||\377\344\344\344\377\0\0\0\377[\210\262\377" - "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377" - "\377\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365" - "\365\377\365\365\365\377\365\365\365\377\344\344\344\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\236\270\321" - "\377P\200\255\377\0\0\0\377\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377" - "\377\377\377\377|||\377\377\377\377\377\344\344\344\377\344\344\344\377" - "\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\0\0" - "\0\377\265\311\334\377\257\305\332\377\262\307\333\377\266\312\335\377" - "\266\312\335\377\266\312\335\377\244\275\325\377\234\267\321\377P\200" - "\255\377\10\15\21\377\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377sss\377\274\274" - "\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274" - "\377\274\274\274\377\274\274\274\377\274\274\274\377\0\0\0\377\233\266" - "\320\377\240\272\323\377\234\267\321\377\234\267\321\377\233\266\320" - "\377\232\265\317\377\240\272\323\377\234\267\321\377\227\263\316\377" - "_\213\264\377\0\0\0\377\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\221\260\314\377\236\270\321\377\232\265\317\377\232\265\317" - "\377\233\266\320\377\234\267\321\377\234\267\321\377\234\267\321\377" - "\240\272\323\377\225\262\316\377Ly\243\377\0\0\0\377\0\0\0\1\0\0\0\10" - "\0\0\0\31\0\0\0(\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0" - "\0\377It\234\377\77e\210\377\77e\210\377\77e\210\377\77e\210\377\77e" - "\210\377\77e\210\377\77e\210\377\77e\210\377*C[\377\0\0\0\377\0\0\0\0" - "\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21" - "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\377Eo\226\3777Yx\3777Yx\3777Yx\377" - "7Yx\3777Yx\377\77e\210\377\77e\210\377*C[\377\0\0\0\377\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0" - "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\77e\210\377*C[\377\0\0\0\377\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\377*C[\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mail_receive) -#endif -#ifdef __GNUC__ -static const guint8 stock_mail_receive[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mail_receive[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\311\333\307\377\311\332\307\377\311\332\307\377\201\232y\377" - "XuM\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\377\262\311\260\377\251\304\247\377\255\310\253" - "\377[yP\377MgD\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\273\320\271\377\256\307\254\377" - "\256\307\254\377[yP\377MgD\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\324\0\0\0\377\0\0\0\377\0\0\0\377\271\316\267" - "\377\256\307\254\377\252\307\250\377[yP\377MgD\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\315\336\313" - "\377\261\311\260\377\265\316\265\377\260\311\260\377\255\306\253\377" - "[yP\377[yP\377[yP\377MhD\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0" - "\0\0\2\0\0\0\2\0\0\0\377\315\336\313\377\264\313\262\377\263\312\261" - "\377\255\306\253\377[yP\377[yP\377MhD\377\0\0\0\377\0\0\0\2\0\0\0\2\0" - "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "f\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\315\336" - "\313\377\252\307\250\377\260\307\256\377[yP\377MhD\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\10\0\0\0" - "\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377SSS\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\376\376\376\377\0\0\0\377\315\336" - "\313\377\255\310\253\377TqJ\377\0\0\0\377\367\367\367\377\366\366\366" - "\377\365\365\365\377\364\364\364\377\343\343\343\377SSS\377\0\0\0\377" - "\0\0\0\31\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377" - "OOO\377\377\377\377\377\365\365\365\377\364\364\364\377\363\363\363\377" - "\362\362\362\377\0\0\0\377\317\337\314\377\0\0\0\377\360\360\360\377" - "\357\357\357\377\356\356\356\377\355\355\355\377\343\343\343\377OOO\377" - "\256\256\256\377\0\0\0\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\2\0" - "\0\0\377\377\377\377\377\344\344\344\377CCC\377\375\375\375\377\363\363" - "\363\377\362\362\362\377\362\362\362\377\361\361\361\377---\377\357\357" - "\357\377\356\356\356\377\356\356\356\377\355\355\355\377\343\343\343" - "\377OOO\377\254\254\254\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21" - "\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\344" - "\344\344\377OOO\377\373\373\373\377\361\361\361\377\360\360\360\377\360" - "\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377\355\355" - "\355\377\343\343\343\377CCC\377\240\240\240\377\324\324\324\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377" - "\377\377\377\377\373\373\373\377\365\365\365\377\344\344\344\377CCC\377" - "\370\370\370\377\360\360\360\377\357\357\357\377\356\356\356\377\355" - "\355\355\377\354\354\354\377\343\343\343\377OOO\377\225\225\225\377\324" - "\324\324\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21" - "\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365" - "\365\365\377\365\365\365\377\344\344\344\377>>>\377\365\365\365\377\356" - "\356\356\377\355\355\355\377\354\354\354\377\343\343\343\377MMM\377\201" - "\201\201\377\306\306\306\377\344\344\344\377\344\344\344\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377" - "\377\377\377\377\373\373\373\377\365\365\365\377\365\365\365\377\344" - "\344\344\377jjj\377CCC\377\363\363\363\377\354\354\354\377\343\343\343" - "\377OOO\377jjj\377\306\306\306\377\306\306\306\377\365\365\365\377\344" - "\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0" - "\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365\377" - "\344\344\344\377ccc\377\377\377\377\377\271\271\271\377OOO\377\360\360" - "\360\377OOO\377\225\225\225\377\306\306\306\377sss\377\306\306\306\377" - "\365\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0" - "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377" - "\344\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344\344\377" - "\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344\344\377" - "\344\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310\310\377" - "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377" - "\377\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365" - "\365\377\365\365\365\377\365\365\365\377\344\344\344\377\344\344\344" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377" - "|||\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0" - "\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377|||\377\377\377\377\377" - "\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344" - "\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344" - "\344\377\344\344\344\377\344\344\344\377\344\344\344\377|||\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377" - "sss\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377" - "\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274" - "\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274" - "\274\377\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0" - "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\207\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\31" - "\0\0\0(\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0" - "-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0(\0\0\0\31\0\0\0\10" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21" - "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0" - "\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\16\0\0\0\10\0" - "\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0" - "\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0" - "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0" - "\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mail_reply) -#endif -#ifdef __GNUC__ -static const guint8 stock_mail_reply[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mail_reply[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0" - "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2" - "\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0" - "\0\0\0\1\0\0\0\377SSS\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\376\376\376\377\375\375\375\377\374\374\374\377" - "\373\373\373\377\371\371\371\377\370\370\370\377\367\367\367\377\366" - "\366\366\377\365\365\365\377\364\364\364\377\343\343\343\377SSS\377\0" - "\0\0\377\0\0\0\31\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\356\356" - "\356\377OOO\377\377\377\377\377\365\365\365\377\364\364\364\377\363\363" - "\363\377\362\362\362\377\362\362\362\377\361\361\361\377\360\360\360" - "\377\360\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377" - "\343\343\343\377OOO\377\256\256\256\377\0\0\0\377\0\0\0(\0\0\0\17\0\0" - "\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\344\344\344\377CCC\377" - "\375\375\375\377\363\363\363\377\362\362\362\377\362\362\362\377\361" - "\361\361\377\360\360\360\377\357\357\357\377\356\356\356\377\356\356" - "\356\377\355\355\355\377\343\343\343\377OOO\377\254\254\254\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377" - "\377\377\377\377\365\365\365\377\344\344\344\377OOO\377\373\373\373\377" - "\361\361\361\377\360\360\360\377\360\360\360\377\357\357\357\377\356" - "\356\356\377\355\355\355\377\355\355\355\377\343\343\343\377CCC\377\240" - "\240\240\377\324\324\324\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21" - "\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\365" - "\365\365\377\344\344\344\377CCC\377\370\370\370\377\360\360\360\377\357" - "\357\357\377\356\356\356\377\355\355\355\377\354\354\354\377\343\343" - "\343\377OOO\377\225\225\225\377\324\324\324\377\344\344\344\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377" - "\377\377\377\377\365\365\365\377\365\365\365\377\365\365\365\377\344" - "\344\344\377>>>\377\365\365\365\377\356\356\356\377\355\355\355\377\354" - "\354\354\377\343\343\343\377MMM\377\201\201\201\377\306\306\306\377\344" - "\344\344\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21" - "\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377=\32" - "\23\377\365\365\365\377\344\344\344\377jjj\377CCC\377\363\363\363\377" - "\354\354\354\377\343\343\343\377OOO\377jjj\377\306\306\306\377\306\306" - "\306\377\365\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0" - "\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\0\0" - "\0\377\0\0\0\377\344\344\344\377ccc\377\377\377\377\377\271\271\271\377" - "OOO\377\360\360\360\377OOO\377\225\225\225\377\306\306\306\377sss\377" - "\306\306\306\377\365\365\365\377\344\344\344\377\310\310\310\377\0\0" - "\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\0\0\0\377\352" - "\300\272\377\0\0\0\377ccc\377\377\377\377\377\365\365\365\377\344\344" - "\344\377\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344" - "\344\377\344\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310" - "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377" - "\352\300\272\377\337\236\225\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\344\344\344\377\365\365\365\377\365" - "\365\365\377\365\365\365\377\344\344\344\377|||\377\344\344\344\377\310" - "\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\377\352" - "\300\272\377\340\241\230\377\341\245\235\377\342\247\236\377\343\253" - "\243\377\342\247\236\377\343\252\242\377\337\236\225\377\314bS\377\0" - "\0\0\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344" - "\377\344\344\344\377\344\344\344\377|||\377\310\310\310\377\0\0\0\377" - "\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\377\352\300\272\377\335\227\215\377\337" - "\237\227\377\337\236\225\377\336\232\220\377\335\226\214\377\335\226" - "\214\377\336\232\220\377\335\224\212\377\261C4\377\0\0\0\377\274\274" - "\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274" - "\377\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0\0\21" - "C\31\23\377\352\302\274\377\336\232\220\377\337\234\222\377\335\231\217" - "\377\335\231\217\377\335\227\215\377\336\232\220\377\336\232\220\377" - "\336\232\220\377\336\232\220\377\265E5\377\0\0\0\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\207\0\0\0(\0\0\0\17\0\0\0\0\0\0\0\377e&\35\377\230:,\377\230:,\377" - "\230:,\377\230:,\377\230:,\377\230:,\377\230:,\377\230:,\377|/$\377\0" - "\0\0\377\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0" - "\0(\0\0\0\31\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\377e&\35\377\230:,\377\230" - ":,\377c%\35\377c%\35\377c%\35\377c%\35\377c%\35\377l)\37\377\0\0\0\377" - "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0" - "\21\0\0\0\16\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377e&\35" - "\377\230:,\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0" - "\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\377e&\35\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mail_send) -#endif -#ifdef __GNUC__ -static const guint8 stock_mail_send[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mail_send[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0O\77\12\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" - "\364\346\265\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\364\345" - "\263\377\355\326\204\377u_\20\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\364\345" - "\263\377\355\325\200\377\356\326\205\377\257\215\30\377u_\20\377\0\0" - "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\377\364\345\263\377\357\331\214\377\356\330\213\377\355\325\202" - "\377\257\215\30\377\257\215\30\377u_\20\377\0\0\0\377\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\377\364\345\263\377\356\330\211\377" - "\357\332\222\377\356\330\211\377\355\325\202\377\257\215\30\377\257\215" - "\30\377\257\215\30\377u_\20\377\0\0\0\377\0\0\0\2\0\0\0\2\0\0\0\2\0\0" - "\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\360\333\223\377\355\326\204" - "\377\355\325\200\377\257\215\30\377s]\20\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\10\0\0\0\2\0\0\0\0" - "\0\0\0\0\0\0\0\1\0\0\0\377SSS\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\0\0\0\377\360\334\227\377\355\326\204\377" - "\355\326\204\377\257\215\30\377s]\20\377\0\0\0\377\366\366\366\377\365" - "\365\365\377\364\364\364\377\343\343\343\377SSS\377\0\0\0\377\0\0\0\31" - "\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377OOO\377\377" - "\377\377\377\365\365\365\377\364\364\364\377\0\0\0\377\356\330\211\377" - "\355\323|\377\355\326\204\377\257\215\30\377s]\20\377\0\0\0\377\356\356" - "\356\377\355\355\355\377\343\343\343\377OOO\377\256\256\256\377\0\0\0" - "\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377" - "\344\344\344\377CCC\377\375\375\375\377\363\363\363\377\0\0\0\377\344" - "\277=\377\313\244\34\377\321\250\34\377\220t\23\377|d\21\377\0\0\0\377" - "\355\355\355\377\343\343\343\377OOO\377\254\254\254\377\310\310\310\377" - "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377" - "\377\377\365\365\365\377\344\344\344\377OOO\377\373\373\373\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\343" - "\343\343\377CCC\377\240\240\240\377\324\324\324\377\310\310\310\377\0" - "\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377" - "\377\373\373\373\377\365\365\365\377\344\344\344\377CCC\377\370\370\370" - "\377\360\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377" - "\354\354\354\377\343\343\343\377OOO\377\225\225\225\377\324\324\324\377" - "\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0" - "\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365" - "\377\365\365\365\377\344\344\344\377>>>\377\365\365\365\377\356\356\356" - "\377\355\355\355\377\354\354\354\377\343\343\343\377MMM\377\201\201\201" - "\377\306\306\306\377\344\344\344\377\344\344\344\377\310\310\310\377" - "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377" - "\377\377\373\373\373\377\365\365\365\377\365\365\365\377\344\344\344" - "\377jjj\377CCC\377\363\363\363\377\354\354\354\377\343\343\343\377OO" - "O\377jjj\377\306\306\306\377\306\306\306\377\365\365\365\377\344\344" - "\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0" - "\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365\377\344" - "\344\344\377ccc\377\377\377\377\377\271\271\271\377OOO\377\360\360\360" - "\377OOO\377\225\225\225\377\306\306\306\377sss\377\306\306\306\377\365" - "\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21" - "\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\344" - "\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344\344\377\324" - "\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344\344\377\344" - "\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310\310\377\0" - "\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377" - "\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365\365" - "\377\365\365\365\377\365\365\365\377\344\344\344\377\344\344\344\377" - "\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377|||\377" - "\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0" - "\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377|||\377\377\377\377\377\344\344" - "\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344" - "\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377" - "\344\344\344\377\344\344\344\377\344\344\344\377|||\377\310\310\310\377" - "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377sss\377\274" - "\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274" - "\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274" - "\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377" - "\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0\0\21\0\0" - "\0\2\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\207" - "\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\31\0\0\0(\0\0" - "\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0" - "\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0(\0\0\0\31\0\0\0\10\0\0\0\1\0" - "\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21\0\0\0\21\0" - "\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21" - "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\16\0\0\0\10\0\0\0\2\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0" - "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0" - "\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_menu_about) -#endif -#ifdef __GNUC__ -static const guint8 stock_menu_about[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_menu_about[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (1024) */ - "\0\0\4\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (64) */ - "\0\0\0@" - /* width (16) */ - "\0\0\0\20" - /* height (16) */ - "\0\0\0\20" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\"\10\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0LN\23l\0\0\0\377\25\26\6#\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\11\0\0\0\377\356\366>\377\0\0\0\377\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\21\4\7dg\32" - "x\0\0\0\377\0\0\0\377\352\361=\377\360\370\77\377\313\3225\370\0\0\0" - "\377\0\0\0\377JL\23k\0\0\0\0\20\21\4\0dg\32\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\34\35\7\0\0\0\0\377\360\370\77\377\360\370\77\377\360\370\77\377\360" - "\370\77\377\360\370\77\377\360\370\77\377\351\360=\377\0\0\0\377\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\37\37\10%\0\0\0" - "\377\360\370\77\377\360\370\77\377\360\370\77\377\360\370\77\377\345" - "\354<\377\0\0\0\377\5\5\1\7\0\0\0\0\0\0\0\0\37\37\10\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\350\360=\377\360\370\77\377\360" - "\370\77\377\360\370\77\377\253\260-\372\0\0\0\377\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\360\370" - "\77\377\354\363>\377\0\0\0\377\357\367\77\377\316\3266\377\0\0\0\377" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\377\264\272/\363\0\0\0\377\30\30\6\77\0\0\0\377\315\3245\375" - "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\36\37\10g\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" - "\26\27\5F\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_menu_blank) -#endif -#ifdef __GNUC__ -static const guint8 stock_menu_blank[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_menu_blank[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (1024) */ - "\0\0\4\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (64) */ - "\0\0\0@" - /* width (16) */ - "\0\0\0\20" - /* height (16) */ - "\0\0\0\20" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_scores) -#endif -#ifdef __GNUC__ -static const guint8 stock_scores[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_scores[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\4\0\0\0\4\0\0" - "\0\3\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\215\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\227\0\0\0\22\0\0\0\6\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\2\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\341\341\341\377\0\0\0\377\0\0\0""2\0\0\0\22\0\0\0\2\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\377\377\377\377\377\353" - "\353\353\377\0\0\0\377\355\355\355\377\322\322\322\377\0\0\0\377\0\0" - "\0L\0\0\0\34\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0" - "\0\377\377\377\377\377\0\0\0\377\0\0\0\377\356\356\356\377\322\322\322" - "\377\0\0\0\377\0\0\0T\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\3\0" - "\0\0\4\0\0\0\10\0\0\0\377\377\377\377\377\355\355\355\377\0\0\0\377\357" - "\357\357\377\323\323\323\377\0\0\0\377\0\0\0U\0\0\0\40\0\0\0\4\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\215\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377" - "\377\356\356\356\377\0\0\0\377\360\360\360\377\324\324\324\377\0\0\0" - "\377\0\0\0W\0\0\0$\0\0\0\10\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\325\325\325\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\205\0\0\0\20\0\0\0\5\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\377\377\377\377\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\355\355\355\377\356\356\356\377\357\357\357\377\361\361" - "\361\377\362\362\362\377\363\363\363\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" - "1\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\377\377\377" - "\377\377\353\353\353\377\354\354\354\377\0\0\0\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\363\363\363\377\364\364" - "\364\377\365\365\365\377\0\0\0\377\0\0\0\377\0\0\0\377\333\333\333\377" - "\0\0\0\377\0\0\0K\0\0\0\34\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0" - "\0\0\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0\377\357\357\357\377" - "\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\365" - "\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\0\0\0\377" - "\334\334\334\377\0\0\0\377\0\0\0T\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\4\0\0\0\377\377\377\377\377\0\0\0\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\367\367\367\377\370\370\370" - "\377\0\0\0\377\0\0\0\377\335\335\335\377\0\0\0\377\0\0\0U\0\0\0\40\0" - "\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\377\377\377\377\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\361\361\361\377\362\362\362\377\363\363\363" - "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377" - "\371\371\371\377\372\372\372\377\0\0\0\377\336\336\336\377\0\0\0\377" - "\0\0\0U\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\377\377" - "\377\377\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362" - "\362\377\363\363\363\377\364\364\364\377\365\365\365\377\366\366\366" - "\377\367\367\367\377\370\370\370\377\0\0\0\377\0\0\0\377\0\0\0\377\337" - "\337\337\377\0\0\0\377\0\0\0U\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\4\0\0\0\377\341\341\341\377\323\323\323\377\324\324\324\377" - "\325\325\325\377\326\326\326\377\327\327\327\377\330\330\330\377\331" - "\331\331\377\331\331\331\377\332\332\332\377\333\333\333\377\334\334" - "\334\377\335\335\335\377\337\337\337\377\340\340\340\377\0\0\0\377\0" - "\0\0T\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\254\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\273\0\0\0L\0\0\0\34\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\2\0\0\0\23\0\0\0""5\0\0\0M\0\0\0T\0\0\0U\0\0\0U\0\0\0U\0\0\0U" - "\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0T\0\0\0L\0\0\0" - "2\0\0\0\22\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\0\0\0\23\0" - "\0\0\35\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40" - "\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\37\0\0\0\34\0\0\0" - "\22\0\0\0\6\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0" - "\0\0\3\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0" - "\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_mic) -#endif -#ifdef __GNUC__ -static const guint8 stock_mic[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_mic[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0<\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0<\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<RRR\377\332" - "\332\333\377\372\372\373\377\361\361\363\377\370\370\371\377\335\334" - "\335\377\0\0\0\377\0\0\0E\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\377\332\331\332\377\363\362\365\377\326\325\334\377\350" - "\350\353\377\267\265\275\377\324\322\327\377ifl\377\0\0\0\377\0\0\0\13" - "\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\372\372\373\377" - "\334\334\342\377\354\353\356\377\301\277\307\377\330\326\333\377\220" - "\217\226\377\214\212\217\377\0\0\0\377\0\0\0\26\0\0\0\4\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\363\361\364\377\357\357\362\377\312" - "\307\321\377\337\336\343\377\235\234\244\377\275\273\301\377CBF\377\0" - "\0\0\377\0\0\0\31\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0\0]\0\0\0\1\0\0\0\377" - "\372\372\372\377\324\322\331\377\350\346\353\377\261\260\272\377\311" - "\307\316\377tqz\377qpv\377\0\0\0\377\0\0\0\31\0\0\0_\0\0\0J\0\0\0\1\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "]\0\0\0\377\0\0\0\377\0\0\0\377\361\360\363\377\355\354\360\377\303\301" - "\312\377\330\326\335\377\214\211\225\377\250\246\257\377226\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0b\0\0\0\7\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377\0\0\0\26\0\0\0\377" - "\371\371\372\377\317\316\326\377\344\342\347\377\250\247\261\377\303" - "\301\310\377ebl\377aae\377\0\0\0\377\0\0\0\34\0\0\0\377\0\0\0\27\0\0" - "\0\12\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\377\0\0\0\25\0\0\0\377\360\356\361\377\353\352\356\377" - "\276\273\306\377\325\324\332\377\204\200\214\377\236\235\246\377-,0\377" - "\0\0\0\377\0\0\0\32\0\0\0\377\0\0\0\25\0\0\0\6\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24" - "\0\0\0\377\370\370\371\377\312\307\321\377\337\336\342\377\234\232\244" - "\377\270\266\276\377YW_\377][a\377\0\0\0\377\0\0\0\31\0\0\0\377\0\0\0" - "\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0\0\0\377\354\352\355\377\343\342\346" - "\377\250\247\260\377\307\305\314\377rqx\377\222\220\231\377(&*\377\0" - "\0\0\377\0\0\0\31\0\0\0\377\0\0\0\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0" - "\0\0\377\350\347\352\377\265\263\272\377\314\314\322\377\205\204\212" - "\377\245\244\253\377JIO\377MLQ\377\0\0\0\377\0\0\0\31\0\0\0\377\0\0\0" - "\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0\0\0C\0\0\0\377\206\204\210\37776" - ":\377aac\377$#&\377DDI\377\0\0\0\377\0\0\0\232\0\0\0\30\0\0\0\377\0\0" - "\0\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0\0\0\6\0\0\0D\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232\0\0\0\32\0\0\0\17\0\0\0\377" - "\0\0\0\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0k\0\0\0\206\0\0\0\6\0\0\0\3\0\0\0\13\0\0\0" - "\26\0\0\0{\0\0\0\32\0\0\0\31\0\0\0\27\0\0\0\17\0\0\0\200\0\0\0m\0\0\0" - "\22\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\2\0\0\0o\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\13\0" - "\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\13\0\0\0\22\0\0\0\24KKK\377" - "aaa\377\0\0\0\377\0\0\0\30\0\0\0\25\0\0\0\24\0\0\0\22\0\0\0\13\0\0\0" - "\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\4\0\0\0\5KKK\377\177\177" - "\177\377\0\0\0\377\0\0\0m\0\0\0;\0\0\0\6\0\0\0\5\0\0\0\2\0\0\0\33\0\0" - "\0]\0\0\0\34\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0KKK\377\177\177\177\377" - "\0\0\0\377\0\0\0\32\0\0\0\12\0\0\0L\0\0\0\2\0\0\0\0\0\0\0I\0\0\0\4\0" - "\0\0M\0\0\0\37\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""3\40\40\40\377hhh\377\0\0\0" - "\377\0\0\0G\0\0\0\7\0\0\0\2\0\0\0k\0\0\0]\0\0\0\2\0\0\0\5\0\0\0\3\0\0" - "\0l\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\\\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377gd[\377\0\0\0\377VRH\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0`\0\0\0" - "\2\0\0\0o\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\33\33\33\377\257\255" - "\251\377\205\202{\377wtl\377VRH\377VRH\377VRH\377VRH\377VRH\377VRH\377" - "VRH\377VRH\377VRH\377LI@\377;:2\377\40\37\32\377\0\0\0\377\0\0\0\14\0" - "\0\0\37\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\27\0\0\0\5\0\0\0K\0\0\0W\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\4\0\0\0\25\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0" - "\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31" - "\0\0\0\31\0\0\0\25\0\0\0\4\0\0\0\1\0\0\0\5"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_multiple_file) -#endif -#ifdef __GNUC__ -static const guint8 stock_multiple_file[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_multiple_file[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (4096) */ - "\0\0\20\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (128) */ - "\0\0\0\200" - /* width (32) */ - "\0\0\0\40" - /* height (32) */ - "\0\0\0\40" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\33\0\0\0\14\0\0\0\2\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\340\340\340\377" - "\301\301\301\377\0\0\0\377\0\0\0+\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0-\0" - "\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\340\340\340\377\301\301\301\377\0\0\0\377\0\0\0" - "-\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\375\375\375\377\373\373\373\377" - "\372\372\371\377\303\303\303\377\373\373\373\377\250\250\250\377\0\0" - "\0\377\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\33\0\0\0\14\0\0\0\2\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\340\340\340\377\301\301" - "\301\377\0\0\0\377\0\0\0+\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\377" - "\377\377\377\377\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\0\0\0\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\375\375\375\377\373\373\373\377\372" - "\372\371\377\303\303\303\377\373\373\373\377\250\250\250\377\0\0\0\377" - "\0\0\0-\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\0\0\0\377\377\377\377\377\377\377\377\377\321\321\321\377" - "\252\252\252\377\323\323\323\377\377\377\377\377\323\323\323\377\377" - "\377\377\377\252\252\252\377\252\252\252\377\375\375\375\377\320\320" - "\320\377\372\372\372\377\371\371\370\377\367\367\366\377\255\255\255" - "\377vvv\377]]]\377@@@\377\0\0\0\377\0\0\0+\0\0\0\14\0\0\0\0\0\0\0\377" - "\377\377\377\377\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\375\375\375\377\374\374\374\377\0\0\0\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\376\376\376\377\374\374\374\377" - "\373\373\372\377\371\371\371\377\367\367\367\377\366\366\365\377\364" - "\364\364\377\342\342\342\377\205\205\205\377KKI\377\26\26\26\377\0\0" - "\0\377\0\0\0N\0\0\0\33\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377" - "\377\377\377\376\376\376\377\374\374\374\377\373\373\372\377\371\371" - "\371\377\0\0\0\377\377\377\377\377\377\377\377\377\252\252\252\377\271" - "\271\271\377\323\323\323\377\323\323\323\377\376\376\376\377\250\250" - "\250\377\236\236\236\377\235\235\235\377\245\245\244\377\366\366\366" - "\377\243\243\242\377\311\311\310\377\362\362\361\377\360\360\357\377" - "\356\356\355\377\355\355\353\377\235\235\235\377\0\0\0\377\0\0\0]\0\0" - "\0#\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\373\373" - "\373\377\371\371\371\377\370\370\367\377\366\366\366\377\0\0\0\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\375\375\375\377\373\373\373\377\372\372\371\377\370\370\370" - "\377\367\367\366\377\365\365\364\377\364\364\363\377\362\362\361\377" - "\360\360\357\377\357\357\356\377\355\355\354\377\354\354\352\377\352" - "\352\350\377\244\244\243\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377" - "\377\377\377\377\0\0\0\377\377\377\377\377\370\370\370\377\367\367\366" - "\377\365\365\364\377\364\364\363\377\0\0\0\377\377\377\377\377\377\377" - "\377\377\252\252\252\377\321\321\321\377\374\374\374\377\316\316\316" - "\377\371\371\370\377\244\244\244\377\243\243\243\377\232\232\231\377" - "\257\257\256\377\361\361\360\377\237\237\236\377rrq\377\225\225\224\377" - "\223\223\223\377\351\351\347\377\347\347\346\377\244\244\244\377\0\0" - "\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377" - "\377\377\377\365\365\365\377\364\364\363\377\362\362\361\377\361\361" - "\360\377\0\0\0\377\377\377\377\377\376\376\376\377\374\374\374\377\373" - "\373\372\377\371\371\371\377\367\367\367\377\366\366\365\377\364\364" - "\364\377\363\363\362\377\361\361\360\377\360\360\356\377\356\356\355" - "\377\354\354\353\377\353\353\351\377\351\351\350\377\350\350\346\377" - "\346\346\344\377\345\345\343\377\242\242\242\377\0\0\0\377\0\0\0_\0\0" - "\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\363\363" - "\362\377\361\361\360\377\360\360\356\377\356\356\355\377\0\0\0\377\377" - "\377\377\377\373\373\373\377\264\264\264\377\263\263\263\377\366\366" - "\366\377\261\261\261\377\260\260\257\377\230\230\230\377\227\227\226" - "\377\356\356\355\377oon\377nnn\377nnm\377mml\377llk\377kkj\377\343\343" - "\341\377\342\342\340\377\242\242\242\377\0\0\0\377\0\0\0_\0\0\0$\0\0" - "\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\360\360\357" - "\377\356\356\355\377\355\355\353\377\353\353\352\377\0\0\0\377\377\377" - "\377\377\370\370\370\377\367\367\366\377\365\365\364\377\364\364\363" - "\377\362\362\361\377\360\360\357\377\357\357\356\377\355\355\354\377" - "\354\354\352\377nnm\377\207\226\245\377\206\226\244\377\205\225\243\377" - "\205\224\243\377jji\377\341\341\336\377\337\337\335\377\243\243\242\377" - "\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377" - "\377\377\377\377\355\355\354\377\354\354\352\377\352\352\350\377\351" - "\351\347\377\0\0\0\377\377\377\377\377\365\365\365\377\261\261\260\377" - "\230\230\230\377\307\307\306\377\305\305\304\377\356\356\354\377\303" - "\303\302\377\301\301\300\377\351\351\347\377lll\377\217\236\254\377\275" - "\270\225\377p|i\377\214\233\252\377iih\377\336\336\333\377\334\334\332" - "\377\243\243\242\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377" - "\377\377\0\0\0\377\377\377\377\377\352\352\351\377\351\351\347\377\347" - "\347\346\377\346\346\344\377\0\0\0\377\377\377\377\377\363\363\362\377" - "\361\361\360\377\360\360\356\377\356\356\355\377\354\354\353\377\353" - "\353\351\377\351\351\350\377\350\350\346\377\346\346\344\377kkj\377\226" - "\245\264\377\323\307\215\377\237\234d\377o\177w\377hhf\377\333\333\330" - "\377\332\332\327\377\240\240\237\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0" - "\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\350\350\346\377" - "\346\346\344\377\345\345\343\377\343\343\341\377\0\0\0\377\377\377\377" - "\377\360\360\357\377\243\243\242\377\225\225\224\377\224\224\223\377" - "\251\251\250\377\232\232\231\377\247\247\246\377\275\275\273\377\343" - "\343\341\377jji\377\235\254\273\377\315\304\226\377fsW\377\233\252\271" - "\377ffe\377\330\330\325\377\327\327\324\377\242\242\241\377\0\0\0\377" - "\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377" - "\377\345\345\343\377\343\343\341\377\342\342\340\377\340\340\336\377" - "\0\0\0\377\377\377\377\377\355\355\354\377\354\354\352\377\352\352\350" - "\377\351\351\347\377\347\347\345\377\345\345\343\377\344\344\342\377" - "\342\342\340\377\341\341\336\377hhh\377\245\264\303\377\313\305\235\377" - "l}o\377o\200s\377eec\377\326\326\322\377\324\324\321\377\242\242\241" - "\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0" - "\377\377\377\377\377\342\342\340\377\341\341\336\377\337\337\335\377" - "\336\336\333\377\0\0\0\377\377\377\377\377\352\352\351\377\233\233\232" - "\377\215\215\214\377\346\346\344\377\274\274\273\377\217\217\215\377" - "\216\216\214\377\271\271\266\377\336\336\333\377ggf\377gge\377ffd\377" - "eed\377ddc\377ddb\377\323\323\320\377\321\321\316\377\241\241\240\377" - "\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\320\320\320\377\0\0\0\377" - "\377\377\377\377\340\340\335\377\336\336\333\377\334\334\332\377\333" - "\333\330\377\0\0\0\377\377\377\377\377\350\350\346\377\346\346\344\377" - "\345\345\343\377\343\343\341\377\341\341\337\377\340\340\336\377\336" - "\336\334\377\335\335\332\377\333\333\330\377\332\332\327\377\330\330" - "\325\377\326\326\323\377\325\325\322\377\323\323\320\377\322\322\316" - "\377\320\320\315\377\317\317\313\377\240\240\237\377\0\0\0\377\0\0\0" - "_\0\0\0$\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\377\335\335" - "\332\377\333\333\330\377\332\332\327\377\330\330\325\377\0\0\0\377\377" - "\377\377\377\345\345\343\377\227\227\226\377\216\216\215\377\215\215" - "\214\377\214\214\212\377\335\335\333\377\222\222\220\377\236\236\233" - "\377\234\234\232\377\207\207\205\377\325\325\322\377\257\257\254\377" - "\230\230\226\377\213\213\210\377\253\253\247\377\315\315\312\377\314" - "\314\310\377\242\242\241\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\40" - "\0\0\0T\0\0\0\377\320\320\320\377\261\261\257\377\264\264\263\377\264" - "\264\261\377\240\240\235\377\0\0\0\377\377\377\377\377\342\342\340\377" - "\341\341\336\377\337\337\335\377\336\336\333\377\334\334\331\377\332" - "\332\330\377\331\331\326\377\327\327\324\377\326\326\322\377\324\324" - "\321\377\323\323\317\377\321\321\315\377\317\317\314\377\316\316\312" - "\377\314\314\310\377\314\314\307\377\314\314\307\377\242\242\240\377" - "\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\12\0\0\0\37\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\377\340" - "\340\335\377\224\224\222\377\266\266\264\377\333\333\330\377\235\235" - "\233\377\210\210\206\377\326\326\323\377\325\325\321\377\214\214\212" - "\377\217\217\215\377\203\203\200\377\316\316\312\377\224\224\221\377" - "\224\224\220\377\314\314\307\377\314\314\307\377\314\314\307\377\237" - "\237\237\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0%" - "\0\0\0T\0\0\0j\0\0\0m\0\0\0m\0\0\0o\0\0\0\377\377\377\377\377\335\335" - "\332\377\333\333\330\377\332\332\327\377\330\330\325\377\326\326\323" - "\377\325\325\322\377\323\323\320\377\322\322\316\377\320\320\315\377" - "\317\317\313\377\315\315\311\377\314\314\307\377\314\314\307\377\314" - "\314\307\377\314\314\307\377\314\314\307\377\314\314\307\377\240\240" - "\237\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\13\0\0" - "\0\34\0\0\0&\0\0\0(\0\0\0(\0\0\0,\0\0\0\377\320\320\320\377\261\261\257" - "\377\264\264\263\377\264\264\261\377\240\240\235\377\240\240\235\377" - "\237\237\235\377\237\237\235\377\237\237\233\377\231\231\225\377\215" - "\215\211\377\213\213\211\377\213\213\211\377\213\213\211\377\211\211" - "\211\377\211\211\211\377\203\203\177\377\204\204\202\377]]\\\377\0\0" - "\0\377\0\0\0^\0\0\0$\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\4\0\0\0\6" - "\0\0\0\7\0\0\0\7\0\0\0\13\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\263\0\0\0T\0\0\0\37\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0!\0\0\0S\0\0" - "\0i\0\0\0m\0\0\0m\0\0\0m\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0" - "\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0l\0\0\0`\0\0\0:" - "\0\0\0\23\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\1\0\0\0\12\0\0\0\34\0\0\0&\0\0\0(\0\0\0(\0\0\0(\0\0\0)\0\0" - "\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0" - "\0\0)\0\0\0)\0\0\0(\0\0\0#\0\0\0\25\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\4\0\0\0" - "\6\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0" - "\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0" - "\7\0\0\0\6\0\0\0\4\0\0\0\1"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_not) -#endif -#ifdef __GNUC__ -static const guint8 stock_not[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_not[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0b\0\0\0\260\0\0\0\342" - "\0\0\0\373\0\0\0\373\0\0\0\343\0\0\0\263\0\0\0j\0\0\0\13\0\0\0\5\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0b\0\0\0\341n\35\15\377\2670\25\377\315" - "4\27\377\3173\27\377\3152\26\377\310/\25\377\260(\22\377h\27\12\377\0" - "\0\0\345\0\0\0o\0\0\0\14\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\225K\24\11\377\3105\27\377" - "\3237\31\377\3215\30\377\3173\27\377\3151\26\377\3140\25\377\312.\25" - "\377\310,\24\377\306+\23\377\270'\21\377D\16\5\377\0\0\0\243\0\0\0\24" - "\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0" - "\0\225o\36\15\377\3238\31\377\3236\30\377\331_H\377\361\317\311\377\371" - "\364\363\377\371\371\371\377\364\353\352\377\350\273\265\377\325vj\377" - "\307\77-\377\302'\21\377\300%\21\377c\22\10\377\0\0\0\246\0\0\0\26\0" - "\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0bK\24\11\377\323" - "8\31\377\3226\30\377\353\261\246\377\372\372\372\377\372\372\372\377" - "\372\372\372\377\371\371\371\377\370\370\370\377\370\370\370\377\355" - "\324\320\377\277#\20\377\277#\20\377\276#\20\377\274!\17\377B\13\5\377" - "\0\0\0|\0\0\0\24\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\341\307" - "4\27\377\3226\30\377\353\261\246\377\373\373\373\377\372\372\372\377" - "\372\372\372\377\371\371\371\377\370\370\370\377\370\370\370\377\355" - "\324\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\272\37\16" - "\377\255\34\14\377\0\0\0\351\0\0\0(\0\0\0\14\0\0\0\1\0\0\0\0\0\0\0\0" - "\0\0\0bm\34\14\377\3225\30\377\326WA\377\372\372\372\377\372\372\372" - "\377\372\372\372\377\371\371\371\377\370\370\370\377\370\370\370\377" - "\355\324\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\277" - "#\20\377\303C6\377\266\34\14\377^\16\5\377\0\0\0\204\0\0\0\31\0\0\0\5" - "\0\0\0\0\0\0\0\1\0\0\0\260\266.\24\377\3173\27\377\341\232\220\377\372" - "\372\372\377\371\371\371\377\371\371\371\377\370\370\370\377\370\370" - "\370\377\355\324\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20" - "\377\277#\20\377\347\306\302\377\335\247\242\377\264\32\13\377\233\25" - "\11\377\0\0\0\304\0\0\0'\0\0\0\13\0\0\0\1\0\0\0\2\0\0\0\342\3132\26\377" - "\3151\26\377\353\306\302\377\371\371\371\377\371\371\371\377\370\370" - "\370\377\367\367\367\377\355\324\320\377\277#\20\377\277#\20\377\277" - "#\20\377\277#\20\377\277#\20\377\347\306\302\377\362\362\362\377\347" - "\312\306\377\262\30\12\377\255\26\12\377\0\0\0\352\0\0\0""4\0\0\0\22" - "\0\0\0\2\0\0\0\3\0\0\0\373\3141\26\377\313/\25\377\361\337\335\377\371" - "\371\371\377\370\370\370\377\367\367\367\377\355\324\320\377\277#\20" - "\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\347\306\302\377" - "\362\362\362\377\361\361\361\377\355\343\342\377\260\26\12\377\256\24" - "\11\377\0\0\0\374\0\0\0<\0\0\0\26\0\0\0\3\0\0\0\3\0\0\0\373\312/\25\377" - "\311-\24\377\361\337\335\377\370\370\370\377\367\367\367\377\355\324" - "\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377" - "\347\306\302\377\362\362\362\377\361\361\361\377\361\361\361\377\351" - "\327\325\377\256\24\11\377\254\22\10\377\0\0\0\374\0\0\0A\0\0\0\30\0" - "\0\0\3\0\0\0\3\0\0\0\343\305,\23\377\307+\23\377\347\272\265\377\367" - "\367\367\377\355\324\320\377\277#\20\377\277#\20\377\277#\20\377\277" - "#\20\377\277#\20\377\347\306\302\377\362\362\362\377\361\361\361\377" - "\361\361\361\377\360\360\360\377\346\321\316\377\255\22\10\377\247\20" - "\7\377\0\0\0\353\0\0\0A\0\0\0\30\0\0\0\3\0\0\0\3\0\0\0\263\255%\20\377" - "\305)\22\377\335\226\215\377\352\310\304\377\277#\20\377\277#\20\377" - "\277#\20\377\277#\20\377\277#\20\377\347\306\302\377\362\362\362\377" - "\361\361\361\377\361\361\361\377\360\360\360\377\357\357\357\377\333" - "\254\250\377\253\20\7\377\223\14\5\377\0\0\0\310\0\0\0=\0\0\0\26\0\0" - "\0\3\0\0\0\2\0\0\0jf\25\11\377\302'\21\377\307A1\377\277#\20\377\277" - "#\20\377\277#\20\377\277#\20\377\277#\20\377\347\305\301\377\362\362" - "\362\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357\357" - "\377\356\356\356\377\267:3\377\250\16\6\377V\6\2\377\0\0\0\222\0\0\0" - "4\0\0\0\22\0\0\0\2\0\0\0\1\0\0\0\13\0\0\0\345\264#\20\377\277#\20\377" - "\277#\20\377\277#\20\377\277#\20\377\277#\20\377\347\305\301\377\362" - "\362\362\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357" - "\357\377\356\356\356\377\321\223\217\377\250\16\6\377\233\13\5\377\0" - "\0\0\353\0\0\0I\0\0\0'\0\0\0\13\0\0\0\1\0\0\0\0\0\0\0\5\0\0\0oC\14\5" - "\377\274!\17\377\273\40\16\377\277#\20\377\277#\20\377\344\273\266\377" - "\362\362\362\377\361\361\361\377\360\360\360\377\360\360\360\377\357" - "\357\357\377\355\355\355\377\321\223\217\377\247\15\6\377\245\13\5\377" - "9\3\1\377\0\0\0\224\0\0\0;\0\0\0\31\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\1\0" - "\0\0\14\0\0\0\243a\20\7\377\270\36\15\377\267\34\14\377\300=1\377\326" - "\212\201\377\337\255\246\377\344\303\276\377\354\343\341\377\346\321" - "\316\377\332\253\247\377\26780\377\247\15\5\377\244\13\5\377U\5\1\377" - "\0\0\0\267\0\0\0F\0\0\0(\0\0\0\14\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\4\0\0\0\24\0\0\0\246@\12\3\377\251\31\12\377\263\30\13\377\261\26" - "\12\377\257\25\11\377\255\23\10\377\253\21\10\377\252\20\7\377\250\16" - "\6\377\246\14\5\377\232\12\4\3779\3\1\377\0\0\0\267\0\0\0I\0\0\0/\0\0" - "\0\24\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\26" - "\0\0\0|\0\0\0\351\\\13\5\377\230\22\10\377\252\23\10\377\253\21\7\377" - "\251\17\7\377\244\16\6\377\221\13\4\377U\5\2\377\0\0\0\353\0\0\0\224" - "\0\0\0F\0\0\0/\0\0\0\26\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\24\0\0\0(\0\0\0\204\0\0\0\304\0\0\0" - "\352\0\0\0\374\0\0\0\374\0\0\0\353\0\0\0\310\0\0\0\222\0\0\0I\0\0\0;" - "\0\0\0(\0\0\0\24\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\14\0\0\0\31\0\0\0'\0\0\0""4" - "\0\0\0<\0\0\0A\0\0\0A\0\0\0<\0\0\0""4\0\0\0'\0\0\0\31\0\0\0\14\0\0\0" - "\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\13\0\0\0\22\0\0\0\26\0\0" - "\0\30\0\0\0\30\0\0\0\26\0\0\0\22\0\0\0\13\0\0\0\5\0\0\0\1\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0" - "\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_table_borders) -#endif -#ifdef __GNUC__ -static const guint8 stock_table_borders[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_table_borders[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\375\375\375\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\336\336\336\377\0\0" - "\0\377\0\0\0E\0\0\0\16\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360" - "\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377" - "\360\360\360\377\360\360\360\377\362\362\362\377nnn\377\363\363\363\377" - "\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366" - "\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360\377\360" - "\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360" - "\360\377\360\360\360\377\362\362\362\377\362\362\362\377\363\363\363" - "\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377" - "\366\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360" - "\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377" - "\360\360\360\377\361\361\361\377\362\362\362\377jjj\377\363\363\363\377" - "\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366" - "\366\366\377\367\367\367\377\367\367\367\377\347\347\347\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360\377\360" - "\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377\361\361" - "\361\377\362\362\362\377\363\363\363\377\363\363\363\377\364\364\364" - "\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366\366\377" - "\367\367\367\377\367\367\367\377\370\370\370\377\350\350\350\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360" - "\377\360\360\360\377\360\360\360\377\360\360\360\377\361\361\361\377" - "\362\362\362\377\362\362\362\377\363\363\363\377kkk\377\365\365\365\377" - "\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367" - "\367\367\377\370\370\370\377\371\371\371\377\350\350\350\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360\377\360" - "\360\360\377\360\360\360\377\361\361\361\377\362\362\362\377\362\362" - "\362\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365" - "\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367\367\377" - "\370\370\370\377\371\371\371\377\371\371\371\377\351\351\351\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360" - "\377\360\360\360\377\361\361\361\377\362\362\362\377\362\362\362\377" - "\363\363\363\377\363\363\363\377\365\365\365\377kkk\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\371\371\371\377\372\372\372\377\351\351\351\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\361\361\361\377\361" - "\361\361\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\366\366\366\377\366\366\366" - "\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371\371\377" - "\371\371\371\377\372\372\372\377\372\372\372\377\352\352\352\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\376\376\376\377kkk\377\362\362" - "\362\377jjj\377\363\363\363\377jjj\377\364\364\364\377kkk\377\366\366" - "\366\377lll\377\367\367\367\377lll\377\370\370\370\377mmm\377\371\371" - "\371\377mmm\377\372\372\372\377nnn\377\353\353\353\377\0\0\0\377\0\0" - "\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\362\362\362\377\362\362" - "\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365\365\365" - "\377\365\365\365\377\366\366\366\377\367\367\367\377\367\367\367\377" - "\370\370\370\377\371\371\371\377\371\371\371\377\372\372\372\377\372" - "\372\372\377\373\373\373\377\374\374\374\377\353\353\353\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363" - "\363\363\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365" - "\365\377\366\366\366\377\367\367\367\377lll\377\370\370\370\377\371\371" - "\371\377\371\371\371\377\372\372\372\377\372\372\372\377\373\373\373" - "\377\374\374\374\377\374\374\374\377\354\354\354\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366" - "\377\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377" - "\371\371\371\377\372\372\372\377\372\372\372\377\373\373\373\377\374" - "\374\374\377\374\374\374\377\375\375\375\377\354\354\354\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\364\364\364\377\364" - "\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366" - "\366\377\367\367\367\377\370\370\370\377mmm\377\371\371\371\377\372\372" - "\372\377\372\372\372\377\373\373\373\377\374\374\374\377\374\374\374" - "\377\375\375\375\377\375\375\375\377\355\355\355\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365\365" - "\365\377\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367" - "\377\367\367\367\377\371\371\371\377\371\371\371\377\372\372\372\377" - "\372\372\372\377\373\373\373\377\374\374\374\377\374\374\374\377\375" - "\375\375\377\375\375\375\377\376\376\376\377\356\356\356\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365" - "\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367" - "\367\377\370\370\370\377\371\371\371\377mmm\377\372\372\372\377\373\373" - "\373\377\374\374\374\377\374\374\374\377\375\375\375\377\375\375\375" - "\377\376\376\376\377\377\377\377\377\356\356\356\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366\366" - "\366\377\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370" - "\377\371\371\371\377\372\372\372\377\372\372\372\377\373\373\373\377" - "\374\374\374\377\374\374\374\377\375\375\375\377\375\375\375\377\376" - "\376\376\377\377\377\377\377\377\377\377\377\356\356\356\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366" - "\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371" - "\371\377\371\371\371\377\372\372\372\377nnn\377\374\374\374\377\374\374" - "\374\377\375\375\375\377\375\375\375\377\376\376\376\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\356\356\356\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0R\0\0\0\20\0" - "\0\0\0\0\0\0\15\0\0\0D\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0" - "\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0" - "\0\0R\0\0\0R\0\0\0R\0\0\0E\0\0\0\16\0\0\0\0\0\0\0\2\0\0\0\15\0\0\0\20" - "\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0" - "\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0" - "\0\0\20\0\0\0\20\0\0\0\20\0\0\0\16\0\0\0\3"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_table_fill) -#endif -#ifdef __GNUC__ -static const guint8 stock_table_fill[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_table_fill[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\377\262\262\262\377\262\262\262\377\262" - "\262\262\377\262\262\262\377\262\262\262\377\262\262\262\377\262\262" - "\262\377\262\262\262\377\262\262\262\377\260\260\260\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\377\336\336\336\377\0\0" - "\0\377\0\0\0E\0\0\0\16\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247" - "\377\247\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377" - "\247\247\247\377\247\247\247\377\250\250\250\377LLL\377\363\363\363\377" - "\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366" - "\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247\377\247" - "\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377\247\247" - "\247\377\247\247\247\377\250\250\250\377\250\250\250\377\363\363\363" - "\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377" - "\366\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247" - "\377\247\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377" - "\247\247\247\377\250\250\250\377\250\250\250\377III\377\363\363\363\377" - "\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366" - "\366\366\377\367\367\367\377\367\367\367\377\347\347\347\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247\377\247" - "\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377\250\250" - "\250\377\250\250\250\377\251\251\251\377\251\251\251\377\364\364\364" - "\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366\366\377" - "\367\367\367\377\367\367\367\377\370\370\370\377\350\350\350\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247" - "\377\247\247\247\377\247\247\247\377\247\247\247\377\250\250\250\377" - "\250\250\250\377\250\250\250\377\251\251\251\377JJJ\377\365\365\365\377" - "\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367" - "\367\367\377\370\370\370\377\371\371\371\377\350\350\350\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247\377\247" - "\247\247\377\247\247\247\377\250\250\250\377\250\250\250\377\250\250" - "\250\377\251\251\251\377\252\252\252\377\253\253\253\377\365\365\365" - "\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367\367\377" - "\370\370\370\377\371\371\371\377\371\371\371\377\351\351\351\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247" - "\377\247\247\247\377\250\250\250\377\250\250\250\377\250\250\250\377" - "\251\251\251\377\251\251\251\377\253\253\253\377JJJ\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\371\371\371\377\372\372\372\377\351\351\351\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\250\250\250\377\250" - "\250\250\377\250\250\250\377\250\250\250\377\251\251\251\377\251\251" - "\251\377\252\252\252\377\253\253\253\377\253\253\253\377\366\366\366" - "\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371\371\377" - "\371\371\371\377\372\372\372\377\372\372\372\377\352\352\352\377\0\0" - "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\261\261\261\377JJJ\377\250\250" - "\250\377III\377\251\251\251\377III\377\252\252\252\377JJJ\377\253\253" - "\253\377KKK\377\254\254\254\377KKK\377\255\255\255\377LLL\377\255\255" - "\255\377LLL\377\256\256\256\377LLL\377\244\244\244\377\0\0\0\377\0\0" - "\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\362\362\362\377\362\362" - "\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365\365\365" - "\377\365\365\365\377\366\366\366\377\254\254\254\377\254\254\254\377" - "\255\255\255\377\255\255\255\377\255\255\255\377\256\256\256\377\256" - "\256\256\377\257\257\257\377\257\257\257\377\244\244\244\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363" - "\363\363\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365" - "\365\377\366\366\366\377\367\367\367\377KKK\377\255\255\255\377\255\255" - "\255\377\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257" - "\377\257\257\257\377\257\257\257\377\244\244\244\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366" - "\377\366\366\366\377\367\367\367\377\255\255\255\377\255\255\255\377" - "\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257\377\257" - "\257\257\377\257\257\257\377\260\260\260\377\244\244\244\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\364\364\364\377\364" - "\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366" - "\366\377\367\367\367\377\370\370\370\377LLL\377\255\255\255\377\256\256" - "\256\377\256\256\256\377\257\257\257\377\257\257\257\377\257\257\257" - "\377\260\260\260\377\260\260\260\377\245\245\245\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365\365" - "\365\377\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367" - "\377\367\367\367\377\371\371\371\377\255\255\255\377\256\256\256\377" - "\256\256\256\377\257\257\257\377\257\257\257\377\257\257\257\377\260" - "\260\260\377\260\260\260\377\261\261\261\377\246\246\246\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365" - "\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367" - "\367\377\370\370\370\377\371\371\371\377LLL\377\256\256\256\377\257\257" - "\257\377\257\257\257\377\257\257\257\377\260\260\260\377\260\260\260" - "\377\261\261\261\377\262\262\262\377\246\246\246\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366\366" - "\366\377\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370" - "\377\371\371\371\377\372\372\372\377\256\256\256\377\257\257\257\377" - "\257\257\257\377\257\257\257\377\260\260\260\377\260\260\260\377\261" - "\261\261\377\262\262\262\377\262\262\262\377\246\246\246\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366" - "\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371" - "\371\377\371\371\371\377\372\372\372\377LLL\377\257\257\257\377\257\257" - "\257\377\260\260\260\377\260\260\260\377\261\261\261\377\262\262\262" - "\377\262\262\262\377\262\262\262\377\246\246\246\377\0\0\0\377\0\0\0" - "R\0\0\0\20\0\0\0\0\0\0\0\377\356\356\356\377\346\346\346\377\346\346" - "\346\377\346\346\346\377\347\347\347\377\350\350\350\377\350\350\350" - "\377\351\351\351\377\352\352\352\377\244\244\244\377\244\244\244\377" - "\244\244\244\377\244\244\244\377\245\245\245\377\246\246\246\377\246" - "\246\246\377\246\246\246\377\246\246\246\377\232\232\232\377\0\0\0\377" - "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\15\0\0\0" - "D\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0" - "\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0" - "\0\0E\0\0\0\16\0\0\0\0\0\0\0\2\0\0\0\15\0\0\0\20\0\0\0\20\0\0\0\20\0" - "\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20" - "\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0" - "\20\0\0\0\16\0\0\0\3"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_text_bulleted_list) -#endif -#ifdef __GNUC__ -static const guint8 stock_text_bulleted_list[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_text_bulleted_list[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232" - "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362" - "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363" - "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333" - "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340" - "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347" - "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\355\355\355\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362" - "\362\362\377\341\341\341\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347" - "\377\350\350\350\377\351\351\351\377\352\352\352\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\0\0\0\377\0\0\0""8\0\0\0" - "\25\0\0\0\377\362\362\362\377\342\342\342\377\343\343\343\377\236\236" - "\236\377mmm\377\237\237\237\377\346\346\346\377\347\347\347\377ooo\377" - "ppp\377ppp\377qqq\377qqq\377qqq\377rrr\377rrr\377sss\377\360\360\360" - "\377\361\361\361\377\362\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0" - "\377\363\363\363\377\343\343\343\377\344\344\344\377nnn\377nnn\377nn" - "n\377\347\347\347\377\350\350\350\377\351\351\351\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\355\355\355\377\356" - "\356\356\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362" - "\362\377\363\363\363\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363" - "\363\377\344\344\344\377\345\345\345\377\240\240\240\377ooo\377\241\241" - "\241\377\350\350\350\377\351\351\351\377ppp\377qqq\377qqq\377rrr\377" - "rrr\377sss\377sss\377sss\377ttt\377\362\362\362\377\363\363\363\377\364" - "\364\364\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\345" - "\345\345\377\346\346\346\377\347\347\347\377\350\350\350\377\351\351" - "\351\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354" - "\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377" - "\356\356\356\377\360\360\360\377\361\361\361\377\363\363\363\377\364" - "\364\364\377\365\365\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364" - "\364\364\377\346\346\346\377\347\347\347\377\350\350\350\377\351\351" - "\351\377\352\352\352\377\352\352\352\377\353\353\353\377qqq\377rrr\377" - "rrr\377sss\377sss\377ttt\377\362\362\362\377\363\363\363\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\366\366\366\377\0\0\0\377\0" - "\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\347\347\347\377\350\350\350" - "\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354\377" - "\354\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\360" - "\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\364\364" - "\364\377\365\365\365\377\365\365\365\377\366\366\366\377\367\367\367" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\350\350\350" - "\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354\377" - "\355\355\355\377\356\356\356\377\356\356\356\377\357\357\357\377\360" - "\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\364\364" - "\364\377\365\365\365\377\366\366\366\377\367\367\367\377\367\367\367" - "\377\370\370\370\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365" - "\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354\377" - "\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377\360" - "\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\364\364" - "\364\377\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370" - "\377\370\370\370\377\371\371\371\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0" - "\377\365\365\365\377\352\352\352\377\353\353\353\377\354\354\354\377" - "\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377\361" - "\361\361\377\362\362\362\377\362\362\362\377\363\363\363\377\364\364" - "\364\377\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370" - "\377\371\371\371\377\372\372\372\377\372\372\372\377\0\0\0\377\0\0\0" - "=\0\0\0\27\0\0\0\377\366\366\366\377\353\353\353\377\354\354\354\377" - "\303\303\303\377rrr\377\304\304\304\377\360\360\360\377\361\361\361\377" - "ttt\377uuu\377\203\203\203\377uuu\377vvv\377vvv\377www\377www\377xxx" - "\377\372\372\372\377\373\373\373\377\374\374\374\377\0\0\0\377\0\0\0" - "=\0\0\0\27\0\0\0\377\367\367\367\377\355\355\355\377\355\355\355\377" - "rrr\377sss\377sss\377\361\361\361\377\362\362\362\377\363\363\363\377" - "\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\367" - "\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377\373\373" - "\373\377\374\374\374\377\375\375\375\377\0\0\0\377\0\0\0=\0\0\0\27\0" - "\0\0\377\367\367\367\377\356\356\356\377\357\357\357\377\304\304\304" - "\377sss\377\306\306\306\377\362\362\362\377\363\363\363\377uuu\377vv" - "v\377vvv\377www\377www\377www\377xxx\377xxx\377\373\373\373\377\374\374" - "\374\377\375\375\375\377\376\376\376\377\0\0\0\377\0\0\0=\0\0\0\27\0" - "\0\0\377\370\370\370\377\360\360\360\377\361\361\361\377\362\362\362" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372" - "\372\372\377\373\373\373\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\0\0\0\377\0" - "\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361\377\362\362\362" - "\377\363\363\363\377\364\364\364\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372" - "\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377\375\375" - "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362\377\362\362\362" - "\377\363\363\363\377\364\364\364\377\365\365\365\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372" - "\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377\376\376" - "\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\232\311\311\311" - "\377\355\355\355\377\370\370\370\377\365\365\365\377\366\366\366\377" - "\367\367\367\377\370\370\370\377\370\370\370\377\371\371\371\377\372" - "\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377\376\376" - "\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\356\356\356\377\275\275\275\377\0\0\0\324\0\0\0:\0\0\0\26\0\0\0" - "\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\324\0" - "\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0\0\0<\0\0\0=" - "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0" - "=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0\0\0\7\0\0\0" - "\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0" - "\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27" - "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0\7\0\0\0" - "\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0" - "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0" - "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_text_indent) -#endif -#ifdef __GNUC__ -static const guint8 stock_text_indent[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_text_indent[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232" - "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362" - "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363" - "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333" - "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340" - "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\256\256\256\377\347\347\347" - "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\343\343\343\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362" - "\362\362\377\341\341\341\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347" - "\377\350\350\350\377\351\351\351\377\352\352\352\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\347\347\347\377\0\0\0\377\0\0\0""8\0\0\0" - "\25\0\0\0\377\362\362\362\377\342\342\342\377\254\254\254\377\254\254" - "\254\377\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257" - "\377\260\260\260\377\261\261\261\377\262\262\262\377\262\262\262\377" - "\263\263\263\377\263\263\263\377\264\264\264\377\265\265\265\377\265" - "\265\265\377\266\266\266\377\361\361\361\377\350\350\350\377\0\0\0\377" - "\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\343\343\343\377\344\344\344" - "\377\345\345\345\377\345\345\345\377\346\346\346\377\347\347\347\377" - "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354" - "\354\354\377\355\355\355\377\355\355\355\377\356\356\356\377\357\357" - "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\351\351\351" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\344\344\344" - "\377\345\345\345\377\346\346\346\377\347\347\347\377\347\347\347\377" - "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354" - "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\357\357" - "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363" - "\377\352\352\352\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363" - "\377\345\345\345\377\346\346\346\377\347\347\347\377\350\350\350\377" - "\351\351\351\377\351\351\351\377\352\352\352\377uuu\377vvv\377vvv\377" - "www\377www\377xxx\377xxx\377xxx\377yyy\377yyy\377\364\364\364\377\353" - "\353\353\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\346" - "\346\346\377\347\347\347\377\350\350\350\377\252\252\252\377\352\352" - "\352\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355" - "\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361\377" - "\362\362\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365" - "\365\365\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364" - "\364\364\377\347\347\347\377\350\350\350\377\351\351\351\377\0\0\0\377" - "\254\254\254\377\354\354\354\377\354\354\354\377vvv\377www\377www\377" - "xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366\377\355" - "\355\355\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\255\255\255\377\356\356" - "\356\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\356\356\356\377\0\0" - "\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\351\351\351\377\352" - "\352\352\377\353\353\353\377\0\0\0\377\255\255\255\377\356\356\356\377" - "\357\357\357\377xxx\377xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377{{{" - "\377{{{\377|||\377\370\370\370\377\357\357\357\377\0\0\0\377\0\0\0=\0" - "\0\0\27\0\0\0\377\365\365\365\377\352\352\352\377\353\353\353\377\354" - "\354\354\377\255\255\255\377\356\356\356\377\357\357\357\377\360\360" - "\360\377\361\361\361\377\362\362\362\377\362\362\362\377\363\363\363" - "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377" - "\370\370\370\377\371\371\371\377\372\372\372\377\360\360\360\377\0\0" - "\0\377\0\0\0=\0\0\0\27\0\0\0\377\366\366\366\377\353\353\353\377\354" - "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360" - "\360\377\361\361\361\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366" - "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377" - "\373\373\373\377\362\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377" - "\367\367\367\377\355\355\355\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366" - "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377" - "\373\373\373\377\374\374\374\377\363\363\363\377\0\0\0\377\0\0\0=\0\0" - "\0\27\0\0\0\377\367\367\367\377\356\356\356\377\357\357\357\377\357\357" - "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363" - "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377" - "\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377\373" - "\373\373\377\374\374\374\377\375\375\375\377\364\364\364\377\0\0\0\377" - "\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\360\360\360\377\267\267\267" - "\377\270\270\270\377\270\270\270\377\270\270\270\377\271\271\271\377" - "\272\272\272\377\273\273\273\377\273\273\273\377\274\274\274\377\275" - "\275\275\377\276\276\276\377\276\276\276\377\276\276\276\377\277\277" - "\277\377\300\300\300\377\301\301\301\377\377\377\377\377\365\365\365" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\364\364\364\377" - "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377" - "\377\365\365\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\366\366\366\377\367\367\367\377\274\274\274\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\331\331\331\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0" - "\232\311\311\311\377\332\332\332\377\356\356\356\377\353\353\353\377" - "\354\354\354\377\355\355\355\377\356\356\356\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\365\365\365" - "\377\365\365\365\377\344\344\344\377\275\275\275\377\0\0\0\324\0\0\0" - ":\0\0\0\26\0\0\0\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\324\0\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0" - "\0\0<\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=" - "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0" - "\0\0\7\0\0\0\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0" - "\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27" - "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0" - "\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0" - "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0" - "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_text_numbered_list) -#endif -#ifdef __GNUC__ -static const guint8 stock_text_numbered_list[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_text_numbered_list[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232" - "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362" - "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363" - "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333" - "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340" - "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347" - "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\355\355\355\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362" - "\362\362\377\341\341\341\377\341\341\341\377\314\314\314\377mmm\377\344" - "\344\344\377\345\345\345\377\346\346\346\377\347\347\347\377\350\350" - "\350\377\351\351\351\377\352\352\352\377\352\352\352\377\353\353\353" - "\377\354\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377" - "\360\360\360\377\361\361\361\377\0\0\0\377\0\0\0""8\0\0\0\25\0\0\0\377" - "\362\362\362\377\342\342\342\377\315\315\315\377mmm\377mmm\377\345\345" - "\345\377\346\346\346\377\347\347\347\377ooo\377ppp\377ppp\377qqq\377" - "qqq\377qqq\377rrr\377rrr\377sss\377\360\360\360\377\361\361\361\377\362" - "\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\343" - "\343\343\377\344\344\344\377\345\345\345\377nnn\377\346\346\346\377\347" - "\347\347\377\350\350\350\377\351\351\351\377\352\352\352\377\353\353" - "\353\377\354\354\354\377\355\355\355\377\355\355\355\377\356\356\356" - "\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377" - "\363\363\363\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377" - "\344\344\344\377\345\345\345\377\346\346\346\377ooo\377\347\347\347\377" - "\350\350\350\377\351\351\351\377ppp\377qqq\377qqq\377rrr\377rrr\377s" - "ss\377sss\377sss\377ttt\377\362\362\362\377\363\363\363\377\364\364\364" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\345\345\345" - "\377\346\346\346\377\347\347\347\377ooo\377\351\351\351\377\351\351\351" - "\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355\377" - "\356\356\356\377\357\357\357\377\360\360\360\377\356\356\356\377\360" - "\360\360\377\361\361\361\377\363\363\363\377\364\364\364\377\365\365" - "\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\346\346" - "\346\377\347\347\347\377\350\350\350\377\351\351\351\377\352\352\352" - "\377\352\352\352\377\353\353\353\377\206\206\206\377rrr\377rrr\377ss" - "s\377sss\377ttt\377\362\362\362\377\363\363\363\377\363\363\363\377\364" - "\364\364\377\365\365\365\377\366\366\366\377\0\0\0\377\0\0\0=\0\0\0\27" - "\0\0\0\377\364\364\364\377\347\347\347\377\350\350\350\377\351\351\351" - "\377\352\352\352\377\353\353\353\377\354\354\354\377\354\354\354\377" - "\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377\361" - "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365" - "\365\377\365\365\365\377\366\366\366\377\367\367\367\377\0\0\0\377\0" - "\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\350\350\350\377\351\351\351" - "\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355\377" - "\356\356\356\377\356\356\356\377\357\357\357\377\360\360\360\377\361" - "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365" - "\365\377\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\351\351\351" - "\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355\377" - "\356\356\356\377\357\357\357\377\360\360\360\377\360\360\360\377\361" - "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365" - "\365\377\366\366\366\377\367\367\367\377\370\370\370\377\370\370\370" - "\377\371\371\371\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365" - "\377\352\352\352\377\353\353\353\377\303\303\303\377rrr\377\327\327\327" - "\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377" - "\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377\366" - "\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372" - "\372\377\372\372\372\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\366\366" - "\366\377\353\353\353\377\354\354\354\377rrr\377\356\356\356\377sss\377" - "\360\360\360\377\361\361\361\377ttt\377uuu\377\203\203\203\377uuu\377" - "vvv\377vvv\377www\377www\377xxx\377\372\372\372\377\373\373\373\377\374" - "\374\374\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\367\367\367\377\355" - "\355\355\377\355\355\355\377\356\356\356\377\330\330\330\377sss\377\361" - "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365" - "\365\377\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370" - "\377\371\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377" - "\375\375\375\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\367\367\367\377" - "\356\356\356\377\357\357\357\377\330\330\330\377sss\377\332\332\332\377" - "\362\362\362\377\363\363\363\377uuu\377vvv\377vvv\377www\377www\377w" - "ww\377xxx\377xxx\377\373\373\373\377\374\374\374\377\375\375\375\377" - "\376\376\376\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377" - "\360\360\360\377\361\361\361\377ttt\377ttt\377uuu\377\364\364\364\377" - "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\373\373\373\377\374\374" - "\374\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\364\364\364\377" - "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\366\366\366\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0" - "\232\311\311\311\377\355\355\355\377\370\370\370\377\365\365\365\377" - "\366\366\366\377\367\367\367\377\370\370\370\377\370\370\370\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\356\356\356\377\275\275\275\377\0\0\0\324\0\0\0" - ":\0\0\0\26\0\0\0\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\324\0\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0" - "\0\0<\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=" - "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0" - "\0\0\7\0\0\0\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0" - "\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27" - "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0" - "\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0" - "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0" - "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_text_unindent) -#endif -#ifdef __GNUC__ -static const guint8 stock_text_unindent[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_text_unindent[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232" - "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362" - "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363" - "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364" - "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333" - "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340" - "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\256\256\256\377\347\347\347" - "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\343\343\343\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362" - "\362\362\377\341\341\341\377\341\341\341\377\342\342\342\377\343\343" - "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347" - "\377\350\350\350\377\351\351\351\377\352\352\352\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\347\347\347\377\0\0\0\377\0\0\0""8\0\0\0" - "\25\0\0\0\377\362\362\362\377\342\342\342\377\254\254\254\377\254\254" - "\254\377\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257" - "\377\260\260\260\377\261\261\261\377\262\262\262\377\262\262\262\377" - "\263\263\263\377\263\263\263\377\264\264\264\377\265\265\265\377\265" - "\265\265\377\266\266\266\377\361\361\361\377\350\350\350\377\0\0\0\377" - "\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\343\343\343\377\344\344\344" - "\377\345\345\345\377\345\345\345\377\346\346\346\377\347\347\347\377" - "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354" - "\354\354\377\355\355\355\377\355\355\355\377\356\356\356\377\357\357" - "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\351\351\351" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\344\344\344" - "\377\345\345\345\377\346\346\346\377\347\347\347\377\347\347\347\377" - "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354" - "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\357\357" - "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363" - "\377\352\352\352\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363" - "\377\345\345\345\377\346\346\346\377\347\347\347\377\350\350\350\377" - "\351\351\351\377\351\351\351\377\352\352\352\377uuu\377vvv\377vvv\377" - "www\377www\377xxx\377xxx\377xxx\377yyy\377yyy\377\364\364\364\377\353" - "\353\353\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\346" - "\346\346\377\347\347\347\377\252\252\252\377\351\351\351\377\352\352" - "\352\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355" - "\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361\377" - "\362\362\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365" - "\365\365\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364" - "\364\364\377\347\347\347\377\252\252\252\377\0\0\0\377\352\352\352\377" - "\353\353\353\377\354\354\354\377\354\354\354\377vvv\377www\377www\377" - "xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366\377\355" - "\355\355\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\252" - "\252\252\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\356\356" - "\356\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\367\367\367\377\367\367\367\377\356\356\356\377\0\0" - "\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\351\351\351\377\253" - "\253\253\377\0\0\0\377\354\354\354\377\355\355\355\377\356\356\356\377" - "\357\357\357\377xxx\377xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377{{{" - "\377{{{\377|||\377\370\370\370\377\357\357\357\377\0\0\0\377\0\0\0=\0" - "\0\0\27\0\0\0\377\365\365\365\377\352\352\352\377\353\353\353\377\255" - "\255\255\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360" - "\360\377\361\361\361\377\362\362\362\377\362\362\362\377\363\363\363" - "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377" - "\370\370\370\377\371\371\371\377\372\372\372\377\360\360\360\377\0\0" - "\0\377\0\0\0=\0\0\0\27\0\0\0\377\366\366\366\377\353\353\353\377\354" - "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360" - "\360\377\361\361\361\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366" - "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377" - "\373\373\373\377\362\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377" - "\367\367\367\377\355\355\355\377\355\355\355\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366" - "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377" - "\373\373\373\377\374\374\374\377\363\363\363\377\0\0\0\377\0\0\0=\0\0" - "\0\27\0\0\0\377\367\367\367\377\356\356\356\377\357\357\357\377\357\357" - "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363" - "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377" - "\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377\373" - "\373\373\377\374\374\374\377\375\375\375\377\364\364\364\377\0\0\0\377" - "\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\360\360\360\377\267\267\267" - "\377\270\270\270\377\270\270\270\377\270\270\270\377\271\271\271\377" - "\272\272\272\377\273\273\273\377\273\273\273\377\274\274\274\377\275" - "\275\275\377\276\276\276\377\276\276\276\377\276\276\276\377\277\277" - "\277\377\300\300\300\377\301\301\301\377\377\377\377\377\365\365\365" - "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\364\364\364\377" - "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377" - "\377\365\365\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362" - "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377" - "\366\366\366\377\366\366\366\377\367\367\367\377\274\274\274\377\371" - "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375" - "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\331\331\331\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0" - "\232\311\311\311\377\332\332\332\377\356\356\356\377\353\353\353\377" - "\354\354\354\377\355\355\355\377\356\356\356\377\356\356\356\377\357" - "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363" - "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\365\365\365" - "\377\365\365\365\377\344\344\344\377\275\275\275\377\0\0\0\324\0\0\0" - ":\0\0\0\26\0\0\0\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\324\0\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0" - "\0\0<\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=" - "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0" - "\0\0\7\0\0\0\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0" - "\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27" - "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0" - "\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0" - "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0" - "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_timer) -#endif -#ifdef __GNUC__ -static const guint8 stock_timer[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_timer[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\23\0" - "\0\0o\0\0\0\266\0\0\0\344\0\0\0\373\0\0\0\373\0\0\0\345\0\0\0\270\0\0" - "\0t\0\0\0\31\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\205\0\0\0" - "\373\207\207\207\377\300\300\300\377\323\323\323\377\326\326\326\377" - "\325\325\325\377\322\322\322\377\275\275\275\377\204\204\204\377\0\0" - "\0\374\0\0\0\217\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377[\210\262\377\0\0\0\377\324\324" - "\324\377\342\342\342\377\365\365\365\377\374\374\374\377\374\374\374" - "\377\374\374\374\377\373\373\373\377\363\363\363\377\354\354\354\377" - "\341\341\341\377\220\220\220\377\0\0\0\324\0\0\0""6\0\0\0\3\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\236" - "\270\321\377P\200\255\377\0\0\0\377\375\375\375\377\375\375\375\377\375" - "\375\375\377\316\316\316\377\310\310\310\377\374\374\374\377\373\373" - "\373\377\373\373\373\377\367\367\367\377\350\350\350\377\272\272\272" - "\377\0\0\0\352\0\0\0\77\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\377\277\321\341" - "\377\257\305\332\377\262\307\333\377\266\312\335\377\244\275\325\377" - "\234\267\321\377P\200\255\377\10\15\21\377\375\375\375\377\375\375\375" - "\377\277\277\277\377\270\270\270\377\373\373\373\377\373\373\373\377" - "\372\372\372\377\371\371\371\377\370\370\370\377\350\350\350\377\301" - "\301\301\377\0\0\0\330\0\0\0\32\0\0\0\4\0\0\0\0\0\0\0\377\302\322\341" - "\377\240\272\323\377\234\267\321\377\232\265\317\377\240\272\323\377" - "\234\267\321\377\227\263\316\377_\213\264\377\0\0\0\377\375\375\375\377" - "\260\260\260\377\251\251\251\377\373\373\373\377\373\373\373\377\371" - "\371\371\377\371\371\371\377\367\367\367\377\366\366\366\377\345\345" - "\345\377\217\217\217\377\0\0\0\242\0\0\0\20\0\0\0\1\0\0\0\377\310\326" - "\344\377\236\270\321\377\232\265\317\377\234\267\321\377\234\267\321" - "\377\234\267\321\377\240\272\323\377\225\262\316\377Ly\243\377\0\0\0" - "\377\241\241\241\377\231\231\231\377\373\373\373\377\372\372\372\377" - "\371\371\371\377\370\370\370\377\367\367\367\377\365\365\365\377\363" - "\363\363\377\350\350\350\377\0\0\0\374\0\0\0>\0\0\0\11\0\0\0\377g\213" - "\254\377\77e\210\377\77e\210\377\77e\210\377\77e\210\377\77e\210\377" - "\77e\210\377*C[\377\0\0\0\377\375\375\375\377\221\221\221\377\212\212" - "\212\377\373\373\373\377\372\372\372\377\371\371\371\377\370\370\370" - "\377\366\366\366\377\365\365\365\377\363\363\363\377\355\355\355\377" - "\216\216\216\377\0\0\0\227\0\0\0\25\0\0\0\377d\207\247\3777Yx\3777Yx" - "\3777Yx\377\77e\210\377\77e\210\377*C[\377\0\0\0\377\377\377\377\377" - "\376\376\376\377\201\201\201\377zzz\377\373\373\373\377\371\371\371\377" - "\370\370\370\377\367\367\367\377\365\365\365\377\364\364\364\377\362" - "\362\362\377\357\357\357\377\323\323\323\377\0\0\0\314\0\0\0(\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\77e\210\377*C[\377\0\0\0\377" - "\375\375\375\377\376\376\376\377\375\375\375\377rrr\377kkk\377\356\356" - "\356\377\371\371\371\377\370\370\370\377\366\366\366\377\364\364\364" - "\377\363\363\363\377\361\361\361\377\357\357\357\377\367\367\367\377" - "\0\0\0\354\0\0\0""9\0\0\0\0\0\0\0\373\350\350\350\377\372\372\372\377" - "\0\0\0\377*C[\377\0\0\0\377\374\374\374\377\374\374\374\377\374\374\374" - "\377\374\374\374\377ccc\377[[[\377\313\313\313\377\345\345\345\377\367" - "\367\367\377\365\365\365\377\364\364\364\377\362\362\362\377\273\273" - "\273\377\356\356\356\377\370\370\370\377\0\0\0\374\0\0\0D\0\0\0\0\0\0" - "\0\373\336\336\336\377\371\371\371\377\0\0\0\377\0\0\0\377\373\373\373" - "\377\373\373\373\377\373\373\373\377\373\373\373\377\373\373\373\377" - "\221\221\221\377LLL\377EEE\377bbb\377\300\300\300\377\335\335\335\377" - "\362\362\362\377\361\361\361\377\265\265\265\377\355\355\355\377\370" - "\370\370\377\0\0\0\374\0\0\0J\0\0\0\0\0\0\0\346\332\332\332\377\370\370" - "\370\377\0\0\0\377\371\371\371\377\371\371\371\377\371\371\371\377\372" - "\372\372\377\372\372\372\377\372\372\372\377\352\352\352\377\276\276" - "\276\377ddd\377...\377'''\377III\377\361\361\361\377\357\357\357\377" - "\355\355\355\377\371\371\371\377\367\367\367\377\0\0\0\355\0\0\0J\0\0" - "\0\0\0\0\0\273\275\275\275\377\365\365\365\377\367\367\367\377\370\370" - "\370\377\370\370\370\377\370\370\370\377\370\370\370\377\370\370\370" - "\377\370\370\370\377\367\367\367\377\366\366\366\377\335\335\335\377" - "\276\276\276\377WWW\377xxx\377\357\357\357\377\356\356\356\377\354\354" - "\354\377\371\371\371\377\323\323\323\377\0\0\0\316\0\0\0D\0\0\0\0\0\0" - "\0t\177\177\177\377\341\341\341\377\366\366\366\377\366\366\366\377\366" - "\366\366\377\366\366\366\377\367\367\367\377\366\366\366\377\366\366" - "\366\377\365\365\365\377\364\364\364\377\364\364\364\377\362\362\362" - "\377\361\361\361\377\357\357\357\377\356\356\356\377\355\355\355\377" - "\364\364\364\377\370\370\370\377\214\214\214\377\0\0\0\237\0\0\0""9\0" - "\0\0\0\0\0\0\31\0\0\0\374\320\320\320\377\353\353\353\377\364\364\364" - "\377\364\364\364\377\365\365\365\377\364\364\364\377\364\364\364\377" - "\364\364\364\377\363\363\363\377\362\362\362\377\361\361\361\377\360" - "\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377\354\354" - "\354\377\370\370\370\377\361\361\361\377\0\0\0\374\0\0\0_\0\0\0(\0\0" - "\0\0\0\0\0\2\0\0\0\217\211\211\211\377\324\324\324\377\362\362\362\377" - "\362\362\362\377\362\362\362\377\362\362\362\377\362\362\362\377\361" - "\361\361\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357" - "\357\377\356\356\356\377\355\355\355\377\354\354\354\377\371\371\371" - "\377\370\370\370\377\230\230\230\377\0\0\0\260\0\0\0H\0\0\0\25\0\0\0" - "\0\0\0\0\0\0\0\0\10\0\0\0\324\253\253\253\377\323\323\323\377\360\360" - "\360\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360\360" - "\377\357\357\357\377\357\357\357\377\356\356\356\377\356\356\356\377" - "\355\355\355\377\354\354\354\377\371\371\371\377\370\370\370\377\304" - "\304\304\377\0\0\0\335\0\0\0Q\0\0\0.\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\1" - "\0\0\0""6\0\0\0\352\253\253\253\377\322\322\322\377\344\344\344\377\356" - "\356\356\377\356\356\356\377\356\356\356\377\256\256\256\377\255\255" - "\255\377\355\355\355\377\354\354\354\377\353\353\353\377\370\370\370" - "\377\370\370\370\377\302\302\302\377\0\0\0\355\0\0\0p\0\0\0<\0\0\0\20" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\77\0\0\0\330\202\202\202" - "\377\315\315\315\377\331\331\331\377\354\354\354\377\354\354\354\377" - "\354\354\354\377\354\354\354\377\353\353\353\377\364\364\364\377\370" - "\370\370\377\367\367\367\377\214\214\214\377\0\0\0\335\0\0\0q\0\0\0B" - "\0\0\0\32\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0" - "\0\32\0\0\0\242\0\0\0\374\210\210\210\377\310\310\310\377\335\335\335" - "\377\370\370\370\377\370\370\370\377\367\367\367\377\361\361\361\377" - "\300\300\300\377\0\0\0\374\0\0\0\260\0\0\0Q\0\0\0<\0\0\0\32\0\0\0\5\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0" - "\20\0\0\0>\0\0\0\227\0\0\0\314\0\0\0\354\0\0\0\374\0\0\0\374\0\0\0\355" - "\0\0\0\316\0\0\0\237\0\0\0_\0\0\0H\0\0\0.\0\0\0\20\0\0\0\4\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\1\0\0\0\10\0\0\0\25\0\0\0(\0\0\0""9\0\0\0D\0\0\0J\0\0\0J\0\0\0D\0\0" - "\0""9\0\0\0(\0\0\0\25\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\1\0\0\0\6\0\0\0\12\0\0\0\15\0\0\0\17\0\0\0\17\0\0\0\15\0\0\0\12" - "\0\0\0\6\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_timer_stopped) -#endif -#ifdef __GNUC__ -static const guint8 stock_timer_stopped[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_timer_stopped[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\23\0\0" - "\0o\0\0\0\266\0\0\0\344\0\0\0\373\0\0\0\373\0\0\0\345\0\0\0\270\0\0\0" - "t\0\0\0\31\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\205\0\0\0\373\207" - "\207\207\377\300\300\300\377\323\323\323\377\326\326\326\377\325\325" - "\325\377\322\322\322\377\275\275\275\377\204\204\204\377\0\0\0\374\0" - "\0\0\217\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0)\0\0\0\314\223\223\223\377\324\324\324\377" - "\342\342\342\377\365\365\365\377\374\374\374\377\374\374\374\377\374" - "\374\374\377\373\373\373\377\363\363\363\377\354\354\354\377\341\341" - "\341\377\220\220\220\377\0\0\0\324\0\0\0""6\0\0\0\3\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0)\0\0\0\344\277\277\277\377\336\336" - "\336\377\360\360\360\377\375\375\375\377\375\375\375\377\375\375\375" - "\377\316\316\316\377\310\310\310\377\374\374\374\377\373\373\373\377" - "\373\373\373\377\367\367\367\377\350\350\350\377\272\272\272\377\0\0" - "\0\352\0\0\0\77\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\314\267\267\267\377\342\342\342\377\373\373\373\377\375\375\375\377" - "\375\375\375\377\375\375\375\377\375\375\375\377\277\277\277\377\270" - "\270\270\377\373\373\373\377\373\373\373\377\372\372\372\377\371\371" - "\371\377\370\370\370\377\350\350\350\377\301\301\301\377\0\0\0\330\0" - "\0\0\32\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\205\207\207\207\377\336" - "\336\336\377\373\373\373\377\375\375\375\377\375\375\375\377\375\375" - "\375\377\375\375\375\377\375\375\375\377\260\260\260\377\251\251\251" - "\377\373\373\373\377\373\373\373\377\371\371\371\377\371\371\371\377" - "\367\367\367\377\366\366\366\377\345\345\345\377\217\217\217\377\0\0" - "\0\242\0\0\0\20\0\0\0\1\0\0\0\0\0\0\0\23\0\0\0\373\324\324\324\377\367" - "\367\367\377\375\375\375\377\375\375\375\377\375\375\375\377\375\375" - "\375\377\375\375\375\377\375\375\375\377\241\241\241\377\231\231\231" - "\377\373\373\373\377\372\372\372\377\371\371\371\377\370\370\370\377" - "\367\367\367\377\365\365\365\377\363\363\363\377\350\350\350\377\0\0" - "\0\374\0\0\0>\0\0\0\11\0\0\0\0\0\0\0o\207\207\207\377\342\342\342\377" - "\374\374\374\377\375\375\375\377\375\375\375\377\375\375\375\377\375" - "\375\375\377\376\376\376\377\375\375\375\377\221\221\221\377\212\212" - "\212\377\373\373\373\377\372\372\372\377\371\371\371\377\370\370\370" - "\377\366\366\366\377\365\365\365\377\363\363\363\377\355\355\355\377" - "\216\216\216\377\0\0\0\227\0\0\0\25\0\0\0\0\0\0\0\266\300\300\300\377" - "\364\364\364\377\374\374\374\377\374\374\374\377\375\375\375\377\375" - "\375\375\377\376\376\376\377\377\377\377\377\376\376\376\377\201\201" - "\201\377zzz\377\373\373\373\377\371\371\371\377\370\370\370\377\367\367" - "\367\377\365\365\365\377\364\364\364\377\362\362\362\377\357\357\357" - "\377\323\323\323\377\0\0\0\314\0\0\0(\0\0\0\0\0\0\0\346\323\323\323\377" - "\372\372\372\377\373\373\373\377\374\374\374\377\374\374\374\377\375" - "\375\375\377\375\375\375\377\376\376\376\377\375\375\375\377rrr\377k" - "kk\377\356\356\356\377\371\371\371\377\370\370\370\377\366\366\366\377" - "\364\364\364\377\363\363\363\377\361\361\361\377\357\357\357\377\367" - "\367\367\377\0\0\0\354\0\0\0""9\0\0\0\0\0\0\0\373\350\350\350\377\372" - "\372\372\377\337\337\337\377\373\373\373\377\374\374\374\377\374\374" - "\374\377\374\374\374\377\374\374\374\377\374\374\374\377ccc\377[[[\377" - "\313\313\313\377\345\345\345\377\367\367\367\377\365\365\365\377\364" - "\364\364\377\362\362\362\377\273\273\273\377\356\356\356\377\370\370" - "\370\377\0\0\0\374\0\0\0D\0\0\0\0\0\0\0\373\336\336\336\377\371\371\371" - "\377\332\332\332\377\372\372\372\377\373\373\373\377\373\373\373\377" - "\373\373\373\377\373\373\373\377\373\373\373\377\221\221\221\377LLL\377" - "EEE\377bbb\377\300\300\300\377\335\335\335\377\362\362\362\377\361\361" - "\361\377\265\265\265\377\355\355\355\377\370\370\370\377\0\0\0\374\0" - "\0\0J\0\0\0\0\0\0\0\346\332\332\332\377\370\370\370\377\371\371\371\377" - "\371\371\371\377\371\371\371\377\371\371\371\377\372\372\372\377\372" - "\372\372\377\372\372\372\377\352\352\352\377\276\276\276\377ddd\377." - "..\377'''\377III\377\361\361\361\377\357\357\357\377\355\355\355\377" - "\371\371\371\377\367\367\367\377\0\0\0\355\0\0\0J\0\0\0\0\0\0\0\273\275" - "\275\275\377\365\365\365\377\367\367\367\377\370\370\370\377\370\370" - "\370\377\370\370\370\377\370\370\370\377\370\370\370\377\370\370\370" - "\377\367\367\367\377\366\366\366\377\335\335\335\377\276\276\276\377" - "WWW\377xxx\377\357\357\357\377\356\356\356\377\354\354\354\377\371\371" - "\371\377\323\323\323\377\0\0\0\316\0\0\0D\0\0\0\0\0\0\0t\177\177\177" - "\377\341\341\341\377\366\366\366\377\366\366\366\377\366\366\366\377" - "\366\366\366\377\367\367\367\377\366\366\366\377\366\366\366\377\365" - "\365\365\377\364\364\364\377\364\364\364\377yyy\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\234" - "\0\0\0\0\0\0\0\31\0\0\0\374\320\320\320\377\353\353\353\377\364\364\364" - "\377\364\364\364\377\365\365\365\377\364\364\364\377\364\364\364\377" - "\364\364\364\377\363\363\363\377\362\362\362\377\361\361\361\377\0\0" - "\0\377\351\\\23\377\362g\37\377\356b\32\377\345Y\23\377\333T\22\377\322" - "S\27\377\312R\33\377\276D\17\377\0\0\0\377\0\0\0\0\0\0\0\2\0\0\0\217" - "\211\211\211\377\324\324\324\377\362\362\362\377\362\362\362\377\362" - "\362\362\377\362\362\362\377\362\362\362\377\361\361\361\377\361\361" - "\361\377\360\360\360\377\360\360\360\377\0\0\0\377\353a\33\377\376\362" - "\353\377\374\346\333\377\350k,\377\337e)\377\370\342\330\377\373\361" - "\355\377\300K\30\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\10\0\0\0\324\253" - "\253\253\377\323\323\323\377\360\360\360\377\360\360\360\377\360\360" - "\360\377\360\360\360\377\360\360\360\377\357\357\357\377\357\357\357" - "\377\356\356\356\377\0\0\0\377\345[\26\377\372\337\322\377\377\377\377" - "\377\372\346\334\377\372\344\331\377\377\377\377\377\364\334\322\377" - "\275G\23\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0""6\0\0\0\352\253" - "\253\253\377\322\322\322\377\344\344\344\377\356\356\356\377\356\356" - "\356\377\356\356\356\377\256\256\256\377\255\255\255\377\355\355\355" - "\377\0\0\0\377\335U\22\377\342d%\377\371\340\324\377\377\377\377\377" - "\377\377\377\377\365\336\323\377\307U\"\377\271B\16\377\0\0\0\377\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\77\0\0\0\330\202\202\202\377\315\315" - "\315\377\331\331\331\377\354\354\354\377\354\354\354\377\354\354\354" - "\377\354\354\354\377\353\353\353\377\0\0\0\377\323O\21\377\332a)\377" - "\371\343\331\377\377\377\377\377\377\377\377\377\366\344\333\377\304" - "W(\377\265@\16\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5" - "\0\0\0\32\0\0\0\242\0\0\0\374\210\210\210\377\310\310\310\377\335\335" - "\335\377\370\370\370\377\370\370\370\377\367\367\367\377\0\0\0\377\312" - "N\23\377\367\341\327\377\377\377\377\377\364\335\323\377\364\335\323" - "\377\377\377\377\377\364\342\332\377\262B\23\377\0\0\0\377\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\20\0\0\0>\0\0\0\227\0\0" - "\0\314\0\0\0\354\0\0\0\374\0\0\0\374\0\0\0\355\0\0\0\377\302K\26\377" - "\370\353\345\377\363\333\321\377\304S\"\377\300R\"\377\361\332\320\377" - "\367\353\347\377\255A\25\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\25\0\0\0(\0\0\0""9\0\0\0D\0" - "\0\0J\0\0\0J\0\0\0\377\267@\16\377\272E\23\377\270C\21\377\266@\16\377" - "\263>\15\377\260>\20\377\253\77\23\377\2447\14\377\0\0\0\377\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0" - "\0\6\0\0\0\12\0\0\0\15\0\0\0\17\0\0\0\17\0\0\0\206\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\177"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_trash) -#endif -#ifdef __GNUC__ -static const guint8 stock_trash[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_trash[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0R\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" - "X\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\0\220\34\34" - "\34\377vvv\377\346\346\346\377\323\323\323\377\303\303\303\377\220\220" - "\220\377III\377\0\0\0\377\0\0\0\276\0\0\0,\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0E\0\0\0\240\0\0\0" - "\377\0\0\0\377HG=\377\272\270\246\377\342\342\337\377\361\361\360\377" - "\352\351\346\377\362\362\356\377\353\352\345\377\301\300\265\377WVJ\377" - "RQF\377\0\0\0\377\0\0\0\377\0\0\0\227\0\0\0""3\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0T\0\0\0\377\250\246\217\377\275\273\241\377\300" - "\276\243\377\243\241\212\377ml\\\377||r\377LLI\377EE\77\377DC:\377oo" - "g\377\306\305\271\377\266\265\233\377ml]\377\263\261\233\377\247\246" - "\216\377\220\217z\377\0\0\0\377\0\0\0E\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\377\252\251\223\377\314\313\265\377\320\316\272\377\325\323" - "\301\377\256\255\243\377\224\223\212\377EDB\377##!\377541\377)(#\377" - "\36\36\32\377SRF\377\255\254\223\377\222\221\211\377\302\301\257\377" - "\261\257\226\377\254\252\222\377\223\222}\377\0\0\0\377\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\10\10\10\377\321\320\301\377\314\313\265\377\326\325" - "\304\377\337\336\321\377\316\315\300\377\254\254\246\377\220\217\212" - "\377~}w\377\\\\U\377GF>\377edV\377wve\377\200~o\377\276\275\247\377\265" - "\263\232\377\266\265\233\377\265\263\232\377\241\237\210\377\0\0\0\377" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\331\330\314\377\366\365\362" - "\377\333\332\321\377\332\331\316\377\345\344\331\377\320\317\303\377" - "\323\323\311\377\312\311\274\377\267\266\246\377\270\266\241\377\260" - "\257\226\377\241\237\210\377\271\270\235\377\271\267\235\377\270\266" - "\234\377\304\302\251\377\257\255\227\377\213\211v\377\0\0\0\377\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\252\251\230\377\266\266\262\377" - "\371\371\367\377\372\372\370\377\364\364\360\377\342\341\332\377\331" - "\331\316\377\333\332\317\377\325\323\301\377\323\321\276\377\304\302" - "\251\377\300\276\243\377\305\304\254\377\326\325\303\377\315\314\277" - "\377\273\272\255\377|zi\377qp`\377\0\0\0\336\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\23\23\23\316\231\230\202\377\257\256\235\377\303\303\276\377" - "\336\336\334\377\351\351\350\377\373\373\372\377\375\375\374\377\375" - "\375\375\377\374\373\372\377\371\371\367\377\362\362\357\377\352\351" - "\343\377\333\332\321\377\300\277\261\377\225\224\204\377xwf\377nm]\377" - "[[M\377\0\0\0\315\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\222]\\O\377\223" - "\222}\377\243\242\223\377\270\267\246\377\330\327\320\377\333\333\324" - "\377\323\322\312\377\310\310\303\377\306\305\275\377\275\274\255\377" - "\272\270\250\377\237\236\213\377\216\214x\377\214\213w\377\216\214x\377" - "zyh\377lk]\377NME\377\0\0\0y\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2" - "\0\0\0\377BBB\377{{s\377\237\237\226\377\322\321\307\377\334\333\322" - "\377\314\313\276\377\321\320\302\377\304\303\266\377\261\257\226\377" - "\261\257\226\377\261\257\226\377\232\230\203\377\200\177m\377}|k\377" - "ji^\377@@>\377\0\0\0\377\0\0\0""3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\37777-\377\17\17\17\377874\377xxu\377\231\230\223\377\212" - "\211~\377\263\262\244\377\252\252\236\377\243\241\212\377\207\206s\377" - "\217\215y\377baU\377TTQ\37711.\377\0\0\0\377++#\377\0\0\0\377\0\0\0\17" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377qq]\377WWK\377BB:\377" - "&&\40\377!!!\377\33\33\33\377\0\0\0\377$$$\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\26\26\23\377**\"\37700'\377\77\77""4\377\0\0\0\377" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377zze\377[[Q" - "\377\205\205v\377vvk\377\230\230\216\377uuk\377QQF\377\177\177t\377j" - "jX\377@@5\377bbQ\377TTE\377>>3\377UUF\37744+\377QQC\377\0\0\0\377\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\205\205n\377]" - "]T\377\221\221\202\377\202\202x\377\252\252\243\377zzq\377NNE\377\212" - "\212\200\377||m\377BB7\377``R\377ZZJ\377<<2\377NNA\37755,\377TTE\377" - "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\3\0\0\0\377" - "\205\205n\377[[Q\377\254\254\234\377\205\205{\377\273\273\263\377\243" - "\243\232\377TTK\377\223\223\212\377\221\221\205\377BB7\377``R\377hhV" - "\377AA6\377jjX\377CC7\377jjX\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\1\0\0\0\5\0\0\0\10\0\0\0\377\205\205n\377[[Q\377\244\244\223\377" - "\205\205{\377\301\301\266\377\261\261\242\377kk_\377\261\261\242\377" - "\235\235\213\377TTE\377\204\204p\377qq^\377CC7\377jjX\377CC7\377jjX\377" - "\0\0\0\377\0\0\0\6\0\0\0\3\0\0\0\0\0\0\0\2\0\0\0\12\0\0\0\24\0\0\0\377" - "\205\205n\377[[Q\377\245\245\224\377\205\205{\377\302\302\267\377\261" - "\261\242\377kk_\377\261\261\242\377\235\235\213\377TTE\377\204\204p\377" - "qq^\377CC7\377jjX\377CC7\377jjX\377\0\0\0\377\0\0\0\26\0\0\0\13\0\0\0" - "\2\0\0\0\3\0\0\0\26\0\0\0+\0\0\0\377\205\205n\377[[Q\377\235\235\213" - "\377\205\205{\377\301\301\266\377\261\261\242\377kk_\377\261\261\242" - "\377\235\235\213\377TTE\377\204\204p\377qq^\377CC7\377jjX\377CC7\377" - "jjX\377\0\0\0\377\0\0\0""1\0\0\0\32\0\0\0\4\0\0\0\7\0\0\0#\0\0\0I\0\0" - "\0\377{{e\377[[Q\377\244\244\223\377\205\205{\377\301\301\266\377\261" - "\261\242\377kk_\377\261\261\242\377\235\235\213\377TTE\377\204\204p\377" - "qq^\377CC7\377jjX\377CC7\377__O\377\0\0\0\377\0\0\0H\0\0\0*\0\0\0\7\0" - "\0\0\12\0\0\0,\0\0\0X\0\0\0\377ffT\377[[Q\377\244\244\223\377\202\202" - "x\377\301\301\266\377\261\261\242\377kk_\377\261\261\242\377\235\235" - "\213\377TTE\377\204\204p\377qq^\377CC7\377jjX\377II<\377WWH\377\0\0\0" - "\377\0\0\0P\0\0\0*\0\0\0\7\0\0\0\6\0\0\0\35\0\0\0C\0\0\0r\0\0\0\377W" - "WJ\377}}m\377vvi\377\263\263\250\377\241\241\224\377mma\377\263\263\245" - "\377\235\235\213\377TTE\377\204\204p\377iiW\377AA5\377VVG\377DD8\377" - "\0\0\0\377\0\0\0\177\0\0\0C\0\0\0\35\0\0\0\4\0\0\0\1\0\0\0\13\0\0\0\34" - "\0\0\0""2\0\0\0g\0\0\0\320\0\0\0\377\0\0\0\377YYQ\377XXI\377NN@\377t" - "tg\377aaS\377NNA\377II<\377II<\377\0\0\0\377\0\0\0\377\0\0\0\304\0\0" - "\0t\0\0\0>\0\0\0%\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\17\0" - "\0\0\31\0\0\0\37\0\0\0r\0\0\0\264\0\0\0\302\0\0\0\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\271\0\0\0\217\0\0\0S\0\0\0," - "\0\0\0*\0\0\0\33\0\0\0\10\0\0\0\1\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_trash_full) -#endif -#ifdef __GNUC__ -static const guint8 stock_trash_full[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_trash_full[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\10\10" - "\10\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\6\6\6\21\6\6\6K\16\16\16\377BBB\377JJJ\377>>>\377,,,\377\0" - "\0\0\377\6\6\6>\6\6\6!\0\0\0\0\0\0\0\0\0\0\0\0\10\10\10\377\10\10\10" - "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\6\6\6:\0\0\0\377\0\0\0\377\205\203q\377\360\355\330\377\362\361\351" - "\377\356\355\344\377\307\306\272\377SRF\377\0\0\0\377\0\0\0\377\6\6\6" - "K\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\6\6\6>\20\20\20\377\302\300\245\377\301\277\245" - "\377zyg\377HG@\377''%\37765.\377\207\205r\377\240\236\210\377\243\241" - "\212\377\245\243\214\377\0\0\0\377\6\6\6!\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0+++\377\323\321\274" - "\377\334\332\304\377\342\340\317\377\271\267\242\377db[\377986\377<<" - "3\377a`S\377\232\230\203\377\267\265\233\377\263\262\230\377\244\242" - "\213\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\10\10\10\377" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\350\344\323\377\364\361\351" - "\377\362\361\344\377\352\351\332\377\345\342\322\377\325\322\276\377" - "\303\301\247\377\257\255\224\377\300\276\244\377\306\304\254\377\270" - "\266\234\377ywf\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\10\10\10\377\10\10\10\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\212\211" - "u\377\361\355\322\377\373\370\351\377\371\365\355\377\370\367\356\377" - "\370\367\354\377\365\363\346\377\354\352\331\377\336\335\313\377\0\0" - "\0\377\0\0\0\377BA8\377\0\0\0\377\0\0\0\0\0\0\0>\0\0\0\377\0\0\0W\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\202RQF\377sqe\377" - "\237\235\221\377\344\341\310\377\351\345\317\377\342\340\313\377\321" - "\321\313\377\216\215\177\377\0\0\0\377\377\377\377\377\301\301\301\377" - "\0\0\0\377\0\0\0\240\0\0\0L\0\0\0\377\377\377\377\377\0\0\0\377\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\37\37\33\377440\377" - "KID\377hgb\377pof\377kkd\377nl]\377XWK\377++%\377\0\0\0\377\377\377\377" - "\377\222\222\222\377\2\2\2\377\0\0\0\377\346\346\346\377\0\0\0\377\0" - "\0\0>\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0**#\377" - "\240\240\225\377MM@\377660\377**&\377//*\377\17\17\15\377\13\13\11\377" - "\20\20\15\377(($\377\0\0\0\377\274\274\274\377nnn\377\355\355\355\377" - "\0\0\0\377\0\0\0L\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0++$\377\245\244\231\377\267\266\256\377qpg\377\241\241\222" - "\377tsc\377@@5\377ii[\377%%\36\377\34\34\34\377\354\354\354\377\317\317" - "\317\377ooo\377\257\257\257\377\0\0\0\377\0\0\0!\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0,,%\377\255\255\243\377\331" - "\331\322\377\213\213\177\377\326\325\316\377\210\210{\377XWO\377\177" - "\177u\377\0\0\0\377\336\336\336\377\377\377\377\377\336\336\336\377\336" - "\336\336\377\311\311\311\377\0\0\0\377\0\0\0\77\0\0\0\1\0\0\0\1\0\0\0" - "\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6,,%\377\255\255\243\377\332" - "\332\323\377\217\216\201\377\335\335\324\377\254\253\231\377]]R\377i" - "i`\377mmm\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" - "\377\377\347\347\347\377\223\223\223\377\0\0\0\377\0\0\0+\0\0\0\13\0" - "\0\0\7\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\5\0\0\0\21++$\377~~u\377\330\330" - "\321\377\215\215\200\377\335\335\323\377\254\253\231\377PPG\377\30\30" - "\30\377\311\311\311\377\307\340\307\377x\265x\377\233\310\233\377\377" - "\377\377\377\347\347\347\377\306\306\306\377\0\0\0\377\0\0\0U\0\0\0\35" - "\0\0\0\27\0\0\0\15\0\0\0\3\0\0\0\1\0\0\0\11\0\0\0\34''!\377CC=\377\216" - "\216\206\377^^U\377\332\332\320\377\254\253\231\37755.\377]]]\377\324" - "\347\324\377]\246]\377\307\340\307\377\377\377\377\377]\246]\377\215" - "\272\215\377\345\345\345\377\206\206\206\377\0\0\0\377\0\0\0G\0\0\0'" - "\0\0\0\31\0\0\0\10\0\0\0\1\0\0\0\11\0\0\0\34\4\4\4k\6\6\6\377\6\6\6\377" - "BA:\377\217\217{\377zzl\377\0\0\0\377\304\304\304\377s\262s\377\307\340" - "\307\377\377\377\377\377\377\377\377\377x\265x\377n\253n\377\345\345" - "\345\377\220\220\220\377\0\0\0\377\0\0\0w\0\0\0.\0\0\0\"\0\0\0\16\0\0" - "\0\1\0\0\0\5\0\0\0\23\0\0\0&\0\0\0""0\4\4\4y\6\6\6\377\0\0\0\377\17\17" - "\17\377\0\0\0\377\327\327\327\377\377\377\377\377\377\377\377\377\377" - "\377\377\377\377\377\377\377\377\377\377\377\364\364\364\377S\235S\377" - "\277\277\277\377JJJ\377\0\0\0\377\0\0\0""1\0\0\0(\0\0\0\23\0\0\0\0\0" - "\0\0\1\0\0\0\6\0\0\0\23\0\0\0\40\0\0\0)\0\0\0-\0\0\0.\0\0\0""0\0\0\0" - "\377\354\354\354\377x\265x\377\377\377\377\377\377\377\377\377\307\340" - "\307\377\377\377\377\377\272\323\272\377\212\270\212\377\212\267\212" - "\377qqq\377\0\0\0\377\0\0\0""2\0\0\0*\0\0\0\27\0\0\0\0\0\0\0\0\0\0\0" - "\1\0\0\0\3\0\0\0\12\0\0\0\21\0\0\0\26\0\0\0\33\0\0\0\"\0\0\0\377\254" - "\254\254\377\354\354\354\377o\254o\377o\254o\377n\253n\377T\235T\377" - "\262\314\262\377\212\270\212\377\222\222\222\377aaa\377\0\0\0\377\0\0" - "\0""1\0\0\0'\0\0\0\23\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1" - "\0\0\0\2\0\0\0\10\0\0\0\22\0\0\0U\0\0\0\377\0\0\0\377iii\377\200\200" - "\200\377}\220}\377\241\241\241\377\203\203\203\377zzz\377CCC\377\0\0" - "\0\377\0\0\0w\0\0\0*\0\0\0\34\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\7\0\0\0\21\0\0\0""9\0\0\0p\0" - "\0\0\234\0\0\0\304\0\0\0\377\0\0\0\377\0\0\0\377(((\377444\263888q\0" - "\0\0#\0\0\0\32\0\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\14\0\0\0\21\0\0\0\23" - "\0\0\0\24\0\0\0\26\0\0\0\26\0\0\0\26\0\0\0\25\0\0\0\25\0\0\0\24\0\0\0" - "\17\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\6\0\0" - "\0\6\0\0\0\7\0\0\0\10\0\0\0\7\0\0\0\6\0\0\0\6\0\0\0\4\0\0\0\2\0\0\0\1" - "\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_volume) -#endif -#ifdef __GNUC__ -static const guint8 stock_volume[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_volume[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0,\0\0\0\377\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0I@f\320I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0-\0\0\0\377" - "\0\0\0\377\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0I@f\377I@f+\0\0\0\0I@f+I@f" - "\252I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0-\0\0\0\377\256\253\237\377\0\0\0\377\0\0\0" - "\21\0\0\0\2\0\0\0\0\0\0\0\0I@f+I@f\377I@f+\0\0\0\0I@f\213I@fO\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0o\0\0\0\377\256\253\237\377\334\331\323\377\0\0\0\377\0\0\0\221" - "\0\0\0\4I@f\377I@f+\0\0\0\0I@f\252I@fO\0\0\0\0I@fcI@f\213\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\7\0\0\0\377\233\230\212\377\200~r" - "\377\0\0\0\377\256\253\237\377\342\341\334\377\362\362\360\377\0\0\0" - "\377\0\0\0\347\0\0\0\12I@f+I@f\377\0\0\0\0I@fOI@f\252\0\0\0\0I@f@I@f" - "\252\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\22\0\0\0\377\343\342" - "\335\377\266\266\261\377\0\0\0\377\356\355\352\377\352\352\346\377\305" - "\301\267\377\0\0\0\377III\377\0\0\0\24\0\0\0\0I@f\377\0\0\0\0I@f+I@f" - "\320\0\0\0\0I@f#I@f\320\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0" - "\30\0\0\0\377\260\254\234\377\222\216\201\377\0\0\0\377\315\312\301\377" - "\270\264\246\377\277\273\257\377\0\0\0\377\11\11\11\377\0\0\0\30\0\0" - "\0\0I@f\377\0\0\0\0\0\0\0\0I@f\377\0\0\0\0\0\0\0\0I@f\377\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\377\233\230\212\377\200~" - "r\377\0\0\0\377\236\232\214\377\260\254\234\377\260\254\234\377\0\0\0" - "\377+++\377\0\0\0\27\0\0\0\0I@f\377\0\0\0\0I@f+I@f\320\0\0\0\0I@f#I@" - "f\320\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\377yvl\377" - "dbY\377\0\0\0\377\236\232\214\377\236\232\214\377\236\232\214\377\0\0" - "\0\377\10\10\10\376\0\0\0\27I@f+I@f\377\0\0\0\0I@fOI@f\252\0\0\0\0I@" - "f@I@f\252\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\240\0\0\0\377\215\212}\377\236\232\214\377" - "\0\0\0\377\0\0\0\300\0\0\0\30I@f\377I@f+\0\0\0\0I@f\252I@fO\0\0\0\0I" - "@fYI@f\213\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\30\0\0\0>\0" - "\0\0S\0\0\0S\0\0\0Q\0\0\0r\0\0\0\377~{p\377\0\0\0\377\0\0\0=\0\0\0\32" - "\0\0\0\0\0\0\0\0I@f+I@f\320I@f+\0\0\0\0I@f\213I@fO\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\2\0\0\0\22\0\0\0/\0\0\0=\0\0\0;\0\0\0""8\0\0\0C" - "\0\0\0o\0\0\0\377\0\0\0\377\0\0\0""1\0\0\0\26\0\0\0\0\0\0\0\0I@f\377" - "I@f+\0\0\0\0I@f+I@f\213I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0" - "\0\0\7\0\0\0\22\0\0\0\27\0\0\0\26\0\0\0\26\0\0\0%\0\0\0>\0\0\0l\0\0\0" - "\377\0\0\0\"\0\0\0\13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0I@f\320" - "I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2" - "\0\0\0\3\0\0\0\3\0\0\0\4\0\0\0\15\0\0\0#\0\0\0;\0\0\0""8\0\0\0\30\0\0" - "\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\3\0\0\0\15\0\0\0\37\0\0\0%\0\0\0\21\0\0\0\2\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\3\0\0\0\11\0\0\0\15\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_midi) -#endif -#ifdef __GNUC__ -static const guint8 stock_midi[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_midi[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (2304) */ - "\0\0\11\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (96) */ - "\0\0\0`" - /* width (24) */ - "\0\0\0\30" - /* height (24) */ - "\0\0\0\30" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\24\0\0\0n\0\0\0\24\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\36\0\0" - "\0\206\0\0\0$\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0$\0\0\0^\0\0\0u\0\0\0\231\0\0\0\231\0\0\0Q\0\0\0<\0\0\0" - "(\0\0\0\17\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0.\0\0\0\276\0\0\0X\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "^\0\0\0C\0\0\0u\0\0\0$\0\0\0\24\0\0\0E\0\0\0w\0\0\0}\0\0\0X\0\0\0""7" - "\0\0\0\15\0\0\0A\0\0\0\225\0\0\0""8\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\271\0\0\0$\0\0\0" - "\177\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\0\0\0>\0\0\0\201\0\0\0\311" - "\0\0\0\200\0\0\0G\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0E\0\0\0\364\0\0\0b\0\0\0\362\0\0\0" - "U\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\355\377\377\377\377\0\0\0\355\377\377\377\377" - "\0\0\0\356\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\376\250\250\250\377\0\0\0\355\267\267" - "\267\377\0\0\0\356\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0{\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0z\0\0\0\0\0\0\0\0\0\0\0\377\323\321\316\377\274\272\265" - "\377\254\252\244\377\230\226\217\377\230\226\217\377\230\226\217\377" - "\230\226\217\377\230\226\217\377\230\226\217\377\230\226\217\377\230" - "\226\217\377\230\226\217\377\230\226\217\377\230\226\217\377\230\226" - "\217\377\230\226\217\377\230\226\217\377zxr\377b`[\377USO\377\0\0\0\377" - "\0\0\0\23\0\0\0\0\0\0\0\377\257\255\251\377\234\232\225\377\204\202|" - "\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377f" - "d]\377fd]\377fd]\377fd]\377fd]\377RPJ\377RPJ\377A@;\377\0\0\0\377\0\0" - "\0,\0\0\0\3\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0""6\0\0\0\7\0\0\0\377\315\315\315\377VVV\377" - "\0\0\0\377\312\312\312\377VVV\377\0\0\0\377\310\310\310\377VVV\377\0" - "\0\0\377\305\305\305\377\302\302\302\377\271\271\271\377\303\303\303" - "\377VVV\377\0\0\0\377\300\300\300\377VVV\377\0\0\0\377\276\276\276\377" - "\270\270\270\377\0\0\0\377\0\0\0\77\0\0\0\14\0\0\0\377\377\377\377\377" - "kkk\377\0\0\0\377\374\374\374\377kkk\377\0\0\0\377\370\370\370\377kk" - "k\377\0\0\0\377\366\366\366\377\361\361\361\377\346\346\346\377\362\362" - "\362\377kkk\377\0\0\0\377\360\360\360\377kkk\377\0\0\0\377\355\355\355" - "\377\346\346\346\377\0\0\0\377\0\0\0E\0\0\0\22\0\0\0\377\377\377\377" - "\377kkk\377\0\0\0\377\373\373\373\377kkk\377\0\0\0\377\367\367\367\377" - "kkk\377\0\0\0\377\365\365\365\377\361\361\361\377\345\345\345\377\362" - "\362\362\377kkk\377\0\0\0\377\357\357\357\377kkk\377\0\0\0\377\354\354" - "\354\377\345\345\345\377\0\0\0\377\0\0\0D\0\0\0\23\0\0\0\377\377\377" - "\377\377kkk\377\0\0\0\377\372\372\372\377kkk\377\0\0\0\377\367\367\367" - "\377kkk\377\0\0\0\377\365\365\365\377\360\360\360\377\344\344\344\377" - "\362\362\362\377kkk\377\0\0\0\377\356\356\356\377kkk\377\0\0\0\377\353" - "\353\353\377\344\344\344\377\0\0\0\377\0\0\0D\0\0\0\20\0\0\0\377\376" - "\376\376\377NNN\377\0\0\0\377\372\372\372\377NNN\377\0\0\0\377\366\366" - "\366\377NNN\377\0\0\0\377\365\365\365\377\357\357\357\377\344\344\344" - "\377\361\361\361\377NNN\377\0\0\0\377\356\356\356\377NNN\377\0\0\0\377" - "\353\353\353\377\343\343\343\377\0\0\0\377\0\0\0D\0\0\0\16\0\0\0\377" - "\375\375\375\377\374\374\374\377\360\360\360\377\372\372\372\377\367" - "\367\367\377\354\354\354\377\366\366\366\377\363\363\363\377\347\347" - "\347\377\364\364\364\377\356\356\356\377\343\343\343\377\360\360\360" - "\377\352\352\352\377\336\336\336\377\356\356\356\377\346\346\346\377" - "\332\332\332\377\353\353\353\377\343\343\343\377\0\0\0\377\0\0\0D\0\0" - "\0\16\0\0\0\377\374\374\374\377\373\373\373\377\357\357\357\377\372\372" - "\372\377\366\366\366\377\353\353\353\377\366\366\366\377\362\362\362" - "\377\347\347\347\377\363\363\363\377\356\356\356\377\342\342\342\377" - "\360\360\360\377\351\351\351\377\336\336\336\377\355\355\355\377\345" - "\345\345\377\331\331\331\377\352\352\352\377\342\342\342\377\0\0\0\377" - "\0\0\0D\0\0\0\16\0\0\0\377\374\374\374\377\373\373\373\377\370\370\370" - "\377\373\373\373\377\373\373\373\377\366\366\366\377\373\373\373\377" - "\371\371\371\377\366\366\366\377\371\371\371\377\370\370\370\377\363" - "\363\363\377\370\370\370\377\366\366\366\377\361\361\361\377\370\370" - "\370\377\364\364\364\377\360\360\360\377\370\370\370\377\341\341\341" - "\377\0\0\0\377\0\0\0D\0\0\0\16\0\0\0\377\301\301\301\377\300\300\300" - "\377\267\267\267\377\301\301\301\377\275\275\275\377\270\270\270\377" - "\275\275\275\377\272\272\272\377\264\264\264\377\272\272\272\377\270" - "\270\270\377\251\251\251\377\272\272\272\377\263\263\263\377\251\251" - "\251\377\266\266\266\377\257\257\257\377\246\246\246\377\264\264\264" - "\377\255\255\255\377\0\0\0\377\0\0\0D\0\0\0\16\0\0\0n\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\227\0\0\0\77\0" - "\0\0\14\0\0\0\6\0\0\0#\0\0\0>\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0" - "\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0" - "\0\0D\0\0\0D\0\0\0D\0\0\0\77\0\0\0#\0\0\0\6\0\0\0\1\0\0\0\6\0\0\0\14" - "\0\0\0\15\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0" - "\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0" - "\0\0\16\0\0\0\16\0\0\0\16\0\0\0\14\0\0\0\6\0\0\0\1"}; - - -/* GdkPixbuf RGBA C-Source image dump */ - -#ifdef __SUNPRO_C -#pragma align 4 (stock_authentication) -#endif -#ifdef __GNUC__ -static const guint8 stock_authentication[] __attribute__ ((__aligned__ (4))) = -#else -static const guint8 stock_authentication[] = -#endif -{ "" - /* Pixbuf magic (0x47646b50) */ - "GdkP" - /* length: header (24) + pixel_data (9216) */ - "\0\0$\30" - /* pixdata_type (0x1010002) */ - "\1\1\0\2" - /* rowstride (192) */ - "\0\0\0\300" - /* width (48) */ - "\0\0\0""0" - /* height (48) */ - "\0\0\0""0" - /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\3" - "\0\0\0\4\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\1\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\1\0\0\0\2\0\0\0\4\0\0\0\7\0\0\0\12\0\0\0\16\0\0\0\21\0\0\0\23\0\0" - "\0\23\0\0\0\23\0\0\0\21\0\0\0\16\0\0\0\12\0\0\0\7\0\0\0\4\0\0\0\2\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\10\0\0" - "\0\16\0\0\0g\0\0\0\253\0\0\0\332\0\0\0\366\1\1\1\377\0\0\0\366\0\0\0" - "\334\0\0\0\260\0\0\0q\0\0\0\36\0\0\0\25\0\0\0\16\0\0\0\10\0\0\0\4\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\14\0\0\0\203\0\0\0\354" - "\1\1\1\377\233\233\233\377\320\320\320\377\343\343\343\377\351\351\351" - "\377\335\335\335\377\306\306\306\377\221\221\221\377\1\1\1\377\0\0\0" - "\356\0\0\0\221\0\0\0#\0\0\0\27\0\0\0\15\0\0\0\5\0\0\0\2\0\0\0\1\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0" - "\0\0\7\0\0\0>\0\0\0\320\1\1\1\377\276\276\276\377\352\352\352\377\361" - "\361\361\377\363\363\363\377\361\361\361\377\355\355\355\377\352\352" - "\352\377\346\346\346\377\342\342\342\377\330\330\330\377\234\234\234" - "\377\1\1\1\377\0\0\0\330\0\0\0W\0\0\0\36\0\0\0\20\0\0\0\7\0\0\0\2\0\0" - "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\7" - "\0\0\0R\0\0\0\366```\377\343\343\343\377\363\363\363\377\360\360\360" - "\377\354\354\354\377\346\346\346\377\344\344\344\377\343\343\343\377" - "\342\342\342\377\342\342\342\377\342\342\342\377\341\341\341\377\326" - "\326\326\377\267\267\267\377EEE\377\0\0\0\367\0\0\0m\0\0\0\"\0\0\0\22" - "\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0" - "\0\5\0\0\0>\0\0\0\366\205\205\205\377\354\354\354\377\363\363\363\377" - "\352\352\352\377\343\343\343\377\331\331\331\377\316\316\316\377\302" - "\302\302\377\302\302\302\377\314\314\314\377\325\325\325\377\334\334" - "\334\377\340\340\340\377\335\335\335\377\310\310\310\377\271\271\271" - "\377bbb\377\0\0\0\370\0\0\0Y\0\0\0!\0\0\0\17\0\0\0\5\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\15\0\0\0\320^^^\377\354\354\354" - "\377\363\363\363\377\350\350\350\377\334\334\334\377\274\274\274\370" - "XXX\360\24\24\24\341\0\0\0\333\0\0\0\326\0\0\0\324{{{\352\276\276\276" - "\366\340\340\340\377\337\337\337\377\334\334\334\377\303\303\303\377" - "\273\273\273\377LLL\377\0\0\0\273\0\0\0""5\0\0\0\33\0\0\0\13\0\0\0\3" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\203\1\1\1\377\342\342" - "\342\377\363\363\363\377\351\351\351\377\330\330\330\377\227\227\227" - "\354\0\0\0\352\0\0\0\274\0\0\0g\0\0\0Y\0\0\0S\0\0\0Q\0\0\0Y\0\0\0\305" - "\234\234\234\351\335\335\335\371\340\340\340\377\330\330\330\377\273" - "\273\273\377\266\266\266\377\1\1\1\377\0\0\0x\0\0\0*\0\0\0\23\0\0\0\7" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\3\0\0\0\15\0\0\0\354\271\271\271\377\363" - "\363\363\377\353\353\353\377\330\330\330\377\212\212\212\356\0\0\0\342" - "\0\0\0}\0\0\0W\0\0\0F\0\0\0""9\0\0\0""0\0\0\0.\0\0\0""1\0\0\0;\0\0\0" - "\224\222\222\222\337\333\333\333\367\337\337\337\377\316\316\316\377" - "\263\263\263\377\223\223\223\377\0\0\0\313\0\0\0:\0\0\0\36\0\0\0\13\0" - "\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0E\1\1\1\377\352\352\352\377\361\361" - "\361\377\335\335\335\377\300\300\300\377\2\2\2\350\0\0\0\214\0\0\0T\0" - "\0\0<\0\0\0)\0\0\0\34\0\0\0\25\0\0\0\23\0\0\0\26\0\0\0\37\0\0\0.\0\0" - "\0\240\242\242\242\337\345\345\345\377\335\335\335\377\300\300\300\377" - "\266\266\266\377\1\1\1\377\0\0\0a\0\0\0)\0\0\0\22\0\0\0\5\0\0\0\1\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\2\0\0\0\11\0\0\0p\240\240\240\377\361\361\361\377\350\350\350\377" - "\306\306\306\377\201\201\201\354\0\0\0\322\0\0\0Z\0\0\0>\0\0\0%\0\0\0" - "\24\0\0\0\13\0\0\0\7\0\0\0\5\0\0\0\7\0\0\0\15\0\0\0\30\0\0\0""0\2\2\2" - "\313\334\334\334\357\352\352\352\377\321\321\321\377\256\256\256\377" - "vvv\377\0\0\0\220\0\0\0""4\0\0\0\30\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\14" - "\0\0\0\223\320\320\320\377\362\362\362\377\331\331\331\377\300\300\300" - "\377///\345\0\0\0\213\0\0\0J\0\0\0,\0\0\0\25\0\0\0\11\0\0\0\3\0\0\0\1" - "\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\13\0\0\0\31\0\0\0n\202\202\202\340\356" - "\356\356\377\334\334\334\377\265\265\265\377\237\237\237\377\0\0\0\274" - "\0\0\0>\0\0\0\37\0\0\0\13\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\16\0\0\0\325\341\341\341" - "\377\361\361\361\377\314\314\314\377\300\300\300\377\17\17\17\331\0\0" - "\0e\0\0\0=\0\0\0\40\0\0\0\16\0\0\0\5\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1" - "\0\0\0\2\0\0\0\5\0\0\0\17\0\0\0#\37\37\37\323\354\354\354\377\342\342" - "\342\377\300\300\300\377\250\250\250\377\0\0\0\325\0\0\0G\0\0\0%\0\0" - "\0\16\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\2\0\0\0\7\0\0\0\24\0\0\0\336\346\346\346\377\357\357\357\377" - "\313\313\313\377\267\267\267\377\0\0\0\322\0\0\0W\0\0\0""6\0\0\0\34\0" - "\0\0\15\0\0\0\10\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\10\0\0" - "\0\16\0\0\0\35\0\0\0\301\351\351\351\377\345\345\345\377\305\305\305" - "\377\256\256\256\377\0\0\0\360\0\0\0O\0\0\0.\0\0\0\25\0\0\0\10\0\0\0" - "\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\6\0\0\0" - "\17\0\0\0\37\0\0\0\354\332\332\332\377\353\353\353\377\312\312\312\377" - "\253\253\253\377\0\0\0\322\0\0\0Y\0\0\0<\0\0\0%\0\0\0\32\0\0\0\26\0\0" - "\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\26\0\0\0\32\0\0\0&\0" - "\0\0\300\344\344\344\377\343\343\343\377\312\312\312\377\255\254\252" - "\377\0\0\0\371\0\0\0Y\0\0\0;\0\0\0\"\0\0\0\23\0\0\0\12\0\0\0\5\0\0\0" - "\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5""1\26\7f7\31\10\3777\31\10\377" - "7\31\10\377\234R\27\377\270n%\377\271k&\377\247Z\34\3777\31\10\3777\31" - "\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10" - "\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\377" - "7\31\10\377\245^\37\377\274s*\377\270o'\377\227U\32\3777\31\10\3777\31" - "\10\3777\31\10\3777\31\10\377%\20\5_\0\0\0\33\0\0\0\16\0\0\0\5\0\0\0" - "\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12""7\31\10\377\311\234b\377\364\341\313" - "\377\364\340\311\377\357\333\276\377\354\325\267\377\353\322\264\377" - "\352\322\263\377\353\317\260\377\351\316\256\377\350\314\253\377\347" - "\314\250\377\350\307\241\377\346\306\241\377\346\306\241\377\346\306" - "\241\377\346\306\241\377\346\306\241\377\350\307\241\377\350\307\241" - "\377\346\306\241\377\345\305\240\377\345\305\240\377\343\302\232\377" - "\340\300\233\377\340\275\223\377\337\272\222\377\337\272\216\377\335" - "\263\206\377\325\254|\377\242a\33\3777\31\10\377\0\0\0""1\0\0\0\32\0" - "\0\0\12\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\20""7\31\10\377\365\346\320" - "\377\352\323\257\377\352\317\257\377\343\302\232\377\332\270\213\377" - "\332\266\207\377\330\260\201\377\326\256\177\377\323\253|\377\321\251" - "t\377\317\245n\377\314\243m\377\312\237g\377\312\237g\377\312\237g\377" - "\312\237g\377\312\237g\377\312\237g\377\312\237g\377\310\236g\377\306" - "\233c\377\302\230a\377\302\223[\377\277\220R\377\274\210K\377\275\204" - "@\377\272~=\377\263v4\377\247j\"\377\215S\24\3777\31\10\377\0\0\0E\0" - "\0\0&\0\0\0\17\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\23""7\31\10\377\365" - "\344\316\377\351\316\256\377\347\315\250\377\337\275\220\377\330\261" - "\203\377\325\255~\377\322\252{\377\322\246w\377\320\247q\377\315\243" - "l\377\310\237h\377\305\233d\377\304\231a\377\304\231a\377\304\231a\377" - "\305\232b\377\305\232b\377\305\232b\377\305\232b\377\304\231a\377\302" - "\230]\377\301\224Z\377\277\220T\377\276\216O\377\274\207I\377\272\202" - "\77\377\272~=\377\261t2\377\247j\"\377\213R\24\3777\31\10\377\0\0\0Q" - "\0\0\0.\0\0\0\23\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\24""7\31\10\377\365" - "\346\320\377\353\317\260\377\351\316\256\377\340\277\227\377\333\264" - "\206\377\330\260\201\377\327\257\200\377\322\254{\377\322\246w\377\320" - "\246o\377\314\243m\377\265\216\\\377\240~P\377\232yM\377\232yM\377\262" - "\214Y\377\307\234d\377\307\234d\377\307\234d\377\305\232b\377\302\227" - "_\377\302\223[\377\277\220T\377\276\216O\377\274\204A\377\272\202\77" - "\377\265|8\377\257s,\377\243f\36\377\207P\24\3777\31\10\377\0\0\0W\0" - "\0\0""2\0\0\0\25\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365" - "\344\316\377\352\317\257\377\350\315\251\377\337\274\222\377\325\255" - "~\377\322\253}\377\322\252{\377\320\253u\377\320\246o\377\315\243l\377" - "\263\216]\377\224tJ\377w^<\377\40\31\20\377\0\0\0\377\40\31\20\377y`" - ">\377\310\237h\377\312\237g\377\307\235f\377\305\233d\377\304\231a\377" - "\302\230]\377\277\221V\377\276\216O\377\276\206E\377\274\203\77\377\266" - "|7\377\252l#\377\215U\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0" - "\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\344\316\377\351\316" - "\256\377\350\316\251\377\341\274\224\377\332\264\207\377\330\262\201" - "\377\327\257\200\377\322\252{\377\320\250s\377\317\245n\377\222tM\377" - "z`>\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377y`\77\377\312" - "\237g\377\305\233d\377\305\232b\377\302\227_\377\301\224Z\377\276\217" - "Q\377\274\207I\377\272\201=\377\267~:\377\263y4\377\246i!\377\213R\24" - "\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5" - "\0\0\0\25""7\31\10\377\364\341\313\377\350\315\251\377\345\311\244\377" - "\335\272\220\377\325\255~\377\322\252{\377\322\252{\377\322\245u\377" - "\321\247p\377\314\243m\377\225uL\377\40\32\20\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\0\0\0\377\0\0\0\377!\32\20\377\327\267\216\377\310\236g\377" - "\306\233c\377\304\231a\377\302\227_\377\277\221V\377\275\214L\377\274" - "\210E\377\273\202>\377\266|7\377\251k\"\377\215S\24\3777\31\10\377\0" - "\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10" - "\377\365\344\316\377\351\315\254\377\347\313\246\377\337\274\222\377" - "\330\260\201\377\326\256\177\377\322\253}\377\322\252{\377\321\245r\377" - "\315\243l\377\226wN\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" - "\377\0\0\0\377\0\0\0\377\341\313\255\377\307\235f\377\304\231a\377\302" - "\227_\377\300\223Y\377\276\217Q\377\275\214L\377\274\205C\377\272~=\377" - "\263x2\377\247j\"\377\213R\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25" - "\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313\377\350" - "\314\247\377\345\312\244\377\334\271\217\377\326\256\177\377\323\253" - "|\377\322\252{\377\322\245u\377\317\245n\377\312\241k\377\225uL\377\40" - "\31\20\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\40\31\17" - "\377\336\306\247\377\302\230a\377\301\222V\377\277\220T\377\275\215N" - "\377\274\207I\377\272\202\77\377\265}:\377\265x6\377\255r,\377\244f\35" - "\377\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\344\316\377\351\315\254\377\347" - "\313\246\377\335\272\220\377\325\255~\377\322\253y\377\321\250r\377\317" - "\245n\377\312\241k\377\310\237h\377\305\232b\377u\\8\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377u[7\377\335\307\247\377\302\223" - "[\377\301\222V\377\277\220R\377\276\216O\377\274\210K\377\274\203\77" - "\377\267\177<\377\266|7\377\260u/\377\244h!\377\211Q\24\3777\31\10\377" - "\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10" - "\377\365\346\320\377\352\317\257\377\351\316\252\377\341\274\224\377" - "\333\264\206\377\332\263\205\377\332\263\205\377\326\256\177\377\322" - "\253y\377\320\250s\377\317\245n\377\314\243m\377z`>\377!\32\20\377\0" - "\0\0\377\40\32\21\377\222~c\377\343\317\263\377\324\263\210\377\306\233" - "c\377\302\230]\377\301\224Z\377\277\220T\377\275\214L\377\273\204D\377" - "\267\177<\377\266z9\377\261v0\377\244h!\377\213R\24\3777\31\10\377\0" - "\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10" - "\377\364\341\313\377\351\316\252\377\345\311\244\377\332\270\213\377" - "\322\254w\377\322\245u\377\321\250r\377\315\244n\377\312\241k\377\310" - "\236g\377\304\231a\377\302\230]\377\245}M\377\0\0\0\377\0\0\0\377\0\0" - "\0\377\331\277\236\377\312\243q\377\304\231a\377\302\230a\377\302\223" - "[\377\277\221V\377\277\220T\377\275\214L\377\274\210E\377\272\202\77" - "\377\267}8\377\263x2\377\255o&\377\211Q\24\3777\31\10\377\0\0\0X\0\0" - "\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365" - "\344\316\377\351\316\252\377\347\313\246\377\334\271\217\377\326\256" - "\177\377\323\253|\377\322\252{\377\322\245u\377\320\246o\377\312\241" - "k\377\310\236g\377\272\223^\377\225tJ\377\0\0\0\377\0\0\0\377\0\0\0\377" - "\305\263\233\377\304\231a\377\304\231a\377\302\230a\377\301\222V\377" - "\277\221V\377\276\216O\377\274\207I\377\274\203\77\377\267~:\377\265" - "y8\377\255v.\377\257r*\377\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0" - "\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\346\320\377" - "\352\317\257\377\351\316\252\377\341\275\226\377\333\264\206\377\330" - "\260\201\377\326\256\177\377\322\254{\377\320\250s\377\315\243l\377\312" - "\240i\377\265\217]\377\203fA\377\0\0\0\377\0\0\0\377\0\0\0\377\217uT" - "\377\336\306\247\377\304\231a\377\302\230]\377\301\222V\377\277\220T" - "\377\275\215N\377\274\211G\377\274\203\77\377\267~:\377\265y8\377\257" - "s,\377\275\202B\377\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0" - "\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313\377\347" - "\314\250\377\346\306\241\377\333\270\216\377\323\253|\377\322\253y\377" - "\321\247v\377\320\246o\377\314\242k\377\312\237g\377\305\232b\377\264" - "\215Y\377lT3\377\0\0\0\377\0\0\0\377\0\0\0\377mU6\377\336\306\247\377" - "\304\231a\377\302\230a\377\302\223[\377\301\222V\377\277\220R\377\274" - "\210K\377\273\204D\377\272~=\377\264{7\377\261v0\377\300\215Q\377\211" - "N\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0" - "\0\5\0\0\0\25""7\31\10\377\364\340\311\377\347\313\246\377\346\306\241" - "\377\334\263\207\377\321\253v\377\321\245r\377\320\246o\377\315\243l" - "\377\310\237h\377\304\231a\377\262\213W\377\254\203N\377\77""0\34\377" - "\0\0\0\377\0\0\0\377\0\0\0\377@2\36\377\322\275\237\377\310\242q\377" - "\302\223[\377\277\221V\377\277\220T\377\275\215N\377\274\211G\377\270" - "\200=\377\265|8\377\265x6\377\257t.\377\300\215Q\377\206L\23\3777\31" - "\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25" - "7\31\10\377\364\341\313\377\346\312\245\377\346\306\241\377\333\264\206" - "\377\321\253v\377\320\247q\377\317\245n\377\312\241k\377\310\236g\377" - "\304\231a\377\262\207S\377\232uE\377\77""0\34\377\0\0\0\377\0\0\0\377" - "\0\0\0\377\77""0\34\377\211h>\377\332\301\240\377\275\216P\377\275\215" - "N\377\274\210K\377\273\204D\377\272\202\77\377\267~:\377\264{7\377\261" - "w2\377\255q*\377\312\235c\377\207M\24\3777\31\10\377\0\0\0X\0\0\0""3" - "\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313" - "\377\350\314\247\377\344\310\243\377\332\270\215\377\323\253|\377\322" - "\246w\377\320\253u\377\320\246o\377\313\242l\377\310\237h\377\267\217" - "[\377\177c\77\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377r" - "Y8\377\323\263\211\377\302\230a\377\301\222V\377\277\221V\377\276\217" - "Q\377\274\210K\377\274\204A\377\265}:\377\265|8\377\261v0\377\314\237" - "i\377\211Q\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\344\316\377\350\315\251\377\345" - "\311\244\377\334\271\217\377\325\255~\377\322\252{\377\322\253y\377\321" - "\247p\377\317\245n\377\312\241k\377\310\237h\377\305\232b\377\305\232" - "b\377\305\232b\377\305\232b\377\305\232b\377\305\232b\377\305\232b\377" - "\305\232b\377\304\231a\377\302\223[\377\277\221V\377\277\220R\377\274" - "\207I\377\274\203\77\377\267~:\377\270\177;\377\274\202=\377\316\241" - "k\377\211N\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313\377\350\313\245\377\345" - "\311\244\377\332\270\213\377\322\252{\377\322\245u\377\321\247p\377\315" - "\244n\377\312\237g\377\307\234d\377\304\231a\377\301\227\\\377\300\223" - "Y\377\300\222W\377\300\222W\377\300\222W\377\300\222W\377\300\222W\377" - "\300\222W\377\277\221V\377\277\220R\377\276\216O\377\274\211G\377\273" - "\204D\377\271\201>\377\265|8\377\270\177;\377\274\205E\377\315\240j\377" - "\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1" - "\0\0\0\5\0\0\0\25""7\31\10\377\364\340\311\377\346\311\243\377\345\305" - "\240\377\331\270\210\377\323\246v\377\320\247q\377\317\245n\377\313\242" - "l\377\312\237g\377\306\233c\377\305\232b\377\304\231a\377\302\230]\377" - "\302\230a\377\302\230a\377\304\231a\377\304\231a\377\305\232b\377\305" - "\232b\377\304\231a\377\301\224Z\377\300\223Y\377\277\220T\377\274\214" - "M\377\274\211G\377\276\212M\377\304\231a\377\276\213O\377\307\235`\377" - "\211N\24\3777\31\10\377\0\0\0W\0\0\0""3\0\0\0\25\0\0\0\5\0\0\0\1\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1" - "\0\0\0\5\0\0\0\24""7\31\10\377\364\340\311\377\346\310\241\377\341\303" - "\234\377\332\263\205\377\321\245r\377\317\245n\377\315\243l\377\310\237" - "h\377\305\233d\377\302\231_\377\302\223[\377\300\222W\377\277\221V\377" - "\277\221V\377\300\222W\377\302\223[\377\301\227\\\377\305\232b\377\310" - "\236g\377\315\243l\377\315\243l\377\316\241k\377\316\241k\377\322\253" - "y\377\322\252w\377\321\245r\377\324\247s\377\277\212L\377\261s0\377\207" - "M\24\3777\31\10\377\0\0\0T\0\0\0""0\0\0\0\24\0\0\0\5\0\0\0\1\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0" - "\0\5\0\0\0\22""3\27\7\301\262u-\377\307\235`\377\304\232]\377\275\214" - "L\377\272~=\377\270~9\377\266z9\377\265x6\377\263u2\377\257w.\377\255" - "r,\377\254t+\377\252r)\377\252r)\377\252r)\377\256q)\377\256q)\377\256" - "q)\377\256q)\377\252r)\377\251m&\377\252l#\377\245i\"\377\243g\40\377" - "\242e\35\377\236a\31\377\233_\30\377\231]\26\377\222V\25\377X0\15\377" - "&\21\5\264\0\0\0K\0\0\0*\0\0\0\21\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\16" - "+\23\6q1\26\7\3077\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10" - "\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\377" - "7\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31" - "\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10" - "\3777\31\10\3777\31\10\3777\31\10\3777\31\10\377&\21\5\264\14\5\1e\0" - "\0\0;\0\0\0\40\0\0\0\14\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\11\0\0\0\30" - "\0\0\0,\0\0\0A\0\0\0O\0\0\0U\0\0\0W\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0" - "X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0" - "\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0W\0\0\0S\0" - "\0\0K\0\0\0;\0\0\0'\0\0\0\24\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0" - "\0\4\0\0\0\15\0\0\0\30\0\0\0$\0\0\0,\0\0\0""0\0\0\0""3\0\0\0""3\0\0\0" - "3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0" - "\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3" - "\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""2\0\0\0""0\0\0\0" - "*\0\0\0\40\0\0\0\24\0\0\0\11\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\2\0\0\0\4\0\0\0\11\0\0\0\16\0\0\0\22\0\0\0\24\0\0\0\25\0\0\0\25\0" - "\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25" - "\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0" - "\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\24\0" - "\0\0\21\0\0\0\14\0\0\0\7\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\5\0\0" - "\0\5\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6" - "\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0" - "\0\6\0\0\0\6\0\0\0\6\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\4\0\0\0\3\0\0\0\2" - "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0" - "\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1" - "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0" - "\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0"}; - - diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch b/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch deleted file mode 100644 index e0765bae18..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomeui-2.6.1.1/configure.in.old 2004-08-04 00:28:43.582266664 +0100 -+++ libgnomeui-2.6.1.1/configure.in 2004-08-04 00:29:27.496590672 +0100 -@@ -235,7 +235,7 @@ - - dnl This is installed from GTK+ 2.0's gdk-pixbuf - AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource) --test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_ERROR([ -+test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_WARN([ - *** You need the gdk-pixbuf-csource tool which is installed - *** from GTK+ 2.0's gdk-pixbuf. - *** diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb deleted file mode 100644 index b78ffc505b..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "GNOME User Interface Library" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" - -SECTION = "x11/gnome/libs" -DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native gnome-common-native" - -inherit gnome - -FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ - ${libdir}/libglade/*/lib*.so \ - ${datadir}/pixmaps/gnome-about-logo.png" -FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la" -FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a" - -SRC_URI += " \ - file://0001-suppress-string-format-literal-warning-to-fix-build-.patch \ - file://gnome-stock-pixbufs.h \ - file://no-pixbuf-csource.patch \ - file://05_fix_invalid_utf8.patch \ -" -SRC_URI[archive.md5sum] = "d4bb506b1916015323928faab5aa708b" -SRC_URI[archive.sha256sum] = "ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = "--disable-gtk-doc" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h -} - -LDFLAGS += "-lm" diff --git a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb index 3cd7910769..a7c8a6fce1 100644 --- a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb +++ b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb @@ -5,7 +5,9 @@ LICENSE = "LGPL-2.0+" LIC_FILES_CHKSUM = "file://tap.c;beginline=1;endline=20;md5=71756eeb144e9eeb177c69aa672b1635" PR = "r4" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://burtonini.com/temp/${BP}.tar.gz \ file://gtkstylus.sh" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb deleted file mode 100644 index 946d11845c..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "LibGTop2" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://copyright.txt;md5=dbc839bf158d19a20e661db14db7a58c" - -inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspection -# depends on libxau -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-netload-Include-libc-net-headers-unconditionally.patch \ - " -SRC_URI[archive.md5sum] = "ee29a9ef60659ebf4b075ac281f71cb2" -SRC_URI[archive.sha256sum] = "463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5" - -DEPENDS = "glib-2.0 intltool-native libxau" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb new file mode 100644 index 0000000000..494934fe74 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "LibGTop2" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspection gettext + +# depends on libxau +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "bb0ce7de6b28694b40405eedac8a31b5" +SRC_URI[archive.sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612" + +DEPENDS = "glib-2.0 libxau" diff --git a/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.14.bb b/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.14.bb deleted file mode 100644 index 2252c44ee9..0000000000 --- a/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.14.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "libs" -require libidl_${PV}.bb -inherit native - -PR = "r1" - -DEPENDS = "bison-native glib-2.0-native flex-native" - -SRC_URI[md5sum] = "bb8e10a218fac793a52d404d14adedcb" -SRC_URI[sha256sum] = "c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220" diff --git a/meta-gnome/recipes-gnome/libidl/libidl.inc b/meta-gnome/recipes-gnome/libidl/libidl.inc deleted file mode 100644 index 1a5c815820..0000000000 --- a/meta-gnome/recipes-gnome/libidl/libidl.inc +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Library for parsing CORBA IDL files" -HOMEPAGE = "http://andrewtv.org/libIDL/" -SECTION = "x11/gnome/libs" -LICENSE = "LGPLv2+" - -inherit autotools pkgconfig - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2" - -S = "${WORKDIR}/libIDL-${PV}" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += " ${bindir}" diff --git a/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb b/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb deleted file mode 100644 index 86dfcf2f09..0000000000 --- a/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb +++ /dev/null @@ -1,13 +0,0 @@ -require libidl.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -DEPENDS = "glib-2.0 flex-native libidl-native" - -PR = "r1" - -BINCONFIG_GLOB = "*-config-2" -inherit autotools pkgconfig binconfig - -SRC_URI[md5sum] = "bb8e10a218fac793a52d404d14adedcb" -SRC_URI[sha256sum] = "c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220" diff --git a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb index d6aeed380f..957d7d0279 100644 --- a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb +++ b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb @@ -15,7 +15,9 @@ DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native \ B = "${S}" -inherit autotools pkgconfig gobject-introspection +inherit distro_features_check autotools pkgconfig gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend() { (cd ${S}; NOCONFIGURE="yes" . ${S}/autogen.sh) diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch new file mode 100644 index 0000000000..3493e511be --- /dev/null +++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch @@ -0,0 +1,33 @@ +From ec0e52b49c9b6869413c9544c2ed44710ab91141 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 14 Apr 2018 16:15:59 +0800 +Subject: [PATCH] drop zenity detection + +OE does not support zenity + +Upstream-Status: inappropriate [OE specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5f9e7e9..80b32c7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -359,11 +359,6 @@ fi + + AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") + +-AC_PATH_PROG(ZENITY, zenity, no) +-if test x"$ZENITY" = xno; then +- AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) +-fi +- + dnl ************************************************************************** + dnl Check for Vulkan support + dnl ************************************************************************** +-- +1.8.3.1 + diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch deleted file mode 100644 index 539d756b3e..0000000000 --- a/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e7fd072f0df968f342878b77098e97ff07ed28d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 10:26:31 -0700 -Subject: [PATCH] ui: Define _GNU_SOURCE - -it becomes portable across musl and glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ui/theme.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ui/theme.c b/src/ui/theme.c -index 84b57a0..c7eafc8 100644 ---- a/src/ui/theme.c -+++ b/src/ui/theme.c -@@ -60,6 +60,7 @@ - #include <gtk/gtk.h> - #include <string.h> - #include <stdlib.h> -+#define _GNU_SOURCE - #define __USE_XOPEN - #include <math.h> - --- -2.13.3 - diff --git a/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch deleted file mode 100644 index 1970e9afb1..0000000000 --- a/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch +++ /dev/null @@ -1,28 +0,0 @@ -Remove unused variable (YELP_HELP_RULES) - -Upstream-Status: Pending -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: metacity-2.34.13/doc/creating_themes/Makefile.am -=================================================================== ---- metacity-2.34.13.orig/doc/creating_themes/Makefile.am -+++ metacity-2.34.13/doc/creating_themes/Makefile.am -@@ -1,6 +1,5 @@ - ### This part of Makefile.am can be customized by you. - --@YELP_HELP_RULES@ - - # The name of the directory in /usr/share/gnome/help/, - # and the name of the main .xml file: -Index: metacity-2.34.13/doc/creating_themes/Makefile.in -=================================================================== ---- metacity-2.34.13.orig/doc/creating_themes/Makefile.in -+++ metacity-2.34.13/doc/creating_themes/Makefile.in -@@ -455,7 +455,6 @@ uninstall-am: - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - --@YELP_HELP_RULES@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb deleted file mode 100644 index 370de70008..0000000000 --- a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "x11/wm" -SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90" - -DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils libgtop intltool-native" -PR = "r1" - -inherit gnomebase update-alternatives distro_features_check -# depends on startup-notification which depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://remove-yelp-help-rules-var.patch \ - file://0001-ui-Define-_GNU_SOURCE.patch \ - " -SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6" -SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF += "--disable-xinerama" - -do_configure_prepend() { - sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in -} - -FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" -RDEPENDS_${PN} += "gsettings-desktop-schemas" - diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb new file mode 100644 index 0000000000..48fc9144dc --- /dev/null +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb @@ -0,0 +1,34 @@ +SECTION = "x11/wm" +SUMMARY = "Metacity is the boring window manager for the adult in you" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ + file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" + +DEPENDS = "gsettings-desktop-schemas startup-notification \ + gnome-doc-utils gdk-pixbuf-native \ + gtk+3 glib-2.0 libcanberra libgtop intltool-native" + +inherit autotools gettext gnomebase distro_features_check +# depends on startup-notification which depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "git://github.com/GNOME/metacity.git;branch=master \ + file://0001-drop-zenity-detection.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "c0d4b2fc0fcd6f2d3c37da935923f9e9ed5eb99f" + +EXTRA_OECONF += "--disable-xinerama" + +do_configure_prepend() { + cd ${S} + aclocal --install || exit 1 + autoreconf --verbose --force --install -Wno-portability || exit 1 + cd - + +} + +FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" +RDEPENDS_${PN} += "gsettings-desktop-schemas" + diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch new file mode 100644 index 0000000000..f19eb49798 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch @@ -0,0 +1,40 @@ +From a4ed38e95cbe07f02028249b8b315565a5ac1e43 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 May 2018 22:32:45 -0700 +Subject: [PATCH] nautilus: drop gnome-desktop thumbnail API with new + gdk-pixbuf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If gdk-pixbuf >= 2.36.5 is available, its scaling API can do what we +want, so we don’t need to use the deprecated gnome-desktop one. + +Also fixes compile errors seen on master +nautilus-properties-window.c:5101: undefined reference to `gnome_desktop_thumbnail_scale_down_pixbuf' + +Upstream-Status: Backport + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nautilus-properties-window.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c +index dea8b0f..fad9bd1 100644 +--- a/src/nautilus-properties-window.c ++++ b/src/nautilus-properties-window.c +@@ -5098,10 +5098,11 @@ update_preview_callback (GtkFileChooser *icon_chooser, + scale = (double)gdk_pixbuf_get_height (pixbuf) / + gdk_pixbuf_get_width (pixbuf); + +- scaled_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf ++ scaled_pixbuf = gdk_pixbuf_scale_simple + (pixbuf, + PREVIEW_IMAGE_WIDTH, +- scale * PREVIEW_IMAGE_WIDTH); ++ scale * PREVIEW_IMAGE_WIDTH, ++ GDK_INTERP_HYPER); + g_object_unref (pixbuf); + pixbuf = scaled_pixbuf; + } diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff b/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff deleted file mode 100644 index ccd2934b3a..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/configure.in 2009-04-13 11:26:43.000000000 +0200 -+++ nautilus-2.26.1/configure.in 2009-04-13 11:28:37.000000000 +0200 -@@ -375,25 +375,6 @@ - - dnl =========================================================================== - --dnl strftime checks -- --AC_TRY_RUN([#include <time.h> -- int main () -- { -- char buf[100]; -- struct tm tm = {0}; -- tm.tm_year = 99; -- if (strftime(buf, 100, "%EY", &tm) == 4 && -- strcmp (buf, "1999")==0) -- return 0; -- return 1; -- } -- ], -- AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.]) -- ) -- --dnl =========================================================================== -- - # - # Checks for Xft/XRender - # diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff b/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff deleted file mode 100644 index 56d2e159d7..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff +++ /dev/null @@ -1,41 +0,0 @@ -From dc9c8cf2676c8c91ea0ae250cfedf863352f3ccd Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 24 Jun 2011 20:24:08 +0200 -Subject: [PATCH] hack out check that tries to run generated binaries - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - configure.in | 17 +---------------- - 1 files changed, 1 insertions(+), 16 deletions(-) - -diff --git a/configure.in b/configure.in -index c3aa371..1d3ecdc 100644 ---- a/configure.in -+++ b/configure.in -@@ -251,22 +251,7 @@ AC_SUBST(WARNING_CFLAGS) - - dnl =========================================================================== - --dnl strftime checks -- --AC_TRY_RUN([#include <time.h> -- int main () -- { -- char buf[100]; -- struct tm tm = {0}; -- tm.tm_year = 99; -- if (strftime(buf, 100, "%EY", &tm) == 4 && -- strcmp (buf, "1999")==0) -- return 0; -- return 1; -- } -- ], -- AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.]) -- ) -+AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.]) - - dnl ========================================================================== - --- -1.6.6.1 - diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb index 8fdbf6ac2b..bdb2f3c884 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb @@ -6,14 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=36cf660aea2b8beffba7945f44a7e748 \ file://COPYING.EXTENSIONS;md5=7579d6678402a1868631bf82c93ff0d4 \ file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/3.18/nautilus-${PV}.tar.xz" +inherit distro_features_check autotools pkgconfig gobject-introspection + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/${MAJ_VER}/nautilus-${PV}.tar.xz \ + file://0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch \ + " SRC_URI[md5sum] = "0f578bda5655c0ce204befafca5803d7" SRC_URI[sha256sum] = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15" DEPENDS = "gtk+3 gnome-desktop3 gsettings-desktop-schemas glib-2.0-native intltool-native pango" -inherit distro_features_check autotools pkgconfig gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = " \ @@ -23,7 +27,7 @@ EXTRA_OECONF = " \ --enable-tracker=no \ --disable-schemas-compile \ --enable-xmp=no \ - --enable-libexif=no \ + --enable-libexif=no \ " FILES_${PN} += "${datadir}/*" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch deleted file mode 100644 index daf7464c3c..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 10bd8094e1d94e5c737791c7f4b6b844f535c120 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 3 May 2013 10:00:16 +0200 -Subject: [PATCH] linc2/src/Makefile.am: fix build with glib 2.36 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted [1] - -[1] https://bugzilla.gnome.org/show_bug.cgi?id=696900 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - linc2/src/Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/linc2/src/Makefile.am b/linc2/src/Makefile.am -index 357a2dd..ba0e347 100644 ---- a/linc2/src/Makefile.am -+++ b/linc2/src/Makefile.am -@@ -12,8 +12,7 @@ INCLUDES = \ - -I$(top_builddir)/linc2/include \ - -I$(top_srcdir)/linc2/include \ - $(LINC_CFLAGS) \ -- $(WARN_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(WARN_CFLAGS) - - if OS_WIN32 - else --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch deleted file mode 100644 index 7993abb92c..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001 -From: Kjartan Maraas <kmaraas@gnome.org> -Date: Tue, 14 May 2013 13:29:53 +0200 -Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport [1] - -[1] https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - test/everything/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am -index 32beb36..cb4b1d6 100644 ---- a/test/everything/Makefile.am -+++ b/test/everything/Makefile.am -@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \ - $(EVERYTHING_BUILT) \ - everything-imodule.c - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_builddir)/src \ -@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared - BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c - CLEANFILES = ${BUILT_SOURCES} iorfile - --TESTS = $(srcdir)/test.sh -+TESTS = $(top_builddir)/test/everything/test.sh - - EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) - --- -1.8.3.1 - diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch deleted file mode 100644 index 5fc1de5610..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ORBit2-2.14.17/configure.in-orig 2009-01-10 09:36:18.000000000 -0800 -+++ ORBit2-2.14.17/configure.in 2009-06-17 15:10:59.000000000 -0700 -@@ -217,20 +217,20 @@ dnl - dnl So many people with broken linking setups asked about this - dnl it turned out to be necessary to check for this. - dnl --dofus_save_libs="$LIBS" --LIBS="$ORBIT_LIBS $LIBS" --AC_TRY_RUN([ #include <stdio.h> -- main () -- { -- return 0; -- } ],, -- AC_MSG_ERROR([ --Linking is badly borked on your system. Please ensure your library path is correct --Check config.log for details - check near the end of the log above 'failed program was' --Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the --prefix you're compiling on: '${prefix}' ]), --AC_MSG_WARN([Could not check for borked linking while cross-compiling])) --LIBS="$dofus_save_libs" -+dnl dofus_save_libs="$LIBS" -+dnl LIBS="$ORBIT_LIBS $LIBS" -+dnl AC_TRY_RUN([ #include <stdio.h> -+dnl main () -+dnl { -+dnl return 0; -+dnl } ],, -+dnl AC_MSG_ERROR([ -+dnl Linking is badly borked on your system. Please ensure your library path is correct -+dnl Check config.log for details - check near the end of the log above 'failed program was' -+dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the -+dnl prefix you're compiling on: '${prefix}' ]), -+dnl AC_MSG_WARN([Could not check for borked linking while cross-compiling])) -+dnl LIBS="$dofus_save_libs" - - orig_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch deleted file mode 100644 index f629e506dd..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in ---- ORBit2-2.14.12.orig/ORBit-2.0.pc.in 2008-01-29 13:45:22.000000000 +0100 -+++ ORBit2-2.14.12/ORBit-2.0.pc.in 2008-09-23 20:13:07.000000000 +0200 -@@ -2,7 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --orbit_idl=@bindir@/orbit-idl-2@EXEEXT@ -+orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@ - - - Name: ORBit-2.0 diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb deleted file mode 100644 index eb4397263b..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "CORBA ORB" -HOMEPAGE = "http://www.gnome.org/projects/ORBit2" -SECTION = "x11/gnome/libs" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_NAME = "ORBit2" -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = " \ - ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ - file://configure-lossage.patch \ - file://pkgconfig-fix.patch \ - file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \ - file://0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch \ -" -SRC_URI[md5sum] = "7082d317a9573ab338302243082d10d1" -SRC_URI[sha256sum] = "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550" - -BBCLASSEXTEND = "native" - -IDL_COMPILER_DEPENDS = "orbit2-native" -IDL_COMPILER_DEPENDS_class-native = " " -DEPENDS = "libidl popt ${IDL_COMPILER_DEPENDS}" - -# IDL_COMPILER_DEPENDS_class-native for some reason didn't work and orbit2-native -# was still in orbit2-native DEPENDS causing circular dependency -DEPENDS_class-native = "libidl-native popt-native" -PARALLEL_MAKE = "" - - -FILES_${PN} += "${libdir}/orbit-2.0/*.so" -FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la" -FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a" -FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" - -S = "${WORKDIR}/${SRC_NAME}-${PV}" - -LEAD_SONAME = "libORBit-2.so" - -inherit autotools pkgconfig gtk-doc - -EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" -EXTRA_OEMAKE_class-native = " " diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch b/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch deleted file mode 100644 index e37482b97b..0000000000 --- a/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch +++ /dev/null @@ -1,22 +0,0 @@ -Causes locale file to be installed in /usr/locale instead of /usr/share/locale - -Apply the same fix as in evolution-data-server: -https://git.gnome.org/browse/evolution-data-server/commit/configure.ac?id=ec46c763e9342f604b7228c660623d271dfeb101 - -Upstream-Status: Pending - -diff -uNr gnome-themes-2.32.1.orig/configure.in gnome-themes-2.32.1/configure.in ---- gnome-themes-2.32.1.orig/configure.in 2015-09-18 15:01:25.152055729 +0200 -+++ gnome-themes-2.32.1/configure.in 2015-09-18 15:09:03.312072156 +0200 -@@ -19,11 +19,6 @@ - - AM_GLIB_GNU_GETTEXT - --# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME --# this is the directory where the *.{mo,gmo} files are installed --localedir='${prefix}/${DATADIRNAME}/locale' --AC_SUBST(localedir) -- - # Workaround to make aclocal get the right flags - AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") - diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch b/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch deleted file mode 100644 index 1b4096dd0d..0000000000 --- a/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch +++ /dev/null @@ -1,52 +0,0 @@ - -The patch is ported from sato-icon-theme. - -pkg-config will only search the target sysroot and we want the native script. This -patch adds an option to allow the path to the tool to be specified. - -Upstream-Status: Pending -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.in | 26 ++++++++++++++++---------- - 1 file changed, 16 insertions(+), 10 deletions(-) - -diff --git a/configure.in b/configure.in -index 5f7a18c..e8fc31e 100644 ---- a/configure.in -+++ b/configure.in -@@ -74,16 +74,22 @@ AC_ARG_ENABLE([icon-mapping], - ICONMAP="true" - if test "x$enable_mapping" != "xno"; then - UTILS_REQUIRED=0.8.7 -- -- AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -- PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, have_utils=yes, have_utils=no) -- if test "x$have_utils" = "xyes"; then -- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -- ICONMAP="$UTILS_PATH/icon-name-mapping" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes]) -+ PKG_PROG_PKG_CONFIG() -+ AC_ARG_WITH(iconmap, -+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]), -+ ICONMAP=$withval, ICONMAP="") -+ if test "x$ICONMAP" = "x"; then -+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, have_utils=yes, have_utils=no) -+ if test "x$have_utils" = "xyes"; then -+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -+ ICONMAP="$UTILS_PATH/icon-name-mapping" -+ -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes"]) -+ fi - fi - fi - AC_SUBST(ICONMAP) --- -1.7.9.5 - diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb deleted file mode 100644 index 1a89f48dd9..0000000000 --- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "GNOME themes" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2b543dc97eb7594d026af39d9b54204b" - -PR = "r3" - -SECTION = "x11/gnome" -DEPENDS = "gtk-engines icon-naming-utils icon-naming-utils-native \ - glib-2.0 intltool-native libxml-simple-perl-native \ - glib-2.0-native \ -" -RDEPENDS_${PN} = "adwaita-icon-theme" - -EXTRA_OECONF += "--enable-all-themes \ - --with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping \ -" - -inherit gnomebase perlnative - -PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist" -FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux" -FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast" -FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse" -FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint" -FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse" -FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint" -FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist" - -FILES_${PN} += "${datadir}/themes ${datadir}/icons" - -SRC_URI += "file://iconpath-option.patch \ - file://drop-localedir-override.patch \ -" -SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1" -SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a" -GNOME_COMPRESS_TYPE="bz2" - diff --git a/meta-gnome/recipes-support/florence/florence_0.6.3.bb b/meta-gnome/recipes-support/florence/florence_0.6.3.bb deleted file mode 100644 index b9b7d0cb17..0000000000 --- a/meta-gnome/recipes-support/florence/florence_0.6.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Florence is a virtual keyboard for touch screens" -HOMEPAGE = "http://florence.sourceforge.net/english.html" - -#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer1.0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0" -SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e" - -inherit gettext autotools gconf pkgconfig - -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord" - -FILES_${PN} += "${datadir}/glib-2.0/schemas" diff --git a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb index d6744a3065..0a0a3e6b43 100644 --- a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb +++ b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb @@ -18,7 +18,9 @@ SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0 \ RDEPENDS_${PN} = "gtk+" -inherit autotools gtk-doc gobject-introspection +inherit distro_features_check autotools gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend() { touch ${S}/ChangeLog } diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch b/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch new file mode 100644 index 0000000000..79756b9a07 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch @@ -0,0 +1,62 @@ +From d0537cb7f2dc5877700ad78dfd191515379d4edc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Jan 2016 02:22:51 +0000 +Subject: [PATCH 1/2] Check for issetugid() + +If secure version of getenv is not there then we can use +issetugid() as aid to call getenv() + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + configure.ac | 1 + + lib/config.c | 12 +++++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1ded1a2..ee19e1f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -125,6 +125,7 @@ AC_TYPE_OFF_T + AC_TYPE_SIZE_T + + AC_CHECK_FUNCS([__secure_getenv secure_getenv]) ++AC_CHECK_FUNCS([issetugid]) + + # Modify CFLAGS after all tests are run (some of them could fail because + # of the -Werror). +diff --git a/lib/config.c b/lib/config.c +index 29e7120..30f9daf 100644 +--- a/lib/config.c ++++ b/lib/config.c +@@ -44,8 +44,10 @@ + # define safe_getenv(string) secure_getenv(string) + #elif defined(HAVE___SECURE_GETENV) + # define safe_getenv(string) __secure_getenv(string) ++#elif defined(HAVE_ISSETUGID) ++# define safe_getenv(string) safe_getenv_issetugid(string) + #else +-# error Neither secure_getenv not __secure_getenv are available ++# error None of secure_getenv, __secure_getenv, or issetugid is available + #endif + + struct config_config { +@@ -59,6 +61,14 @@ struct config_key { + GList *values; + }; + ++static const char* ++safe_getenv_issetugid(const char* name) ++{ ++ if (issetugid ()) ++ return 0; ++ return getenv (name); ++} ++ + /* Compare two section names */ + static int + compare_section_names(gconstpointer a, gconstpointer b) +-- +2.7.0 + diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch b/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch new file mode 100644 index 0000000000..7c47df22e4 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch @@ -0,0 +1,34 @@ +From a4857911ece5ebfcdef42aee4c070eb216f39597 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> +Date: Fri, 13 May 2016 11:40:13 -0500 +Subject: [PATCH] modules/files.c: parse_field fix string formating in + g_warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[YOCTO #9547] + +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> + +Upstream-Status: Pending +--- + modules/files.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/files.c b/modules/files.c +index 4ef0a57..35eafc9 100644 +--- a/modules/files.c ++++ b/modules/files.c +@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue *value, + string, &err); + if (ret == FALSE) { + g_assert(err != NULL); +- g_warning(lu_strerror(err)); ++ g_warning(lu_strerror(err), NULL); + lu_error_free(&err); + } + return ret; +-- +2.1.4 + diff --git a/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch b/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch new file mode 100644 index 0000000000..4bc0219f19 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch @@ -0,0 +1,27 @@ +From 4b2f81f307ffeac12956e5c16e894e5ebb937ea5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Jan 2016 02:26:00 +0000 +Subject: [PATCH 2/2] remove unused execinfo.h + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/error.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/error.c b/lib/error.c +index a5ec30a..443e601 100644 +--- a/lib/error.c ++++ b/lib/error.c +@@ -18,7 +18,6 @@ + #include <config.h> + #include <sys/types.h> + #include <errno.h> +-#include <execinfo.h> + #include <libintl.h> + #include <stdarg.h> + #include <stdlib.h> +-- +2.7.0 + diff --git a/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-gnome/recipes-support/libuser/libuser_0.62.bb new file mode 100644 index 0000000000..7ec54eb16e --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -0,0 +1,35 @@ +SUMMARY = "user and group account administration library" +DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user \ +and group accounts" +HOMEPAGE = "https://pagure.io/libuser" +BUGTRACKER = "https://pagure.io/libuser/issues" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ + file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" + +SECTION = "base" + +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ + file://0001-Check-for-issetugid.patch \ + file://0002-remove-unused-execinfo.h.patch \ + file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ + " + +SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2" +SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b" + +DEPENDS = "popt libpam glib-2.0 python3" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +inherit autotools gettext python3native python3-dir pkgconfig gtk-doc + +EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" + +PACKAGES += "${PN}-python " + +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" + diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index 10765ee0c1..4e49becc4f 100644 --- a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -10,7 +10,9 @@ SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" -inherit setuptools3 pkgconfig gtk-icon-cache gsettings +inherit distro_features_check setuptools3 pkgconfig gtk-icon-cache gsettings + +REQUIRED_DISTRO_FEATURES = "x11" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-gnome/recipes-support/usermode/usermode_1.111.bb b/meta-gnome/recipes-support/usermode/usermode_1.111.bb index c2d73289ee..3aea2e6bb4 100644 --- a/meta-gnome/recipes-support/usermode/usermode_1.111.bb +++ b/meta-gnome/recipes-support/usermode/usermode_1.111.bb @@ -23,7 +23,8 @@ SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit autotools gettext pkgconfig +inherit distro_features_check autotools gettext pkgconfig EXTRA_OEMAKE += "INSTALL='install -p'" +REQUIRED_DISTRO_FEATURES = "x11 pam" diff --git a/meta-gnome/site/riscv64-linux b/meta-gnome/site/riscv64-linux new file mode 100644 index 0000000000..e3a41ea0e1 --- /dev/null +++ b/meta-gnome/site/riscv64-linux @@ -0,0 +1,16 @@ +# libidl +libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} + +# ORBit2 +ac_cv_alignof_CORBA_boolean=1 +ac_cv_alignof_CORBA_char=1 +ac_cv_alignof_CORBA_double=8 +ac_cv_alignof_CORBA_float=4 +ac_cv_alignof_CORBA_long=4 +ac_cv_alignof_CORBA_long_double=8 +ac_cv_alignof_CORBA_long_long=8 +ac_cv_alignof_CORBA_octet=1 +ac_cv_alignof_CORBA_pointer=4 +ac_cv_alignof_CORBA_short=2 +ac_cv_alignof_CORBA_struct=1 +ac_cv_alignof_CORBA_wchar=2 diff --git a/meta-initramfs/README b/meta-initramfs/README index e24acf993c..7185383123 100644 --- a/meta-initramfs/README +++ b/meta-initramfs/README @@ -25,8 +25,7 @@ with '[meta-initramfs]' in the subject. When sending single patches, please using something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][PATCH' -Layer maintainers: Andrea Adami <andrea.adami@gmail.com> - Paul Eggleton <paul.eggleton@linux.intel.com> +Interm layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index d9b7c4cfb3..97afc9374e 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,6 +16,8 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" +LAYERSERIES_COMPAT_meta-initramfs = "sumo" + SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ " diff --git a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb index 6b845bd9d3..3a8d9f7438 100644 --- a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +++ b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb @@ -8,5 +8,5 @@ IMAGE_INSTALL = "kexecboot-klibc kexec-klibc ubiattach-klibc" python () { if d.getVar('TARGET_ARCH') == "nios2": - raise bb.parse.SkipPackage("'nios2' not supported arch") + raise bb.parse.SkipRecipe("'nios2' not supported arch") } diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index e18409d11a..ccf9f6ab1b 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -6,10 +6,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -PV = "045+git${SRCREV}" +PV = "046+git${SRCREV}" -# v045 tag -SRCREV = "39c9b67f86145953aa30def9d77c68597a4ccfe8" +# v046 tag +SRCREV = "a0799ffb554487a370c2a1adafaedd2021b6dc8c" SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ " diff --git a/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch b/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch index 1b1a993a03..dfbe7ba6b4 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch +++ b/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch @@ -1,26 +1,24 @@ -From 22afaa21b4b258082be591e54c99e1ba6fbd7748 Mon Sep 17 00:00:00 2001 +From b7b3caa9b5c8abcd3c371d0683001cd681e104b3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 15 Jul 2017 10:19:22 -0700 Subject: [PATCH 1/2] Add another variable LIBS to provides libraries from env Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index ac14404..92a8e73 100644 +index cc7e823..ae30a07 100644 --- a/Makefile +++ b/Makefile -@@ -27,7 +27,7 @@ RPM_OPT_FLAGS ?= -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector - CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function -ggdb - LDFLAGS := +@@ -31,7 +31,7 @@ ifneq ($(VERBOSE_TEST),) + VERBOSE_TEST="--verbose" + endif -grubby_LIBS = -lblkid -lpopt +grubby_LIBS = -lblkid -lpopt ${LIBS} all: grubby --- -2.13.3 - diff --git a/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch b/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch index d936249be8..e693916e1d 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch +++ b/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch @@ -1,4 +1,4 @@ -From 0841706a5b5280e501c8e392c70c466c5fbcf0aa Mon Sep 17 00:00:00 2001 +From 15f0572f2f456c2c1b700bc790d9ce7a5c13cc74 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Tue, 4 Aug 2015 23:54:41 -0700 Subject: [PATCH] rename grub2-editenv to grub-editenv @@ -8,38 +8,48 @@ We don't use the name grub2-editenv for grub2. Upstream-Status: Inappropriate Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- grubby.c | 4 ++-- - test.sh | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) + test.sh | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/grubby.c b/grubby.c -index d4ebb86..47a1a15 100644 +index 396041a..3ceae69 100644 --- a/grubby.c +++ b/grubby.c -@@ -290,7 +290,7 @@ static char *grub2GetEnv(struct configFileInfo *info, char *name) - char *s = NULL; - char *ret = NULL; - char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv"; -- int rc = asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name); -+ int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name); +@@ -301,7 +301,7 @@ static char *grub2GetEnv(struct configFileInfo *info, char *name) + char *ret = NULL; + char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv"; + int rc = +- asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name); ++ asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name); - if (rc < 0) - return NULL; -@@ -361,7 +361,7 @@ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value) - if (!value) - return -1; + if (rc < 0) + return NULL; +@@ -373,7 +373,7 @@ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value) + if (!value) + return -1; -- rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value); -+ rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value); - free(value); - if (rc <0) - return -1; +- rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value); ++ rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value); + free(value); + if (rc < 0) + return -1; diff --git a/test.sh b/test.sh -index 6379698..f738388 100755 +index 33d24cf..009479c 100755 --- a/test.sh +++ b/test.sh -@@ -574,7 +574,7 @@ if [ "$testgrub2" == "y" ]; then +@@ -573,7 +573,7 @@ if [ "$testgrub2" == "y" ]; then + --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \ + --boot-filesystem=/boot/ + commandTest "saved_default output" \ +- "grub2-editenv test/grub2-support_files/env_temp list" \ ++ "grub-editenv test/grub2-support_files/env_temp list" \ + "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" + + # copy a stanza and add arguments as well, while using --set-index= +@@ -627,7 +627,7 @@ if [ "$testgrub2" == "y" ]; then --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \ --copy-default commandTest "saved_default output" \ @@ -48,7 +58,7 @@ index 6379698..f738388 100755 "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" testing="GRUB2 add kernel with default=saved_entry and a terrible title" -@@ -587,13 +587,13 @@ if [ "$testgrub2" == "y" ]; then +@@ -640,13 +640,13 @@ if [ "$testgrub2" == "y" ]; then testing="GRUB2 set default with default=saved_entry and a terrible name" grub2Test grub2.9 add/g2-1.9 --env grubenv.1 --set-default-index=0 commandTest "saved_default output" \ @@ -64,6 +74,3 @@ index 6379698..f738388 100755 "saved_entry=title" testing="GRUB2 --default-index with default=saved_entry" --- -2.3.5 - diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb index 5a998248c8..dc3a70bb52 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -4,6 +4,7 @@ about the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) zipl (s390) boot loaders. It is primarily designed to be used from scripts which install \ new kernels and need to find information about the current boot environment. \ " +HOMEPAGE = "https://github.com/rhboot/grubby" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" @@ -11,18 +12,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "popt util-linux" DEPENDS_append_libc-musl = " libexecinfo" -SRC_URI = "https://github.com/rhinstaller/${BPN}/archive/${PV}-1.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "79c5cfa02c567efdc5bb18cdd584789e2e35aa23" +SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \ file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ file://run-ptest \ file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \ file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ " -SRC_URI[md5sum] = "1005907b275d6d93368d045274537d86" -SRC_URI[sha256sum] = "85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df" - -S = "${WORKDIR}/${BPN}-${PV}-1" - RDEPENDS_${PN} += "dracut" inherit autotools-brokensep ptest diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb new file mode 100644 index 0000000000..8430b7e102 --- /dev/null +++ b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "A command line tool for updating and displaying info about boot loaders" +DESCRIPTION = "grubby is a command line tool for updating and displaying information \ +about the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) and \ +zipl (s390) boot loaders. It is primarily designed to be used from scripts which install \ +new kernels and need to find information about the current boot environment. \ +" +HOMEPAGE = "https://github.com/rhboot/grubby" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +DEPENDS = "popt util-linux" +DEPENDS_append_libc-musl = " libexecinfo" + +S = "${WORKDIR}/git" +SRCREV = "a1d2ae93408c3408e672d7eba4550fdf27fb0201" +SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \ + file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ + file://run-ptest \ + file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \ + file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ + " + +RDEPENDS_${PN} += "dracut" + +inherit autotools-brokensep ptest + +EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'" + +LIBS_libc-musl = "-lexecinfo" +LIBS ?= "" +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH} + sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh +} + +RDEPENDS_${PN}-ptest = "util-linux-getopt bash" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch index 8d1ec69ae9..e7a0cce837 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch @@ -1,4 +1,4 @@ -From f414dea1316a48aba3e8e293201ebd51652d3ef4 Mon Sep 17 00:00:00 2001 +From 57e3a60b23891905733bfea7a1cb78c2377cc524 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 9 Jul 2017 15:17:29 -0700 Subject: [PATCH] Define in_* structs for non-glibc system libs @@ -10,14 +10,38 @@ glibc in mind, and does not provide adequate guards for musl to infer that these structs should be defined in linux/in.h Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - usr/include/netinet/in.h | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) + usr/include/net/if.h | 11 +++++++++++ + usr/include/netinet/in.h | 36 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 47 insertions(+) -Index: git/usr/include/netinet/in.h -=================================================================== ---- git.orig/usr/include/netinet/in.h -+++ git/usr/include/netinet/in.h +diff --git a/usr/include/net/if.h b/usr/include/net/if.h +index 116a176..6246b12 100644 +--- a/usr/include/net/if.h ++++ b/usr/include/net/if.h +@@ -1,6 +1,17 @@ + #ifndef _NET_IF_H + #define _NET_IF_H + ++#ifndef __GLIBC__ ++#include <linux/libc-compat.h> ++#undef __UAPI_DEF_IF_IFREQ ++#define __UAPI_DEF_IF_IFREQ 1 ++#undef __UAPI_DEF_IF_IFNAMSIZ ++#define __UAPI_DEF_IF_IFNAMSIZ 1 ++#undef __UAPI_DEF_IF_IFMAP ++#define __UAPI_DEF_IF_IFMAP 1 ++#undef __UAPI_DEF_IF_NET_DEVICE_FLAGS ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 ++#endif + #include <sys/socket.h> + #include <sys/types.h> + #include <linux/if.h> +diff --git a/usr/include/netinet/in.h b/usr/include/netinet/in.h +index 2952bb2..0c95bc9 100644 +--- a/usr/include/netinet/in.h ++++ b/usr/include/netinet/in.h @@ -5,6 +5,42 @@ #ifndef _NETINET_IN_H #define _NETINET_IN_H @@ -61,25 +85,3 @@ Index: git/usr/include/netinet/in.h #include <klibc/extern.h> #include <stdint.h> #include <endian.h> /* Must be included *before* <linux/in.h> */ -Index: git/usr/include/net/if.h -=================================================================== ---- git.orig/usr/include/net/if.h -+++ git/usr/include/net/if.h -@@ -1,6 +1,17 @@ - #ifndef _NET_IF_H - #define _NET_IF_H - -+#ifndef __GLIBC__ -+#include <linux/libc-compat.h> -+#undef __UAPI_DEF_IF_IFREQ -+#define __UAPI_DEF_IF_IFREQ 1 -+#undef __UAPI_DEF_IF_IFNAMSIZ -+#define __UAPI_DEF_IF_IFNAMSIZ 1 -+#undef __UAPI_DEF_IF_IFMAP -+#define __UAPI_DEF_IF_IFMAP 1 -+#undef __UAPI_DEF_IF_NET_DEVICE_FLAGS -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 -+#endif - #include <sys/socket.h> - #include <sys/types.h> - #include <linux/if.h> diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch index 7cd4c0e49c..181dcfb6de 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch @@ -1,4 +1,4 @@ -From 10fb440795a7796140bd657ee028847ec7c34447 Mon Sep 17 00:00:00 2001 +From 4b4147b76518d31a88fb2c58cdbf2236e159a25c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 8 Sep 2017 23:10:54 -0700 Subject: [PATCH] Kbuild.klibc: Add path to compiler headers via -isystem @@ -7,12 +7,13 @@ We need to include this path so it can find compiler headers e.g. stdarg.h which is called from wrapper stdarg.h using include_next Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - scripts/Kbuild.klibc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + scripts/Kbuild.klibc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index f500d535..1d5cdc43 100644 +index 101f86f..1d5cdc4 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -105,7 +105,8 @@ KLIBCOBJCOPY := $(OBJCOPY) @@ -25,6 +26,3 @@ index f500d535..1d5cdc43 100644 -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ -I$(KLIBCOBJ)/../include \ --- -2.14.1 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch index 41cc14275e..1ba05a811e 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch @@ -1,19 +1,20 @@ -From f66edde8a704131d98e8783ea8d4c848e8119b20 Mon Sep 17 00:00:00 2001 +From b6185401fc3daa7fa8ba2b84db3e4da3b94a9867 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 26 Jul 2017 16:13:16 -0700 -Subject: [PATCH 1/3] Kbuild.klibc: Use -print-libgcc-file-name instead of +Subject: [PATCH] Kbuild.klibc: Use -print-libgcc-file-name instead of --print-libgcc -print-libgcc-file-name works with clang and gcc unlike --print-libgcc which is gcc specific Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- scripts/Kbuild.klibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index f500d535..101f86f5 100644 +index f500d53..101f86f 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -128,7 +128,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ @@ -25,6 +26,3 @@ index f500d535..101f86f5 100644 KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o KLIBCLIBC := $(KLIBCOBJ)/libc.a --- -2.13.3 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch index 41a6b9e130..de04d691fe 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch @@ -1,4 +1,4 @@ -From 9ea19bd9636806a73bcf29cfcee40a268f91eb4c Mon Sep 17 00:00:00 2001 +From 63ab5102d6ef362a597941e62470bf19e6f1652b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 11 Jul 2017 08:09:52 -0700 Subject: [PATCH] always use bfd linker @@ -8,12 +8,13 @@ therefore explicitly asking for bfd linker would fix the linking issues on such distros Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index dc10fc5d..40647be4 100644 +index dc10fc5..40647be 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ include $(srctree)/scripts/Kbuild.include @@ -25,6 +26,3 @@ index dc10fc5d..40647be4 100644 export AR := $(KLIBCROSS)ar export RANLIB := $(KLIBCROSS)ranlib export STRIP := $(KLIBCROSS)strip --- -2.13.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch index 9c0ea63974..fcf4f891a4 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch @@ -1,4 +1,4 @@ -From a46a144ac883898d9cedf7a0b13aec6d10116125 Mon Sep 17 00:00:00 2001 +From ebd2b0e414c98467156b961abb470b5d07f37ea8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Sep 2017 23:11:53 -0700 Subject: [PATCH] arm: Do not set a fallback march and mtune @@ -9,14 +9,13 @@ need to compute values for CPU_ARCH and CPU_TUNE which is a bit harder in OE Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending +--- usr/klibc/arch/arm/MCONFIG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG -index 53bc1dc3..857e2f2d 100644 +index 303c6ac..48d2685 100644 --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG @@ -10,7 +10,7 @@ @@ -28,6 +27,3 @@ index 53bc1dc3..857e2f2d 100644 KLIBCBITSIZE = 32 KLIBCREQFLAGS += -fno-exceptions KLIBCSTRIPFLAGS += -R .ARM.exidx --- -2.14.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch index ae8c1f11a0..46a23987f5 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch @@ -1,4 +1,4 @@ -From 2fff607fd0b5550e5072a6fffcbb01c29d5207d2 Mon Sep 17 00:00:00 2001 +From 8beffe501c1ac5b35d62004735c4157c74183901 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 9 Jul 2017 13:51:25 -0700 Subject: [PATCH] dash: Specify format string in fmtstr() @@ -9,12 +9,13 @@ usr/dash/jobs.c:429:3: error: format not a string literal and no format argument col = fmtstr(s, 32, strsignal(st)); Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- usr/dash/jobs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/dash/jobs.c b/usr/dash/jobs.c -index 009bbfee..299bcacc 100644 +index 009bbfe..299bcac 100644 --- a/usr/dash/jobs.c +++ b/usr/dash/jobs.c @@ -426,7 +426,7 @@ sprint_status(char *s, int status, int sigonly) @@ -26,6 +27,3 @@ index 009bbfee..299bcacc 100644 #ifdef WCOREDUMP if (WCOREDUMP(status)) { col += fmtstr(s + col, 16, " (core dumped)"); --- -2.13.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch index 1b033acc42..04c97fc5ee 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch @@ -1,4 +1,4 @@ -From ab060a57b41f989665ade20e813bbcb67f91f1f2 Mon Sep 17 00:00:00 2001 +From d966d52d1e569cbc2293d841285e2b8941f28c61 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 9 Jul 2017 15:56:28 -0700 Subject: [PATCH] include linux/sysinfo.h directly @@ -10,12 +10,13 @@ but until its done in right place, change the local header override to avoid this assumption Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- usr/include/sys/sysinfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/include/sys/sysinfo.h b/usr/include/sys/sysinfo.h -index dba68dc6..d145c0b1 100644 +index dba68dc..d145c0b 100644 --- a/usr/include/sys/sysinfo.h +++ b/usr/include/sys/sysinfo.h @@ -5,7 +5,7 @@ @@ -27,6 +28,3 @@ index dba68dc6..d145c0b1 100644 extern int sysinfo(struct sysinfo *info); --- -2.13.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch index 9791412e48..3bc081d4e9 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch @@ -1,15 +1,16 @@ -From b4e120f5edf06e6df138b1804a8b5180584cea6b Mon Sep 17 00:00:00 2001 +From cf97079009ba48d10e52052b2eab7461ea4dd09b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 10 Jul 2017 20:42:50 -0700 Subject: [PATCH] mkfifo: Implement mkfifo Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- usr/utils/mkfifo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr/utils/mkfifo.c b/usr/utils/mkfifo.c -index 5a758b2a..f1f577e6 100644 +index 5a758b2..f1f577e 100644 --- a/usr/utils/mkfifo.c +++ b/usr/utils/mkfifo.c @@ -26,6 +26,11 @@ static int make_fifo(char *dir) @@ -24,6 +25,3 @@ index 5a758b2a..f1f577e6 100644 int main(int argc, char *argv[]) { int c, ret = 0; --- -2.13.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch index 6bb384bb0b..e842353061 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch @@ -1,11 +1,22 @@ +From d2fb484d995221277cce7abddcd7dfa0e8bceec3 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Fri, 11 Jan 2013 17:26:40 +0000 +Subject: [PATCH] klibc_2.0.2: apply FIX_V4BX patch for armv4 targets only + Status: not applicable upstream, in OE/Yocto we use $(FIX_V4BX) which is "" in case of armv5 or thumbs. Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- a/usr/klibc/arch/arm/MCONFIG 2013-01-09 01:12:02.000000000 +0100 -+++ b/usr/klibc/arch/arm/MCONFIG 2013-01-08 23:45:59.000000000 +0100 -@@ -29,6 +29,7 @@ +--- + usr/klibc/arch/arm/MCONFIG | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG +index 53bc1dc..303c6ac 100644 +--- a/usr/klibc/arch/arm/MCONFIG ++++ b/usr/klibc/arch/arm/MCONFIG +@@ -29,6 +29,7 @@ else KLIBCSHAREDFLAGS = -Ttext 0x01800200 ifeq ($(CONFIG_AEABI),y) KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch index 9bc4835dcd..5f47d3f20a 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch @@ -1,3 +1,11 @@ +From 0cb26cf2d25d36c1fdcc4f1635e4329436ed866a Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Fri, 19 Sep 2014 23:09:29 +0200 + +--- + klcc/klcc.in | 3 +++ + 1 file changed, 3 insertions(+) + diff --git a/klcc/klcc.in b/klcc/klcc.in index 43d0984..61e9385 100644 --- a/klcc/klcc.in diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch index 316c80a926..f28cd54233 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch @@ -1,12 +1,22 @@ +From 1118cc971917abe19ddb029aa80417f6fd6bb343 Mon Sep 17 00:00:00 2001 +From: Thomas Kunze <thommycheck@gmx.de> +Date: Sat, 6 Aug 2011 05:30:14 +0000 +Subject: [PATCH] klibc: initial commit of version 1.5.24 + Patch was imported from the OpenEmbedded git server (git://git.openembedded.org/openembedded) as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 Signed-off-by: Thomas Kunze <thommycheck@gmx.de> -diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig ---- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 -@@ -5,4 +5,4 @@ +--- + defconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/defconfig b/defconfig +index 04b98e9..0cb23d0 100644 +--- a/defconfig ++++ b/defconfig +@@ -6,4 +6,4 @@ CONFIG_KLIBC_ZLIB=y CONFIG_REGPARM=y # ARM options # CONFIG_KLIBC_THUMB is not set diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch index 204306475f..a5563b7407 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch @@ -1,15 +1,22 @@ +From 1be2bc41f915922102a3ba671b54c2df6f0052e6 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings <ben@decadent.org.uk> +Date: Sun, 14 Mar 2010 18:41:56 +0000 +Subject: [PATCH] klibc_1.5.26: now build against linux-libc-headers + commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a -Author: Ben Hutchings <ben@decadent.org.uk> -Date: Sun Mar 14 18:41:56 2010 +0000 Taken from debian "Fix klibc Debian specific build trouble" Adapted for klibc_2.0.2 -Index: klibc-2.0~rc2/scripts/Kbuild.install -=================================================================== ---- klibc-2.0~rc2.orig/scripts/Kbuild.install 2012-02-11 18:50:21.000000000 +0000 -+++ klibc-2.0~rc2/scripts/Kbuild.install 2012-02-11 19:04:52.000000000 +0000 -@@ -95,7 +95,9 @@ +--- + scripts/Kbuild.install | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install +index 8af5697..d32a8a5 100644 +--- a/scripts/Kbuild.install ++++ b/scripts/Kbuild.install +@@ -95,7 +95,9 @@ header: $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin @@ -18,5 +25,5 @@ Index: klibc-2.0~rc2/scripts/Kbuild.install + ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ + done $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include + $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch index c01c712a12..5c7a6625b5 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch @@ -1,3 +1,8 @@ +From 1892079b827cf8f8316305b6d6e0985db82441a2 Mon Sep 17 00:00:00 2001 +From: Thomas Kunze <thommycheck@gmx.de> +Date: Sat, 6 Aug 2011 05:30:14 +0000 +Subject: [PATCH] klibc: initial commit of version 1.5.24 + Patch was imported from the OpenEmbedded git server (git://git.openembedded.org/openembedded) as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735 @@ -6,11 +11,25 @@ Signed-off-by: Thomas Kunze <thommycheck@gmx.de> Minor edits following upstream changes Signed-off-by: Andrea Adami <andrea.adami@gmail.com> -Index: klibc-1.5.24/scripts/Kbuild.install -=================================================================== ---- a/scripts/Kbuild.install 2011-07-27 15:50:53.000000000 +0200 -+++ b/scripts/Kbuild.install 2011-08-01 00:03:03.000000000 +0200 -@@ -88,13 +88,10 @@ +--- + scripts/Kbuild.install | 4 ---- + usr/dash/Kbuild | 2 -- + usr/gzip/Kbuild | 2 -- + usr/kinit/Kbuild | 2 -- + usr/kinit/fstype/Kbuild | 2 -- + usr/kinit/ipconfig/Kbuild | 2 -- + usr/kinit/nfsmount/Kbuild | 2 -- + usr/kinit/resume/Kbuild | 2 -- + usr/kinit/run-init/Kbuild | 2 -- + usr/klibc/Kbuild | 2 -- + usr/utils/Kbuild | 2 -- + 11 files changed, 24 deletions(-) + +diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install +index d32a8a5..fda699d 100644 +--- a/scripts/Kbuild.install ++++ b/scripts/Kbuild.install +@@ -88,19 +88,15 @@ else header: $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" $(Q)mkdir -p $(INSTALLROOT)$(bindir) @@ -24,119 +43,107 @@ Index: klibc-1.5.24/scripts/Kbuild.install $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ done -@@ -103,7 +100,6 @@ - done $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) footer: header - -Index: klibc-1.5.24/usr/dash/Kbuild -=================================================================== ---- a/usr/dash/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/dash/Kbuild 2011-08-01 00:07:56.000000000 +0200 -@@ -92,5 +92,3 @@ +diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild +index 3a98c1f..1a6920a 100644 +--- a/usr/dash/Kbuild ++++ b/usr/dash/Kbuild +@@ -92,5 +92,3 @@ $(obj)/syntax.c: $(obj)/mksyntax $(obj)/syntax.h: $(obj)/syntax.c $(Q): -# Targets to install -install-y := sh.shared - -Index: klibc-1.5.24/usr/gzip/Kbuild -=================================================================== ---- a/usr/gzip/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/gzip/Kbuild 2011-08-01 00:06:39.000000000 +0200 -@@ -21,5 +21,3 @@ +diff --git a/usr/gzip/Kbuild b/usr/gzip/Kbuild +index 9bbf0a4..c497d02 100644 +--- a/usr/gzip/Kbuild ++++ b/usr/gzip/Kbuild +@@ -21,5 +21,3 @@ $(obj)/gunzip $(obj)/zcat: $(obj)/gzip # Cleaning targets := gzip gzip.g gunzip zcat -# Targets to install -install-y := gzip gunzip zcat - -Index: klibc-1.5.24/usr/kinit/fstype/Kbuild -=================================================================== ---- a/usr/kinit/fstype/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/kinit/fstype/Kbuild 2011-08-01 00:09:12.000000000 +0200 -@@ -21,5 +21,3 @@ +diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild +index 5320127..f7fdccd 100644 +--- a/usr/kinit/Kbuild ++++ b/usr/kinit/Kbuild +@@ -33,5 +33,3 @@ targets += kinit kinit.g kinit.shared kinit.shared.g + subdir- := fstype ipconfig nfsmount resume run-init + + +-# install binary +-install-y := kinit kinit.shared +diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild +index 9b20db1..367611d 100644 +--- a/usr/kinit/fstype/Kbuild ++++ b/usr/kinit/fstype/Kbuild +@@ -21,5 +21,3 @@ shared/fstype-y := $(objs) # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) - -Index: klibc-1.5.24/usr/kinit/ipconfig/Kbuild -=================================================================== ---- a/usr/kinit/ipconfig/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/kinit/ipconfig/Kbuild 2011-08-01 00:10:52.000000000 +0200 -@@ -27,5 +27,3 @@ +diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild +index 7f8d181..eb1d472 100644 +--- a/usr/kinit/ipconfig/Kbuild ++++ b/usr/kinit/ipconfig/Kbuild +@@ -27,5 +27,3 @@ shared/ipconfig-y := $(objs) # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) - -Index: klibc-1.5.24/usr/kinit/Kbuild -=================================================================== ---- a/usr/kinit/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/kinit/Kbuild 2011-08-01 00:20:18.000000000 +0200 -@@ -33,5 +33,3 @@ - subdir- := fstype ipconfig nfsmount resume run-init - - --# install binary --install-y := kinit kinit.shared - -Index: klibc-1.5.24/usr/kinit/nfsmount/Kbuild -=================================================================== ---- a/usr/kinit/nfsmount/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/kinit/nfsmount/Kbuild 2011-08-01 00:12:52.000000000 +0200 -@@ -23,5 +23,3 @@ +diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild +index 461e6f3..ba31708 100644 +--- a/usr/kinit/nfsmount/Kbuild ++++ b/usr/kinit/nfsmount/Kbuild +@@ -23,5 +23,3 @@ dummypmap-y := dummypmap_test.o clean-dirs := static shared -# Install binary -install-y := $(shared-y) - -Index: klibc-1.5.24/usr/kinit/resume/Kbuild -=================================================================== ---- a/usr/kinit/resume/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/kinit/resume/Kbuild 2011-08-01 00:13:51.000000000 +0200 -@@ -26,5 +26,3 @@ +diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild +index 034195d..c1342e1 100644 +--- a/usr/kinit/resume/Kbuild ++++ b/usr/kinit/resume/Kbuild +@@ -26,5 +26,3 @@ shared/resume-lib := ../lib.a # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) - -Index: klibc-1.5.24/usr/kinit/run-init/Kbuild -=================================================================== ---- a/usr/kinit/run-init/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/kinit/run-init/Kbuild 2011-08-01 00:14:41.000000000 +0200 -@@ -25,5 +25,3 @@ +diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild +index f7832b7..c153b0a 100644 +--- a/usr/kinit/run-init/Kbuild ++++ b/usr/kinit/run-init/Kbuild +@@ -30,5 +30,3 @@ shared/run-init-lib := ../lib.a # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) - -Index: klibc-1.5.24/usr/klibc/Kbuild -=================================================================== ---- a/usr/klibc/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/klibc/Kbuild 2011-08-01 00:18:11.000000000 +0200 -@@ -177,5 +177,3 @@ +diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild +index eba6add..98caf2e 100644 +--- a/usr/klibc/Kbuild ++++ b/usr/klibc/Kbuild +@@ -185,5 +185,3 @@ install-rule: $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib)) $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib - $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ - $(INSTALLROOT)$(SHLIBDIR) - -Index: klibc-1.5.24/usr/utils/Kbuild -=================================================================== ---- a/usr/utils/Kbuild 2011-07-27 15:50:53.000000000 +0200 -+++ b/usr/utils/Kbuild 2011-08-01 00:19:13.000000000 +0200 -@@ -72,5 +72,3 @@ +diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild +index 05aa794..67d9486 100644 +--- a/usr/utils/Kbuild ++++ b/usr/utils/Kbuild +@@ -72,5 +72,3 @@ $(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt # Clean deletes the static and shared dir clean-dirs := static shared diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc index 9014f5267f..7df33d64e4 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc @@ -48,7 +48,7 @@ do_install() { ln -s gzip ${D}${base_bindir}/zcat } -EXTRA_KLIBC_DEPS = "${@base_conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}" +EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}" PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*" diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-Add-simple-getline-implementation-to-libmissing.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-Add-simple-getline-implementation-to-libmissing.patch new file mode 100644 index 0000000000..d4c6d87551 --- /dev/null +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-Add-simple-getline-implementation-to-libmissing.patch @@ -0,0 +1,187 @@ +From 10c289454dad34632d767694aecb508dae5073bf Mon Sep 17 00:00:00 2001 +From: David Oberhollenzer <david.oberhollenzer@sigma-star.at> +Date: Thu, 1 Feb 2018 12:16:18 +0100 +Subject: [PATCH 1/4] Add simple getline() implementation to libmissing + +Some C libraries, like klibc don't implement getline(). This patch +adds a simple stub implementation to libmissing that does an fgets +into a stack allocated buffer and returns the result. + +Upstream-Status: Backport + +Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> +--- + configure.ac | 1 + + include/common.h | 1 + + include/libmissing.h | 7 +++++++ + jffsX-utils/Makemodule.am | 2 +- + lib/Makemodule.am | 3 ++- + lib/getline.c | 36 ++++++++++++++++++++++++++++++++++++ + misc-utils/Makemodule.am | 2 ++ + ubi-utils/Makemodule.am | 2 +- + ubifs-utils/Makemodule.am | 1 + + 9 files changed, 52 insertions(+), 3 deletions(-) + create mode 100644 lib/getline.c + +diff --git a/configure.ac b/configure.ac +index 83d754f..5af0115 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -191,6 +191,7 @@ if test "x$need_cmocka" = "xyes"; then + fi + + AC_CHECK_HEADERS([execinfo.h]) ++AC_CHECK_FUNCS([getline]) + + ##### produce summary on dependencies ##### + +diff --git a/include/common.h b/include/common.h +index 2ce5d22..f8f72ea 100644 +--- a/include/common.h ++++ b/include/common.h +@@ -32,6 +32,7 @@ + #include <sys/sysmacros.h> + + #include "config.h" ++#include "libmissing.h" + + #ifndef PROGRAM_NAME + # error "You must define PROGRAM_NAME before including this header" +diff --git a/include/libmissing.h b/include/libmissing.h +index 0196033..09dbce1 100644 +--- a/include/libmissing.h ++++ b/include/libmissing.h +@@ -7,11 +7,18 @@ + #include <execinfo.h> + #endif + ++#include <sys/types.h> ++#include <stdio.h> ++ + #ifndef HAVE_EXECINFO_H + int backtrace(void **buffer, int size); + char **backtrace_symbols(void *const *buffer, int size); + void backtrace_symbols_fd(void *const *buffer, int size, int fd); + #endif + ++#ifndef HAVE_GETLINE ++ssize_t getline(char **lineptr, size_t *n, FILE *stream); ++#endif ++ + #endif /* LIBMISSING_H */ + +diff --git a/jffsX-utils/Makemodule.am b/jffsX-utils/Makemodule.am +index fb181de..9d7a5d9 100644 +--- a/jffsX-utils/Makemodule.am ++++ b/jffsX-utils/Makemodule.am +@@ -17,7 +17,7 @@ jffs2dump_SOURCES = jffsX-utils/jffs2dump.c + jffs2dump_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS) + + sumtool_SOURCES = jffsX-utils/sumtool.c +-sumtool_LDADD = libmtd.a ++sumtool_LDADD = libmtd.a libmissing.a + + JFFSX_BINS = \ + mkfs.jffs2 jffs2dump jffs2reader sumtool +diff --git a/lib/Makemodule.am b/lib/Makemodule.am +index 5bee5b6..645632a 100644 +--- a/lib/Makemodule.am ++++ b/lib/Makemodule.am +@@ -7,7 +7,8 @@ libmtd_a_SOURCES = \ + lib/libmtd_int.h + + libmissing_a_SOURCES = \ +- lib/execinfo.c ++ lib/execinfo.c \ ++ lib/getline.c + + libubi_a_SOURCES = \ + lib/libubi.c \ +diff --git a/lib/getline.c b/lib/getline.c +new file mode 100644 +index 0000000..c575bf7 +--- /dev/null ++++ b/lib/getline.c +@@ -0,0 +1,36 @@ ++#include <stdlib.h> ++#include <string.h> ++ ++#include "libmissing.h" ++ ++#ifndef HAVE_GETLINE ++ssize_t getline(char **lineptr, size_t *n, FILE *stream) ++{ ++ char buffer[256], *new; ++ size_t count; ++ ++ if (!(*lineptr)) ++ *n = 0; ++ ++ if (!fgets(buffer, sizeof(buffer), stream)) { ++ if (!feof(stream)) ++ return -1; ++ ++ buffer[0] = '\0'; ++ } ++ ++ count = strlen(buffer) + 1; ++ ++ if (*n < count) { ++ new = realloc(*lineptr, count); ++ if (!new) ++ return -1; ++ *lineptr = new; ++ *n = count; ++ } ++ ++ memcpy(*lineptr, buffer, count); ++ return count; ++} ++#endif ++ +diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am +index ce1c385..bfc5342 100644 +--- a/misc-utils/Makemodule.am ++++ b/misc-utils/Makemodule.am +@@ -1,4 +1,5 @@ + ftl_format_SOURCES = misc-utils/ftl_format.c ++ftl_format_LDADD = libmissing.a + + doc_loadbios_SOURCES = misc-utils/doc_loadbios.c + +@@ -25,6 +26,7 @@ flash_otp_info_SOURCES = misc-utils/flash_otp_info.c + flash_otp_dump_SOURCES = misc-utils/flash_otp_dump.c + + flash_otp_lock_SOURCES = misc-utils/flash_otp_lock.c ++flash_otp_lock_LDADD = libmissing.a + + flash_otp_write_SOURCES = misc-utils/flash_otp_write.c + +diff --git a/ubi-utils/Makemodule.am b/ubi-utils/Makemodule.am +index 215eac2..7b447c7 100644 +--- a/ubi-utils/Makemodule.am ++++ b/ubi-utils/Makemodule.am +@@ -23,7 +23,7 @@ ubinize_SOURCES = ubi-utils/ubinize.c + ubinize_LDADD = libubi.a libubigen.a libmtd.a libiniparser.a + + ubiformat_SOURCES = ubi-utils/ubiformat.c +-ubiformat_LDADD = libubi.a libubigen.a libmtd.a libscan.a ++ubiformat_LDADD = libubi.a libubigen.a libmtd.a libscan.a libmissing.a + + ubirename_SOURCES = ubi-utils/ubirename.c + ubirename_LDADD = libmtd.a libubi.a +diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am +index 5862afb..787beb9 100644 +--- a/ubifs-utils/Makemodule.am ++++ b/ubifs-utils/Makemodule.am +@@ -17,6 +17,7 @@ mkfs_ubifs_SOURCES = \ + ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c \ + ubifs-utils/mkfs.ubifs/devtable.c + mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(UUID_LIBS) -lm ++mkfs_ubifs_LDADD += libmissing.a + mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(UUID_CFLAGS) \ + -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/mkfs.ubifs/ + +-- +2.7.4 + diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch new file mode 100644 index 0000000000..bb675a7be1 --- /dev/null +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch @@ -0,0 +1,326 @@ +From 01c98d5d5d044d9a125abcdbb2f3d771966365b0 Mon Sep 17 00:00:00 2001 +From: mirabilos <m@mirbsd.org> +Date: Thu, 1 Feb 2018 15:34:07 +0100 +Subject: [PATCH 2/4] Instead of doing preprocessor magic, just output off_t as + long long + +Fix warnings abot PRIdoff_t in libmtd.c, in mtd_read (and mtd_write): + +In file included from ../git/lib/libmtd.c:40:0: +../git/lib/libmtd.c: In function 'mtd_read': +../git/include/common.h:110:18: warning: format '%ld' expects argument of + type 'long int', but argument 5 has type 'off_t {aka long long int}' + [-Wformat=] + +../git/include/common.h:120:2: note: in expansion of macro 'errmsg' + errmsg(fmt, ##__VA_ARGS__); \ + ^~~~~~ +../git/lib/libmtd.c:1082:10: note: in expansion of macro 'sys_errmsg' + return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t, + ^~~~~~~~~~ + +/usr/lib/klibc/include/inttypes.h:28:17: note: format string is defined here + #define PRId32 "d" + +Upstream-Status: Submitted + +Signed-off-by: Thorsten Glaser <tg@mirbsd.org> +--- + include/common.h | 18 ------------------ + jffsX-utils/mkfs.jffs2.c | 20 ++++++++++---------- + lib/libmtd.c | 8 ++++---- + misc-utils/flash_erase.c | 6 +++--- + misc-utils/flash_otp_write.c | 2 +- + misc-utils/ftl_check.c | 2 +- + misc-utils/mtd_debug.c | 4 ++-- + misc-utils/serve_image.c | 4 ++-- + tests/fs-tests/integrity/integck.c | 4 ++-- + tests/mtd-tests/nandpagetest.c | 4 ++-- + tests/ubi-tests/integ.c | 6 +++--- + ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 6 +++--- + 12 files changed, 33 insertions(+), 51 deletions(-) + +diff --git a/include/common.h b/include/common.h +index f8f72ea..642c212 100644 +--- a/include/common.h ++++ b/include/common.h +@@ -70,24 +70,6 @@ extern "C" { + #define O_CLOEXEC 0 + #endif + +-/* define a print format specifier for off_t */ +-#if (SIZEOF_OFF_T >= 8) +-#define PRIxoff_t PRIx64 +-#define PRIdoff_t PRId64 +-#else +-#define PRIxoff_t "l"PRIx32 +-#define PRIdoff_t "l"PRId32 +-#endif +- +-/* define a print format specifier for loff_t */ +-#if (SIZEOF_LOFF_T >= 8) +-#define PRIxloff_t PRIx64 +-#define PRIdloff_t PRId64 +-#else +-#define PRIxloff_t "l"PRIx32 +-#define PRIdloff_t "l"PRId32 +-#endif +- + /* Verbose messages */ + #define bareverbose(verbose, fmt, ...) do { \ + if (verbose) \ +diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c +index 9aa6c39..0661786 100644 +--- a/jffsX-utils/mkfs.jffs2.c ++++ b/jffsX-utils/mkfs.jffs2.c +@@ -1237,8 +1237,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) + } else switch (e->sb.st_mode & S_IFMT) { + case S_IFDIR: + if (verbose) { +- printf("\td %04o %9" PRIdoff_t " %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ printf("\td %04o %9lld %5d:%-3d %s\n", ++ e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size, + (int) (e->sb.st_uid), (int) (e->sb.st_gid), + e->name); + } +@@ -1247,8 +1247,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) + break; + case S_IFSOCK: + if (verbose) { +- printf("\ts %04o %9" PRIdoff_t " %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ printf("\ts %04o %9lld %5d:%-3d %s\n", ++ e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + } + write_pipe(e); +@@ -1256,8 +1256,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) + break; + case S_IFIFO: + if (verbose) { +- printf("\tp %04o %9" PRIdoff_t " %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ printf("\tp %04o %9lld %5d:%-3d %s\n", ++ e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + } + write_pipe(e); +@@ -1285,8 +1285,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) + break; + case S_IFLNK: + if (verbose) { +- printf("\tl %04o %9" PRIdoff_t " %5d:%-3d %s -> %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ printf("\tl %04o %9lld %5d:%-3d %s -> %s\n", ++ e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name, + e->link); + } +@@ -1297,8 +1297,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) + wrote = write_regular_file(e); + write_xattr_entry(e); + if (verbose) { +- printf("\tf %04o %9" PRIdoff_t " (%9u) %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, wrote, ++ printf("\tf %04o %9lld (%9u) %5d:%-3d %s\n", ++ e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size, wrote, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + } + break; +diff --git a/lib/libmtd.c b/lib/libmtd.c +index 86c89ae..f375381 100644 +--- a/lib/libmtd.c ++++ b/lib/libmtd.c +@@ -1079,8 +1079,8 @@ int mtd_read(const struct mtd_dev_info *mtd, int fd, int eb, int offs, + /* Seek to the beginning of the eraseblock */ + seek = (off_t)eb * mtd->eb_size + offs; + if (lseek(fd, seek, SEEK_SET) != seek) +- return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t, +- mtd->mtd_num, seek); ++ return sys_errmsg("cannot seek mtd%d to offset %lld", ++ mtd->mtd_num, (long long)seek); + + while (rd < len) { + ret = read(fd, buf + rd, len - rd); +@@ -1188,8 +1188,8 @@ int mtd_write(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, int eb, + if (data) { + /* Seek to the beginning of the eraseblock */ + if (lseek(fd, seek, SEEK_SET) != seek) +- return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t, +- mtd->mtd_num, seek); ++ return sys_errmsg("cannot seek mtd%d to offset %lld", ++ mtd->mtd_num, (long long)seek); + ret = write(fd, data, len); + if (ret != len) + return sys_errmsg("cannot write %d bytes to mtd%d " +diff --git a/misc-utils/flash_erase.c b/misc-utils/flash_erase.c +index 0c9449f..ec4b2e1 100644 +--- a/misc-utils/flash_erase.c ++++ b/misc-utils/flash_erase.c +@@ -53,8 +53,8 @@ int target_endian = __BYTE_ORDER; + static void show_progress(struct mtd_dev_info *mtd, off_t start, int eb, + int eb_start, int eb_cnt) + { +- bareverbose(!quiet, "\rErasing %d Kibyte @ %"PRIxoff_t" -- %2i %% complete ", +- mtd->eb_size / 1024, start, ((eb - eb_start) * 100) / eb_cnt); ++ bareverbose(!quiet, "\rErasing %d Kibyte @ %llx -- %2i %% complete ", ++ mtd->eb_size / 1024, (unsigned long long)start, ((eb - eb_start) * 100) / eb_cnt); + fflush(stdout); + } + +@@ -210,7 +210,7 @@ int main(int argc, char *argv[]) + if (!noskipbad) { + int ret = mtd_is_bad(&mtd, fd, eb); + if (ret > 0) { +- verbose(!quiet, "Skipping bad block at %08"PRIxoff_t, offset); ++ verbose(!quiet, "Skipping bad block at %08llx", (unsigned long long)offset); + continue; + } else if (ret < 0) { + if (errno == EOPNOTSUPP) { +diff --git a/misc-utils/flash_otp_write.c b/misc-utils/flash_otp_write.c +index b02d0b0..04c96c6 100644 +--- a/misc-utils/flash_otp_write.c ++++ b/misc-utils/flash_otp_write.c +@@ -76,7 +76,7 @@ int main(int argc,char *argv[]) + return errno; + } + +- printf("Writing OTP user data on %s at offset 0x%"PRIxoff_t"\n", argv[2], offset); ++ printf("Writing OTP user data on %s at offset 0x%llx\n", argv[2], (unsigned long long)offset); + + if (mtd_type_is_nand_user(&mtdInfo)) + len = mtdInfo.writesize; +diff --git a/misc-utils/ftl_check.c b/misc-utils/ftl_check.c +index a853cf4..e854922 100644 +--- a/misc-utils/ftl_check.c ++++ b/misc-utils/ftl_check.c +@@ -131,7 +131,7 @@ static void check_partition(int fd) + perror("read failed"); + break; + } +- printf("\nErase unit %"PRIdoff_t":\n", i); ++ printf("\nErase unit %lld:\n", (long long)i); + if ((hdr2.FormattedSize != hdr.FormattedSize) || + (hdr2.NumEraseUnits != hdr.NumEraseUnits) || + (hdr2.SerialNumber != hdr.SerialNumber)) +diff --git a/misc-utils/mtd_debug.c b/misc-utils/mtd_debug.c +index ac37e23..d65ad36 100644 +--- a/misc-utils/mtd_debug.c ++++ b/misc-utils/mtd_debug.c +@@ -160,7 +160,7 @@ retry: + if (buf != NULL) + free(buf); + close(outfd); +- printf("Copied %zu bytes from address 0x%.8"PRIxoff_t" in flash to %s\n", len, offset, filename); ++ printf("Copied %zu bytes from address 0x%.8llx in flash to %s\n", len, (unsigned long long)offset, filename); + return 0; + + err2: +@@ -225,7 +225,7 @@ retry: + if (buf != NULL) + free(buf); + fclose(fp); +- printf("Copied %d bytes from %s to address 0x%.8"PRIxoff_t" in flash\n", len, filename, offset); ++ printf("Copied %d bytes from %s to address 0x%.8llx in flash\n", len, filename, (unsigned long long)offset); + return 0; + } + +diff --git a/misc-utils/serve_image.c b/misc-utils/serve_image.c +index f2475d6..6c8c8fb 100644 +--- a/misc-utils/serve_image.c ++++ b/misc-utils/serve_image.c +@@ -129,8 +129,8 @@ int main(int argc, char **argv) + } + + if (st.st_size % erasesize) { +- fprintf(stderr, "Image size %" PRIdoff_t " bytes is not a multiple of erasesize %d bytes\n", +- st.st_size, erasesize); ++ fprintf(stderr, "Image size %lld bytes is not a multiple of erasesize %d bytes\n", ++ (long long)st.st_size, erasesize); + exit(1); + } + image = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, rfd, 0); +diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c +index 84753d6..0a7f142 100644 +--- a/tests/fs-tests/integrity/integck.c ++++ b/tests/fs-tests/integrity/integck.c +@@ -897,8 +897,8 @@ static ssize_t file_write_data(struct file_info *file, int fd, off_t offset, + remains = size; + actual = 0; + written = IO_BUFFER_SIZE; +- v("write %zd bytes, offset %"PRIdoff_t", file %s", +- size, offset, get_file_name(file)); ++ v("write %zd bytes, offset %lld, file %s", ++ size, (long long)offset, get_file_name(file)); + while (remains) { + /* Fill up buffer with random data */ + if (written < IO_BUFFER_SIZE) { +diff --git a/tests/mtd-tests/nandpagetest.c b/tests/mtd-tests/nandpagetest.c +index c6812df..465e548 100644 +--- a/tests/mtd-tests/nandpagetest.c ++++ b/tests/mtd-tests/nandpagetest.c +@@ -232,8 +232,8 @@ static int verify_eraseblock(int ebnum) + return err; + + if (lseek(fd, addr, SEEK_SET) != addr) { +- fprintf(stderr, "cannot seek mtd%d to offset %"PRIdloff_t, +- mtd.mtd_num, addr); ++ fprintf(stderr, "cannot seek mtd%d to offset %lld", ++ mtd.mtd_num, (long long)addr); + return -1; + } + +diff --git a/tests/ubi-tests/integ.c b/tests/ubi-tests/integ.c +index 26c2ce5..1cd0649 100644 +--- a/tests/ubi-tests/integ.c ++++ b/tests/ubi-tests/integ.c +@@ -243,7 +243,7 @@ static void check_erase_block(struct erase_block_info *erase_block, int fd) + while (size) + if (read_buffer[--size] != 0xff) { + fprintf(stderr, "block no. = %d\n" , erase_block->block_number); +- fprintf(stderr, "offset = %"PRIdoff_t"\n" , gap_start); ++ fprintf(stderr, "offset = %lld\n" , (long long)gap_start); + fprintf(stderr, "size = %ld\n" , (long) bytes_read); + error_exit("verify 0xff failed"); + } +@@ -254,7 +254,7 @@ static void check_erase_block(struct erase_block_info *erase_block, int fd) + errno = 0; + bytes_read = read(fd, read_buffer, w->size); + if (bytes_read != w->size) { +- fprintf(stderr, "offset = %"PRIdoff_t"\n" , w->offset); ++ fprintf(stderr, "offset = %lld\n" , (long long)w->offset); + fprintf(stderr, "size = %ld\n" , (long) w->size); + fprintf(stderr, "bytes_read = %ld\n" , (long) bytes_read); + error_exit("read failed"); +@@ -279,7 +279,7 @@ static void check_erase_block(struct erase_block_info *erase_block, int fd) + while (size) + if (read_buffer[--size] != 0xff) { + fprintf(stderr, "block no. = %d\n" , erase_block->block_number); +- fprintf(stderr, "offset = %"PRIdoff_t"\n" , gap_start); ++ fprintf(stderr, "offset = %lld\n" , (long long)gap_start); + fprintf(stderr, "size = %ld\n" , (long) bytes_read); + error_exit("verify 0xff failed!"); + } +diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +index c916f48..f0237ab 100644 +--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c ++++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +@@ -772,11 +772,11 @@ int write_leb(int lnum, int len, void *buf) + return sys_err_msg("ubi_leb_change_start failed"); + + if (lseek(out_fd, pos, SEEK_SET) != pos) +- return sys_err_msg("lseek failed seeking %"PRIdoff_t, pos); ++ return sys_err_msg("lseek failed seeking %lld", (long long)pos); + + if (write(out_fd, buf, c->leb_size) != c->leb_size) +- return sys_err_msg("write failed writing %d bytes at pos %"PRIdoff_t, +- c->leb_size, pos); ++ return sys_err_msg("write failed writing %d bytes at pos %lld", ++ c->leb_size, (long long)pos); + + return 0; + } +-- +2.7.4 + diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch new file mode 100644 index 0000000000..08c53d18a3 --- /dev/null +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch @@ -0,0 +1,34 @@ +From 139d93bc405272a3261d57be26da842e737fe4d0 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Sun, 28 Jan 2018 23:10:34 +0100 +Subject: [PATCH 3/4] Makefile.am: only build ubi-utils + +We only target the ubi-utils, static, small. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5a6e77c..98715dd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,9 +34,9 @@ EXTRA_DIST += $(GLOBAL_HEADER) $(GLOBAL_EXTRA) + + include lib/Makemodule.am + include ubi-utils/Makemodule.am +-include misc-utils/Makemodule.am +-include nand-utils/Makemodule.am +-include nor-utils/Makemodule.am ++#include misc-utils/Makemodule.am ++#include nand-utils/Makemodule.am ++#include nor-utils/Makemodule.am + + if BUILD_UBIFS + include ubifs-utils/Makemodule.am +-- +2.7.4 + diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch new file mode 100644 index 0000000000..5da05fa48f --- /dev/null +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch @@ -0,0 +1,38 @@ +From ae1cf6d0eb1833e46549328a4473222c259723d7 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 1 Feb 2018 00:25:00 +0100 +Subject: [PATCH 4/4] mtd-utils: common.h: no features.h for klibc builds + +Add guard around features.h to fix missing include (here first error): + + ../git/include/common.h:29:10: + fatal error: features.h: No such file or directory + #include <features.h> + ^~~~~~~~~~~~ + compilation terminated + +Upstream-Status: Submitted + +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> +--- + include/common.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/common.h b/include/common.h +index 642c212..f7c71fe 100644 +--- a/include/common.h ++++ b/include/common.h +@@ -26,7 +26,10 @@ + #include <string.h> + #include <fcntl.h> + #include <errno.h> ++#if defined(__KLIBC__) ++#else + #include <features.h> ++#endif + #include <inttypes.h> + #include <unistd.h> + #include <sys/sysmacros.h> +-- +2.7.4 + diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch deleted file mode 100644 index 6e1b9ff100..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch +++ /dev/null @@ -1,84 +0,0 @@ -From c4e6bd9378645d577e9d9f85da85f1438afe7c50 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Sun, 29 Jun 2014 00:32:29 +0200 -Subject: [PATCH 1/6] Makefile: build ubi-utils only - -We build all the static ubi-utils but actually only ubiattach is needed in -a minimalistic initramfs for the mount of ubi volumes. - -More fixes are needed in order to build the full mtd-utils. -The first issue is: - -| mkfs.jffs2.c:64:20: fatal error: libgen.h: No such file or directory -| #include <libgen.h> - -Removing the include then the second error is: - -| mkfs.jffs2.c:1570:22: error: '_SC_PAGESIZE' undeclared -| (first use in this function) -| page_size = sysconf(_SC_PAGESIZE); - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - Makefile | 24 ++---------------------- - 1 file changed, 2 insertions(+), 22 deletions(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -16,28 +16,11 @@ endif - - TESTS = tests - --MTD_BINS = \ -- ftl_format flash_erase nanddump doc_loadbios \ -- ftl_check mkfs.jffs2 flash_lock flash_unlock \ -- flash_otp_info flash_otp_dump flash_otp_lock flash_otp_write \ -- mtd_debug flashcp nandwrite nandtest mtdpart \ -- jffs2dump \ -- nftldump nftl_format docfdisk \ -- rfddump rfdformat \ -- serve_image recv_image \ -- sumtool jffs2reader - UBI_BINS = \ - ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \ - ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol ubiblock - --BINS = $(MTD_BINS) --BINS += mkfs.ubifs/mkfs.ubifs --BINS += $(addprefix ubi-utils/,$(UBI_BINS)) --SCRIPTS = flash_eraseall -- --TARGETS = $(BINS) --TARGETS += lib/libmtd.a --TARGETS += ubi-utils/libubi.a -+BINS = $(addprefix ubi-utils/,$(UBI_BINS)) - - OBJDEPS = $(BUILDDIR)/include/version.h - -@@ -61,12 +44,9 @@ endif - rm -f $(BUILDDIR)/include/version.h - $(MAKE) -C $(TESTS) clean - --install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS} -+install:: $(addprefix $(BUILDDIR)/,${BINS}) - mkdir -p ${DESTDIR}/${SBINDIR} - install -m 0755 $^ ${DESTDIR}/${SBINDIR}/ -- mkdir -p ${DESTDIR}/${MANDIR}/man1 -- install -m 0644 mkfs.jffs2.1 ${DESTDIR}/${MANDIR}/man1/ -- -gzip -9f ${DESTDIR}/${MANDIR}/man1/*.1 - - tests:: - $(MAKE) -C $(TESTS) -@@ -91,8 +71,6 @@ LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) - LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS) - LDLIBS_jffs2reader = -lz $(LZOLDLIBS) - --$(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v)))) -- - # - # Common libmtd - # diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0002-common.mk-for-klibc-CC-is-klcc.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0002-common.mk-for-klibc-CC-is-klcc.patch deleted file mode 100644 index f46824b5cd..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0002-common.mk-for-klibc-CC-is-klcc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f3609c7c0450b4c31e1d4603fcf2cfb1ba46f994 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Sun, 29 Jun 2014 00:37:28 +0200 -Subject: [PATCH 2/6] common.mk: for klibc $(CC) is klcc - -Do not hardcode: assign the value to the variable if it is not already defined. - -Upstream-Status: Pending - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - common.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common.mk b/common.mk -index ba87377..59c56df 100644 ---- a/common.mk -+++ b/common.mk -@@ -1,4 +1,4 @@ --CC := $(CROSS)gcc -+CC ?= $(CROSS)gcc - AR := $(CROSS)ar - RANLIB := $(CROSS)ranlib - --- -1.9.1 - diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0003-libubi.c-add-klibc-specific-fixes.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0003-libubi.c-add-klibc-specific-fixes.patch deleted file mode 100644 index 962b3685f3..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0003-libubi.c-add-klibc-specific-fixes.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 72a39bb3290a79e76b0dbf59eef83ea2d9b577a1 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Sun, 29 Jun 2014 00:40:15 +0200 -Subject: [PATCH 3/6] libubi.c: add klibc specific fixes for ioctl - -First issue is that ioctl() in klibc doesn't expect a constant as arg3. -Second issue is that arg3 in klibc ioctl() implementation is not optional. - -Fixes: - -| ubi-utils/libubi.c: In function 'do_attach': -| ubi-utils/libubi.c:698:8: warning: passing argument 3 of 'ioctl' discards -| 'const' qualifier from pointer target type -| ret = ioctl(fd, UBI_IOCATT, r); -| ^ -| In file included from ubi-utils/libubi.c:32:0: -| .../lib/klibc/include/sys/ioctl.h:15:14: note: expected 'void *' but argument -| is of type 'const struct ubi_attach_req *' -| __extern int ioctl(int, int, void *); -| ^ - -| ubi-utils/libubi.c: In function 'ubi_vol_block_create': -| ubi-utils/libubi.c:1118:9: error: too few arguments to function 'ioctl' -| return ioctl(fd, UBI_IOCVOLCRBLK); -| ^ -| In file included from ubi-utils/libubi.c:32:0: -| .../lib/klibc/include/sys/ioctl.h:15:14: note: declared here -| __extern int ioctl(int, int, void *); -| ^ -| ubi-utils/libubi.c: In function 'ubi_vol_block_remove': -| ubi-utils/libubi.c:1123:9: error: too few arguments to function 'ioctl' -| return ioctl(fd, UBI_IOCVOLRMBLK); -| ^ -| In file included from ubi-utils/libubi.c:32:0: -| .../usr/lib/klibc/include/sys/ioctl.h:15:14: note: declared here -| __extern int ioctl(int, int, void *); -| ^ - -Upstream-Status: Inappropriate [klibc specific] - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - ubi-utils/libubi.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ubi-utils/libubi.c b/ubi-utils/libubi.c -index 1e08b7d..491e525 100644 ---- a/ubi-utils/libubi.c -+++ b/ubi-utils/libubi.c -@@ -687,7 +687,7 @@ void libubi_close(libubi_t desc) - * success and %-1 in case of failure. @r->ubi_num contains newly created UBI - * device number. - */ --static int do_attach(const char *node, const struct ubi_attach_req *r) -+static int do_attach(const char *node, struct ubi_attach_req *r) - { - int fd, ret; - -@@ -1115,12 +1115,12 @@ int ubi_rsvol(libubi_t desc, const char *node, int vol_id, long long bytes) - - int ubi_vol_block_create(int fd) - { -- return ioctl(fd, UBI_IOCVOLCRBLK); -+ return ioctl(fd, UBI_IOCVOLCRBLK, NULL); - } - - int ubi_vol_block_remove(int fd) - { -- return ioctl(fd, UBI_IOCVOLRMBLK); -+ return ioctl(fd, UBI_IOCVOLRMBLK, NULL); - } - - int ubi_update_start(libubi_t desc, int fd, long long bytes) --- -1.9.1 - diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0004-common.h-klibc-fixes-1.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0004-common.h-klibc-fixes-1.patch deleted file mode 100644 index fee1cbcf90..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0004-common.h-klibc-fixes-1.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e56767b9caa02e7c41803499c77dc939d5a7f64a Mon Sep 17 00:00:00 2001 -From: Thorsten Glaser <tg@mirbsd.org> -Date: Fri, 20 Jun 2014 10:56:27 +0000 -Subject: [PATCH 4/6] Restore compatibility to dietlibc, klibc, musl libc after commit 4f1b108 - -Each C library has their own way to define off_t, and the <features.h> -header is nonstandard and specific to the GNU libc and those that clone -it (uClibc). Fefe’s dietlibc uses different flags, and klibc always uses -a 64-bit off_t (like the BSDs); musl libc cannot be recognised using cpp -instructions, so we assume 64 bit there (and on unknown C libraries) and -leave it to the user to submit a follow-up fix if we guess wrong. I also -added a static assertion to verify the 64 bit guess is correct. - -It would be really better using a configure script for this instead. - -Fixes: -| CC lib/libmtd.o -| In file included from ubi-utils/ubiutils-common.c:35:0: -| ./include/common.h:29:22: fatal error: features.h: No such file or directory -| #include <features.h> -| ^ -| compilation terminated. - -Upstream-Status: Pending - -Signed-off-by: Thorsten Glaser <tg@mirbsd.org> -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - include/common.h | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/include/common.h b/include/common.h -index 6895e5c..77f3f7d 100644 ---- a/include/common.h -+++ b/include/common.h -@@ -26,7 +26,9 @@ - #include <string.h> - #include <fcntl.h> - #include <errno.h> -+#if defined(__GLIBC__) || defined(__UCLIBC__) - #include <features.h> -+#endif - #include <inttypes.h> - #include "version.h" - -@@ -52,6 +54,21 @@ extern "C" { - #endif - - /* define a print format specifier for off_t */ -+#if defined(__KLIBC__) -+/* always 64 bit on klibc */ -+#define PRIxoff_t PRIx64 -+#define PRIdoff_t PRId64 -+#elif defined(__dietlibc__) -+/* depends on compiler flags on dietlibc */ -+#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) -+#define PRIxoff_t PRIx64 -+#define PRIdoff_t PRId64 -+#else -+#define PRIxoff_t "l"PRIx32 -+#define PRIdoff_t "l"PRId32 -+#endif -+#elif defined(__GLIBC__) || defined(__UCLIBC__) -+/* depends on compiler flags on glibc and uClibc */ - #ifdef __USE_FILE_OFFSET64 - #define PRIxoff_t PRIx64 - #define PRIdoff_t PRId64 -@@ -59,6 +76,13 @@ extern "C" { - #define PRIxoff_t "l"PRIx32 - #define PRIdoff_t "l"PRId32 - #endif -+#else -+/* unknown libc or musl */ -+#define PRIxoff_t PRIx64 -+#define PRIdoff_t PRId64 -+/* verify our guess of 64 bit is correct */ -+static char __PRIxoff_t_static_assert[sizeof(off_t) == 8 ? 1 : -1]; -+#endif - - /* Verbose messages */ - #define bareverbose(verbose, fmt, ...) do { \ --- -1.9.1 - diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch deleted file mode 100644 index 6b09c14d6c..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8318852ef4f768bed31072aa7b57e11adc1f639c Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Sun, 29 Jun 2014 00:44:03 +0200 -Subject: [PATCH 5/6] common.h: more workarounds for klibc compatibility - -Patch is addressing two issues: -* First, Klibc doesn't have rpmatch(). -* Second, Klibc lacks getline() - -Fixes: -| LD ubi-utils/ubiformat -| .../git/ubi-utils/ubiformat.o: In function `prompt': -| .../git/./include/common.h:157: undefined reference to `getline' -| .../git/./include/common.h:164: undefined reference to `rpmatch' -| .../git/./include/common.h:157: undefined reference to `getline' -| .../git/./include/common.h:164: undefined reference to `rpmatch' - -Upstream-Status: Pending - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - include/common.h | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -Index: git/include/common.h -=================================================================== ---- git.orig/include/common.h -+++ git/include/common.h -@@ -161,15 +161,17 @@ static inline int __rpmatch(const char * - */ - static inline bool prompt(const char *msg, bool def) - { -- char *line = NULL; -- size_t len; -+ char *line; - bool ret = def; - -+ const int sizeof_line = 2; -+ line = malloc(sizeof_line); -+ - do { - normsg_cont("%s (%c/%c) ", msg, def ? 'Y' : 'y', def ? 'n' : 'N'); - fflush(stdout); - -- while (getline(&line, &len, stdin) == -1) { -+ while (fgets(line, sizeof_line, stdin) == NULL) { - printf("failed to read prompt; assuming '%s'\n", - def ? "yes" : "no"); - break; diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0006-libiniparser-remove-unused-function-needing-float.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0006-libiniparser-remove-unused-function-needing-float.patch deleted file mode 100644 index 043a89d67e..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0006-libiniparser-remove-unused-function-needing-float.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 72a04a9b9ed33c889d2e2b86f306c5be9f6cde35 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Sun, 29 Jun 2014 00:44:57 +0200 -Subject: [PATCH 6/6] libiniparser: remove unused function needing float - -Fixes: -| LD ubi-utils/ubiformat -| .../git/ubi-utils/libiniparser.a(libiniparser.o): In function -| ` LD ubi-utils/ubirename -| iniparser_getdouble': -| .../git/ubi-utils/libiniparser.c:336: undefined reference to `atof' - -Grep doesn't reveal any occurrence of iniparser_getdouble(), using atof() so -remove it: floating-point is not supported in klibc - -Upstream-Status: Pending - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - ubi-utils/include/libiniparser.h | 15 --------------- - ubi-utils/libiniparser.c | 22 ---------------------- - 2 files changed, 37 deletions(-) - -diff --git a/ubi-utils/include/libiniparser.h b/ubi-utils/include/libiniparser.h -index be3c667..abd77aa 100644 ---- a/ubi-utils/include/libiniparser.h -+++ b/ubi-utils/include/libiniparser.h -@@ -158,21 +158,6 @@ int iniparser_getint(dictionary * d, const char * key, int notfound); - - /*-------------------------------------------------------------------------*/ - /** -- @brief Get the string associated to a key, convert to a double -- @param d Dictionary to search -- @param key Key string to look for -- @param notfound Value to return in case of error -- @return double -- -- This function queries a dictionary for a key. A key as read from an -- ini file is given as "section:key". If the key cannot be found, -- the notfound value is returned. -- */ --/*--------------------------------------------------------------------------*/ --double iniparser_getdouble(dictionary * d, char * key, double notfound); -- --/*-------------------------------------------------------------------------*/ --/** - @brief Get the string associated to a key, convert to a boolean - @param d Dictionary to search - @param key Key string to look for -diff --git a/ubi-utils/libiniparser.c b/ubi-utils/libiniparser.c -index 898f57f..ba70c08 100644 ---- a/ubi-utils/libiniparser.c -+++ b/ubi-utils/libiniparser.c -@@ -316,28 +316,6 @@ int iniparser_getint(dictionary * d, const char * key, int notfound) - - /*-------------------------------------------------------------------------*/ - /** -- @brief Get the string associated to a key, convert to a double -- @param d Dictionary to search -- @param key Key string to look for -- @param notfound Value to return in case of error -- @return double -- -- This function queries a dictionary for a key. A key as read from an -- ini file is given as "section:key". If the key cannot be found, -- the notfound value is returned. -- */ --/*--------------------------------------------------------------------------*/ --double iniparser_getdouble(dictionary * d, char * key, double notfound) --{ -- char * str ; -- -- str = iniparser_getstring(d, key, INI_INVALID_KEY); -- if (str==INI_INVALID_KEY) return notfound ; -- return atof(str); --} -- --/*-------------------------------------------------------------------------*/ --/** - @brief Get the string associated to a key, convert to a boolean - @param d Dictionary to search - @param key Key string to look for --- -1.9.1 - diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index 518c02fc00..85bc3724c1 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -7,27 +7,30 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -inherit klibc +inherit autotools pkgconfig klibc -SRCREV = "aea36417067dade75192bafa03af70b6eb2677b1" +SRCREV = "bc63d36e39f389c8c17f6a8e9db47f2acc884659" SRC_URI = "git://git.infradead.org/mtd-utils.git \ - file://0001-Makefile-only-build-ubi-utils.patch \ - file://0002-common.mk-for-klibc-CC-is-klcc.patch \ - file://0003-libubi.c-add-klibc-specific-fixes.patch \ - file://0004-common.h-klibc-fixes-1.patch \ - file://0005-common.h-klibc-fixes-2.patch \ - file://0006-libiniparser-remove-unused-function-needing-float.patch \ + file://0001-Add-simple-getline-implementation-to-libmissing.patch \ + file://0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch \ + file://0003-Makefile.am-only-build-ubi-utils.patch \ + file://0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch \ " S = "${WORKDIR}/git/" -EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" +EXTRA_OECONF += "--disable-tests --without-jffs --without-ubifs" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" +PACKAGECONFIG[xattr] = ",,acl," + +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" do_install () { oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} } -PACKAGES = "ubi-utils-klibc-dbg" +PACKAGES = "ubi-utils-klibc-dbg ubi-utils-klibc-doc" PACKAGES =+ "mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubidetach-klibc \ ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \ diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch deleted file mode 100644 index 0ff61e543e..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/kexec/arch/arm/crashdump-arm.c -+++ b/kexec/arch/arm/crashdump-arm.c -@@ -20,7 +20,7 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ --#include <elf.h> -+#include "../../../include/elf.h" - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch deleted file mode 100644 index 35100a3b49..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,7 +46,7 @@ - # where necessary. - CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ - -Iinclude/ --CFLAGS = @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes -+CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes - PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ - ASFLAGS = @ASFLAGS@ - LDFLAGS = @LDFLAGS@ diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch deleted file mode 100644 index ccbb24d0db..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 37737527725e465833be649101c4a6f8352c5d5e Mon Sep 17 00:00:00 2001 -From: Tyler Hall <tylerwhall@gmail.com> -Date: Tue, 7 Feb 2012 18:50:05 -0500 -Subject: Fix out-of-tree build - -Use automatic variables for prerequisites when copying man pages and -include a makefile relative to $(srcdir). - -Backported to 2.0.2-klibc - -Signed-off-by: Tyler Hall <tylerwhall@gmail.com> -Signed-off-by: Simon Horman <horms@verge.net.au> - -diff --git a/kdump/Makefile b/kdump/Makefile -index 1e2b72c..5dfa928 100644 ---- a/kdump/Makefile -+++ b/kdump/Makefile -@@ -22,7 +22,7 @@ $(KDUMP): $(KDUMP_OBJS) - - $(KDUMP_MANPAGE): kdump/kdump.8 - $(MKDIR) -p $(MANDIR)/man8 -- cp kdump/kdump.8 $(KDUMP_MANPAGE) -+ cp $^ $(KDUMP_MANPAGE) - echo:: - @echo "KDUMP_SRCS $(KDUMP_SRCS)" - @echo "KDUMP_DEPS $(KDUMP_DEPS)" -diff --git a/kexec/Makefile b/kexec/Makefile -index 2137cab..8c815b5 100644 ---- a/kexec/Makefile -+++ b/kexec/Makefile -@@ -82,7 +82,7 @@ $(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include - - $(KEXEC_MANPAGE): kexec/kexec.8 - @$(MKDIR) -p $(MANDIR)/man8 -- cp kexec/kexec.8 $(KEXEC_MANPAGE) -+ cp $^ $(KEXEC_MANPAGE) - echo:: - @echo "KEXEC_SRCS $(KEXEC_SRCS)" - @echo "KEXEC_DEPS $(KEXEC_DEPS)" -diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile -index 3dba7cf..41242a5 100644 ---- a/kexec/arch/ppc/Makefile -+++ b/kexec/arch/ppc/Makefile -@@ -1,7 +1,7 @@ - # - # kexec ppc (linux booting linux) - # --include kexec/arch/ppc/libfdt/Makefile.libfdt -+include $(srcdir)/kexec/arch/ppc/libfdt/Makefile.libfdt - - ppc_KEXEC_SRCS = kexec/arch/ppc/kexec-ppc.c - ppc_KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c - - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch deleted file mode 100644 index 7f8cddd354..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kexec/ifdown.c -+++ b/kexec/ifdown.c -@@ -14,7 +14,7 @@ - #include <sys/ioctl.h> - #include <sys/socket.h> - #include <sys/time.h> --#include <sys/errno.h> -+#include <errno.h> - - #include <net/if.h> - #include <netinet/in.h> diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch deleted file mode 100644 index c666afcac6..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/kexec/kexec-elf-rel.c -+++ b/kexec/kexec-elf-rel.c -@@ -4,7 +4,7 @@ - #include <stdio.h> - #include <errno.h> - #include <stdlib.h> --#include "elf.h" -+#include "../include/elf.h" - #include <boot/elf_boot.h> - #include "kexec.h" - #include "kexec-elf.h" - ---- a/kexec/arch/arm/kexec-elf-rel-arm.c -+++ b/kexec/arch/arm/kexec-elf-rel-arm.c -@@ -1,5 +1,5 @@ - #include <stdio.h> --#include <elf.h> -+#include "../../../include/elf.h" - #include "../../kexec.h" - #include "../../kexec-elf.h" - - ---- a/kexec/arch/i386/kexec-elf-rel-x86.c -+++ b/kexec/arch/i386/kexec-elf-rel-x86.c -@@ -1,5 +1,5 @@ - #include <stdio.h> --#include <elf.h> -+#include "../../../include/elf.h" - #include "../../kexec.h" - #include "../../kexec-elf.h" - - ---- a/kexec/arch/ppc/kexec-elf-rel-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-rel-ppc.c -@@ -1,5 +1,5 @@ - #include <stdio.h> --#include <elf.h> -+#include "../../../include/elf.h" - #include "../../kexec.h" - #include "../../kexec-elf.h" - - ---- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -+++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -@@ -1,5 +1,5 @@ - #include <stdio.h> --#include <elf.h> -+#include "../../../include/elf.h" - #include <string.h> - #include "../../kexec.h" - #include "../../kexec-elf.h" - ---- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -@@ -1,5 +1,5 @@ - #include <stdio.h> --#include <elf.h> -+#include "../../../include/elf.h" - #include "../../kexec.h" - #include "../../kexec-elf.h" - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch deleted file mode 100644 index 081de1bb51..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/kexec/kexec-syscall.h -+++ b/kexec/kexec-syscall.h -@@ -2,7 +2,7 @@ - #define KEXEC_SYSCALL_H - - #define __LIBRARY__ --#include <syscall.h> -+/*#include <syscall.h>*/ - #include <sys/syscall.h> - #include <unistd.h> - -@@ -23,6 +23,7 @@ - #define LINUX_REBOOT_CMD_KEXEC 0x45584543 - - #ifndef __NR_kexec_load -+/* - #ifdef __i386__ - #define __NR_kexec_load 283 - #endif -@@ -61,19 +62,21 @@ - #ifndef __NR_kexec_load - #error Unknown processor architecture. Needs a kexec_load syscall number. - #endif -+*/ - #endif /*ifndef __NR_kexec_load*/ - - struct kexec_segment; -- -+/* - static inline long kexec_load(void *entry, unsigned long nr_segments, - struct kexec_segment *segments, unsigned long flags) - { - return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); - } -- -+*/ - static inline long kexec_reboot(void) - { -- return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); -+ //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); -+ return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); - } - - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch deleted file mode 100644 index 56cdfb08d8..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/purgatory/arch/ppc/crt.S -+++ b/purgatory/arch/ppc/crt.S -@@ -249,6 +249,7 @@ - * - */ - -+/* already defined in misc.S - _GLOBAL(__lshrdi3) - subfic 6,5,32 - srw 4,4,5 # LSW = count > 31 ? 0 : LSW >> count -@@ -259,5 +260,7 @@ - srw 3,3,5 # MSW = MSW >> count - or 4,4,7 # LSW |= t2 - blr -+*/ -+ - #endif - #endif diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch deleted file mode 100644 index 41fc1168fb..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/purgatory/Makefile -+++ b/purgatory/Makefile -@@ -47,7 +47,7 @@ - $(PURGATORY): CC=$(TARGET_CC) - $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ - $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ -- -Os -fno-builtin -ffreestanding -+ -Os -fno-builtin -ffreestanding -nostdinc - - $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ - -I$(srcdir)/purgatory/include \ -@@ -61,7 +61,8 @@ - - $(PURGATORY): $(PURGATORY_OBJS) - $(MKDIR) -p $(@D) -- $(CC) $(LDFLAGS) -o $@ $^ -+# $(CC) $(LDFLAGS) -o $@ $^ -+ $(LD) $(LDFLAGS) -o $@ $^ - - # $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch deleted file mode 100644 index 5710561b16..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/purgatory/string.c -+++ b/purgatory/string.c -@@ -1,5 +1,5 @@ - #include <stddef.h> --#include <string.h> -+/* #include <string.h> */ - - size_t strnlen(const char *s, size_t max) - { diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch deleted file mode 100644 index 85bf7aa4f4..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/util_lib/include/sha256.h -+++ b/util_lib/include/sha256.h -@@ -1,7 +1,8 @@ - #ifndef SHA256_H - #define SHA256_H - --#include <sys/types.h> -+//#include <sys/types.h> -+#include <stddef.h> - #include <stdint.h> - - typedef struct - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch deleted file mode 100644 index 04a97e6bc8..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/kexec/crashdump-elf.c -+++ b/kexec/crashdump-elf.c -@@ -47,7 +47,8 @@ - if (xen_present()) - nr_cpus = xen_get_nr_phys_cpus(); - else -- nr_cpus = sysconf(_SC_NPROCESSORS_CONF); -+ /*nr_cpus = sysconf(_SC_NPROCESSORS_CONF);*/ -+ nr_cpus = 1; - - if (nr_cpus < 0) { - return -1; - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch deleted file mode 100644 index 77a1c01a1c..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/kexec/arch/i386/x86-linux-setup.c -+++ b/kexec/arch/i386/x86-linux-setup.c -@@ -280,9 +280,9 @@ static int add_edd_entry(struct x86_linu - memset(edd_info, 0, sizeof(struct edd_info)); - - /* extract the device number */ -- if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) { -+ if (sscanf(strrchr(sysfs_name,'/') + 1, "int13_dev%hhx", &devnum) != 1) { - fprintf(stderr, "Invalid format of int13_dev dir " -- "entry: %s\n", basename(sysfs_name)); -+ "entry: %s\n", strrchr(sysfs_name,'/') + 1); - return -1; - } - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch deleted file mode 100644 index 9500bd6048..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -106,8 +106,8 @@ - - MAN_PAGES:= kexec/kexec.8 - MAN_PAGES+= kdump/kdump.8 --BINARIES_i386:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test --BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test -+BINARIES_i386:= $(SBINDIR)/kexec -+BINARIES_x86_64:=$(SBINDIR)/kexec - BINARIES:=$(SBINDIR)/kexec $(SBINDIR)/kdump $(BINARIES_$(ARCH)) - - TARGETS:=$(BINARIES) $(MAN_PAGES) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch deleted file mode 100644 index a497c9a63d..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/purgatory/arch/i386/pic.c -+++ b/purgatory/arch/i386/pic.c -@@ -16,7 +16,7 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ --#include <sys/io.h> -+#include "include/arch/io.h" - #include <purgatory.h> - #include "purgatory-x86.h" - - ---- a/purgatory/arch/i386/vga.c -+++ b/purgatory/arch/i386/vga.c -@@ -1,4 +1,4 @@ --#include <sys/io.h> -+#include "include/arch/io.h" - #include <purgatory.h> - #include "purgatory-x86.h" - - diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch deleted file mode 100644 index cad6951547..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/kexec/arch/i386/x86-linux-setup.c -+++ b/kexec/arch/i386/x86-linux-setup.c -@@ -176,6 +176,8 @@ static int file_scanf(const char *dir, c - FILE *fp; - int retno; - char filename[PATH_MAX]; -+ long line_size = MAX_LINE; -+ char *line; - - snprintf(filename, PATH_MAX, "%s/%s", dir, file); - filename[PATH_MAX-1] = 0; -@@ -186,7 +188,14 @@ static int file_scanf(const char *dir, c - } - - va_start(argptr, scanf_line); -- retno = vfscanf(fp, scanf_line, argptr); -+ -+ line = xmalloc(sizeof(line) * line_size); -+ while(fgets(line, sizeof(line), fp) != NULL ) { -+ line_size += MAX_LINE; -+ line = xrealloc(line,line_size); -+ } -+ retno = vsscanf(line, scanf_line, argptr); -+ - va_end(argptr); - - fclose(fp); diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch new file mode 100644 index 0000000000..4744e7a35b --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch @@ -0,0 +1,25 @@ +From d6af515cfcc8185f423860f80ff28719975b701f Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:00 +0200 +Subject: [PATCH] force static build + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 54c206f..79188d8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -47,7 +47,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@ + # where necessary. + CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ + -Iinclude/ $($(ARCH)_CPPFLAGS) +-CFLAGS = @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes ++CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes + PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ + ASFLAGS = @ASFLAGS@ $($(ARCH)_ASFLAGS) + LDFLAGS = @LDFLAGS@ diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch index a7600b3010..1d96a2b3db 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch @@ -1,30 +1,29 @@ -From 86b962e7c0de43b20b6210d059e4855ce87078bc Mon Sep 17 00:00:00 2001 +From 0976d2d5be1ed44c2324b609c7d16c1e93181c4b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 13 Jul 2017 16:20:08 -0700 Subject: [PATCH] Adjust the order of headers to fix build for musl Fixes -kexec/ifdown.c:33:16: error: storage size of 'ifc' isn't known + kexec/ifdown.c:33:16: error: storage size of 'ifc' isn't known +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- kexec/ifdown.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kexec/ifdown.c b/kexec/ifdown.c -index 2215798..e13f777 100644 +index 9679ad7..82c6141 100644 --- a/kexec/ifdown.c +++ b/kexec/ifdown.c @@ -16,8 +16,8 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; + #include <sys/socket.h> #include <sys/time.h> - #include <errno.h> -#include <net/if.h> #include <netinet/in.h> +#include <net/if.h> - #define MAX_IFS 64 - --- -2.13.2 - + /* + * First, we find all shaper devices and down them. Then we diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch new file mode 100644 index 0000000000..ae9e7bbc48 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch @@ -0,0 +1,92 @@ +From 7f91875d65778154709e4fa0ccb23f3b2a98b0dc Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:00 +0200 +Subject: [PATCH] kexec-elf-rel: use our elf.h + +Fix: + + kexec-elf-rel.c: In function 'elf_rel_load': + kexec-elf-rel.c:386:39: error: 'STT_NOTYPE' undeclared + +and similar. + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/arch/arm/kexec-elf-rel-arm.c | 2 +- + kexec/arch/i386/kexec-elf-rel-x86.c | 2 +- + kexec/arch/ppc/kexec-elf-rel-ppc.c | 2 +- + kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 2 +- + kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 2 +- + kexec/kexec-elf-rel.c | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/kexec/arch/arm/kexec-elf-rel-arm.c b/kexec/arch/arm/kexec-elf-rel-arm.c +index a939cf4..2551dc0 100644 +--- a/kexec/arch/arm/kexec-elf-rel-arm.c ++++ b/kexec/arch/arm/kexec-elf-rel-arm.c +@@ -1,5 +1,5 @@ + #include <stdio.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include "../../kexec.h" + #include "../../kexec-elf.h" + +diff --git a/kexec/arch/i386/kexec-elf-rel-x86.c b/kexec/arch/i386/kexec-elf-rel-x86.c +index 55a214e..e7583d1 100644 +--- a/kexec/arch/i386/kexec-elf-rel-x86.c ++++ b/kexec/arch/i386/kexec-elf-rel-x86.c +@@ -1,5 +1,5 @@ + #include <stdio.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include "../../kexec.h" + #include "../../kexec-elf.h" + +diff --git a/kexec/arch/ppc/kexec-elf-rel-ppc.c b/kexec/arch/ppc/kexec-elf-rel-ppc.c +index 1acbd86..a60c66c 100644 +--- a/kexec/arch/ppc/kexec-elf-rel-ppc.c ++++ b/kexec/arch/ppc/kexec-elf-rel-ppc.c +@@ -1,5 +1,5 @@ + #include <stdio.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include "../../kexec.h" + #include "../../kexec-elf.h" + +diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c +index 5f8e3f2..765bf6e 100644 +--- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c ++++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c +@@ -1,5 +1,5 @@ + #include <stdio.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include <string.h> + #include "../../kexec.h" + #include "../../kexec-elf.h" +diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +index 7fdde73..cd5d729 100644 +--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c ++++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +@@ -1,5 +1,5 @@ + #include <stdio.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include "../../kexec.h" + #include "../../kexec-elf.h" + +diff --git a/kexec/kexec-elf-rel.c b/kexec/kexec-elf-rel.c +index 9a6e63d..a856636 100644 +--- a/kexec/kexec-elf-rel.c ++++ b/kexec/kexec-elf-rel.c +@@ -4,7 +4,7 @@ + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> +-#include "elf.h" ++#include "../include/elf.h" + #include <boot/elf_boot.h> + #include "kexec.h" + #include "kexec-elf.h" diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch new file mode 100644 index 0000000000..1080e8bb56 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch @@ -0,0 +1,30 @@ +From 8b9da93ac9a4ea79ae953f80f6fe6e4f080341f2 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 17 Apr 2018 10:57:23 +0200 +Subject: [PATCH] kexec-elf-exec.c: replace with our elf.h + +Fix + + kexec-elf-exec.c: In function 'elf_exec_load': + error: 'EM_AARCH64' undeclared + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/kexec-elf-exec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/kexec-elf-exec.c b/kexec/kexec-elf-exec.c +index a9329ac..0dd0700 100644 +--- a/kexec/kexec-elf-exec.c ++++ b/kexec/kexec-elf-exec.c +@@ -4,7 +4,7 @@ + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> +-#include "elf.h" ++#include "../include/elf.h" + #include <boot/elf_boot.h> + #include "kexec.h" + #include "kexec-elf.h" diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch new file mode 100644 index 0000000000..4f7506d44c --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch @@ -0,0 +1,134 @@ +From 1cfee75d9662c3382bb7cb8f1c952333837598ae Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Wed, 18 Apr 2018 02:21:30 +0200 +Subject: [PATCH] crashdump-elf.c: work around for _SC_NPROCESSORS_CONF + +klibc sysconf lacks this so the implementation +of Linus Torvalds was taken (simplified): + +https://sourceware.org/ml/libc-alpha/2011-06/msg00079.html + +Have fun reding the thread! + +Fix + + crashdump-elf.c:117:21: error: '_SC_NPROCESSORS_CONF' undeclared + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/crashdump-elf.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c +index b8bb686..7e6767c 100644 +--- a/kexec/crashdump-elf.c ++++ b/kexec/crashdump-elf.c +@@ -25,6 +25,94 @@ do { \ + } while(0) + #endif + ++#ifdef __KLIBC__ ++#ifndef KLIBC_SYSFS_CPU_H ++#define KLIBC_SYSFS_CPU_H ++ ++ ++static int __get_sysfs_cpus(const char *path); ++int __get_nprocs (void); ++int __get_nprocs_conf (void); ++ ++ ++ ++static int __get_sysfs_cpus(const char *path) ++{ ++ FILE *file; ++ int nr_cpus = 0; ++ int prev = -1; ++ char *p; ++ char line[10]; ++ ++ ++ file = fopen(path, "r"); ++ if (!file) ++ return -1; ++ for (;;) { ++ char sep; ++ int cpu; ++ int n; ++ ++ /* int n = fscanf(file, "%u%c", &cpu, &sep); */ ++ p = fgets(line, sizeof(line), file); ++ if (p == NULL) ++ return -1; ++ else ++ n = sscanf(line, "%u%c", &cpu, &sep); ++ ++ if (n <= 0) ++ break; ++ ++ /* EOF == EOLN */ ++ if (n == 1) ++ sep = '\n'; ++ ++ /* Was the previous CPU a range? */ ++ if (prev >= 0) { ++ nr_cpus += cpu - prev + 1; ++ prev = -1; ++ } else if (sep == '-') ++ prev = cpu; ++ else ++ nr_cpus++; ++ ++ if (sep == '\n') ++ break; ++ } ++ fclose(file); ++ return nr_cpus; ++} ++ ++int __get_nprocs () ++{ ++ long ret; ++ static int cached = -1; ++ ++ ret = cached; ++ if (ret < 0) ++ { ++ ret = __get_sysfs_cpus("/sys/devices/system/cpu/online"); ++ cached = ret; ++ } ++ return ret; ++} ++ ++int __get_nprocs_conf () ++{ ++ long ret; ++ static int cached = -1; ++ ++ ret = cached; ++ if (ret < 0) ++ { ++ ret = __get_sysfs_cpus("/sys/devices/system/cpu/possible"); ++ cached = ret; ++ } ++ return ret; ++} ++#endif ++#endif ++ + /* Prepares the crash memory headers and stores in supplied buffer. */ + int FUNC(struct kexec_info *info, + struct crash_elf_info *elf_info, +@@ -46,7 +134,11 @@ int FUNC(struct kexec_info *info, + if (xen_present()) + nr_cpus = xen_get_nr_phys_cpus(); + else ++#ifndef __KLIBC__ + nr_cpus = sysconf(_SC_NPROCESSORS_CONF); ++#else ++ nr_cpus = __get_nprocs_conf(); ++#endif + + if (nr_cpus < 0) { + return -1; diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch new file mode 100644 index 0000000000..4a8968bcc6 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch @@ -0,0 +1,49 @@ +From e6aa1f18dc44dc71be3ceada2a96383d22454399 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 19 Apr 2018 00:25:01 +0200 +Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper + +Fix + + kexec-syscall.h: In function 'kexec_load': + kexec-syscall.h:80:16: warning: implicit declaration of function 'syscall' + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/kexec-syscall.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h +index 33638c2..6b633e4 100644 +--- a/kexec/kexec-syscall.h ++++ b/kexec/kexec-syscall.h +@@ -77,7 +77,11 @@ struct kexec_segment; + static inline long kexec_load(void *entry, unsigned long nr_segments, + struct kexec_segment *segments, unsigned long flags) + { ++#ifndef __KLIBC__ + return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); ++#else ++ return (long) kexec_load(entry, nr_segments, segments, flags); ++#endif + } + + static inline int is_kexec_file_load_implemented(void) { +@@ -90,8 +94,12 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, + unsigned long cmdline_len, const char *cmdline_ptr, + unsigned long flags) + { ++#ifndef __KLIBC__ + return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, + cmdline_len, cmdline_ptr, flags); ++#else ++ return -1; ++#endif + } + + #define KEXEC_ON_CRASH 0x00000001 +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch new file mode 100644 index 0000000000..3d44683936 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch @@ -0,0 +1,37 @@ +From e6bd7a1bcfbd3e54efc81fbd7d60d915f9af0632 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 17 Apr 2018 11:35:14 +0200 +Subject: [PATCH] kexec.c: add guard around ENOTSUP + +Fix + + kexec.c: In function 'main': + kexec.c:1515:11: error: 'ENOTSUP' undeclared + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/kexec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/kexec/kexec.c b/kexec/kexec.c +index 313d9fe..b5a8a1e 100644 +--- a/kexec/kexec.c ++++ b/kexec/kexec.c +@@ -1501,6 +1501,7 @@ int main(int argc, char *argv[]) + */ + case -EINVAL: + case -ENOEXEC: ++#ifndef __KLIBC__ + /* + * ENOTSUP can be unsupported image + * type or unsupported PE signature +@@ -1513,6 +1514,7 @@ int main(int argc, char *argv[]) + * kernel bug + */ + case -ENOTSUP: ++#endif + do_kexec_file_syscall = 0; + break; + } diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch new file mode 100644 index 0000000000..cfc51cf7f3 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch @@ -0,0 +1,32 @@ +From 12c7b09c3152f2b3475d081691a26bd1a5633256 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 17 Apr 2018 11:38:42 +0200 +Subject: [PATCH] kexec.c: replace missing BLKGETSIZE64 + +Fix + + kexec.c: In function 'slurp_file_generic': + kexec.c:564:19: error: 'BLKGETSIZE64' undeclared + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/kexec.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kexec/kexec.c b/kexec/kexec.c +index b5a8a1e..7842f8b 100644 +--- a/kexec/kexec.c ++++ b/kexec/kexec.c +@@ -54,6 +54,10 @@ + #define KEXEC_LOADED_PATH "/sys/kernel/kexec_loaded" + #define KEXEC_CRASH_LOADED_PATH "/sys/kernel/kexec_crash_loaded" + ++#ifndef BLKGETSIZE64 ++#define BLKGETSIZE64 _IOR(0x12,114,size_t) ++#endif ++ + unsigned long long mem_min = 0; + unsigned long long mem_max = ULONG_MAX; + static unsigned long kexec_flags = 0; diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch new file mode 100644 index 0000000000..df980b118e --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch @@ -0,0 +1,57 @@ +From ad598a71ffff6f86462211f252ac0c7b5de53869 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 17 Apr 2018 13:14:12 +0200 +Subject: [PATCH] vmcore-dmesg.c: work around missing imaxdiv() + +Convert to integer arithmetic for klibc. + +Fix + + vmcore-dmesg.c: In function 'dump_dmesg_structured': + vmcore-dmesg.c:578:2: error: unknown type name 'imaxdiv_t' + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + vmcore-dmesg/vmcore-dmesg.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c +index e340ef4..1b27b71 100644 +--- a/vmcore-dmesg/vmcore-dmesg.c ++++ b/vmcore-dmesg/vmcore-dmesg.c +@@ -575,8 +575,11 @@ static void dump_dmesg_structured(int fd) + ssize_t ret; + char *msg; + uint16_t text_len; ++#ifndef __KLIBC__ + imaxdiv_t imaxdiv_sec, imaxdiv_usec; +- ++#else ++ int64_t imaxdiv_sec, imaxdiv_usec; ++#endif + if (!log_buf_vaddr) { + fprintf(stderr, "Missing the log_buf symbol\n"); + exit(60); +@@ -645,12 +648,20 @@ static void dump_dmesg_structured(int fd) + exit(65); + } + ts_nsec = struct_val_u64(buf, log_offset_ts_nsec); ++#ifndef __KLIBC__ + imaxdiv_sec = imaxdiv(ts_nsec, 1000000000); + imaxdiv_usec = imaxdiv(imaxdiv_sec.rem, 1000); + + len += sprintf(out_buf + len, "[%5llu.%06llu] ", + (long long unsigned int)imaxdiv_sec.quot, + (long long unsigned int)imaxdiv_usec.quot); ++#else ++ imaxdiv_sec = ts_nsec / 1000000000; ++ imaxdiv_usec = (ts_nsec % 1000000000) / 1000; ++ len += sprintf(out_buf + len, "[%5llu.%06llu] ", ++ (long long unsigned int)imaxdiv_sec, ++ (long long unsigned int)imaxdiv_usec); ++#endif + + /* escape non-printable characters */ + text_len = struct_val_u16(buf, log_offset_text_len); diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch new file mode 100644 index 0000000000..cff1485e5e --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch @@ -0,0 +1,47 @@ +From edefda702d906d472ee7a675f6b506d5cfca7ac8 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 17 Apr 2018 13:48:25 +0200 +Subject: [PATCH] fs2dt.c: work around missing getline() + +This simple case can be rewrtten with fgets() + +Fix + + fs2dt.c: In function 'dt_copy_old_root_param': + fs2dt.c:541:6: warning: implicit declaration of function 'getline' + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/fs2dt.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c +index 07a5e2f..d635636 100644 +--- a/kexec/fs2dt.c ++++ b/kexec/fs2dt.c +@@ -531,6 +531,9 @@ static void dt_copy_old_root_param(void) + char *last_cmdline = NULL; + char *p, *old_param; + size_t len = 0; ++#ifdef __KLIBC__ ++ char buf[512]; ++#endif + + strcpy(filename, pathname); + strcat(filename, "bootargs"); +@@ -538,8 +541,13 @@ static void dt_copy_old_root_param(void) + if (!fp) + return; + ++#ifndef __KLIBC__ + if (getline(&last_cmdline, &len, fp) == -1) + die("unable to read %s\n", filename); ++#else ++ last_cmdline = fgets(buf, 200, fp); ++ last_cmdline[strlen(last_cmdline) - 1] = '\0'; ++#endif + + p = strstr(last_cmdline, "root="); + if (p) { diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch new file mode 100644 index 0000000000..0ae2be77de --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch @@ -0,0 +1,43 @@ +From fa3844ce6ce95f2db142b6c77f077b3e704d4f6f Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 17 Apr 2018 19:12:14 +0200 +Subject: [PATCH] purgatory Makefile: adapt to klcc + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + purgatory/Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/purgatory/Makefile b/purgatory/Makefile +index 49ce80a..da36075 100644 +--- a/purgatory/Makefile ++++ b/purgatory/Makefile +@@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c + $(PURGATORY): CC=$(TARGET_CC) + $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ + $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +- -Os -fno-builtin -ffreestanding \ ++ -Os -fno-builtin -ffreestanding -nostdinc \ + -fno-zero-initialized-in-bss \ + -fno-PIC -fno-PIE -fno-stack-protector + +@@ -59,13 +59,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -Iinclude \ + -I$(shell $(CC) -print-file-name=include) + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ +- -Wl,--no-undefined -nostartfiles -nostdlib \ ++ --no-undefined -nostartfiles -nostdlib \ + -nodefaultlibs -e purgatory_start -r \ +- -Wl,-Map=$(PURGATORY_MAP) ++ -Map=$(PURGATORY_MAP) + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@.sym $^ ++# $(CC) $(CFLAGS) -o $@.sym $^ ++ $(LD) $(LDFLAGS) -o $@.sym $^ + # $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) + $(STRIP) --strip-debug -o $@ $@.sym + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch new file mode 100644 index 0000000000..20934da898 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch @@ -0,0 +1,31 @@ +From 2d2ad16f9328a7cbb3f5b8479ae93eb923a0727f Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 19 Apr 2018 00:28:14 +0200 +Subject: [PATCH] purgatory/string.c: avoid inclusion of string.h + +Fix + + purgatory/string.c:39:5: error: conflicting types for 'memcmp' + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + purgatory/string.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/purgatory/string.c b/purgatory/string.c +index f06c460..c5e978a 100644 +--- a/purgatory/string.c ++++ b/purgatory/string.c +@@ -1,5 +1,7 @@ + #include <stddef.h> ++#ifndef __KLIBC__ + #include <string.h> ++#endif + + size_t strnlen(const char *s, size_t max) + { +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch new file mode 100644 index 0000000000..5d1664f76b --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch @@ -0,0 +1,36 @@ +From ec6000b9f287e62cb0746e26cfa4372c7ea528f4 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 19 Apr 2018 23:26:43 +0200 +Subject: [PATCH] sha256.h: avoid inclusion of sys/types.h + +Fix + + purgatory/printf.c:2:10: fatal error: limits.h: + No such file or directory + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + util_lib/include/sha256.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/util_lib/include/sha256.h b/util_lib/include/sha256.h +index 467fb22..40fd3ed 100644 +--- a/util_lib/include/sha256.h ++++ b/util_lib/include/sha256.h +@@ -1,7 +1,11 @@ + #ifndef SHA256_H + #define SHA256_H + ++#ifndef __KLIBC__ + #include <sys/types.h> ++#else ++#include <stddef.h> ++#endif + #include <stdint.h> + + typedef struct +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch new file mode 100644 index 0000000000..ad21266987 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch @@ -0,0 +1,152 @@ +From b15e9610b4ab52c381e712241d50dea96d50d873 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Wed, 2 May 2018 23:14:19 +0200 +Subject: [PATCH 14/14] add if_nameindex from musl + +Taken from musl, minimal changes. +klibc lacks struct and func + +Fix + + ifdown.o: In function `ifdown': + ifdown.c (.text+0x30): undefined reference to `if_nameindex' + +While there add klibc-specific guard and include sys/types.h +to fix : + + /kexec/if_nameindex.c:2: + /usr/lib/klibc/include/linux/types.h:22:0: + warning: "__bitwise" redefined + #define __bitwise __bitwise__ + +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> +--- + kexec/Makefile | 2 +- + kexec/if_nameindex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + kexec/if_nameindex.h | 15 ++++++++++++ + kexec/ifdown.c | 3 +++ + 4 files changed, 83 insertions(+), 1 deletion(-) + create mode 100644 kexec/if_nameindex.c + create mode 100644 kexec/if_nameindex.h + +diff --git a/kexec/Makefile b/kexec/Makefile +index 4db84d8..fb7520b 100644 +--- a/kexec/Makefile ++++ b/kexec/Makefile +@@ -11,7 +11,7 @@ KEXEC_SRCS = $(KEXEC_SRCS_base) + KEXEC_GENERATED_SRCS = + + KEXEC_SRCS_base += kexec/kexec.c +-KEXEC_SRCS_base += kexec/ifdown.c ++KEXEC_SRCS_base += kexec/if_nameindex kexec/ifdown.c + KEXEC_SRCS_base += kexec/kexec-elf.c + KEXEC_SRCS_base += kexec/kexec-elf-exec.c + KEXEC_SRCS_base += kexec/kexec-elf-core.c +diff --git a/kexec/if_nameindex.c b/kexec/if_nameindex.c +new file mode 100644 +index 0000000..e586e41 +--- /dev/null ++++ b/kexec/if_nameindex.c +@@ -0,0 +1,64 @@ ++#define _GNU_SOURCE ++#ifdef __KLIBC__ ++#include <sys/types.h> ++#endif ++#include <netinet/in.h> ++#include <net/if.h> ++#include <stdlib.h> ++#include <sys/socket.h> ++#include <sys/ioctl.h> ++#include <errno.h> ++#include <sys/syscall.h> ++#include <stdio.h> ++#ifdef __KLIBC__ ++#include "if_nameindex.h" ++#endif ++ ++static void *do_nameindex(int s, size_t n) ++{ ++ size_t i, len, k; ++ struct ifconf conf; ++ struct if_nameindex *idx; ++ ++ idx = malloc(n * (sizeof(struct if_nameindex)+sizeof(struct ifreq))); ++ if (!idx) return 0; ++ ++ conf.ifc_buf = (void *)&idx[n]; ++ conf.ifc_len = len = n * sizeof(struct ifreq); ++ if (ioctl(s, SIOCGIFCONF, &conf) < 0) { ++ free(idx); ++ return 0; ++ } ++ if (conf.ifc_len == len) { ++ free(idx); ++ return (void *)-1; ++ } ++ ++ n = conf.ifc_len / sizeof(struct ifreq); ++ for (i=k=0; i<n; i++) { ++ if (ioctl(s, SIOCGIFINDEX, &conf.ifc_req[i]) < 0) { ++ k++; ++ continue; ++ } ++ idx[i-k].if_index = conf.ifc_req[i].ifr_ifindex; ++ idx[i-k].if_name = conf.ifc_req[i].ifr_name; ++ } ++ idx[i-k].if_name = 0; ++ idx[i-k].if_index = 0; ++ ++ return idx; ++} ++ ++struct if_nameindex *if_nameindex() ++{ ++ size_t n; ++ void *p = 0; ++ int s = socket(AF_UNIX, SOCK_DGRAM, 0); ++ if (s>=0) { ++ for (n=0; (p=do_nameindex(s, n)) == (void *)-1; n++); ++/* __syscall(SYS_close, s); */ ++ close(s); ++ } ++ errno = ENOBUFS; ++ return p; ++} +diff --git a/kexec/if_nameindex.h b/kexec/if_nameindex.h +new file mode 100644 +index 0000000..1725fbd +--- /dev/null ++++ b/kexec/if_nameindex.h +@@ -0,0 +1,15 @@ ++#ifndef _NET_IF__NAMEINDEX_H ++#define _NET_IF_NAMEINDEX_H ++ ++struct if_nameindex ++{ ++ unsigned int if_index; ++ char *if_name; ++}; ++ ++unsigned int if_nametoindex (const char *); ++char *if_indextoname (unsigned int, char *); ++struct if_nameindex *if_nameindex (void); ++void if_freenameindex (struct if_nameindex *); ++ ++#endif +diff --git a/kexec/ifdown.c b/kexec/ifdown.c +index 82c6141..cc3ca9f 100644 +--- a/kexec/ifdown.c ++++ b/kexec/ifdown.c +@@ -18,6 +18,9 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; + + #include <netinet/in.h> + #include <net/if.h> ++#ifdef __KLIBC__ ++#include "if_nameindex.h" ++#endif + + /* + * First, we find all shaper devices and down them. Then we +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch new file mode 100644 index 0000000000..0b88b94c6e --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch @@ -0,0 +1,29 @@ +From 3294266c6a875c5009065c1ae5d0b86200c4147c Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Sun, 29 Apr 2018 00:52:31 +0200 +Subject: [PATCH 6/6] vmcore-dmesg: fix warning + + # define __bitwise + +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> +--- + vmcore-dmesg/vmcore-dmesg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c +index e340ef4..91e4789 100644 +--- a/vmcore-dmesg/vmcore-dmesg.c ++++ b/vmcore-dmesg/vmcore-dmesg.c +@@ -2,6 +2,9 @@ + #define _GNU_SOURCE + #define _LARGEFILE_SOURCE 1 + #define _FILE_OFFSET_BITS 64 ++#ifdef __KLIBC__ ++#include <sys/types.h> ++#endif + #include <endian.h> + #include <byteswap.h> + #include <stdio.h> +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch new file mode 100644 index 0000000000..24be4dd76d --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch @@ -0,0 +1,34 @@ +From 6f69f489a442b3a192e4c08748ee8c4d31c75dae Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Sun, 29 Apr 2018 00:46:16 +0200 +Subject: [PATCH 5/6] arm64: crashdump-arm64.c: fix warning + + from ../git/kexec/kexec.h:6, + from ../git/kexec/arch/arm64/crashdump-arm64.c:18: +/tmp/build/tmp-musl/work/aarch64-oe-linux-musl/kexec-tools-klibc/0.6+gitAUTOINC+ +0481e9ed61-r0/recipe-sysroot/usr/lib/klibc/include/klibc/compiler.h:144:0: warni +ng: "__bitwise" redefined + # define __bitwise + +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> +--- + kexec/arch/arm64/crashdump-arm64.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c +index 4fd7aa8..890d88f 100644 +--- a/kexec/arch/arm64/crashdump-arm64.c ++++ b/kexec/arch/arm64/crashdump-arm64.c +@@ -13,6 +13,9 @@ + #define _GNU_SOURCE + + #include <errno.h> ++#ifdef __KLIBC__ ++#include <sys/types.h> ++#endif + #include <linux/elf.h> + + #include "kexec.h" +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch new file mode 100644 index 0000000000..7decbac4fb --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch @@ -0,0 +1,40 @@ +From af7d06a753a4c377b7ffe587da67a6ba56048bea Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 19 Apr 2018 10:47:17 +0200 +Subject: [PATCH 2/2] kexec/arm64: image-header.h: add macro for le64toh + +Fix + + kexec-arm64.c:(.text+0x370): undefined reference to `le64toh' + kexec-arm64.c:(.text+0x380): undefined reference to `le64toh' + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/arch/arm64/image-header.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/kexec/arch/arm64/image-header.h b/kexec/arch/arm64/image-header.h +index 158d411..10ed2d6 100644 +--- a/kexec/arch/arm64/image-header.h ++++ b/kexec/arch/arm64/image-header.h +@@ -8,6 +8,15 @@ + #include <endian.h> + #include <stdint.h> + ++#ifdef __KLIBC__ ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++#define le64toh(x) (x) ++#endif ++#if __BYTE_ORDER == __BIG_ENDIAN ++#define le64toh(x) __bswap_64(x) ++#endif ++#endif ++ + /** + * struct arm64_image_header - arm64 kernel image header. + * +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch new file mode 100644 index 0000000000..f87f4334d7 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch @@ -0,0 +1,51 @@ +From 1ceca8645dbe2780e1b8993c80de772993fe3053 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 19 Apr 2018 10:43:34 +0200 +Subject: [PATCH 1/2] purgatory/arm64: Makefile: remove unknown flags for arm64 + +Fix + + | aarch64-oe-linux-musl-ld: unrecognised emulation mode: cmodel=large + | Supported emulations: aarch64linux aarch64elf aarch64elf32 + aarch64elf32b aarch64elfb armelf armelfb aarch64linuxb aarch64linux32 + aarch64linux32b armelfb_linux_eabi armelf_linux_eabi + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + purgatory/arch/arm64/Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile +index 636abea..ddc9461 100644 +--- a/purgatory/arch/arm64/Makefile ++++ b/purgatory/arch/arm64/Makefile +@@ -1,13 +1,13 @@ + +-arm64_PURGATORY_EXTRA_CFLAGS = \ +- -mcmodel=large \ +- -fno-PIC \ +- -fno-stack-protector \ +- -fno-asynchronous-unwind-tables \ +- -Wundef \ +- -Werror-implicit-function-declaration \ +- -Wdeclaration-after-statement \ +- -Werror=implicit-int \ +- -Werror=strict-prototypes ++#arm64_PURGATORY_EXTRA_CFLAGS = \ ++# -mcmodel=large \ ++# -fno-PIC \ ++# -fno-stack-protector \ ++# -fno-asynchronous-unwind-tables \ ++# -Wundef \ ++# -Werror-implicit-function-declaration \ ++# -Wdeclaration-after-statement \ ++# -Werror=implicit-int \ ++# -Werror=strict-prototypes + + arm64_PURGATORY_SRCS += \ + purgatory/arch/arm64/entry.S \ +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch new file mode 100644 index 0000000000..95962636e5 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch @@ -0,0 +1,31 @@ +From 6dae4752a53973c152b3e91e8a4ca74a486dae8b Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:00 +0200 +Subject: [PATCH] use our elf.h header + +Fix + + kexec/arch/arm/crashdump-arm.c:70:13: error: 'EM_ARM' undeclared here + (not in a function); did you mean 'EM_860'? + .machine = EM_ARM, + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/arch/arm/crashdump-arm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c +index daa4788..2530b29 100644 +--- a/kexec/arch/arm/crashdump-arm.c ++++ b/kexec/arch/arm/crashdump-arm.c +@@ -21,7 +21,7 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + #include <limits.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch new file mode 100644 index 0000000000..c3b2071bcd --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch @@ -0,0 +1,34 @@ +From 709dfe457c07aa0275f3da14634cbce5cf1029dc Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Thu, 19 Apr 2018 19:26:53 +0200 +Subject: [PATCH 3/3] powerpc/purgatory: Makefile: remove unknown flags for + powerpc + +Fix + + powerpc-oe-linux-musl-ld: unrecognised emulation mode: soft-float + Supported emulations: elf32ppclinux elf32ppc elf32ppcsim elf32lppclinux + elf32lppc elf32lppcsim elf64ppc elf64lppc + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> +--- + purgatory/arch/ppc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/purgatory/arch/ppc/Makefile b/purgatory/arch/ppc/Makefile +index c85c58a..cd44a16 100644 +--- a/purgatory/arch/ppc/Makefile ++++ b/purgatory/arch/ppc/Makefile +@@ -7,7 +7,7 @@ ppc_PURGATORY_SRCS += purgatory/arch/ppc/misc.S + ppc_PURGATORY_SRCS += purgatory/arch/ppc/purgatory-ppc.c + ppc_PURGATORY_SRCS += purgatory/arch/ppc/console-ppc.c + +-ppc_PURGATORY_EXTRA_CFLAGS += -msoft-float ++#ppc_PURGATORY_EXTRA_CFLAGS += -msoft-float + + dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS) \ + purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch new file mode 100644 index 0000000000..f1db75741a --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch @@ -0,0 +1,33 @@ +From 9453599fd833794fb5d87cab2622de286144ed54 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Wed, 18 Apr 2018 22:30:17 +0200 +Subject: [PATCH 6/6] purgatory: Makefile: remove unknown flags + +Fix + + x86_64-oe-linux-musl-ld: unrecognised emulation mode: cmodel=large + Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu + i386linux elf_l1om elf_k1om + ../kexec-tools-2.0.17-rc1/purgatory/Makefile:67: + recipe for target 'purgatory/purgatory.ro' failed + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + purgatory/arch/x86_64/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile +index 7300937..38f0bf3 100644 +--- a/purgatory/arch/x86_64/Makefile ++++ b/purgatory/arch/x86_64/Makefile +@@ -23,4 +23,4 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c + x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c + x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c + +-x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large ++#x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large +-- +2.7.4 + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch new file mode 100644 index 0000000000..0d0ed23c90 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch @@ -0,0 +1,30 @@ +From 5f47c30759684cea9a7a409646686c1a358b78ac Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:05 +0200 +Subject: [PATCH] replace basename() with sscanf() + +klibc lacks basename() + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/arch/i386/x86-linux-setup.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c +index 6c7d260..7850083 100644 +--- a/kexec/arch/i386/x86-linux-setup.c ++++ b/kexec/arch/i386/x86-linux-setup.c +@@ -304,9 +304,9 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode, + memset(edd_info, 0, sizeof(struct edd_info)); + + /* extract the device number */ +- if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) { ++ if (sscanf(strrchr(sysfs_name,'/') + 1, "int13_dev%hhx", &devnum) != 1) { + fprintf(stderr, "Invalid format of int13_dev dir " +- "entry: %s\n", basename(sysfs_name)); ++ "entry: %s\n", strrchr(sysfs_name,'/') + 1); + return -1; + } + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch new file mode 100644 index 0000000000..b7d7c1039c --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch @@ -0,0 +1,30 @@ +From 9de68ec5af8db2eff352f12da28145fe5e96244d Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:05 +0200 +Subject: [PATCH] do not build test + +The purpose of this recipe is to build the smallest +binaries. kexek klibc-static for armv5 is around 86 KiB + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 79188d8..953c141 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -178,8 +178,8 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) + PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) + + MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE) +-BINARIES_i386:=$(KEXEC_TEST) +-BINARIES_x86_64:=$(KEXEC_TEST) ++BINARIES_i386:=$(SBINDIR)/kexec ++BINARIES_x86_64:=$(SBINDIR)/kexec + BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH)) + + TARGETS:=$(BINARIES) $(MAN_PAGES) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch new file mode 100644 index 0000000000..493f298a99 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch @@ -0,0 +1,36 @@ +From a992ee014efacdc98d5658be9930dcab0eaadfd7 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:04 +0200 +Subject: [PATCH] i386: replace with our io.h + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + purgatory/arch/i386/pic.c | 2 +- + purgatory/arch/i386/vga.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/purgatory/arch/i386/pic.c b/purgatory/arch/i386/pic.c +index c23c459..c5f7046 100644 +--- a/purgatory/arch/i386/pic.c ++++ b/purgatory/arch/i386/pic.c +@@ -16,7 +16,7 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include <sys/io.h> ++#include "include/arch/io.h" + #include <purgatory.h> + #include "purgatory-x86.h" + +diff --git a/purgatory/arch/i386/vga.c b/purgatory/arch/i386/vga.c +index e65976c..d079d96 100644 +--- a/purgatory/arch/i386/vga.c ++++ b/purgatory/arch/i386/vga.c +@@ -1,4 +1,4 @@ +-#include <sys/io.h> ++#include "include/arch/io.h" + #include <purgatory.h> + #include "purgatory-x86.h" + diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch new file mode 100644 index 0000000000..2f0ad2ea45 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch @@ -0,0 +1,43 @@ +From 423c3f6f41fe04f4512e2a97a130f072d53dd4cf Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 11 Apr 2018 22:51:05 +0200 +Subject: [PATCH] x86-linux-setup.c: replace vfscanf() with vsscanf() + +klibc lacks vfscanf() + +Upstream-Status: Inappropriate [klibc specific] +Signed-off-by: Andrea Adami <andrea.adami@gmail.com> + +--- + kexec/arch/i386/x86-linux-setup.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c +index 7850083..e190356 100644 +--- a/kexec/arch/i386/x86-linux-setup.c ++++ b/kexec/arch/i386/x86-linux-setup.c +@@ -200,6 +200,8 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line, + FILE *fp; + int retno; + char filename[PATH_MAX]; ++ long line_size = MAX_LINE; ++ char *line; + + snprintf(filename, PATH_MAX, "%s/%s", dir, file); + filename[PATH_MAX-1] = 0; +@@ -210,7 +212,14 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line, + } + + va_start(argptr, scanf_line); +- retno = vfscanf(fp, scanf_line, argptr); ++ ++ line = xmalloc(sizeof(line) * line_size); ++ while(fgets(line, sizeof(line), fp) != NULL ) { ++ line_size += MAX_LINE; ++ line = xrealloc(line,line_size); ++ } ++ retno = vsscanf(line, scanf_line, argptr); ++ + va_end(argptr); + + fclose(fp); diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb deleted file mode 100644 index 2e2703382a..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb +++ /dev/null @@ -1,69 +0,0 @@ -# the binaries are statically linked against klibc -SUMMARY = "Kexec tools, statically compiled against klibc" -AUTHOR = "Eric Biederman" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" -SECTION = "kernel/userland" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ - file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" -DEPENDS = "zlib xz" - -PR = "r1" - -inherit klibc autotools - -FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz" - -SRC_URI += " \ - file://kexec-elf-rel.patch \ - file://kexec-syscall.patch \ - file://cflags_static.patch \ - file://ifdown_errno.patch \ - file://purgatory_flags.patch \ - file://purgatory_string.patch \ - file://sha256.patch \ - file://sysconf_nrprocessors.patch \ - file://fix-out-of-tree-build.patch \ - file://0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch \ - " - -SRC_URI[md5sum] = "92eff93b097475b7767f8c98df84408a" -SRC_URI[sha256sum] = "09e180ff36dee087182cdc939ba6c6917b6adbb5fc12d589f31fd3659b6471f2" - -SRC_URI_append_arm = " file://arm_crashdump.patch" -SRC_URI_append_powerpc = " file://ppc__lshrdi3.patch" -SRC_URI_append_x86 = " file://x86_sys_io.patch file://x86_basename.patch file://x86_vfscanf.patch file://x86_kexec_test.patch" -SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch file://x86_vfscanf.patch file://x86_kexec_test.patch" - -S = "${WORKDIR}/kexec-tools-${PV}" - -EXTRA_OECONF += "--without-zlib --without-lzma --without-xen" - -CFLAGS += "-I${STAGING_DIR_HOST}${libdir}/klibc/include -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_x86-64 += "-I${STAGING_DIR_HOST}${libdir}/klibc/include -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" - -do_compile_prepend() { - # Remove the prepackaged config.h from the source tree as it overrides - # the same file generated by configure and placed in the build tree - rm -f ${S}/include/config.h - - # Remove the '*.d' file to make sure the recompile is OK - for dep in `find ${B} -type f -name '*.d'`; do - dep_no_d="`echo $dep | sed 's#.d$##'`" - # Remove file.d when there is a file.o - if [ -f "$dep_no_d.o" ]; then - rm -f $dep - fi - done -} - -PACKAGES =+ "kexec-klibc kdump-klibc" - -FILES_kexec-klibc = "${sbindir}/kexec" -FILES_kdump-klibc = "${sbindir}/kdump" - -INSANE_SKIP_${PN} = "arch" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb new file mode 100644 index 0000000000..14edec2d12 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -0,0 +1,92 @@ +# the binaries are statically linked against klibc +SUMMARY = "Kexec tools, statically compiled against klibc" +AUTHOR = "Eric Biederman" +HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" +SECTION = "kernel/userland" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" +PV = "2.0.17+git${SRCPV}" + +DEPENDS = "zlib xz" + +inherit klibc autotools + +SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" +SRCREV = "0481e9ed61ef80b3d851bb96b0c70a3d4a112c8b" + +BUILD_PATCHES = "file://0001-force-static-build.patch \ + file://0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch" + +KLIBC_PATCHES += " \ + file://0003-kexec-elf-rel-use-our-elf.h.patch \ + file://0004-kexec-elf-exec.c-replace-with-our-err.h.patch \ + file://0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch \ + file://0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch \ + file://0007-kexec.c-add-guard-around-ENOTSUP.patch \ + file://0008-kexec.c-replace-mising-BLKGETSIZE64.patch \ + file://0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch \ + file://0010-fs2dt.c-work-around-missing-getline.patch \ + file://0011-purgatory-Makefile-adapt-to-klcc.patch \ + file://0012-purgatory-string.c-avoid-inclusion-of-string.h.patch \ + file://0013-sha256.h-avoid-inclusion-of-sys-types.h.patch \ + file://0014-add-if_nameindex-from-musl.patch \ + file://0015-vmcore-dmesg-fix-warning.patch" + +WARNING_FIXES = "" + +SRC_URI += "${BUILD_PATCHES} ${KLIBC_PATCHES} ${WARNING_FIXES}" + +SRC_URI_append_arm = " file://arm_crashdump.patch" + +SRC_URI_append_x86 = " file://x86_sys_io.patch file://x86_basename.patch \ + file://x86_vfscanf.patch file://x86_kexec_test.patch" + +SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \ + file://x86_vfscanf.patch file://x86_kexec_test.patch \ + file://x86-64-purgatory-Makefile-remove-unknown-flags.patch" + +SRC_URI_append_aarch64 = " file://arm64_purgatory-Makefile-remove-unknown-flags.patch \ + file://arm64_kexec-image-header.h-add-missing-le64toh.patch \ + file://arm64-crashdump-arm64.c-fix-warning.patch" + +SRC_URI_append_powerpc = " file://powerpc-purgatory-Makefile-remove-unknown-flags.patch" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "--without-zlib --without-lzma --without-xen" + +# fix purgatory/printf.c:2:10: fatal error: limits.h: No such file or directory +# fix include/limits.h:42:10: fatal error: bitsize/limits.h: No such file or directory +COMMON_CFLAGS += "-I${STAGING_DIR_HOST}${libdir}/klibc/include -I${S}/purgatory/include" +CFLAGS_x86_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" +CFLAGS_x86-64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" +CFLAGS_arm_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" +CFLAGS_aarch64_append = "${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" +CFLAGS_mips_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" +CFLAGS_mips64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" +CFLAGS_powerpc_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" + +do_compile_prepend() { + # Remove the prepackaged config.h from the source tree as it overrides + # the same file generated by configure and placed in the build tree + rm -f ${S}/include/config.h + + # Remove the '*.d' file to make sure the recompile is OK + for dep in `find ${B} -type f -name '*.d'`; do + dep_no_d="`echo $dep | sed 's#.d$##'`" + # Remove file.d when there is a file.o + if [ -f "$dep_no_d.o" ]; then + rm -f $dep + fi + done +} + +PACKAGES =+ "kexec-klibc kdump-klibc" + +FILES_kexec-klibc = "${sbindir}/kexec" +FILES_kdump-klibc = "${sbindir}/kdump" + +INSANE_SKIP_${PN} = "arch" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' diff --git a/meta-multimedia/README b/meta-multimedia/README index cbdc1b545d..20f4fb8635 100644 --- a/meta-multimedia/README +++ b/meta-multimedia/README @@ -5,7 +5,7 @@ branch: master revision: HEAD URI: git://github.com/openembedded/meta-oe.git -layers: meta-oe, meta-ruby +layers: meta-oe branch: master revision: HEAD @@ -16,6 +16,4 @@ When sending single patches, please use something like: You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Main layer maintainers: Koen Kooi <koen@dominion.thruhere.net> - Martin Jansa <martin.jansa@gmail.com> - +Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index d68b13f7fe..cfedf2f6b6 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -29,3 +29,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core" +LAYERSERIES_COMPAT_multimedia-layer = "sumo" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb index 9360d65b5e..3ddb818df2 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb @@ -8,4 +8,6 @@ RRECOMMENDS_${PN} = "adwaita-icon-theme" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "212d85ebce89b32468b59e1164050d40" SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" -inherit autotools pkgconfig gettext +inherit distro_features_check autotools pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch deleted file mode 100644 index 0493cea0e0..0000000000 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 9 Jun 2015 12:20:45 -0700 -Subject: [PATCH] Fix builds when using separate source and build directories. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a8731b5..54a3c3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -744,9 +744,9 @@ AC_OUTPUT - # - # Files copied for windows compilation. - # --echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\"" --test -d build/inc || mkdir -p build/inc --cp autoconfig.h build/inc/autoconfig.h --echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\"" --cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h -+echo "configure: copying \"autoconfig.h\" to \"\$srcdir/build/inc/autoconfig.h\"" -+test -d $srcdir/build/inc || mkdir -p $srcdir/build/inc -+cp autoconfig.h $srcdir/build/inc/autoconfig.h -+echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"\$srcdir/build/inc/upnpconfig.h\"" -+cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h - --- -1.9.1 - diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb deleted file mode 100644 index c1b0429bdf..0000000000 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Portable SDK for UPnP* Devices" -DESCRIPTION = "The Portable SDK for UPnP Devices is an SDK for development of \ -UPnP device and control point applications. It consists of the core UPnP \ -protocols along with a UPnP-specific eXtensible Markup Language (XML) parser \ -supporting the Document Object Model (DOM) Level 2 API and an optional, \ -integrated mini web server for serving UPnP related documents." -HOMEPAGE = "http://pupnp.sourceforge.net/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/libupnp-${PV}.tar.bz2 \ - file://sepbuildfix.patch \ -" - -SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e" -SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b" - -S = "${WORKDIR}/libupnp-${PV}" - -inherit autotools diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index 5158f05b66..295618914b 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb @@ -6,60 +6,59 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46" FILESPATH =. "${FILE_DIRNAME}/kodi-17:" DEPENDS = " \ - cmake-native \ - curl-native \ - gperf-native \ - jsonschemabuilder-native \ - nasm-native \ - swig-native \ - unzip-native \ - yasm-native \ - zip-native \ - avahi \ - boost \ - bzip2 \ - crossguid \ - curl \ - dcadec \ - enca \ - expat \ - faad2 \ - ffmpeg \ - fontconfig \ - fribidi \ - giflib \ - jasper \ - libass \ - libcdio \ - libcec \ - libmad \ - libmicrohttpd \ - libmms \ - libmms \ - libmodplug \ - libpcre \ - libplist \ - libsamplerate0 \ - libsdl-image \ - libsdl-mixer \ - libsquish \ - libssh \ - libtinyxml \ - libusb1 \ - libxslt \ - lzo \ - mpeg2dec \ - python \ - samba \ - sqlite3 \ - taglib \ - virtual/egl \ - virtual/libsdl \ - wavpack \ - yajl \ - zlib \ - ${@enable_glew(bb, d)} \ - " + cmake-native \ + curl-native \ + gperf-native \ + jsonschemabuilder-native \ + nasm-native \ + swig-native \ + unzip-native \ + yasm-native \ + zip-native \ + avahi \ + boost \ + bzip2 \ + crossguid \ + curl \ + dcadec \ + enca \ + expat \ + faad2 \ + ffmpeg \ + fontconfig \ + fribidi \ + giflib \ + jasper \ + libass \ + libcdio \ + libcec \ + libmad \ + libmicrohttpd \ + libmms \ + libmms \ + libmodplug \ + libpcre \ + libplist \ + libsamplerate0 \ + libsdl-image \ + libsdl-mixer \ + libsquish \ + libssh \ + libtinyxml \ + libusb1 \ + libxslt \ + lzo \ + mpeg2dec \ + python \ + sqlite3 \ + taglib \ + virtual/egl \ + virtual/libsdl \ + wavpack \ + yajl \ + zlib \ + ${@enable_glew(bb, d)} \ +" PROVIDES = "xbmc" @@ -67,24 +66,24 @@ SRCREV = "6abeebd5ba371547c8f04272296433f5e4e28e86" PV = "17.3+gitr${SRCPV}" ADDONSPV = "17.1" SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \ - https://repo.voidlinux.eu/distfiles/${BPN}-${ADDONSPV}-generated-addons.tar.xz;name=addons;unpack=0 \ - file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ - file://0004-handle-SIGTERM.patch \ - file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ - file://0006-Disable-DVD-support.patch \ - file://0007-Always-compile-libcpluff-as-PIC.patch \ - file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ - file://0009-build-Add-support-for-musl-triplets.patch \ - file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ - file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ - file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ - file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ - file://0013-FTPParse.cpp-use-std-string.patch \ + https://repo.voidlinux.eu/distfiles/${BPN}-${ADDONSPV}-generated-addons.tar.xz;name=addons;unpack=0 \ + file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ + file://0004-handle-SIGTERM.patch \ + file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ + file://0006-Disable-DVD-support.patch \ + file://0007-Always-compile-libcpluff-as-PIC.patch \ + file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ + file://0009-build-Add-support-for-musl-triplets.patch \ + file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ + file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ + file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ + file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ + file://0013-FTPParse.cpp-use-std-string.patch \ " SRC_URI_append_libc-musl = " \ - file://0001-Fix-file_Emu-on-musl.patch \ - file://0002-Remove-FILEWRAP.patch \ + file://0001-Fix-file_Emu-on-musl.patch \ + file://0002-Remove-FILEWRAP.patch \ " SRC_URI[addons.md5sum] = "719614fa764011a18665d08af5c8c92f" SRC_URI[addons.sha256sum] = "350da57408c27473eaf40e7f544bc94841bf101dc4346085260c5c4af0adac97" @@ -102,8 +101,10 @@ ACCEL ?= "" ACCEL_x86 = "vaapi vdpau" ACCEL_x86-64 = "vaapi vdpau" -PACKAGECONFIG ??= "${ACCEL} opengl" -PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', ' openglesv2', d)}" +PACKAGECONFIG ??= "${ACCEL} opengl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'openglesv2', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'samba', '', d)} \ +" PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles," PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,virtual/egl" @@ -113,6 +114,7 @@ PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxinerama libxmu libxrandr libxtst" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[lcms] = "--enable-lcms2,--disable-lcms2,lcms" +PACKAGECONFIG[samba] = "--enable-samba,--disable-samba,samba" EXTRA_OECONF = " \ --disable-debug \ @@ -183,29 +185,31 @@ FILES_${PN}-dbg += "${libdir}/kodi/.debug ${libdir}/kodi/*/.debug ${libdir}/kodi # kodi uses some kind of dlopen() method for libcec so we need to add it manually # OpenGL builds need glxinfo, that's in mesa-demos -RRECOMMENDS_${PN}_append = " libcec \ - python \ - python-ctypes \ - python-lang \ - python-re \ - python-netclient \ - python-html \ - python-difflib \ - python-json \ - python-zlib \ - python-shell \ - python-sqlite3 \ - python-compression \ - libcurl \ - ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'xrandr xdpyinfo', '', d)} \ +RRECOMMENDS_${PN}_append = " \ + libcec \ + python \ + python-ctypes \ + python-lang \ + python-re \ + python-netclient \ + python-html \ + python-difflib \ + python-json \ + python-zlib \ + python-shell \ + python-sqlite3 \ + python-compression \ + libcurl \ + ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'xrandr xdpyinfo', '', d)} \ +" +RRECOMMENDS_${PN}_append_libc-glibc = " \ + glibc-charmap-ibm850 \ + glibc-gconv-ibm850 \ + glibc-gconv-unicode \ + glibc-gconv-utf-32 \ + glibc-charmap-utf-8 \ + glibc-localedata-en-us \ " -RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 \ - glibc-gconv-ibm850 \ - glibc-gconv-unicode \ - glibc-gconv-utf-32 \ - glibc-charmap-utf-8 \ - glibc-localedata-en-us \ - " RPROVIDES_${PN} += "xbmc" diff --git a/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch b/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch new file mode 100644 index 0000000000..bd5e1b6030 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch @@ -0,0 +1,50 @@ +From 0cc7362e171616dcfeb93c6e1576362761bf14e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Jan 2018 18:37:16 -0800 +Subject: [PATCH] Do not use obsolete pow10f() function + +exp10 name is standardized in TS 18661-4 and its +available in glibc since version 2.1 +it has been now removed from glibc 2.27+ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dsp/v4f_IIR2.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dsp/v4f_IIR2.h b/dsp/v4f_IIR2.h +index a68ecf5..ebd1234 100644 +--- a/dsp/v4f_IIR2.h ++++ b/dsp/v4f_IIR2.h +@@ -33,7 +33,7 @@ + namespace DSP { + + #ifdef __APPLE__ +-inline float pow10f(float f) {return pow(10,f);} ++inline float exp10f(float f) {return __exp10f(f);} + #endif + + class RBJv4 +@@ -142,7 +142,7 @@ class IIR2v4 + /* A = pow (10, gain / 40) */ + v4f_t A = (v4f_t) {.025,.025,.025,.025}; + A *= gain; +- A = v4f_map<pow10f> (A); ++ A = v4f_map<exp10f> (A); + + RBJv4 p (f, Q); + +@@ -429,7 +429,7 @@ class IIR2v4Bank + /* A = pow (10, gain / 40) */ + v4f_t A = (v4f_t) {.025,.025,.025,.025}; + A *= gain[i]; +- A = v4f_map<pow10f> (A); ++ A = v4f_map<exp10f> (A); + + RBJv4 p (f[i], Q[i]); + +-- +2.16.1 + diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb index 29167d1aac..fe864c49cc 100644 --- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb @@ -7,6 +7,7 @@ SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ file://Avoid-ambiguity-in-div-invocation.patch \ file://0001-basic.h-Use-c99-supported-stdint-types.patch \ file://append_ldflags.patch \ + file://0001-Do-not-use-obsolete-pow10f-function.patch \ " SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.9.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.11.bb index fffbf0cae3..5002fc9f36 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.9.bb +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.11.bb @@ -10,7 +10,7 @@ SRC_URI = " \ git://github.com/FluidSynth/fluidsynth.git;branch=1.1.x \ file://0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ " -SRCREV = "fe37923393d6a76f42ed044aa56dadc66ec909ce" +SRCREV = "f65c6ba25fb2c7e37c89fc6a4afc5aa645e208c2" S = "${WORKDIR}/git" inherit cmake pkgconfig lib_package diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff deleted file mode 100644 index 5f08afe59a..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff +++ /dev/null @@ -1,16 +0,0 @@ -Lower the rank of ffmpeg plugin so codecs that hook into accelerated pieces (e.g. dsp or hw engines) can get picked over this -Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Inappropriate [embedded specific] - ---- /tmp/gstffmpegdec.c 2009-03-05 09:31:15.000000000 +0100 -+++ gst-ffmpeg-0.10.6/ext/ffmpeg/gstffmpegdec.c 2009-03-05 09:33:09.000000000 +0100 -@@ -2588,7 +2588,7 @@ - case CODEC_ID_MSMPEG4V3: - case CODEC_ID_H264: - case CODEC_ID_COOK: -- rank = GST_RANK_PRIMARY; -+ rank = GST_RANK_SECONDARY; - break; - case CODEC_ID_DVVIDEO: - /* we have a good dv decoder, fast on both ppc as well as x86. they say diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb index a3bfa5fe8a..f2354648df 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -25,7 +25,6 @@ EXTRA_OECONF += "--disable-freetypetest" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice" diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch index 3afca4ec90..69b21dd874 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch @@ -1,34 +1,38 @@ index gst-rtsp_0.10.8/bindings/python/Makefile.am ---- gst-rtsp_0.10.8.orig/bindings/python/Makefile.am -+++ gst-rtsp_0.10.8/bindings/python/Makefile.am +Index: gst-rtsp-0.10.8/bindings/python/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/bindings/python/Makefile.am ++++ gst-rtsp-0.10.8/bindings/python/Makefile.am @@ -14,7 +14,7 @@ defs_DATA = $(DEFS) defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs OVERRIDES = rtspserver.override - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES) - + rtspserver_la_CFLAGS = -I$(top_srcdir)/src \ - $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -index gst-rtsp_0.10.8/examples/Makefile.am ---- gst-rtsp_0.10.8.orig/examples/Makefile.am -+++ gst-rtsp_0.10.8/examples/Makefile.am + $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +Index: gst-rtsp-0.10.8/examples/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/examples/Makefile.am ++++ gst-rtsp-0.10.8/examples/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) - + AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) AM_LDFLAGS = \ -index gst-rtsp_0.10.8/tests/Makefile.am ---- gst-rtsp_0.10.8.orig/tests/Makefile.am -+++ gst-rtsp_0.10.8/tests/Makefile.am +Index: gst-rtsp-0.10.8/tests/Makefile.am +=================================================================== +--- gst-rtsp-0.10.8.orig/tests/Makefile.am ++++ gst-rtsp-0.10.8/tests/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = test-cleanup - + -INCLUDES = -I$(top_srcdir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) - + AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) AM_LDFLAGS = \ diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.2.1.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.2.1.bb new file mode 100644 index 0000000000..5409f32045 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.2.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Gst-Shark Tracers" +DESCRIPTION = "Benchmarks and profiling tools for GStreamer" +HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=GstShark" +SECTION = "multimedia" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=e1caa368743492879002ad032445fa97" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad " + +SRCBRANCH ?= "master" + +SRCREV_base = "a60b3996fe3376d42334fc89014e9d6f6af62899" +SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0" + +SRC_URI = " \ + git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH};name=base \ + git://anongit.freedesktop.org/git/gstreamer/common.git;protocol=https;destsuffix=git/common;name=common; \ + " + +S = "${WORKDIR}/git" + +PACKAGECONFIG_CONFARGS = " \ + --disable-graphviz \ + --enable-gtk-doc=no \ +" + +FILES_${PN} += "\ + ${libdir}/gstreamer-1.0/libgstsharktracers.so \ + ${libdir}/gstreamer-1.0/libgstsharktracers.la \ +" + +inherit autotools gettext + +do_configure() { + ${S}/autogen.sh --noconfigure + oe_runconf +} diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc new file mode 100644 index 0000000000..10ee5bcb2c --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Gstreamer Daemon 1.0" +SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" +HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" +SECTION = "multimedia" +LICENSE = "GPLv2+" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon" + +SRCBRANCH ?= "master" +SRCREV = "097a086a8606dcb368c7d38c7ec4fefc2497401b" +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-gstd-yocto-compatibility.patch" + +S = "${WORKDIR}/git" + +PACKAGECONFIG_CONFARGS = " \ + --disable-gtk-doc \ +" + +inherit autotools pkgconfig gettext + +do_configure() { +${S}/autogen.sh +oe_runconf +} diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch new file mode 100644 index 0000000000..ddc1831936 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch @@ -0,0 +1,63 @@ +From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 +From: Carlos <carlos.rodriguez@ridgerun.com> +Date: Fri, 15 Dec 2017 10:14:05 -0600 +Subject: [PATCH] gstd:yocto compatibility + +--- + autogen.sh | 8 +++++++- + docs/reference/gstd/Makefile.am | 2 +- + gstd/Makefile.am | 2 +- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 66dbd42..793ee2f 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -21,7 +21,11 @@ + # ACLOCAL, AUTOPOINT and/or LIBTOOLIZE to the right versions, or leave them + # unset and get the defaults + +-gtkdocize || exit 1 ++test -n "$srcdir" || srcdir=`dirname "$0"` ++test -n "$srcdir" || srcdir=. ++ ++olddir=`pwd` ++cd "$srcdir" + + autoreconf --verbose --force --install || { + echo 'autogen.sh failed'; +@@ -31,3 +35,5 @@ autoreconf --verbose --force --install || { + echo + echo "Now run './configure' with your system settings followed by 'make' to compile this module." + echo ++ ++cd "$olddir" +diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am +index f860fa1..153a13b 100644 +--- a/docs/reference/gstd/Makefile.am ++++ b/docs/reference/gstd/Makefile.am +@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la + + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/docs/gtk-doc.make ++# include $(top_srcdir)/docs/gtk-doc.make + + # Comment this out if you want 'make check' to test you doc status + # and run some sanity checks +diff --git a/gstd/Makefile.am b/gstd/Makefile.am +index 13c551d..11fe202 100644 +--- a/gstd/Makefile.am ++++ b/gstd/Makefile.am +@@ -49,7 +49,7 @@ bin_PROGRAMS = gstd + + gstd_SOURCES = gstd.c + gstd_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS) $(GJSON_CFLAGS) +-gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) -Wl,-rpath -Wl,$(libdir) ++gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) + gstd_LDADD = libgstd-core.la + + gstdincludedir = $(includedir)/gstd +-- +1.9.1 + diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb new file mode 100644 index 0000000000..94f6b575b9 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb @@ -0,0 +1,3 @@ +require gstd.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch b/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch index 89133adec1..df0c2355d0 100755 --- a/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch +++ b/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch @@ -1,9 +1,9 @@ Index: libdc1394/examples/Makefile.am =================================================================== ---- libdc1394.orig/examples/Makefile.am 2012-06-30 17:50:46.000000000 -0700 -+++ libdc1394/examples/Makefile.am 2012-06-30 19:02:13.822646430 -0700 -@@ -36,8 +36,7 @@ - AM_LDFLAGS = -framework CoreFoundation -framework Carbon +--- libdc1394.orig/examples/Makefile.am ++++ libdc1394/examples/Makefile.am +@@ -36,8 +36,7 @@ if HAVE_MACOSX + AM_LDFLAGS = -framework CoreFoundation $(FRAMEWORK_IOKIT) endif -noinst_PROGRAMS = $(A) diff --git a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb new file mode 100644 index 0000000000..cd075ffe1b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "libde265 is an open source implementation of the h.265 \ +video codec. It is written from scratch and has a plain C API to enable a \ +simple integration into other software." +HOMEPAGE = "http://www.libde265.org/" +SECTION = "libs/multimedia" + +LICENSE = "LGPLv3" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=852f345c1c52c9160f9a7c36bb997546" + +SRC_URI = "https://github.com/strukturag/libde265/releases/download/v${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "93520b378df25f3a94e962f2b54872cc" +SRC_URI[sha256sum] = "eaa0348839c2935dd90647d72c6dd4a043e36361cb3c33d2b04df10fbcebd3cb" + +EXTRA_OECONF = "--disable-sherlock265 --disable-dec265" + +inherit autotools-brokensep pkgconfig + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch index d59d12e69b..db4d6e8c99 100644 --- a/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch +++ b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch @@ -6,11 +6,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Kumar Gala <galak@kernel.crashing.org> -Index: libmusicbrainz-3.0.3/CMakeLists.txt +Index: git/CMakeLists.txt =================================================================== ---- libmusicbrainz-3.0.3.orig/CMakeLists.txt -+++ libmusicbrainz-3.0.3/CMakeLists.txt -@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) +--- git.orig/CMakeLists.txt ++++ git/CMakeLists.txt +@@ -36,7 +36,7 @@ FIND_PACKAGE(LibXml2 REQUIRED) SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) @@ -18,4 +18,4 @@ Index: libmusicbrainz-3.0.3/CMakeLists.txt +SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc) diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb index 2eb21a369e..6754f347e1 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb @@ -16,7 +16,7 @@ DEPENDS += " \ curl \ sqlite \ bzip2 \ - pulseaudio \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ tcp-wrappers \ openal-soft \ yajl \ @@ -36,18 +36,18 @@ DEPENDS += " \ dbus \ expat \ zlib \ - libupnp1.6 \ + libupnp \ " # While this item does not require it, it depends on mpg123 which does LICENSE_FLAGS = "commercial" SRC_URI = " \ - http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \ + http://www.musicpd.org/download/${BPN}/0.20/${BP}.tar.xz \ file://mpd.conf.in \ " -SRC_URI[md5sum] = "fc19f76b512bd471b6af5214965ff7c5" -SRC_URI[sha256sum] = "8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730" +SRC_URI[md5sum] = "8dc87ba95473fd738f2aff9bd69cc212" +SRC_URI[sha256sum] = "6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434" EXTRA_OECONF = "enable_bzip2=yes" EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb new file mode 100644 index 0000000000..44c46f81e8 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "OpenH264 is a codec library which supports H.264 encoding and \ +decoding. It is suitable for use in real time applications such as WebRTC." +HOMEPAGE = "http://www.openh264.org/" +SECTION = "libs/multimedia" + +DEPENDS_x86 += "nasm-native" +DEPENDS_x86-64 += "nasm-native" + +LICENSE = "BSD-2-Clause" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" + +S = "${WORKDIR}/git" +SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" +BRANCH = "openh264v1.7" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" + +COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" +COMPATIBLE_MACHINE_x86 = "(.*)" +COMPATIBLE_MACHINE_x86-64 = "(.*)" +COMPATIBLE_MACHINE_mips = "(.*)" +COMPATIBLE_MACHINE_mips64 = "(.*)" + +EXTRA_OEMAKE_armv7a = "ARCH=arm" +EXTRA_OEMAKE_aarch64 = "ARCH=arm64" +EXTRA_OEMAKE_x86 = "ARCH=i386" +EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" +EXTRA_OEMAKE_mips = "ARCH=mips" +EXTRA_OEMAKE_mips64 = "ARCH=mips64" + +do_configure() { + : +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} diff --git a/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb b/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb new file mode 100644 index 0000000000..189dc87c49 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Library for opening, seeking, and decoding opus audio files" +HOMEPAGE = "https://www.opus-codec.org/" +SECTION = "audio" + +DEPENDS = "libogg openssl libopus" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ac22b992dde6a891f8949c3e2da8576" + +SRC_URI = "https://downloads.xiph.org/releases/opus/${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "ab3f7d15d766f5b36b0951ee435f9ebf" +SRC_URI[sha256sum] = "48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f" + +inherit autotools pkgconfig diff --git a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch index 2ed8d22c6b..838400f07a 100644 --- a/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch +++ b/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch @@ -5,10 +5,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Upstream-Status: Inappropriate [configuration] -Index: schroedinger-1.0.9/configure.ac +Index: schroedinger-1.0.11/configure.ac =================================================================== ---- schroedinger-1.0.9.orig/configure.ac -+++ schroedinger-1.0.9/configure.ac +--- schroedinger-1.0.11.orig/configure.ac ++++ schroedinger-1.0.11/configure.ac @@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then AC_ERROR([orc-0.4 >= $ORC_VER is required]) fi @@ -16,5 +16,5 @@ Index: schroedinger-1.0.9/configure.ac -ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` +ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` AC_SUBST(ORCC) + AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" != xyes) - AC_ARG_WITH([thread], diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch new file mode 100644 index 0000000000..44c6b19be0 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch @@ -0,0 +1,34 @@ +From b1809d82031aa7c5bcaad58bcb4b59e082e0446e Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 15:40:16 +0000 +Subject: [PATCH] Update exported symbol list + +commit 5c58413544 ("Don't export (most) internal libsox symbols") +breaks dynamic flac builds as flac.c references lsx.error, so add it +to the list of exceptions. + +| .libs/flac.o: In function `decoder_read_callback': +| /usr/src/debug/sox/14.4.2-r0/sox-14.4.2/src/flac.c:63: undefined reference to `lsx_error' + +Upstream-Status: Backport [https://bogomips.org/sox.git ("pu" branch)] + +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 7cceaafd..a3a04ed1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -95,7 +95,7 @@ libsox_la_LIBADD += @GOMP_LIBS@ + + libsox_la_CFLAGS = @WARN_CFLAGS@ + libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ +- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' ++ -export-symbols-regex '^(sox_.*|lsx_(([cm]|re)alloc|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|id3_read_tag|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$' + + if HAVE_WIN32_LTDL + libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h +-- +2.16.2 + diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch index 605863a221..4f02a66fcc 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch @@ -1,4 +1,4 @@ -From c2aed28e3e14329ad0a8c4371fdcce9934013f21 Mon Sep 17 00:00:00 2001 +From d0313be5fb947df399a4db24a5f9244510d2ce87 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 16:36:06 -0700 Subject: [PATCH] remove the #error line and live without file-type detection @@ -12,17 +12,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 deletion(-) diff --git a/src/formats.c b/src/formats.c -index 7e231ca..b13f0d5 100644 +index 724a4cda..f683a922 100644 --- a/src/formats.c +++ b/src/formats.c -@@ -416,7 +416,6 @@ static void UNUSED rewind_pipe(FILE * fp) +@@ -422,7 +422,6 @@ static void UNUSED rewind_pipe(FILE * fp) /* To fix this #error, either simply remove the #error line and live without * file-type detection with pipes, or add support for your compiler in the - * lines above. Test with cat monkey.au | ./sox --info - */ + * lines above. Test with cat monkey.wav | ./sox --info - */ - #error FIX NEEDED HERE #define NO_REWIND_PIPE (void)fp; #endif -- -2.13.2 +2.16.2 diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 3eb1856e06..21fddd1e19 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -4,13 +4,11 @@ and can apply different effects and filters to the audio data." HOMEPAGE = "http://sox.sourceforge.net" SECTION = "audio" -DEPENDS = "libpng ffmpeg libsndfile1 libvorbis" +DEPENDS = "libpng ffmpeg libsndfile1" # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" -PR = "r2" - PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ magic \ " @@ -20,6 +18,8 @@ PACKAGECONFIG[wavpack] = "--with-wavpack=dyn,--with-wavpack=no,wavpack," PACKAGECONFIG[flac] = "--with-flac=dyn,--with-flac=no,flac," PACKAGECONFIG[amrwb] = "--with-amrwb=dyn,--with-amrwb=no,opencore-amr," PACKAGECONFIG[amrnb] = "--with-amrnb=dyn,--with-amrnb=no,opencore-amr," +PACKAGECONFIG[oggvorbis] = "--with-oggvorbis=dyn,--with-oggvorbis=no,libvorbis" +PACKAGECONFIG[opus] = "--with-opus=dyn,--with-opus=no,opusfile" PACKAGECONFIG[magic] = "--with-magic,--without-magic,file," PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad," PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," @@ -32,11 +32,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ + file://0001-Update-exported-symbol-list.patch \ " -SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" -SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" - -inherit autotools - -BBCLASSEXTEND = "native" +SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" +SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" +inherit autotools pkgconfig diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb new file mode 100644 index 0000000000..72094b6fad --- /dev/null +++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "TinyALSA is a small library to interface with ALSA in \ +the Linux kernel. It is a lightweight alternative to libasound." +HOMEPAGE = "https://github.com/tinyalsa/tinyalsa" +SECTION = "libs/multimedia" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b" + +SRCREV = "67b9210d344c34e8d1aa0cfe638abce71c5221ca" +SRC_URI = "git://github.com/tinyalsa/tinyalsa" +PV = "1.1.1+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index acb3ccd1d1..8e82b3bd33 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -57,7 +57,6 @@ PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs, gnome-vfs" PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" diff --git a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb index b6cdc4f146..feffa9fe19 100644 --- a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb +++ b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb @@ -5,18 +5,16 @@ SECTION = "multimedia" LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "https://github.com/kirushyk/gst-instruments/archive/${PV}.tar.gz" - -SRC_URI[md5sum] = "14a394dec25642848b17f9999f1b4999" -SRC_URI[sha256sum] = "5565658a33ff9596946541304fbdd3b3683dbb82171a0e6ce56f42b64a01e58d" +DEPENDS = "gstreamer1.0" -S = "${WORKDIR}/gst-instruments-${PV}" +S = "${WORKDIR}/git" +SRCREV = "3b862e52e5c53ad1023dc6808effa4cb75572c4b" +SRC_URI = "git://github.com/kirushyk/gst-instruments.git;protocol=https;" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*a" FILES_${PN} += "${libdir}/*" INSANE_SKIP_${PN} = "dev-so" -DEPENDS = "gstreamer1.0" - inherit autotools pkgconfig diff --git a/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb b/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb deleted file mode 100644 index 8abaa1284a..0000000000 --- a/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "library implementing Secure RTP (RFC 3711)" -HOMEPAGE = "https://github.com/cisco/libsrtp" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=15bc16b9d2e305974dde47e733883714" - -SRC_URI = "https://github.com/cisco/libsrtp/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ - file://0001-Rename-conflicting-variable-mips.patch \ - " -SRC_URI[md5sum] = "2309aa6027992810a4285b042c71e644" -SRC_URI[sha256sum] = "86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda" - -inherit autotools - -do_install[postfuncs] += " rm_unused_bindir " - -rm_unused_bindir() { - rmdir ${D}/${bindir} -} diff --git a/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb b/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb new file mode 100644 index 0000000000..d3ab5b71c0 --- /dev/null +++ b/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "library implementing Secure RTP (RFC 3711)" +HOMEPAGE = "https://github.com/cisco/libsrtp" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=15bc16b9d2e305974dde47e733883714" + +S = "${WORKDIR}/git" +SRCREV = "2b091a4fb21c9b06fc5d4b5763bdaec97542fcd7" +SRC_URI = "git://github.com/cisco/libsrtp.git;protocol=https;branch=1_6_x_throttle; \ + file://0001-Rename-conflicting-variable-mips.patch \ + " + +inherit autotools + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index e490176241..1632c3c60e 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass @@ -1,7 +1,7 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf -# -inherit qemu pythonnative waf +# +inherit qemu pythonnative DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python" @@ -21,6 +21,29 @@ CONFIGUREOPTS = " --prefix=${prefix} \ ${PACKAGECONFIG_CONFARGS} \ " +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +def get_waf_parallel_make(d): + pm = d.getVar('PARALLEL_MAKE') + if pm: + # look for '-j' and throw other options (e.g. '-l') away + # because they might have different meaning in bjam + pm = pm.split() + while pm: + opt = pm.pop(0) + if opt == '-j': + v = pm.pop(0) + elif opt.startswith('-j'): + v = opt[2:].strip() + else: + continue + + v = min(64, int(v)) + return '-j' + str(v) + + return "" + # Three methods for waf cross compile: # 1. answers: # Only --cross-answers - try the cross-answers file, and if @@ -86,8 +109,9 @@ do_configure() { fi } +do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" do_compile () { - python ./buildtools/bin/waf ${@get_waf_parallel_make(d)} + python ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} } do_install() { diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 2dfde4bdf4..e594b7b957 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -17,6 +17,8 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" +LAYERSERIES_COMPAT_networking-layer = "sumo" + LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt new file mode 100644 index 0000000000..1023f6aff3 --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt @@ -0,0 +1,39 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt new file mode 100644 index 0000000000..1023f6aff3 --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt @@ -0,0 +1,39 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch b/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch index 93c836cf34..1bb5c638f0 100644 --- a/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch +++ b/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch @@ -17,7 +17,7 @@ c. keys-ssl.c: error: 'keys' defined but not used [-Werror=unused-variable] static struct pubkey keys[] = { Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Upsteam-Status: Pending +Upstream-Status: Pending Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> --- utils/key2pub.py | 5 +++-- diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch index aceb56df74..812e983798 100644 --- a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch +++ b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch @@ -1,6 +1,7 @@ +From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001 From: Ben Hutchings <ben@decadent.org.uk> Date: Sat, 23 Aug 2014 12:26:37 -0700 -Subject: Fix linking of libraries used by libreg +Subject: [PATCH] Fix linking of libraries used by libreg The math and crypto libraries are called by and need to be linked to libreg.so, not to the executables. @@ -9,10 +10,15 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027 Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/Makefile b/Makefile +index a3ead30..da2dcc3 100644 --- a/Makefile +++ b/Makefile -@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda +@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic CFLAGS += -Wall -g LDLIBREG += -lreg LDLIBS += $(LDLIBREG) @@ -21,16 +27,14 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> LIBREG += libreg.so LDFLAGS += -L ./ -@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r +@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize ifeq ($(USE_OPENSSL),1) CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` -LDLIBS += `pkg-config --libs openssl` +LIBREGLDLIBS += `pkg-config --libs openssl` - ifeq ($(RUNTIME_PUBKEY_ONLY),1) - CFLAGS += -DRUNTIME_PUBKEY_ONLY -@@ -51,7 +51,7 @@ endif + $(LIBREG): keys-ssl.c else CFLAGS += -DUSE_GCRYPT @@ -39,7 +43,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> $(LIBREG): keys-gcrypt.c -@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( +@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $(LIBREG): regdb.h reglib.h reglib.c $(NQ) ' CC ' $@ @@ -48,3 +52,6 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> install-libreg-headers: $(NQ) ' INSTALL libreg-headers' +-- +2.7.4 + diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb index cb3b5c22f5..885c6c0e2b 100644 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb +++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://dhcpcd.c;endline=26;md5=77c40d671aff804ca91ea99556da8 SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "d4f2f3ed4964197dee7767219c33a9df" -SRC_URI[sha256sum] = "5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06" +SRC_URI[md5sum] = "2465624b62c1154f0e89dc69c42c849b" +SRC_URI[sha256sum] = "6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e" inherit autotools-brokensep diff --git a/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch b/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch new file mode 100644 index 0000000000..b58a658b92 --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/0001-Added-option-to-provide-kea-msg-compiler.patch @@ -0,0 +1,235 @@ +From c7806af2957627151ef603ad4aa893ca1a4bf59e Mon Sep 17 00:00:00 2001 +From: Siyu Zhang <siyu.zhang@windriver.com> +Date: Sat, 10 Sep 2016 15:44:10 +0200 +Subject: [PATCH 1/1] Added option to provide kea-msg-compiler + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + configure.ac | 18 ++++++++++++++++++ + src/bin/d2/Makefile.am | 2 +- + src/bin/dhcp4/Makefile.am | 2 +- + src/bin/dhcp6/Makefile.am | 2 +- + src/bin/lfc/Makefile.am | 2 +- + src/hooks/dhcp/user_chk/Makefile.am | 2 +- + src/lib/asiodns/Makefile.am | 2 +- + src/lib/config/Makefile.am | 2 +- + src/lib/dhcp_ddns/Makefile.am | 2 +- + src/lib/dhcpsrv/Makefile.am | 6 +++--- + src/lib/eval/Makefile.am | 2 +- + src/lib/hooks/Makefile.am | 2 +- + src/lib/log/Makefile.am | 8 +++++++- + src/lib/log/tests/Makefile.am | 2 +- + 14 files changed, 39 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ea41f08..edb5120 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -202,6 +202,24 @@ case "$host" in + esac + KEA_CXXFLAGS="$KEA_CXXFLAGS $MULTITHREADING_FLAG" + ++AC_MSG_CHECKING(whether kea-msg-compiler is provided) ++AC_ARG_WITH(msg-compiler, ++ AC_HELP_STRING([--with-msg-compiler=PATH], [use provided kea-msg-compiler instead of local build]), ++ [ ++ dnl TODO: Validate provided kea-msg-compiler ++ AC_SUBST([KEA_MSG_COMPILER], [${withval}]) ++ AC_MSG_RESULT(${withval})], ++ [ ++ AC_MSG_RESULT([no]) ++ if test x"$host" != x"$build" && test x"$host" == x"$target"; then ++ AC_MSG_ERROR(native kea-msg-compiler not provided for cross compilation: build=${build} host=${host} target=${target}) ++ else ++ AC_SUBST([KEA_MSG_COMPILER], ['$(top_builddir)/src/lib/log/compiler/kea-msg-compiler']) ++ with_msg_compiler=no ++ fi]) ++ ++AM_CONDITIONAL([HAVE_MSG_COMPILER], [test x"$with_msg_compiler" != x"no"]) ++ + # Disable -Werror by default. Only use it if specifically enabled. + # The usage of this flag is: + # +diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am +index 0b4e7d5..40cc094 100644 +--- a/src/bin/d2/Makefile.am ++++ b/src/bin/d2/Makefile.am +@@ -53,7 +53,7 @@ spec_config.h: spec_config.h.pre + d2_messages.h d2_messages.cc: s-messages + + s-messages: d2_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/d2/d2_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/d2/d2_messages.mes + touch $@ + + BUILT_SOURCES = d2_messages.h d2_messages.cc +diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am +index 8360677..57acb91 100644 +--- a/src/bin/dhcp4/Makefile.am ++++ b/src/bin/dhcp4/Makefile.am +@@ -47,7 +47,7 @@ spec_config.h: spec_config.h.pre + dhcp4_messages.h dhcp4_messages.cc: s-messages + + s-messages: dhcp4_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes + touch $@ + + BUILT_SOURCES = spec_config.h dhcp4_messages.h dhcp4_messages.cc +diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am +index 47155ae..d7ed722 100644 +--- a/src/bin/dhcp6/Makefile.am ++++ b/src/bin/dhcp6/Makefile.am +@@ -48,7 +48,7 @@ spec_config.h: spec_config.h.pre + dhcp6_messages.h dhcp6_messages.cc: s-messages + + s-messages: dhcp6_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes + touch $@ + + BUILT_SOURCES = spec_config.h dhcp6_messages.h dhcp6_messages.cc +diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am +index 7bfeb96..09a700e 100644 +--- a/src/bin/lfc/Makefile.am ++++ b/src/bin/lfc/Makefile.am +@@ -32,7 +32,7 @@ endif + lfc_messages.h lfc_messages.cc: s-messages + + s-messages: lfc_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/lfc/lfc_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/lfc/lfc_messages.mes + touch $@ + + BUILT_SOURCES = lfc_messages.h lfc_messages.cc +diff --git a/src/hooks/dhcp/user_chk/Makefile.am b/src/hooks/dhcp/user_chk/Makefile.am +index 41ad7b2..32a93412 100644 +--- a/src/hooks/dhcp/user_chk/Makefile.am ++++ b/src/hooks/dhcp/user_chk/Makefile.am +@@ -7,7 +7,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) + # Define rule to build logging source files from message file + user_chk_messages.h user_chk_messages.cc: s-messages + s-messages: user_chk_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/user_chk/user_chk_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/hooks/dhcp/user_chk/user_chk_messages.mes + touch $@ + + # Tell automake that the message files are built as part of the build process +diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am +index 24dfe05..60c9f80 100644 +--- a/src/lib/asiodns/Makefile.am ++++ b/src/lib/asiodns/Makefile.am +@@ -11,7 +11,7 @@ CLEANFILES = *.gcno *.gcda asiodns_messages.h asiodns_messages.cc s-messages + asiodns_messages.h asiodns_messages.cc: s-messages + + s-messages: asiodns_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes + touch $@ + + BUILT_SOURCES = asiodns_messages.h asiodns_messages.cc +diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am +index a89d530..26894ad 100644 +--- a/src/lib/config/Makefile.am ++++ b/src/lib/config/Makefile.am +@@ -7,7 +7,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) + config_messages.h config_messages.cc: s-messages + + s-messages: config_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/config/config_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/config/config_messages.mes + touch $@ + + BUILT_SOURCES = config_messages.h config_messages.cc +diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am +index 820f448..fe15533 100644 +--- a/src/lib/dhcp_ddns/Makefile.am ++++ b/src/lib/dhcp_ddns/Makefile.am +@@ -8,7 +8,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) + dhcp_ddns_messages.h dhcp_ddns_messages.cc: s-messages + + s-messages: dhcp_ddns_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes + touch $@ + + # Tell automake that the message files are built as part of the build process +diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am +index db95dbd..6499b9f 100644 +--- a/src/lib/dhcpsrv/Makefile.am ++++ b/src/lib/dhcpsrv/Makefile.am +@@ -52,11 +52,11 @@ alloc_engine_messages.h alloc_engine_messages.cc dhcpsrv_messages.h \ + dhcpsrv_messages.cc hosts_messages.h hosts_messages.cc: s-messages + + s-messages: alloc_engine_messages.mes dhcpsrv_messages.mes hosts_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes + touch $@ +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes + touch $@ +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes + touch $@ + + # Tell Automake that the {alloc_engine,dhcpsrv,hosts}_messages.{cc,h} source files +diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am +index e4968c1..f8464f8 100644 +--- a/src/lib/eval/Makefile.am ++++ b/src/lib/eval/Makefile.am +@@ -47,7 +47,7 @@ EXTRA_DIST += lexer.ll parser.yy + eval_messages.h eval_messages.cc: s-messages + + s-messages: eval_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/eval/eval_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/eval/eval_messages.mes + touch $@ + + # Tell Automake that the eval_messages.{cc,h} source files are created in the +diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am +index 624e227..3458da8 100644 +--- a/src/lib/hooks/Makefile.am ++++ b/src/lib/hooks/Makefile.am +@@ -8,7 +8,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) + hooks_messages.h hooks_messages.cc: s-messages + + s-messages: hooks_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/hooks/hooks_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/hooks/hooks_messages.mes + touch $@ + + # Tell automake that the message files are built as part of the build process +diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am +index e1185cd..22e9ce6 100644 +--- a/src/lib/log/Makefile.am ++++ b/src/lib/log/Makefile.am +@@ -1,4 +1,10 @@ +-SUBDIRS = interprocess . compiler tests ++SUBDIRS = interprocess . ++ ++if !HAVE_MSG_COMPILER ++SUBDIRS += compiler ++endif ++ ++SUBDIRS += tests + + AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib + AM_CPPFLAGS += $(BOOST_INCLUDES) +diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am +index 03806f9..caf9cab 100644 +--- a/src/lib/log/tests/Makefile.am ++++ b/src/lib/log/tests/Makefile.am +@@ -17,7 +17,7 @@ BUILT_SOURCES = log_test_messages.h log_test_messages.cc + log_test_messages.h log_test_messages.cc: s-messages + + s-messages: log_test_messages.mes +- $(AM_V_GEN) $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/tests/log_test_messages.mes ++ $(AM_V_GEN) @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/log/tests/log_test_messages.mes + touch $@ + + CLEANFILES += log_test_messages.h log_test_messages.cc s-messages +-- +1.8.4.2 + diff --git a/meta-networking/recipes-connectivity/kea/files/0001-Makefile.am-fix-compile-error-about-kea-msg-compiler.patch b/meta-networking/recipes-connectivity/kea/files/0001-Makefile.am-fix-compile-error-about-kea-msg-compiler.patch new file mode 100644 index 0000000000..e8a4ae41b5 --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/0001-Makefile.am-fix-compile-error-about-kea-msg-compiler.patch @@ -0,0 +1,72 @@ +From d800c6017962e358c8b2ada6803acb0f4011a763 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 16 Mar 2018 08:03:20 +0000 +Subject: [PATCH] Makefile.am: fix compile error about kea-msg-compiler + +fix compile error about kea-msg-compiler + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + src/bin/agent/Makefile.am | 2 +- + src/hooks/dhcp/lease_cmds/Makefile.am | 2 +- + src/lib/http/Makefile.am | 2 +- + src/lib/process/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am +index e67c572..b646325 100644 +--- a/src/bin/agent/Makefile.am ++++ b/src/bin/agent/Makefile.am +@@ -33,7 +33,7 @@ endif + ca_messages.h ca_messages.cc: s-messages + + s-messages: ca_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/agent/ca_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/bin/agent/ca_messages.mes + touch $@ + + BUILT_SOURCES = ca_messages.h ca_messages.cc +diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am +index 90abfda..cfd6779 100644 +--- a/src/hooks/dhcp/lease_cmds/Makefile.am ++++ b/src/hooks/dhcp/lease_cmds/Makefile.am +@@ -7,7 +7,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) + # Define rule to build logging source files from message file + lease_cmds_messages.h lease_cmds_messages.cc: s-messages + s-messages: lease_cmds_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes + touch $@ + + # Tell automake that the message files are built as part of the build process +diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am +index 2b0eed5..db3bb0e 100644 +--- a/src/lib/http/Makefile.am ++++ b/src/lib/http/Makefile.am +@@ -8,7 +8,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) + http_messages.h http_messages.cc: s-messages + + s-messages: http_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/http/http_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/http/http_messages.mes + touch $@ + + # Tell automake that the message files are built as part of the build process +diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am +index c7746c6..71998ed 100644 +--- a/src/lib/process/Makefile.am ++++ b/src/lib/process/Makefile.am +@@ -19,7 +19,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) + process_messages.h process_messages.cc: s-messages + + s-messages: process_messages.mes +- $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/process/process_messages.mes ++ @KEA_MSG_COMPILER@ $(top_srcdir)/src/lib/process/process_messages.mes + touch $@ + + spec_config.h: spec_config.h.pre +-- +2.13.3 + diff --git a/meta-networking/recipes-connectivity/kea/files/0001-Makefile.am-update-hooksdir-for-lease_cmds.patch b/meta-networking/recipes-connectivity/kea/files/0001-Makefile.am-update-hooksdir-for-lease_cmds.patch new file mode 100644 index 0000000000..72fa113b00 --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/0001-Makefile.am-update-hooksdir-for-lease_cmds.patch @@ -0,0 +1,30 @@ +From 77ab10015512e9cc0c7a160bd6b534bf4174bc95 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Wed, 21 Mar 2018 06:01:38 +0000 +Subject: [PATCH] Makefile.am: update hooksdir for lease_cmds + +update hooksdir for lease_cmds + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + src/hooks/dhcp/lease_cmds/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am +index cfd6779..22cc4a9 100644 +--- a/src/hooks/dhcp/lease_cmds/Makefile.am ++++ b/src/hooks/dhcp/lease_cmds/Makefile.am +@@ -37,7 +37,7 @@ liblease_cmds_la_CXXFLAGS = $(AM_CXXFLAGS) + liblease_cmds_la_CPPFLAGS = $(AM_CPPFLAGS) + + # install the shared object into $(libdir)/hooks +-lib_hooksdir = $(libdir)/hooks ++lib_hooksdir = $(libdir)/kea/hooks + lib_hooks_LTLIBRARIES = libdhcp_lease_cmds.la + + libdhcp_lease_cmds_la_SOURCES = +-- +2.13.3 + diff --git a/meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch b/meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch new file mode 100644 index 0000000000..9262381d5b --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch @@ -0,0 +1,103 @@ +From 4fd11ef050438adeb1e0ae0d9d2d8ec3a2cb659c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski@archlinux.org> +Date: Sat, 30 Dec 2017 14:40:24 +0100 +Subject: [PATCH] asiolink: fix build with boost 1.66 + +- use native_handle() for getting native socket type +- use io_context instead of io_service + +Upstream-Status: Backport + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + src/lib/asiolink/io_acceptor.h | 4 ++++ + src/lib/asiolink/io_service.h | 5 +++++ + src/lib/asiolink/tcp_socket.h | 4 ++++ + src/lib/asiolink/udp_socket.h | 4 ++++ + src/lib/asiolink/unix_domain_socket.cc | 4 ++++ + 5 files changed, 21 insertions(+) + +diff --git a/src/lib/asiolink/io_acceptor.h b/src/lib/asiolink/io_acceptor.h +index c493d3427..913a3280b 100644 +--- a/src/lib/asiolink/io_acceptor.h ++++ b/src/lib/asiolink/io_acceptor.h +@@ -47,7 +47,11 @@ public: + + /// @brief Returns file descriptor of the underlying socket. + virtual int getNative() const { ++#if BOOST_VERSION < 106600 + return (acceptor_->native()); ++#else ++ return (acceptor_->native_handle()); ++#endif + } + + /// @brief Opens acceptor socket given the endpoint. +diff --git a/src/lib/asiolink/io_service.h b/src/lib/asiolink/io_service.h +index e9e402d11..e0832b2c0 100644 +--- a/src/lib/asiolink/io_service.h ++++ b/src/lib/asiolink/io_service.h +@@ -11,7 +11,12 @@ + + namespace boost { + namespace asio { ++#if BOOST_VERSION < 106600 + class io_service; ++#else ++ class io_context; ++ typedef io_context io_service; ++#endif + } + } + +diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h +index adf74d1f0..83b8264c8 100644 +--- a/src/lib/asiolink/tcp_socket.h ++++ b/src/lib/asiolink/tcp_socket.h +@@ -75,7 +75,11 @@ public: + + /// \brief Return file descriptor of underlying socket + virtual int getNative() const { ++#if BOOST_VERSION < 106600 + return (socket_.native()); ++#else ++ return (socket_.native_handle()); ++#endif + } + + /// \brief Return protocol of socket +diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h +index 07ba44743..5b040cfe1 100644 +--- a/src/lib/asiolink/udp_socket.h ++++ b/src/lib/asiolink/udp_socket.h +@@ -61,7 +61,11 @@ public: + + /// \brief Return file descriptor of underlying socket + virtual int getNative() const { ++#if BOOST_VERSION < 106600 + return (socket_.native()); ++#else ++ return (socket_.native_handle()); ++#endif + } + + /// \brief Return protocol of socket +diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc +index f17ec2e8f..d1ad9ec30 100644 +--- a/src/lib/asiolink/unix_domain_socket.cc ++++ b/src/lib/asiolink/unix_domain_socket.cc +@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_service) + + int + UnixDomainSocket::getNative() const { ++#if BOOST_VERSION < 106600 + return (impl_->socket_.native()); ++#else ++ return (impl_->socket_.native_handle()); ++#endif + } + + int +-- +2.11.0 + diff --git a/meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service b/meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service new file mode 100644 index 0000000000..91aa2eb14f --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service @@ -0,0 +1,13 @@ +[Unit] +Description=Kea DHCP-DDNS Server +Wants=network-online.target +After=network-online.target +After=time-sync.target + +[Service] +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service b/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service new file mode 100644 index 0000000000..f32edcb90d --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service @@ -0,0 +1,13 @@ +[Unit] +Description=Kea DHCPv4 Server +Wants=network-online.target +After=network-online.target +After=time-sync.target + +[Service] +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service b/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service new file mode 100644 index 0000000000..26d2205e64 --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service @@ -0,0 +1,13 @@ +[Unit] +Description=Kea DHCPv6 Server +Wants=network-online.target +After=network-online.target +After=time-sync.target + +[Service] +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/kea/kea_1.3.0.bb b/meta-networking/recipes-connectivity/kea/kea_1.3.0.bb new file mode 100644 index 0000000000..946c1e17dd --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/kea_1.3.0.bb @@ -0,0 +1,52 @@ +SUMMARY = "ISC Kea DHCP Server" +DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It supports both DHCPv4 and DHCPv6 protocols along with their extensions, e.g. prefix delegation and dynamic updates to DNS." +HOMEPAGE = "http://kea.isc.org" +SECTION = "connectivity" +LICENSE = "MPL-2.0 & BSL-1.0 & Apache-2.0" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=9310b19bc010f85f4ad19637f168f23f \ + file://ext/coroutine/LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ +" + +SRC_URI = "\ + http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ + file://0001-Added-option-to-provide-kea-msg-compiler.patch \ + file://0001-Makefile.am-fix-compile-error-about-kea-msg-compiler.patch \ + file://0001-asiolink-fix-build-with-boost-1.66.patch \ + file://0001-Makefile.am-update-hooksdir-for-lease_cmds.patch \ + file://kea-dhcp4.service \ + file://kea-dhcp6.service \ + file://kea-dhcp-ddns.service \ +" + +SRC_URI[md5sum] = "f93bf836fd555a221f9ed0d4520058db" +SRC_URI[sha256sum] = "6edfcdbf2526c218426a1d1a6a6694a4050c97bb8412953a230285d63415c391" + +inherit autotools systemd + +SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install_append_class-target() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_system_unitdir}/kea-dhcp*service +} + +do_install_append() { + rm -rf "${D}${localstatedir}" +} + +PACKAGECONFIG_class-target ??= "kmc openssl log4cplus boost" +PACKAGECONFIG_class-native ??= "openssl log4cplus boost" + +PACKAGECONFIG[kmc] = "--with-msg-compiler=${STAGING_BINDIR_NATIVE}/kea-msg-compiler,,kea-native," +PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl" +PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus" +PACKAGECONFIG[boost] = "--with-boost-include=${STAGING_INCDIR} --with-boost-lib-dir=${STAGING_LIBDIR} --with-boost-libs=-lboost_system,,boost,boost" + +FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a" + +BBCLASSEXTEND += "native" diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.8.3.bb index b6b65da736..c6e37277e4 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.8.3.bb @@ -9,17 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \ file://fix-gcc-6-conflicts-signbit.patch \ " -SRC_URI[md5sum] = "3701e7675baa5619c92622eb141c8301" -SRC_URI[sha256sum] = "fe441f20a9a317cfb99a8b8e628ba0457df472b6d93964d17374d5b5ebdf9280" +SRC_URI[md5sum] = "12b1fcbf13f41e9cdb0903fc670fa1f1" +SRC_URI[sha256sum] = "c4159f056afee41866a6c2d639655bc351e6d3486bbe7758eaedb24f6a4239d5" inherit autotools gettext pkgconfig acpaths = "-I ./m4" -EXTRA_OECONF += "--with-modules" +EXTRA_OECONF += "--with-modules --disable-rpath" -PACKAGECONFIG ??= "libidn openssl zlib gnutls readline expat" -PACKAGECONFIG[libidn] = "--with-libidn, --without-libidn, libidn" +PACKAGECONFIG ??= "openssl zlib gnutls readline expat" PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_INCDIR}/.., --without-zlib, zlib" PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" @@ -29,6 +28,6 @@ PACKAGECONFIG[expat] = "--with-expat=${STAGING_INCDIR}/.. --with-expat-inc=${STA do_install_append() { rm -rf ${D}${libdir}/charset.alias } - +FILES_${PN} += "${datadir}/icons/hicolor" FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" RDEPENDS_${PN} = "perl bash readline" diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb index fcfec6907d..736cce1b01 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb @@ -15,23 +15,28 @@ understand what the code does. It features: \ platform abstraction and threading \ " -HOMEPAGE = "https://polarssl.org" -BUGTRACKER = "https://github.com/polarssl/polarssl/issues" +HOMEPAGE = "https://tls.mbed.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=302d50a6369f5f22efdb674db908167a" SECTION = "libdevel" -SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-gpl.tgz" +SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-apache.tgz" -SRC_URI[md5sum] = "a6ed92fc377ef60f7c24d42b900e0dad" -SRC_URI[sha256sum] = "f5beb43e850283915e3e0f8d37495eade3bfb5beedfb61e7b8da70d4c68edb82" +SRC_URI[md5sum] = "2d4b0e2cb844efde1e73d3bcd9731fef" +SRC_URI[sha256sum] = "ab8b62b995781bcf22e87a265ed06267f87c3041198e996b44441223d19fa9c3" + +inherit cmake + +PACKAGECONFIG ??= "shared-libs programs" +PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-USE_SHARED_MBEDTLS_LIBRARY=OFF" +PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" + +EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" -DEPENDS = "openssl" -RDEPENDS_${PN} += "libcrypto" PROVIDES += "polarssl" RPROVIDES_${PN} = "polarssl" -EXTRA_OECMAKE = "-DUSE_SHARED_POLARSSL_LIBRARY=on -DLIB_INSTALL_DIR=${baselib}" -inherit cmake +PACKAGES =+ "${PN}-programs" +FILES_${PN}-programs = "${bindir}/" diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service b/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service new file mode 100644 index 0000000000..e7bfad0a93 --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Lightweight UPnP IGD daemon +Documentation=man:miniupnpd(8) +After=network.target + +[Service] +Type=forking +ExecStartPre=/etc/miniupnpd/iptables_init.sh +ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf +ExecStopPost=/etc/miniupnpd/iptables_removeall.sh +PIDFile=/run/miniupnpd.pid + +[Install] +WantedBy=network.target diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb index c6f36e1375..04b5cd589c 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb @@ -5,16 +5,17 @@ the network." SECTION = "networking" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aa71c78c373ccfe0ff207af0cd966d91" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91ac00c6b9f5c106e89291e196fe0234" -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig systemd DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \ -" -SRC_URI[md5sum] = "1c07a215dd9b362e75a9efc05e2fb3b4" -SRC_URI[sha256sum] = "d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7" + file://miniupnpd.service" + +SRC_URI[md5sum] = "b4c7c938915edeee6ca4c65dd021f212" +SRC_URI[sha256sum] = "860c15f2f8340fd69546b01cffe4c7fcff3e63a7bdfe5a2af6b2346f0e074bb6" IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" @@ -34,4 +35,9 @@ do_install() { install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/init.d install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ } + +SYSTEMD_SERVICE_${PN} = "miniupnpd.service" diff --git a/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch b/meta-networking/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch index a5aa277a08..a5aa277a08 100644 --- a/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch +++ b/meta-networking/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch diff --git a/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch b/meta-networking/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch index c89dfe6bef..c89dfe6bef 100644 --- a/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch +++ b/meta-networking/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch diff --git a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init index d2a27b2732..d2a27b2732 100644 --- a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init +++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init diff --git a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.service index 25f68fae05..25f68fae05 100644 --- a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service +++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.service diff --git a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb index 13ce3811d4..13ce3811d4 100644 --- a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb index cce3f91880..1b604ad529 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb @@ -26,7 +26,7 @@ USERADD_PARAM_${PN} = "--system nm-openvpn" FILES_${PN} += " \ ${libdir}/NetworkManager/*.so \ - ${libdir}/NetworkManager/VPN/nm-openvpn-service.name \ + ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ " FILES_${PN}-staticdev += " \ diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch deleted file mode 100644 index ced0c7cfff..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 15:57:05 -0700 -Subject: [PATCH 1/5] adjust net/ headers for musl compatibility - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libnm-core/nm-utils.c | 12 +++++++----- - libnm-core/nm-utils.h | 5 ++--- - src/platform/wifi/wifi-utils.h | 2 +- - 3 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c -index df75d56..868224e 100644 ---- a/libnm-core/nm-utils.c -+++ b/libnm-core/nm-utils.c -@@ -19,24 +19,26 @@ - * Copyright 2005 - 2014 Red Hat, Inc. - */ - --#include "nm-default.h" -- --#include "nm-utils.h" -- - #include <string.h> - #include <errno.h> - #include <stdlib.h> --#include <netinet/ether.h> - #include <arpa/inet.h> - #include <uuid/uuid.h> - #include <libintl.h> - #include <gmodule.h> - #include <sys/stat.h> -+//#include <net/if_arp.h> -+//#include <net/ethernet.h> -+#include <netinet/ether.h> -+ -+#include "nm-default.h" - -+#include "nm-utils.h" - #if WITH_JANSSON - #include <jansson.h> - #endif - -+ - #include "nm-common-macros.h" - #include "nm-utils-private.h" - #include "nm-setting-private.h" -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 407c14e..156ccae 100644 ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -27,11 +27,10 @@ - - #include <glib.h> - --#include <netinet/in.h> -- - /* For ETH_ALEN and INFINIBAND_ALEN */ --#include <linux/if_ether.h> -+//#include <linux/if_ether.h> - #include <linux/if_infiniband.h> -+#include <netinet/in.h> - - #include "nm-core-enum-types.h" - #include "nm-setting-wireless-security.h" -diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 8e2b93f..84f5ce9 100644 ---- a/src/platform/wifi/wifi-utils.h -+++ b/src/platform/wifi/wifi-utils.h -@@ -22,7 +22,7 @@ - #ifndef __WIFI_UTILS_H__ - #define __WIFI_UTILS_H__ - --#include <net/ethernet.h> -+//#include <net/ethernet.h> - - #include "nm-dbus-interface.h" - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch deleted file mode 100644 index 26f380bf98..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 18:37:19 -0700 -Subject: [PATCH] check for strndupa before using it - -musl does not have strndupa - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - config.h.in | 4 ++++ - configure.ac | 1 + - src/systemd/src/basic/alloc-util.h | 12 ++++++++++++ - 3 files changed, 17 insertions(+) - -diff --git a/config.h.in b/config.h.in -index db8c135..c4229ed 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -41,6 +41,10 @@ - */ - #undef HAVE_DCGETTEXT - -+/* Define to 1 if you have the declaration of `strndupa', and to 0 if you -+ don't. */ -+#undef HAVE_DECL_STRNDUPA -+ - /* Define to 1 if you have the <dlfcn.h> header file. */ - #undef HAVE_DLFCN_H - -diff --git a/configure.ac b/configure.ac -index 2630f8d..d0a57fd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION) - - GIT_SHA_RECORD(NM_GIT_SHA) - -+AC_CHECK_DECLS([strndupa], [], [], [[#include <string.h>]]) - dnl - dnl Checks for typedefs, structures, and compiler characteristics. - dnl -diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h -index ceeee51..924b59c 100644 ---- a/src/systemd/src/basic/alloc-util.h -+++ b/src/systemd/src/basic/alloc-util.h -@@ -25,6 +25,18 @@ - #include <string.h> - - #include "macro.h" -+#include "config.h" -+ -+#if !HAVE_DECL_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = (char *)alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ (char *)memcpy(__new, __old, __len); \ -+ }) -+#endif - - #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch deleted file mode 100644 index bd194a61d2..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch +++ /dev/null @@ -1,621 +0,0 @@ -From: Sjoerd Simons <sjoerd@luon.net> -Date: Sun, 21 Aug 2016 21:46:02 +0200 -Subject: [PATCH] dns/resolved: add systemd-resolved backend - -Add initial DNS backend that pushes DNS information into -systemd-resolved. Backend is choosen by default if the systems -resolv.conv is setup to pointing to one of the standard resolved -locations. - -This doesn't handle global dns configuration. - -Signed-off-by: Sjoerd Simons <sjoerd@luon.net> - -https://bugzilla.gnome.org/show_bug.cgi?id=762540 - -Upstream-Status: Backport - ---- - man/NetworkManager.conf.xml | 10 +- - src/Makefile.am | 2 + - src/dns-manager/nm-dns-manager.c | 43 ++- - src/dns-manager/nm-dns-systemd-resolved.c | 427 ++++++++++++++++++++++++++++++ - src/dns-manager/nm-dns-systemd-resolved.h | 45 ++++ - 5 files changed, 523 insertions(+), 4 deletions(-) - create mode 100644 src/dns-manager/nm-dns-systemd-resolved.c - create mode 100644 src/dns-manager/nm-dns-systemd-resolved.h - -diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml -index 6295b82..0a67ae5 100644 ---- a/man/NetworkManager.conf.xml -+++ b/man/NetworkManager.conf.xml -@@ -275,10 +275,12 @@ no-auto-default=* - <varlistentry> - <term><varname>dns</varname></term> - <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> -- <para><literal>default</literal>: The default if the key is -- not specified. NetworkManager will update -+ <para><literal>default</literal>: NetworkManager will update - <filename>resolv.conf</filename> to reflect the nameservers -- provided by currently active connections.</para> -+ provided by currently active connections. This is the default -+ if the key is not specified, unless the system is configured -+ to use systemd-resolved; in this case the default is -+ <literal>systemd-resolved</literal></para> - <para><literal>dnsmasq</literal>: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update -@@ -288,6 +290,8 @@ no-auto-default=* - to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The <filename>/etc/resolv.conf</filename> - will be managed by dnssec-trigger daemon.</para> -+ <para><literal>systemd-resolved</literal>: NetworkManager will -+ push the DNS configuration to systemd-resolved</para> - <para><literal>none</literal>: NetworkManager will not - modify resolv.conf. This implies - <literal>rc-manager</literal> <literal>unmanaged</literal></para> -diff --git a/src/Makefile.am b/src/Makefile.am -index 8d29b19..10f63de 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -345,6 +345,8 @@ libNetworkManager_la_SOURCES = \ - \ - dns-manager/nm-dns-dnsmasq.c \ - dns-manager/nm-dns-dnsmasq.h \ -+ dns-manager/nm-dns-systemd-resolved.c \ -+ dns-manager/nm-dns-systemd-resolved.h \ - dns-manager/nm-dns-unbound.c \ - dns-manager/nm-dns-unbound.h \ - dns-manager/nm-dns-manager.c \ -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 5a758a9..38bc786 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -45,6 +45,7 @@ - - #include "nm-dns-plugin.h" - #include "nm-dns-dnsmasq.h" -+#include "nm-dns-systemd-resolved.h" - #include "nm-dns-unbound.h" - - #if WITH_LIBSOUP -@@ -1588,6 +1589,37 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager) - - NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER); - -+static gboolean -+_resolvconf_resolved_managed (void) -+{ -+ static const char *const resolved_paths[] = { -+ "/run/systemd/resolve/resolv.conf", -+ "/lib/systemd/resolv.conf", -+ "/usr/lib/systemd/resolv.conf", -+ }; -+ GFile *f; -+ GFileInfo *info; -+ gboolean ret = FALSE; -+ -+ f = g_file_new_for_path (_PATH_RESCONF); -+ info = g_file_query_info (f, -+ G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK","\ -+ G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET, -+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, -+ NULL, NULL); -+ -+ if (info && g_file_info_get_is_symlink (info)) { -+ ret = _nm_utils_strv_find_first ((gchar **) resolved_paths, -+ G_N_ELEMENTS (resolved_paths), -+ g_file_info_get_symlink_target (info)) >= 0; -+ } -+ -+ g_clear_object(&info); -+ g_clear_object(&f); -+ -+ return ret; -+} -+ - static void - init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin) - { -@@ -1633,7 +1665,16 @@ again: - - rc_manager = _check_resconf_immutable (rc_manager); - -- if (nm_streq0 (mode, "dnsmasq")) { -+ if ( (!mode && _resolvconf_resolved_managed ()) -+ || nm_streq0 (mode, "systemd-resolved")) { -+ if ( force_reload_plugin -+ || !NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { -+ _clear_plugin (self); -+ priv->plugin = nm_dns_systemd_resolved_new (); -+ plugin_changed = TRUE; -+ } -+ mode = "systemd-resolved"; -+ } else if (nm_streq0 (mode, "dnsmasq")) { - if (force_reload_plugin || !NM_IS_DNS_DNSMASQ (priv->plugin)) { - _clear_plugin (self); - priv->plugin = nm_dns_dnsmasq_new (); -diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns-manager/nm-dns-systemd-resolved.c -new file mode 100644 -index 0000000..6bdd5f6 ---- /dev/null -+++ b/src/dns-manager/nm-dns-systemd-resolved.c -@@ -0,0 +1,427 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* -+ * Copyright (C) 2010 Dan Williams <dcbw@redhat.com> -+ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net> -+ * -+ * 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, 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, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include "nm-default.h" -+ -+#include "nm-dns-systemd-resolved.h" -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/wait.h> -+#include <arpa/inet.h> -+#include <sys/stat.h> -+#include <linux/if.h> -+ -+#include "nm-core-internal.h" -+#include "nm-platform.h" -+#include "nm-utils.h" -+#include "nm-ip4-config.h" -+#include "nm-ip6-config.h" -+#include "nm-bus-manager.h" -+#include "nm-manager.h" -+#include "nm-device.h" -+#include "NetworkManagerUtils.h" -+ -+G_DEFINE_TYPE (NMDnsSystemdResolved, nm_dns_systemd_resolved, NM_TYPE_DNS_PLUGIN) -+ -+#define NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(o) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_SYSTEMD_RESOLVED, \ -+ NMDnsSystemdResolvedPrivate)) -+ -+#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1" -+#define SYSTEMD_RESOLVED_DBUS_PATH "/org/freedesktop/resolve1" -+ -+typedef struct { -+ int ifindex; -+ GList *configs; -+} InterfaceConfig; -+ -+typedef struct { -+ GDBusProxy *resolve; -+ GCancellable *init_cancellable; -+ GCancellable *update_cancellable; -+ GQueue dns_updates; -+ GQueue domain_updates; -+} NMDnsSystemdResolvedPrivate; -+ -+/*****************************************************************************/ -+ -+#define _NMLOG_DOMAIN LOGD_DNS -+#define _NMLOG_PREFIX_NAME "systemd-resolved" -+#define _NMLOG(level, ...) \ -+ G_STMT_START { \ -+ nm_log ((level), _NMLOG_DOMAIN, \ -+ "%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ -+ _NMLOG_PREFIX_NAME, \ -+ (self) \ -+ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ -+ } G_STMT_END -+ -+/*****************************************************************************/ -+ -+static void -+call_done (GObject *source, GAsyncResult *r, gpointer user_data) -+{ -+ GVariant *v; -+ GError *error = NULL; -+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data; -+ -+ v = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), r, &error); -+ -+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ return; -+ -+ if (error != NULL) { -+ _LOGW ("Failed: %s\n", error->message); -+ g_error_free (error); -+ } -+} -+ -+static void -+add_interface_configuration (NMDnsSystemdResolved *self, -+ GArray *interfaces, -+ const NMDnsIPConfigData *data) -+{ -+ int i; -+ InterfaceConfig *ic = NULL; -+ int ifindex; -+ NMDevice *device; -+ -+ if (NM_IS_IP4_CONFIG (data->config)) -+ ifindex = nm_ip4_config_get_ifindex (data->config); -+ else if (NM_IS_IP6_CONFIG (data->config)) -+ ifindex = nm_ip6_config_get_ifindex (data->config); -+ else -+ g_return_if_reached (); -+ -+ device = nm_manager_get_device_by_ifindex (nm_manager_get (), ifindex); -+ -+ if (!nm_device_get_managed (device, FALSE)) -+ return; -+ -+ for (i = 0; i < interfaces->len; i++) { -+ InterfaceConfig *tic = &g_array_index (interfaces, InterfaceConfig, i); -+ if (ifindex == tic->ifindex) { -+ ic = tic; -+ break; -+ } -+ } -+ -+ if (!ic) { -+ g_array_set_size (interfaces, interfaces->len + 1); -+ ic = &g_array_index (interfaces, InterfaceConfig, -+ interfaces->len - 1); -+ ic->ifindex = ifindex; -+ } -+ -+ ic->configs = g_list_append (ic->configs, data->config); -+} -+ -+static void -+add_domain (GVariantBuilder *domains, -+ const char *domain, -+ gboolean never_default) -+{ -+ /* If this link is never the default (e.g. only used for resources on this -+ * network) add a routing domain. */ -+ g_variant_builder_add (domains, "(sb)", domain, never_default); -+} -+ -+static void -+update_add_ip6_config (NMDnsSystemdResolved *self, -+ GVariantBuilder *dns, -+ GVariantBuilder *domains, -+ const NMIP6Config *config) -+{ -+ guint i, n; -+ -+ n = nm_ip6_config_get_num_nameservers (config); -+ for (i = 0 ; i < n; i++) { -+ const struct in6_addr *ip; -+ -+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)")); -+ g_variant_builder_add (dns, "i", AF_INET6); -+ ip = nm_ip6_config_get_nameserver (config, i), -+ -+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, ip, 16, 1)); -+ g_variant_builder_close (dns); -+ } -+ -+ n = nm_ip6_config_get_num_searches (config); -+ if (n > 0) { -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip6_config_get_search (config, i), -+ nm_ip6_config_get_never_default (config)); -+ } -+ } else { -+ n = nm_ip6_config_get_num_domains (config); -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip6_config_get_domain (config, i), -+ nm_ip6_config_get_never_default (config)); -+ } -+ } -+} -+ -+static void -+update_add_ip4_config (NMDnsSystemdResolved *self, -+ GVariantBuilder *dns, -+ GVariantBuilder *domains, -+ const NMIP4Config *config) -+{ -+ guint i, n; -+ -+ n = nm_ip4_config_get_num_nameservers (config); -+ for (i = 0 ; i < n; i++) { -+ guint32 ns; -+ -+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)")); -+ g_variant_builder_add (dns, "i", AF_INET); -+ ns = nm_ip4_config_get_nameserver (config, i), -+ -+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, &ns, 4, 1)); -+ g_variant_builder_close (dns); -+ } -+ -+ n = nm_ip4_config_get_num_searches (config); -+ if (n > 0) { -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip4_config_get_search (config, i), -+ nm_ip4_config_get_never_default (config)); -+ } -+ } else { -+ n = nm_ip4_config_get_num_domains (config); -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip4_config_get_domain (config, i), -+ nm_ip4_config_get_never_default (config)); -+ } -+ } -+} -+ -+static void -+free_pending_updates (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariant *v; -+ -+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) -+ g_variant_unref (v); -+ -+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) -+ g_variant_unref (v); -+} -+ -+static void -+prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariantBuilder dns, domains; -+ GList *l; -+ -+ g_variant_builder_init (&dns, G_VARIANT_TYPE ("(ia(iay))")); -+ g_variant_builder_add (&dns, "i", ic->ifindex); -+ g_variant_builder_open (&dns, G_VARIANT_TYPE ("a(iay)")); -+ -+ g_variant_builder_init (&domains, G_VARIANT_TYPE ("(ia(sb))")); -+ g_variant_builder_add (&domains, "i", ic->ifindex); -+ g_variant_builder_open (&domains, G_VARIANT_TYPE ("a(sb)")); -+ -+ for (l = ic->configs ; l != NULL ; l = g_list_next (l)) { -+ if (NM_IS_IP4_CONFIG (l->data)) -+ update_add_ip4_config (self, &dns, &domains, l->data); -+ else if (NM_IS_IP6_CONFIG (l->data)) -+ update_add_ip6_config (self, &dns, &domains, l->data); -+ else -+ g_assert_not_reached (); -+ } -+ g_variant_builder_close (&dns); -+ g_variant_builder_close (&domains); -+ -+ g_queue_push_tail (&priv->dns_updates, -+ g_variant_ref_sink (g_variant_builder_end (&dns))); -+ g_queue_push_tail (&priv->domain_updates, -+ g_variant_ref_sink (g_variant_builder_end (&domains))); -+} -+ -+static void -+send_updates (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariant *v; -+ -+ nm_clear_g_cancellable (&priv->update_cancellable); -+ -+ if (!priv->resolve) -+ return; -+ -+ priv->update_cancellable = g_cancellable_new (); -+ -+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) { -+ g_dbus_proxy_call (priv->resolve, "SetLinkDNS", v, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, priv->update_cancellable, call_done, self); -+ g_variant_unref (v); -+ } -+ -+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) { -+ g_dbus_proxy_call (priv->resolve, "SetLinkDomains", v, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, priv->update_cancellable, call_done, self); -+ g_variant_unref (v); -+ } -+} -+ -+static gboolean -+update (NMDnsPlugin *plugin, -+ const NMDnsIPConfigData **configs, -+ const NMGlobalDnsConfig *global_config, -+ const char *hostname) -+{ -+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (plugin); -+ GArray *interfaces = g_array_new (TRUE, TRUE, sizeof (InterfaceConfig)); -+ const NMDnsIPConfigData **c; -+ int i; -+ -+ for (c = configs; *c != NULL; c++) -+ add_interface_configuration (self, interfaces, *c); -+ -+ free_pending_updates (self); -+ -+ for (i = 0; i < interfaces->len; i++) { -+ InterfaceConfig *ic = &g_array_index (interfaces, InterfaceConfig, i); -+ -+ prepare_one_interface (self, ic); -+ g_list_free (ic->configs); -+ } -+ -+ g_array_free (interfaces, TRUE); -+ -+ send_updates (self); -+ -+ return TRUE; -+} -+ -+/****************************************************************/ -+ -+static gboolean -+is_caching (NMDnsPlugin *plugin) -+{ -+ return TRUE; -+} -+ -+static const char * -+get_name (NMDnsPlugin *plugin) -+{ -+ return "systemd-resolved"; -+} -+ -+/****************************************************************/ -+ -+NMDnsPlugin * -+nm_dns_systemd_resolved_new (void) -+{ -+ return g_object_new (NM_TYPE_DNS_SYSTEMD_RESOLVED, NULL); -+} -+ -+static void -+resolved_proxy_created (GObject *source, GAsyncResult *r, gpointer user_data) -+{ -+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data; -+ NMDnsSystemdResolvedPrivate *priv; -+ gs_free_error GError *error = NULL; -+ GDBusProxy *resolve; -+ -+ resolve = g_dbus_proxy_new_finish (r, &error); -+ if ( !resolve -+ && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ return; -+ -+ priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ g_clear_object (&priv->init_cancellable); -+ if (!resolve) { -+ _LOGW ("failed to connect to resolved via DBus: %s", error->message); -+ g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED); -+ return; -+ } -+ -+ priv->resolve = resolve; -+ send_updates (self); -+} -+ -+ -+static void -+nm_dns_systemd_resolved_init (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ NMBusManager *dbus_mgr; -+ GDBusConnection *connection; -+ -+ g_queue_init (&priv->dns_updates); -+ g_queue_init (&priv->domain_updates); -+ -+ dbus_mgr = nm_bus_manager_get (); -+ g_return_if_fail (dbus_mgr); -+ -+ connection = nm_bus_manager_get_connection (dbus_mgr); -+ g_return_if_fail (connection); -+ -+ priv->init_cancellable = g_cancellable_new (); -+ g_dbus_proxy_new (connection, -+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, -+ NULL, -+ SYSTEMD_RESOLVED_DBUS_SERVICE, -+ SYSTEMD_RESOLVED_DBUS_PATH, -+ SYSTEMD_RESOLVED_DBUS_SERVICE ".Manager", -+ priv->init_cancellable, -+ resolved_proxy_created, -+ self); -+} -+ -+static void -+dispose (GObject *object) -+{ -+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (object); -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ -+ free_pending_updates (self); -+ g_clear_object (&priv->resolve); -+ nm_clear_g_cancellable (&priv->init_cancellable); -+ nm_clear_g_cancellable (&priv->update_cancellable); -+ -+ G_OBJECT_CLASS (nm_dns_systemd_resolved_parent_class)->dispose (object); -+} -+ -+static void -+nm_dns_systemd_resolved_class_init (NMDnsSystemdResolvedClass *dns_class) -+{ -+ NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class); -+ GObjectClass *object_class = G_OBJECT_CLASS (dns_class); -+ -+ g_type_class_add_private (dns_class, sizeof (NMDnsSystemdResolvedPrivate)); -+ -+ object_class->dispose = dispose; -+ -+ plugin_class->is_caching = is_caching; -+ plugin_class->update = update; -+ plugin_class->get_name = get_name; -+} -+ -diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns-manager/nm-dns-systemd-resolved.h -new file mode 100644 -index 0000000..45c64b3 ---- /dev/null -+++ b/src/dns-manager/nm-dns-systemd-resolved.h -@@ -0,0 +1,45 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* 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, 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, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net> -+ */ -+ -+#ifndef __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ -+#define __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ -+ -+#include "nm-dns-plugin.h" -+ -+#define NM_TYPE_DNS_SYSTEMD_RESOLVED (nm_dns_systemd_resolved_get_type ()) -+#define NM_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolved)) -+#define NM_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass)) -+#define NM_IS_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED)) -+#define NM_IS_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED)) -+#define NM_DNS_SYSTEMD_RESOLVED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass)) -+ -+typedef struct { -+ NMDnsPlugin parent; -+} NMDnsSystemdResolved; -+ -+typedef struct { -+ NMDnsPluginClass parent; -+} NMDnsSystemdResolvedClass; -+ -+GType nm_dns_systemd_resolved_get_type (void); -+ -+NMDnsPlugin *nm_dns_systemd_resolved_new (void); -+ -+#endif /* __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ */ -+ diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch deleted file mode 100644 index ca7e4a496f..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f799f1f0e68cc7bf89c0a56aec5ecf46937619d Mon Sep 17 00:00:00 2001 -From: Ricardo Salveti <rsalveti@rsalveti.net> -Date: Thu, 15 Jun 2017 10:02:38 -0300 -Subject: [PATCH] dns/resolved: also check for /etc/resolv-conf.systemd - -OE specific resolv.conf path, so it can be enabled by default if available. - -Upstream-Status: Inappropriate [OE config specific] - -Signed-off-by: Ricardo Salveti <rsalveti@rsalveti.net> ---- - src/dns-manager/nm-dns-manager.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index c1d2bf7..d70d4b4 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -1596,6 +1596,7 @@ _resolvconf_resolved_managed (void) - "/run/systemd/resolve/resolv.conf", - "/lib/systemd/resolv.conf", - "/usr/lib/systemd/resolv.conf", -+ "/etc/resolv-conf.systemd", - }; - GFile *f; - GFileInfo *info; --- -2.7.4 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch deleted file mode 100644 index 5c9ed92b80..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7dd40db6606c3b3559365a03944cb99aee5ceabc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 4 Apr 2013 12:57:58 +0200 -Subject: [PATCH] don't try to run /sbin/dhclient to get the version number, - this break cross-compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [build system specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cc66e9b..7163287 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -488,12 +488,6 @@ AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes) - # Search and check the executables - if test "$with_dhclient" = "yes"; then - AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) -- if test "$with_dhclient" != "no"; then -- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then -- AC_MSG_WARN([Cannot use dhclient, version 4.x is required]) -- with_dhclient=no -- fi -- fi - fi - if test "$with_dhcpcd" = "yes"; then - AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) --- -1.7.6.5 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch new file mode 100644 index 0000000000..7194423192 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -0,0 +1,40 @@ +From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 31 Mar 2017 16:48:00 -0700 +Subject: [PATCH 5/7] sd-lldp.h: Remove net/ethernet.h seems to be over + specified + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/systemd/src/libsystemd-network/sd-lldp.c | 1 + + src/systemd/src/systemd/sd-lldp.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c +index 31e2448..7721cc2 100644 +--- a/src/systemd/src/libsystemd-network/sd-lldp.c ++++ b/src/systemd/src/libsystemd-network/sd-lldp.c +@@ -21,6 +21,7 @@ + #include "nm-sd-adapt.h" + + #include <arpa/inet.h> ++#include <net/ethernet.h> + #include <linux/sockios.h> + + #include "sd-lldp.h" +diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h +index 3f35eeb..61b0e45 100644 +--- a/src/systemd/src/systemd/sd-lldp.h ++++ b/src/systemd/src/systemd/sd-lldp.h +@@ -22,7 +22,7 @@ + ***/ + + #include <inttypes.h> +-#include <net/ethernet.h> ++//#include <net/ethernet.h> + #include <sys/types.h> + + #include "sd-event.h" +-- +2.14.1 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch deleted file mode 100644 index 4234e2be2d..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a9bfe6f2029d75caf28fcdf3e740843cf6359615 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 07:31:25 -0700 -Subject: [PATCH 1/2] systemd: xlocale.h is dropped by newer glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/src/basic/parse-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c -index 9c21e5a..dd95d1f 100644 ---- a/src/systemd/src/basic/parse-util.c -+++ b/src/systemd/src/basic/parse-util.c -@@ -25,11 +25,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#ifdef __GLIBC__ --#include <xlocale.h> --#else - #include <locale.h> --#endif - #include "alloc-util.h" - #include "extract-word.h" - #include "macro.h" --- -2.13.2 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch deleted file mode 100644 index aa57c832cb..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7274bbadd398a69b8babf47431f80d35e0228c42 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@gmail.com> -Date: Mon, 18 Jan 2016 08:53:26 +0100 -Subject: [PATCH] Fix nm-version-macro includes - -nm-version-macros.h cannot be found since include directive has -been changed from " to <. This breaks for example gnome-panel -build: -/usr/include/NetworkManager/NetworkManager.h:31:31: -fatal error: nm-version-macros.h: No such file or directory. ---- - libnm-core/nm-version.h | 2 +- - libnm-util/NetworkManager.h | 2 +- - libnm-util/nm-version.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h -index 730330a..d751bc1 100644 ---- a/libnm-core/nm-version.h -+++ b/libnm-core/nm-version.h -@@ -23,7 +23,7 @@ - - #include <glib.h> - --#include <nm-version-macros.h> -+#include "nm-version-macros.h" - - /* Deprecation / Availability macros */ - -diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h -index d83e4ab..3a964fc 100644 ---- a/libnm-util/NetworkManager.h -+++ b/libnm-util/NetworkManager.h -@@ -28,7 +28,7 @@ - - /* This header must not include glib or libnm. */ - --#include <nm-version-macros.h> -+#include "nm-version-macros.h" - - /* - * dbus services details -diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h -index 63895dd..41101a4 100644 ---- a/libnm-util/nm-version.h -+++ b/libnm-util/nm-version.h -@@ -23,7 +23,7 @@ - - #include <glib.h> - --#include <nm-version-macros.h> -+#include "nm-version-macros.h" - - /* Deprecation / Availability macros */ - --- -2.5.0 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch new file mode 100644 index 0000000000..28848d3543 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -0,0 +1,25 @@ +From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001 +From: Pablo Saavedra <psaavedra@igalia.com> +Date: Tue, 13 Mar 2018 17:36:20 +0100 +Subject: [PATCH 7/7] Fixed configure.ac: Fix pkgconfig sysroot locations + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 51e5eb6..c9d3e56 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -669,7 +669,7 @@ else + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) + + AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) +- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` ++ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` + JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` + + if test "$JANSSON_SONAME" = ""; then +-- +2.14.1 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch deleted file mode 100644 index 22bc6e8bda..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:05:05 -0700 -Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/src/basic/socket-util.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h -index 2536b08..76d6107 100644 ---- a/src/systemd/src/basic/socket-util.h -+++ b/src/systemd/src/basic/socket-util.h -@@ -29,6 +29,12 @@ - #include <linux/netlink.h> - #include <linux/if_packet.h> - -+#if !defined(__GLIBC__) -+/* SIOCGSTAMPNS from linux/asm-generic.h -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ -+#include <linux/sockios.h> -+#endif -+ - #include "macro.h" - #include "util.h" - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch deleted file mode 100644 index e32b5c00dd..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch +++ /dev/null @@ -1,67 +0,0 @@ -From adc0668b854289a11cfc29597b5566ba1869d17e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 07:32:09 -0700 -Subject: [PATCH 2/2] user format string in g_dbus_message_new_method_error () - -This fixes format errors with -Werror=format-security - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/nm-manager.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index c3d65cd..e814912 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4871,6 +4871,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (error || (result != NM_AUTH_CALL_RESULT_YES)) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Not authorized to perform this operation")); - if (error) - error_message = error->message; -@@ -4882,6 +4883,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (!object) { - reply = g_dbus_message_new_method_error (pfd->message, - "org.freedesktop.DBus.Error.UnknownObject", -+ "%s", - (error_message = "Object doesn't exist.")); - goto done; - } -@@ -4890,6 +4892,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (!nm_exported_object_get_interface_by_type (object, pfd->interface_type)) { - reply = g_dbus_message_new_method_error (pfd->message, - "org.freedesktop.DBus.Error.InvalidArgs", -+ "%s", - (error_message = "Object is of unexpected type.")); - goto done; - } -@@ -4905,6 +4908,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (global_dns && !nm_global_dns_config_is_internal (global_dns)) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Global DNS configuration already set via configuration file")); - goto done; - } -@@ -4949,6 +4953,7 @@ do_set_property_check (gpointer user_data) - if (!pfd->subject) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Could not determine request UID.")); - goto out; - } -@@ -4958,6 +4963,7 @@ do_set_property_check (gpointer user_data) - if (!chain) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Could not authenticate request.")); - goto out; - } --- -2.13.2 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch deleted file mode 100644 index 236914f756..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:08:45 -0700 -Subject: [PATCH 3/5] Define ETH_ALEN - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libnm-core/nm-utils.h | 1 + - src/platform/wifi/wifi-utils.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 156ccae..68e222b 100644 ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -29,6 +29,7 @@ - - /* For ETH_ALEN and INFINIBAND_ALEN */ - //#include <linux/if_ether.h> -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ - #include <linux/if_infiniband.h> - #include <netinet/in.h> - -diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 84f5ce9..33a838d 100644 ---- a/src/platform/wifi/wifi-utils.h -+++ b/src/platform/wifi/wifi-utils.h -@@ -24,6 +24,8 @@ - - //#include <net/ethernet.h> - -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+ - #include "nm-dbus-interface.h" - - typedef struct WifiData WifiData; --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch new file mode 100644 index 0000000000..92485f0441 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch @@ -0,0 +1,77 @@ +From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 22 Mar 2018 11:08:30 +0100 +Subject: [PATCH] Do not create settings settings/property documentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It was tried to get this work but gi / GirRepository could not be found by +python. Anyway it is not necessary for us to have the settings/property docs. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 18 ++---------------- + configure.ac | 4 ---- + 2 files changed, 2 insertions(+), 20 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 639921d..314a61d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -961,9 +961,7 @@ endif + if HAVE_INTROSPECTION + + libnm_noinst_data = \ +- libnm/nm-property-docs.xml \ + libnm/nm-settings-docs-overrides.xml \ +- libnm/nm-settings-docs.xml \ + libnm/nm-settings-keyfile-docs.xml \ + libnm/nm-settings-ifcfg-rh-docs.xml + +@@ -3317,23 +3315,11 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp + + clients_common_settings_doc_c = clients/common/settings-docs.c +-if HAVE_INTROSPECTION +-$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) +-DISTCLEANFILES += $(clients_common_settings_doc_c) +-check-local-settings-docs: $(clients_common_settings_doc_c) +- @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ +- if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ +- echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ +- false; \ +- fi;\ +- fi +-check_local += check-local-settings-docs +-else ++ + $(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp + $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" + check-local-settings-docs: +-endif ++ + EXTRA_DIST += \ + $(clients_common_settings_doc_c) \ + $(clients_common_settings_doc_c).in +diff --git a/configure.ac b/configure.ac +index c9d3e56..407222e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1286,10 +1286,6 @@ GTK_DOC_CHECK(1.0) + # check if we can build setting property documentation + build_docs=no + if test -n "$INTROSPECTION_MAKEFILE"; then +- # If g-i is installed we know we have python, but we might not have pygobject +- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then +- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) +- fi + + AC_PATH_PROG(PERL, perl) + if test -z "$PERL"; then +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch deleted file mode 100644 index 27c9ae9624..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:09:41 -0700 -Subject: [PATCH 4/5] Define missing features to cater for musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/sd-adapt/nm-sd-adapt.h | 2 +- - src/systemd/src/basic/parse-util.c | 5 ++++- - src/systemd/src/basic/stdio-util.h | 2 ++ - src/systemd/src/basic/util.h | 5 +++++ - src/systemd/src/systemd/sd-event.h | 4 ---- - 5 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h -index cf27c1a..72c1b89 100644 ---- a/src/systemd/sd-adapt/nm-sd-adapt.h -+++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -119,7 +119,7 @@ G_STMT_START { \ - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv - # else --# error neither secure_getenv nor __secure_getenv is available -+# define secure_getenv getenv - # endif - #endif - -diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c -index 2738663..9c21e5a 100644 ---- a/src/systemd/src/basic/parse-util.c -+++ b/src/systemd/src/basic/parse-util.c -@@ -25,8 +25,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifdef __GLIBC__ - #include <xlocale.h> -- -+#else -+#include <locale.h> -+#endif - #include "alloc-util.h" - #include "extract-word.h" - #include "macro.h" -diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h -index bd1144b..c92e935 100644 ---- a/src/systemd/src/basic/stdio-util.h -+++ b/src/systemd/src/basic/stdio-util.h -@@ -19,7 +19,9 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#ifdef __GLIBC__ - #include <printf.h> -+#endif - #include <stdarg.h> - #include <stdio.h> - #include <sys/types.h> -diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h -index bb2fc31..fe074a5 100644 ---- a/src/systemd/src/basic/util.h -+++ b/src/systemd/src/basic/util.h -@@ -46,6 +46,11 @@ - #include "missing.h" - #include "time-util.h" - -+#if !defined(__GLIBC__) -+typedef int (*__compar_fn_t) (const void*, const void*); -+typedef __compar_fn_t comparison_fn_t; -+#endif -+ - size_t page_size(void) _pure_; - #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) - -diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h -index cc26b7d..c7e0004 100644 ---- a/src/systemd/src/systemd/sd-event.h -+++ b/src/systemd/src/systemd/sd-event.h -@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata); - typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata); - typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata); - typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata); --#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED - typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata); --#else --typedef void* sd_event_child_handler_t; --#endif - - int sd_event_default(sd_event **e); - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch deleted file mode 100644 index f4a04c782c..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:48:00 -0700 -Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over - specified - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/src/systemd/sd-lldp.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h -=================================================================== ---- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h -+++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h -@@ -22,7 +22,7 @@ - ***/ - - #include <inttypes.h> --#include <net/ethernet.h> -+//#include <net/ethernet.h> - #include <sys/types.h> - - #include "sd-event.h" -Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c -=================================================================== ---- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c -+++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c -@@ -21,6 +21,7 @@ - #include "nm-sd-adapt.h" - - #include <arpa/inet.h> -+#include <net/ethernet.h> - - #include "sd-lldp.h" - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch new file mode 100644 index 0000000000..9d208e1fda --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch @@ -0,0 +1,53 @@ +From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 22 Mar 2018 17:54:10 +0100 +Subject: [PATCH 1/4] Usual fix for musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/systemd/src/basic/stdio-util.h | 2 ++ + src/systemd/src/basic/util.h | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h +index bd1144b..9eafacb 100644 +--- a/src/systemd/src/basic/stdio-util.h ++++ b/src/systemd/src/basic/stdio-util.h +@@ -19,7 +19,9 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + ++#if defined(__GLIBC__) + #include <printf.h> ++#endif + #include <stdarg.h> + #include <stdio.h> + #include <sys/types.h> +diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h +index b31dfd1..9b7032c 100644 +--- a/src/systemd/src/basic/util.h ++++ b/src/systemd/src/basic/util.h +@@ -46,6 +46,11 @@ + #include "missing.h" + #include "time-util.h" + ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + size_t page_size(void) _pure_; + #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) + +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch new file mode 100644 index 0000000000..548cccb329 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch @@ -0,0 +1,35 @@ +From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 22 Mar 2018 18:18:06 +0100 +Subject: [PATCH 2/4] musl: dlopen is included so LD_LIBS="" instead of + LD_LIBS="none required" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 487a266..96ae4f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -305,6 +305,7 @@ dnl + dnl Checks for libdl - on certain platforms its part of libc + dnl + AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) ++AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""]) + AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") + + PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch new file mode 100644 index 0000000000..5dd17b63b4 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch @@ -0,0 +1,72 @@ +From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 22 Mar 2018 18:24:07 +0100 +Subject: [PATCH 3/4] musl: network support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + libnm-core/nm-utils.h | 4 ++++ + src/platform/wifi/wifi-utils.h | 4 ++++ + src/systemd/src/basic/socket-util.h | 5 +++++ + 3 files changed, 13 insertions(+) + +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h +index df9284b..2bcf4b8 100644 +--- a/libnm-core/nm-utils.h ++++ b/libnm-core/nm-utils.h +@@ -30,7 +30,11 @@ + #include <netinet/in.h> + + /* For ETH_ALEN and INFINIBAND_ALEN */ ++#if defined(__GLIBC__) + #include <linux/if_ether.h> ++#else ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ ++#endif + #include <linux/if_infiniband.h> + + #include "nm-core-enum-types.h" +diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h +index 705717b..da3edc4 100644 +--- a/src/platform/wifi/wifi-utils.h ++++ b/src/platform/wifi/wifi-utils.h +@@ -22,7 +22,11 @@ + #ifndef __WIFI_UTILS_H__ + #define __WIFI_UTILS_H__ + ++#if defined(__GLIBC__) + #include <net/ethernet.h> ++#else /* musl libc */ ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ ++#endif + + #include "nm-dbus-interface.h" + +diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h +index d7e2d85..d109c84 100644 +--- a/src/systemd/src/basic/socket-util.h ++++ b/src/systemd/src/basic/socket-util.h +@@ -29,6 +29,11 @@ + #include <linux/netlink.h> + #include <linux/if_infiniband.h> + #include <linux/if_packet.h> ++#if !defined(__GLIBC__) ++/* SIOCGSTAMPNS from linux/asm-generic.h ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */ ++#include <linux/sockios.h> ++#endif + + #include "macro.h" + #include "missing.h" +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch new file mode 100644 index 0000000000..fc55ce85f6 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch @@ -0,0 +1,62 @@ +From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 22 Mar 2018 18:29:00 +0100 +Subject: [PATCH 4/4] musl: process-util +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/systemd/src/basic/process-util.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c +index 272030d..485f1db 100644 +--- a/src/systemd/src/basic/process-util.c ++++ b/src/systemd/src/basic/process-util.c +@@ -36,6 +36,9 @@ + #include <sys/wait.h> + #include <syslog.h> + #include <unistd.h> ++#ifndef __GLIBC__ ++#include <pthread.h> ++#endif + #if 0 /* NM_IGNORED */ + #if HAVE_VALGRIND_VALGRIND_H + #include <valgrind/valgrind.h> +@@ -1015,11 +1018,13 @@ static void reset_cached_pid(void) { + cached_pid = CACHED_PID_UNSET; + } + ++#ifdef __GLIBC__ + /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc + * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against + * libpthread, as it is part of glibc anyway. */ + extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); + extern void* __dso_handle __attribute__ ((__weak__)); ++#endif + + pid_t getpid_cached(void) { + pid_t current_value; +@@ -1042,7 +1047,11 @@ pid_t getpid_cached(void) { + + new_pid = getpid(); + ++#ifdef __GLIBC__ + if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { ++#else ++ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { ++#endif + /* OOM? Let's try again later */ + cached_pid = CACHED_PID_UNSET; + return new_pid; +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch new file mode 100644 index 0000000000..752fe4f581 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch @@ -0,0 +1,77 @@ +From b3b4fe35018c98ad176719b2d9ffb867974fc7c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 16 Apr 2018 14:45:44 +0200 +Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/systemd/src/systemd/sd-dhcp-client.h | 2 ++ + src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++ + src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++ + src/systemd/src/systemd/sd-ipv4ll.h | 2 ++ + 4 files changed, 8 insertions(+) + +diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h +index 5e46d8d..18a613f 100644 +--- a/src/systemd/src/systemd/sd-dhcp-client.h ++++ b/src/systemd/src/systemd/sd-dhcp-client.h +@@ -21,7 +21,9 @@ + ***/ + + #include <inttypes.h> ++#if defined(__GLIBC__) + #include <net/ethernet.h> ++#endif + #include <netinet/in.h> + #include <sys/types.h> + +diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h +index 7ab99cc..85acdf2 100644 +--- a/src/systemd/src/systemd/sd-dhcp-lease.h ++++ b/src/systemd/src/systemd/sd-dhcp-lease.h +@@ -22,7 +22,9 @@ + ***/ + + #include <inttypes.h> ++#if defined(__GLIBC__) + #include <net/ethernet.h> ++#endif + #include <netinet/in.h> + #include <sys/types.h> + +diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h +index 7819f0d..35f30ee 100644 +--- a/src/systemd/src/systemd/sd-dhcp6-client.h ++++ b/src/systemd/src/systemd/sd-dhcp6-client.h +@@ -21,7 +21,9 @@ + ***/ + + #include <inttypes.h> ++#if defined(__GLIBC__) + #include <net/ethernet.h> ++#endif + #include <sys/types.h> + + #include "sd-dhcp6-lease.h" +diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h +index 5ba9208..c90eca6 100644 +--- a/src/systemd/src/systemd/sd-ipv4ll.h ++++ b/src/systemd/src/systemd/sd-ipv4ll.h +@@ -20,7 +20,9 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + ++#if defined(__GLIBC__) + #include <net/ethernet.h> ++#endif + #include <netinet/in.h> + + #include "sd-event.h" +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch new file mode 100644 index 0000000000..8ed7ee64fb --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch @@ -0,0 +1,47 @@ +From 6db6596e450062601d18b2ae812a4a58d2e03a53 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 16 Apr 2018 15:07:20 +0200 +Subject: [PATCH] Add a strndupa replacement for musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/systemd/src/basic/in-addr-util.c | 1 + + src/systemd/src/basic/string-util.h | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git a/src/systemd/src/basic/in-addr-util.c b/src/systemd/src/basic/in-addr-util.c +index 2a02d90..a57c360 100644 +--- a/src/systemd/src/basic/in-addr-util.c ++++ b/src/systemd/src/basic/in-addr-util.c +@@ -30,6 +30,7 @@ + #include "in-addr-util.h" + #include "macro.h" + #include "parse-util.h" ++#include "string-util.h" + #include "util.h" + + bool in4_addr_is_null(const struct in_addr *a) { +diff --git a/src/systemd/src/basic/string-util.h b/src/systemd/src/basic/string-util.h +index 4c94b18..a6dc446 100644 +--- a/src/systemd/src/basic/string-util.h ++++ b/src/systemd/src/basic/string-util.h +@@ -44,6 +44,11 @@ + #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) + #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) + ++/* musl does not know strndupa */ ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + int strcmp_ptr(const char *a, const char *b) _pure_; + + static inline bool streq_ptr(const char *a, const char *b) { +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb index d5f456f37b..09c5dbd188 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb @@ -5,11 +5,12 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=8eb8e72bab097b9d11763002cb003697 \ + file://docs/api/html/license.html;md5=77b9e362690c149da196aefe7712db30 \ " DEPENDS = " \ intltool-native \ + libxslt-native \ libnl \ dbus \ dbus-glib \ @@ -20,28 +21,25 @@ DEPENDS = " \ libnewt \ polkit \ jansson \ + curl \ " -inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection - -GI_DATA_ENABLED_libc-musl = "False" - -SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ - file://0002-Fix-nm-version-macro-includes.patch \ - file://0001-adjust-net-headers-for-musl-compatibility.patch \ - file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \ - file://0003-Define-ETH_ALEN.patch \ - file://0004-Define-missing-features-to-cater-for-musl.patch \ - file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ - file://0001-check-for-strndupa-before-using-it.patch \ - file://0001-dns-resolved-add-systemd-resolved-backend.patch \ - file://0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch \ - file://0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch \ - file://0002-user-format-string-in-g_dbus_message_new_method_erro.patch \ - " -SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75" -SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309" +inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection gtk-doc + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ + file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ + file://0003-Do-not-create-settings-settings-property-documentati.patch \ + file://musl/0001-musl-basic.patch \ + file://musl/0002-musl-dlopen-configure-ac.patch \ + file://musl/0003-musl-network-support.patch \ + file://musl/0004-musl-process-util.patch \ + file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \ + file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \ +" +SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14" +SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76" S = "${WORKDIR}/NetworkManager-${PV}" @@ -55,13 +53,21 @@ EXTRA_OECONF = " \ --with-nmtui=yes \ " +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +# stolen from https://github.com/voidlinux/void-packages/blob/master/srcpkgs/NetworkManager/template +CFLAGS_libc-musl_append = " \ + -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv \ + -D__USE_POSIX199309 -DRTLD_DEEPBIND=0 \ +" + do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" } PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ " @@ -73,7 +79,6 @@ PACKAGECONFIG[systemd] = " \ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" # Use full featured dhcp client instead of internal one @@ -101,6 +106,8 @@ FILES_${PN} += " \ ${libexecdir} \ ${libdir}/pppd/*/nm-pppd-plugin.so \ ${libdir}/NetworkManager/*.so \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/conf.d \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ ${base_libdir}/udev/* \ diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch index 0ab3436fc5..0e89a9be01 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch @@ -13,16 +13,17 @@ If no network connection appears within DefaultTimeoutStartSec therefore get killed. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> + --- packaging/systemd/nmb.service | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service -index 992c0cd..555c9ab 100644 +index 71c93d6..f3d2fc2 100644 --- a/packaging/systemd/nmb.service +++ b/packaging/systemd/nmb.service @@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba - ExecStart=/usr/sbin/nmbd $NMBDOPTIONS + ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID LimitCORE=infinity +TimeoutStartSec=0 diff --git a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch index c37cfcde44..8ca7a52ed8 100644 --- a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch +++ b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch @@ -1,13 +1,24 @@ -Don't check xsltproc manpages +From 2214c2d1e455a38c891d17e421b438e3f7c495d8 Mon Sep 17 00:00:00 2001 +From: Bian Naimeng <biannm@cn.fujitsu.com> +Date: Mon, 18 Apr 2016 17:00:53 -0400 +Subject: [PATCH] Don't check xsltproc manpages +Upstream-Status: Pending + Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> -Index: samba-4.4.2/lib/ldb/wscript -=================================================================== ---- samba-4.4.2.orig/lib/ldb/wscript -+++ samba-4.4.2/lib/ldb/wscript -@@ -65,7 +65,7 @@ def configure(conf): - conf.define('USING_SYSTEM_LDB', 1) +--- + lib/ldb/wscript | 2 +- + lib/talloc/wscript | 2 +- + lib/tdb/wscript | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/ldb/wscript b/lib/ldb/wscript +index 5ea5231..d94086b 100644 +--- a/lib/ldb/wscript ++++ b/lib/ldb/wscript +@@ -98,7 +98,7 @@ def configure(conf): + conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) if conf.env.standalone_ldb: - conf.CHECK_XSLTPROC_MANPAGES() @@ -15,24 +26,24 @@ Index: samba-4.4.2/lib/ldb/wscript # we need this for the ldap backend if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -Index: samba-4.4.2/lib/talloc/wscript -=================================================================== ---- samba-4.4.2.orig/lib/talloc/wscript -+++ samba-4.4.2/lib/talloc/wscript -@@ -56,7 +56,7 @@ def configure(conf): - if conf.env.standalone_talloc: - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 +diff --git a/lib/talloc/wscript b/lib/talloc/wscript +index df7e6be..b3305cf 100644 +--- a/lib/talloc/wscript ++++ b/lib/talloc/wscript +@@ -49,7 +49,7 @@ def configure(conf): + conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + conf.env.TALLOC_VERSION = VERSION - conf.CHECK_XSLTPROC_MANPAGES() + #conf.CHECK_XSLTPROC_MANPAGES() - if not conf.env.disable_python: - # also disable if we don't have the python libs installed -Index: samba-4.4.2/lib/tdb/wscript -=================================================================== ---- samba-4.4.2.orig/lib/tdb/wscript -+++ samba-4.4.2/lib/tdb/wscript -@@ -92,7 +92,7 @@ def configure(conf): + conf.CHECK_HEADERS('sys/auxv.h') + conf.CHECK_FUNCS('getauxval') +diff --git a/lib/tdb/wscript b/lib/tdb/wscript +index 4782550..6bb3fa1 100644 +--- a/lib/tdb/wscript ++++ b/lib/tdb/wscript +@@ -89,7 +89,7 @@ def configure(conf): not conf.env.disable_tdb_mutex_locking): conf.define('USE_TDB_MUTEX_LOCKING', 1) @@ -41,3 +52,6 @@ Index: samba-4.4.2/lib/tdb/wscript if not conf.env.disable_python: # also disable if we don't have the python libs installed +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch index 025ac2775f..6a7f8facc5 100644 --- a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch +++ b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Add config option without-valgrind Upstream-Status: Pending Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + --- lib/replace/wscript | 4 +++- source3/wscript | 5 ++++- @@ -16,9 +17,9 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index f0040b1..aca73af 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -101,7 +101,9 @@ struct foo bar = { .y = 'X', .x = 1 }; - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') +@@ -101,7 +101,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') + if not Options.options.disable_valgrind: @@ -26,12 +27,12 @@ index f0040b1..aca73af 100644 + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') - conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') diff --git a/source3/wscript b/source3/wscript index bac3dd5..a5c51ea 100644 --- a/source3/wscript +++ b/source3/wscript -@@ -1016,7 +1016,10 @@ syscall(SYS_setgroups32, 0, NULL); +@@ -1070,7 +1070,10 @@ syscall(SYS_setgroups32, 0, NULL); Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") else: conf.DEFINE('WITH_DNS_UPDATES', 1) @@ -44,12 +45,12 @@ index bac3dd5..a5c51ea 100644 if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'): conf.DEFINE('VALGRIND', '1') diff --git a/wscript b/wscript -index 7679c0f..681ac17 100644 +index 542a60c..22e6116 100644 --- a/wscript +++ b/wscript -@@ -72,6 +72,10 @@ def set_options(opt): - help=("Disable systemd integration"), - action='store_false', dest='enable_systemd') +@@ -86,6 +86,10 @@ def set_options(opt): + help=("Disable RELRO builds"), + action="store_false", dest='enable_relro') + opt.add_option('--without-valgrind', + help=("Disable use of the valgrind headers"), diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 6b9ade920e..0cbacb6c0e 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: samba-4.4.5/source3/wscript +Index: samba-4.7.0/source3/wscript =================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +--- samba-4.7.0.orig/source3/wscript ++++ samba-4.7.0/source3/wscript +@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; + "or headers not found. Use --without-pam to disable " + "PAM support."); + + else: + Logs.warn("PAM disabled") + use_pam=False @@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript + conf.undefine('PAM_RHOST') + conf.undefine('PAM_TTY') + conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + # diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb index f33c1384bf..a8517c541e 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb @@ -26,23 +26,21 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ + file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[md5sum] = "cf5eaf34f510e3d5643c0dcfd49fcc40" -SRC_URI[sha256sum] = "bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936" - -#SRC_URI[md5sum] = "c6ee5c766016d59908c8fb672fbbd445" -#SRC_URI[sha256sum] = "9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa" +SRC_URI[md5sum] = "0253021a45c479cec1e135b004a0177a" +SRC_URI[sha256sum] = "1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e" inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -#DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd libaio libpam" -DEPENDS += "libldb" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" @@ -119,7 +117,7 @@ EXTRA_OECONF += "--enable-fhs \ --disable-rpath-install \ --with-shared-modules=${SAMBA4_MODULES} \ --bundled-libraries=${SAMBA4_LIBS} \ - ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ + ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ --with-cluster-support \ --with-profiling-data \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ @@ -197,7 +195,7 @@ PACKAGES =+ "${PN}-python ${PN}-pidl \ ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ winbind \ ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ - smbclient" + smbclient ${PN}-client ${PN}-server ${PN}-test" python samba_populate_packages() { def module_hook(file, pkg, pattern, format, basename): @@ -294,3 +292,27 @@ FILES_smbclient = "${bindir}/cifsdd \ RDEPENDS_${PN}-pidl_append = " perl" FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" + +RDEPENDS_${PN}-client = "\ + smbclient \ + winbind \ + registry-tools \ + ${PN}-pidl \ + " + +ALLOW_EMPTY_${PN}-client = "1" + +RDEPENDS_${PN}-server = "\ + ${PN} \ + winbind \ + registry-tools \ + " + +ALLOW_EMPTY_${PN}-server = "1" + +RDEPENDS_${PN}-test = "\ + ${PN}-ctdb-tests \ + ${PN}-testsuite \ + " + +ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch index 1520553a45..047caec324 100644 --- a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch +++ b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch @@ -1,4 +1,4 @@ -From 815e861721a9c43efddb78521147145ebc7569ca Mon Sep 17 00:00:00 2001 +From 4335c4c61877c0b65ff4ec767e8ad3ad8c73c32d Mon Sep 17 00:00:00 2001 From: Zhiquan Li <zhiquan.li@windriver.com> Date: Fri, 13 Nov 2015 17:40:24 +0800 Subject: [PATCH] fix do_package failed since snort 2.9.7.0 @@ -13,6 +13,7 @@ It's a rpm debugedit bug: Upstream-Status:Inappropriate [embedded specific] Signed-off-by: Zhiquan Li <zhiquan.li@windriver.com> + --- src/snort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -30,6 +31,3 @@ index 8308e57..499d157 100644 #include "profiler.h" #include "rules.h" #include "treenodes.h" --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch b/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch index 54c2a9521b..2e28cd0486 100644 --- a/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch +++ b/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch @@ -1,4 +1,4 @@ -From 4d7ebe3ed6cee72bc7db98bd408d22c10ef5dd82 Mon Sep 17 00:00:00 2001 +From 5875dea90f71350b7205788fbc67e3759077cefe Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe@deserted.net> Date: Wed, 20 Nov 2013 16:06:07 -0500 Subject: [PATCH] libpcap: search sysroot for headers @@ -9,15 +9,16 @@ the search path at the sysroot instead. Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe@deserted.net> + --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index e52bb6c..8ded35d 100644 +index 62573a8..fded45b 100644 --- a/configure.in +++ b/configure.in -@@ -78,7 +78,7 @@ case "$host" in +@@ -69,7 +69,7 @@ case "$host" in linux="yes" AC_DEFINE([LINUX],[1],[Define if Linux]) AC_SUBST(extra_incl) @@ -26,6 +27,3 @@ index e52bb6c..8ded35d 100644 ;; *-hpux10*|*-hpux11*) AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) --- -1.7.10.4 - diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch b/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch index 39e5c9c03a..6aa0b736f9 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch @@ -1,17 +1,27 @@ +From 5a53260a819e2873f58165e96852529719101c53 Mon Sep 17 00:00:00 2001 +From: Chunrong Guo <B40290@freescale.com> +Date: Mon, 4 Nov 2013 10:39:56 +0800 +Subject: [PATCH] snort: add recipe + Upstream-Status:Inappropriate [embedded specific] fix the below error: -checking for dap address space id... configure: +checking for dap address space id... configure: configure: error: cannot run test program while cross compiling - Signed-off-by: Chunrong Guo <B40290@freescale.com> ---- a/configure.in 2013-08-23 00:06:37.239361932 -0500 -+++ b/configure.in 2013-08-23 00:07:32.860266534 -0500 -@@ -679,23 +679,23 @@ +--- + configure.in | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/configure.in b/configure.in +index 6fe5d68..e7636ce 100644 +--- a/configure.in ++++ b/configure.in +@@ -698,23 +698,23 @@ if test "x$ac_cv_func_daq_dp_add_dc" = "xyes"; then - AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]) + fi -AC_MSG_CHECKING([for daq address space ID]) -AC_RUN_IFELSE( @@ -48,5 +58,5 @@ Signed-off-by: Chunrong Guo <B40290@freescale.com> +# [DAQ version supports address space ID in header.]) +#fi - # any sparc platform has to have this one defined. - AC_MSG_CHECKING(for sparc) + AC_MSG_CHECKING([for daq flow ID]) + AC_RUN_IFELSE( diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch index e6afcabaa8..04df37c94f 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch @@ -1,16 +1,26 @@ +From 5aa42a3137c657b5eddd4608343aa1854bd7cd27 Mon Sep 17 00:00:00 2001 +From: Zhiquan Li <zhiquan.li@windriver.com> +Date: Mon, 16 Nov 2015 10:23:00 +0800 +Subject: [PATCH] snort: 2.9.6.0 -> 2.9.7.5 + Upstream-Status:Inappropriate [embedded specific] fix the below error: checking for daq flow ID... configure: configure: error: cannot run test program while cross compiling +--- + configure.in | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) ---- a/configure.in 2015-10-28 10:36:42.918512690 +0800 -+++ b/configure.in 2015-10-28 10:37:36.738510048 +0800 -@@ -716,23 +716,23 @@ +diff --git a/configure.in b/configure.in +index e7636ce..2fbd298 100644 +--- a/configure.in ++++ b/configure.in +@@ -716,23 +716,23 @@ have_daq_address_space_id="yes" # [DAQ version supports address space ID in header.]) #fi - + -AC_MSG_CHECKING([for daq flow ID]) -AC_RUN_IFELSE( -[AC_LANG_PROGRAM( @@ -45,6 +55,6 @@ configure: error: cannot run test program while cross compiling +# AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], +# [DAQ version supports flow ID in header.]) +#fi - + AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) AC_RUN_IFELSE( diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch index 1a13298ca2..15958a72d0 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch @@ -1,16 +1,26 @@ +From b916443d43f2e1eeacfbed0033274a0270ef634d Mon Sep 17 00:00:00 2001 +From: Zhiquan Li <zhiquan.li@windriver.com> +Date: Mon, 16 Nov 2015 10:23:00 +0800 +Subject: [PATCH] snort: 2.9.6.0 -> 2.9.7.5 + Upstream-Status:Inappropriate [embedded specific] fix the below error: checking for DAQ_VERDICT_RETRY... configure: configure: error: cannot run test program while cross compiling +--- + configure.in | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) ---- a/configure.in 2015-10-28 10:45:18.174487395 +0800 -+++ b/configure.in 2015-10-28 10:45:47.586485951 +0800 -@@ -734,23 +734,23 @@ +diff --git a/configure.in b/configure.in +index 2fbd298..62573a8 100644 +--- a/configure.in ++++ b/configure.in +@@ -734,23 +734,23 @@ have_daq_flow_id="yes" # [DAQ version supports flow ID in header.]) #fi - + -AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) -AC_RUN_IFELSE( -[AC_LANG_PROGRAM( @@ -45,7 +55,6 @@ configure: error: cannot run test program while cross compiling +# AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1], +# [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.]) +#fi - + # any sparc platform has to have this one defined. AC_MSG_CHECKING(for sparc) - diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch b/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch index 9dafe63459..79e9f076b1 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch @@ -1,3 +1,8 @@ +From a1fdbced4166cb0f35d23b63a59312d86860485a Mon Sep 17 00:00:00 2001 +From: Chunrong Guo <B40290@freescale.com> +Date: Mon, 4 Nov 2013 10:39:56 +0800 +Subject: [PATCH] snort: add recipe + Upstream-Status: Inappropriate [embedded specific] fix the below error: @@ -6,10 +11,15 @@ configure: error: cannot run test program while cross compiling Signed-off-by: Chunrong Guo <B40290@freescale.com> +--- + configure.in | 50 ++++++++++++++++---------------------------------- + 1 file changed, 16 insertions(+), 34 deletions(-) ---- a/configure.in 2013-08-21 03:56:17.197414789 -0500 -+++ b/configure.in 2013-08-21 23:19:05.298553560 -0500 -@@ -281,25 +281,7 @@ +diff --git a/configure.in b/configure.in +index 20d15eb..6fe5d68 100644 +--- a/configure.in ++++ b/configure.in +@@ -274,25 +274,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,int64_t]) AC_CHECK_TYPES([boolean]) # In case INADDR_NONE is not defined (like on Solaris) @@ -36,7 +46,7 @@ Signed-off-by: Chunrong Guo <B40290@freescale.com> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> -@@ -397,21 +379,21 @@ +@@ -421,21 +403,21 @@ if test "x$LPCAP" = "xno"; then fi fi diff --git a/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch b/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch index 2becc06244..0404ea0fab 100644 --- a/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch +++ b/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch @@ -1,3 +1,8 @@ +From f46d096015d7402a37a59eb66b8f6b7fbf0cdff0 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 24 May 2017 17:38:53 +0800 +Subject: [PATCH] snort: enable static daq + Upstream-Status: Inappropriate [embedded specific] When enable static daq for snort, it calls to daq-modules-config to get link @@ -5,7 +10,11 @@ library and library path. Library path is useless for oe and cause host contamination issue. So filter it. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/configure.in b/configure.in index fded45b..a247bb9 100644 --- a/configure.in diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index 2034b85fb5..21e77c5417 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -4,8 +4,7 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" -DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native" -DEPENDS_append_libc-musl = " libtirpc" +DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -48,8 +47,8 @@ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += " -ltirpc" do_install_append() { install -d ${D}${sysconfdir}/snort/rules diff --git a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index bd55efce27..7eea5d135b 100644 --- a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -14,6 +14,8 @@ SRC_URI[sha256sum] = "3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb486884 S = "${WORKDIR}/${BPN}" +inherit update-alternatives + EXTRA_OEMAKE = "-e MAKEFLAGS=" # comment out MakeInclude in Makefile which sets build environment @@ -30,3 +32,7 @@ do_install () { install -d ${D}/${base_sbindir} install -m 0755 ${S}/vconfig ${D}/${base_sbindir}/ } + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "vconfig" +ALTERNATIVE_LINK_NAME[vconfig] = "${base_sbindir}/vconfig" diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.14.4.bb index 512619098a..dc9094d8bf 100644 --- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb +++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.14.4.bb @@ -12,15 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PROVIDES += "cyassl" RPROVIDES_${PN} = "cyassl" -SRC_URI = "https://github.com/wolfSSL/wolfssl/archive/v${PV}-stable.zip \ +S = "${WORKDIR}/git" +SRCREV = "1196a3b64d9fabffc8273b87f6f69ac0e75d2eb7" +SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https; \ file://0001-fix-no-rule-to-make-cyassl-options.h.patch \ " -SRC_URI[md5sum] = "f9caf558169ab650dc8200708799ebeb" -SRC_URI[sha256sum] = "b6d87d3e2c8757177d69aff373c91cf162f4a3944fae90fa10d086fd5f9542e7" - -S = "${WORKDIR}/wolfssl-${PV}-stable" - inherit autotools PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch index 075af5707b..87159718b2 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -1,19 +1,20 @@ -From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 +From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 19:10:57 -0700 -Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF +Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF if they are not defined as is in musl then define them here Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- include/automount.h | 8 ++++++++ include/nsswitch.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/include/automount.h b/include/automount.h -index 219b07d..b12c22a 100644 +index cc336ad..8bdcf12 100644 --- a/include/automount.h +++ b/include/automount.h @@ -42,6 +42,14 @@ @@ -32,7 +33,7 @@ index 219b07d..b12c22a 100644 #ifndef HAVE_MOUNT #error Failed to locate mount(8)! diff --git a/include/nsswitch.h b/include/nsswitch.h -index 2b445a9..3db77b2 100644 +index d3e4027..7a0c38f 100644 --- a/include/nsswitch.h +++ b/include/nsswitch.h @@ -24,6 +24,9 @@ @@ -45,6 +46,3 @@ index 2b445a9..3db77b2 100644 #define NSSWITCH_FILE _PATH_NSSWITCH_CONF enum nsswitch_status { --- -2.12.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch index 7ac1456748..32293dd09f 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch @@ -1,4 +1,4 @@ -From e4ee00e08acd7c0912a3264ad32e4de861c7416f Mon Sep 17 00:00:00 2001 +From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 7 Sep 2017 22:22:31 -0700 Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC @@ -7,6 +7,7 @@ __S_IEXEC is internal to libc and may not be available on all libc e.g. musl Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- modules/lookup_multi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -24,6 +25,3 @@ index 3ecda6d..cf109de 100644 type = src_prog; else type = src_file; --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch index 6b6ba6d855..469027aacc 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -1,21 +1,22 @@ -From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 +From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 19:12:10 -0700 -Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC +Subject: [PATCH] Replace __S_IEXEC with S_IEXEC S_IEXEC is portable Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- daemon/lookup.c | 4 ++-- modules/lookup_multi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/lookup.c b/daemon/lookup.c -index 62071df..1bec97f 100644 +index 201ccbb..d821db8 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c -@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source +@@ -366,7 +366,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source if (!S_ISREG(st.st_mode)) return NSS_STATUS_NOTFOUND; @@ -24,7 +25,7 @@ index 62071df..1bec97f 100644 type = src_prog; else type = src_file; -@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ +@@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ if (!S_ISREG(st.st_mode)) return NSS_STATUS_NOTFOUND; @@ -34,10 +35,10 @@ index 62071df..1bec97f 100644 else type = src_file; diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index 6ec8434..88d081f 100644 +index fadd2ea..3ecda6d 100644 --- a/modules/lookup_multi.c +++ b/modules/lookup_multi.c -@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch +@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch continue; } @@ -46,6 +47,3 @@ index 6ec8434..88d081f 100644 type = src_prog; else type = src_file; --- -2.12.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch index fdb906b22b..816a409cdd 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch @@ -1,14 +1,18 @@ -[PATCH] add the needed stdarg.h +From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] [PATCH] add the needed stdarg.h Upstream-status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - lib/defaults.c | 1 + + lib/defaults.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/defaults.c b/lib/defaults.c -index 2b03ea2..5728e67 100644 +index 0e48a78..667f35d 100644 --- a/lib/defaults.c +++ b/lib/defaults.c @@ -16,6 +16,7 @@ @@ -19,6 +23,3 @@ index 2b03ea2..5728e67 100644 #include <ctype.h> #include <string.h> #include <sys/utsname.h> --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch index af5be6a830..1d5c3e1eeb 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch @@ -1,3 +1,8 @@ +From 2cbc576ea1fbd1cbf4579d64b30e41d762084e7f Mon Sep 17 00:00:00 2001 +From: "yanjun.zhu" <yanjun.zhu@windriver.com> +Date: Tue, 15 Jan 2013 12:45:44 +0800 +Subject: [PATCH] autofs: do not check for modprobe + Description: Loading autofs module is #ifdef'ed in the source, so there is no need to check for /proc (which is only used to load module) or modprobe. Both modprobe and /proc @@ -7,9 +12,16 @@ Description: Loading autofs module is #ifdef'ed in the source, so Upstream-Status: Backport [1] [1] http://www.spinics.net/lists/autofs/msg00139.html -diff -urpN a/configure.in b/configure.in ---- a/configure.in 2013-01-15 11:30:22.000000000 +0800 -+++ b/configure.in 2013-01-15 11:31:45.000000000 +0800 +--- + configure.in | 6 ------ + daemon/module.c | 3 +++ + include/automount.h | 11 +++-------- + 3 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/configure.in b/configure.in +index 44a1c8b..b226236 100644 +--- a/configure.in ++++ b/configure.in @@ -34,11 +34,6 @@ AC_MSG_CHECKING([for binaries in]) AC_MSG_RESULT([$searchpath]) @@ -22,7 +34,7 @@ diff -urpN a/configure.in b/configure.in # Location of init.d directory? # AF_INIT_D() -@@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umo +@@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umount, $searchpath) AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath) AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath) AF_PATH_INCLUDE(E4FSCK, fsck.ext4 e4fsck, , $searchpath) @@ -30,30 +42,32 @@ diff -urpN a/configure.in b/configure.in AF_CHECK_PROG(LEX, flex lex, , $searchpath) AF_CHECK_PROG(YACC, bison, , $searchpath) -diff -urpN a/daemon/module.c b/daemon/module.c ---- a/daemon/module.c 2013-01-15 11:30:49.000000000 +0800 -+++ b/daemon/module.c 2013-01-15 11:32:00.000000000 +0800 -@@ -18,6 +18,8 @@ - #include <stdlib.h> +diff --git a/daemon/module.c b/daemon/module.c +index bed8f7a..e41a98e 100644 +--- a/daemon/module.c ++++ b/daemon/module.c +@@ -19,6 +19,8 @@ #include "automount.h" + #include "nsswitch.h" +#if 0 +/* see comment in daemon/automount.c around load_autofs4_module() call */ int load_autofs4_module(void) { FILE *fp; -@@ -52,6 +54,7 @@ int load_autofs4_module(void) +@@ -53,6 +55,7 @@ int load_autofs4_module(void) return 1; } +#endif - struct lookup_mod *open_lookup(const char *name, const char *err_prefix, - const char *mapfmt, int argc, const char *const *argv) -diff -urpN a/include/automount.h b/include/automount.h ---- a/include/automount.h 2013-01-15 11:31:10.000000000 +0800 -+++ b/include/automount.h 2013-01-15 11:32:06.000000000 +0800 -@@ -50,16 +50,11 @@ + int open_lookup(const char *name, const char *err_prefix, const char *mapfmt, + int argc, const char *const *argv, struct lookup_mod **lookup) +diff --git a/include/automount.h b/include/automount.h +index c0f5fbf..cc336ad 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -51,16 +51,11 @@ #error Failed to locate umount(8)! #endif diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch index 09fea495df..8e06db6e4a 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch @@ -1,4 +1,4 @@ -From 54a9bd28a307dd74df044d779ca85adcf36aa202 Mon Sep 17 00:00:00 2001 +From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe.macdonald@windriver.com> Date: Tue, 18 Jun 2013 10:05:21 -0400 Subject: [PATCH] Fix the dependency issue @@ -10,19 +10,17 @@ generated by rpcgen during buildtime Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> + --- - lib/Makefile | 1 + + lib/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Makefile b/lib/Makefile -index 5418009..bff4e1d 100644 +index 518b483..4798a4b 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -75,3 +75,4 @@ install: all +@@ -81,3 +81,4 @@ install: all clean: rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ +$(OBJS): $(RPCS) --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch index 3a878980a4..9b0942ebf6 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch @@ -1,21 +1,22 @@ -Upstream-Status: Pending - -From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001 +From 2256b8aa98cff15ddf2a8d36496e6c9125927901 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter <obi@opendreambox.org> Date: Wed, 13 Mar 2013 16:17:08 +0100 Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h +Upstream-Status: Pending + Fixes compile error with uclibc. Glibc's nfs/nfs.h contains nothing but "#include linux/nfs.h". rpc_subs.h already includes other linux/nfs*.h files directly. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> + --- - include/rpc_subs.h | 2 +- + include/rpc_subs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rpc_subs.h b/include/rpc_subs.h -index b6d59f9..a2d9648 100644 +index e744e89..83db47e 100644 --- a/include/rpc_subs.h +++ b/include/rpc_subs.h @@ -18,7 +18,7 @@ @@ -27,6 +28,3 @@ index b6d59f9..a2d9648 100644 #include <linux/nfs2.h> #include <linux/nfs3.h> --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch index cbf2bf8047..18ce193855 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch @@ -1,12 +1,21 @@ +From b31decac4acb194b020c621d2d11019f636a45e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 24 Apr 2017 20:41:25 -0700 +Subject: [PATCH] autofs: Upgrade to 5.1.2 release + Make configure compatible with -Wl,--as-needed following https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure 2016-07-05 Martin von Gagern -Index: autofs-5.1.2/aclocal.m4 -=================================================================== ---- autofs-5.1.2.orig/aclocal.m4 -+++ autofs-5.1.2/aclocal.m4 +--- + aclocal.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 0e4a624..2e620cd 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 @@ -415,9 +415,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], [ # save current flags @@ -19,7 +28,7 @@ Index: autofs-5.1.2/aclocal.m4 AC_TRY_LINK( [ #include <rpc/rpc.h> ], -@@ -440,7 +440,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna +@@ -440,7 +440,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyname]) # restore flags CFLAGS="$af_check_libtirpc_save_cflags" diff --git a/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-networking/recipes-daemons/autofs/autofs/cross.patch index 8f1af625f0..b25c43f747 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/cross.patch @@ -1,8 +1,17 @@ -Index: autofs-5.0.7/aclocal.m4 -=================================================================== ---- autofs-5.0.7.orig/aclocal.m4 2012-10-28 04:45:07.000000000 -0700 -+++ autofs-5.0.7/aclocal.m4 2012-10-28 10:47:53.263996910 -0700 -@@ -7,6 +7,8 @@ +From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:53:10 -0800 + +--- + aclocal.m4 | 2 ++ + configure.in | 8 ++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 2115204..2a9a802 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- AC_DEFUN(AF_PATH_INCLUDE, [AC_PATH_PROGS($1,$2,$3,$4) if test -n "$$1"; then @@ -11,11 +20,11 @@ Index: autofs-5.0.7/aclocal.m4 AC_DEFINE(HAVE_$1,1,[define if you have $1]) AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) HAVE_$1=1 -Index: autofs-5.0.7/configure.in -=================================================================== ---- autofs-5.0.7.orig/configure.in 2012-10-28 04:45:06.000000000 -0700 -+++ autofs-5.0.7/configure.in 2012-10-28 10:50:07.580000628 -0700 -@@ -301,13 +301,15 @@ +diff --git a/configure.in b/configure.in +index 25d7c4e..44a1c8b 100644 +--- a/configure.in ++++ b/configure.in +@@ -324,13 +324,15 @@ AC_PROG_CC cat > pietest.c <<EOF int main(void) { return 0; } EOF @@ -33,7 +42,7 @@ Index: autofs-5.0.7/configure.in AC_MSG_RESULT([$gcc_supports_pie]) if test $gcc_supports_pie = yes ; then DAEMON_CFLAGS="-fPIE" -@@ -316,6 +318,8 @@ +@@ -339,6 +341,8 @@ fi rm -f pietest.c AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LDFLAGS) diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch index 9b641838fa..21a97c8f5c 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -1,4 +1,7 @@ -[PATCH] fix the YACC rule to fix a building failure +From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Mon, 18 May 2015 16:28:36 +0800 +Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure Upstream-Statu: Pending @@ -14,6 +17,7 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. |../Makefile.rules:64: recipe for target 'amd_tok.o' failed |---------------------- Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- lib/Makefile | 6 ++++-- modules/Makefile | 3 ++- @@ -44,7 +48,7 @@ index 4798a4b..c40cf86 100644 nss_tok.o: nss_tok.c nss_parse.tab.h diff --git a/modules/Makefile b/modules/Makefile -index 237b70b..71415d0 100644 +index d9ab06c..abc7698 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l @@ -57,6 +61,3 @@ index 237b70b..71415d0 100644 $(YACC) -v -d -p amd_ -b amd_parse $? amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch index 94750b257c..414325974d 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch @@ -1,6 +1,9 @@ -autofs: fails to compile with openldap disabled +From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001 +From: Amy Fong <amy.fong@windriver.com> +Date: Fri, 18 Jan 2013 12:13:32 -0500 +Subject: [PATCH] autofs: fails to compile with openldap disabled -As of 5.0.6, it appears that changes were introduced so that +As of 5.0.6, it appears that changes were introduced so that if you compile with openldap disabled and openldap headers are not available, then autofs fails to build. @@ -12,13 +15,13 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com> 1 file changed, 4 insertions(+) --- - include/lookup_ldap.h | 4 ++++ + include/lookup_ldap.h | 4 ++++ 1 file changed, 4 insertions(+) -Index: autofs-5.1.2/include/lookup_ldap.h -=================================================================== ---- autofs-5.1.2.orig/include/lookup_ldap.h -+++ autofs-5.1.2/include/lookup_ldap.h +diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h +index 3a7aba7..bfdb0b3 100644 +--- a/include/lookup_ldap.h ++++ b/include/lookup_ldap.h @@ -1,7 +1,9 @@ #ifndef LOOKUP_LDAP_H #define LOOKUP_LDAP_H diff --git a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch index 634005bd27..21396dd6f6 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch @@ -1,14 +1,18 @@ -[PATCH] force STRIP to emtpy +From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] [PATCH] force STRIP to emtpy otherwise the generate file will be stripped Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - Makefile.rules | 2 +- + Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.rules b/Makefile.rules -index 710a2c9..e4334db 100644 +index 709dd04..b1f7e50 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -31,7 +31,7 @@ LDFLAGS ?= -s @@ -20,6 +24,3 @@ index 710a2c9..e4334db 100644 else STRIP ?= strip --strip-debug endif --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch b/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch index d68944b459..0a2d502b8d 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch @@ -1,21 +1,17 @@ -Index: autofs-5.0.7/aclocal.m4 -=================================================================== ---- autofs-5.0.7.orig/aclocal.m4 2012-10-28 13:17:45.504237027 -0700 -+++ autofs-5.0.7/aclocal.m4 2012-10-28 13:20:50.108242739 -0700 -@@ -403,7 +403,7 @@ - # save current flags - af_check_libtirpc_save_cflags="$CFLAGS" - af_check_libtirpc_save_ldflags="$LDFLAGS" --CFLAGS="$CFLAGS -I/usr/include/tirpc" -+CFLAGS="$CFLAGS -I=/usr/include/tirpc" - LDFLAGS="$LDFLAGS -ltirpc" - - AC_TRY_LINK( -Index: autofs-5.0.7/Makefile.rules -=================================================================== ---- autofs-5.0.7.orig/Makefile.rules 2012-10-28 13:17:45.308237022 -0700 -+++ autofs-5.0.7/Makefile.rules 2012-10-28 13:21:25.720242803 -0700 -@@ -48,7 +48,7 @@ +From cb6a4f61adb027f2366318f2c08c8264ebf39218 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:53:10 -0800 + +--- + Makefile.rules | 2 +- + aclocal.m4 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.rules b/Makefile.rules +index 6fa3e02..709dd04 100644 +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -46,7 +46,7 @@ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 LIBS += -lpthread ifdef TIRPCLIB @@ -24,3 +20,16 @@ Index: autofs-5.0.7/Makefile.rules LIBS += $(TIRPCLIB) endif +diff --git a/aclocal.m4 b/aclocal.m4 +index 2a9a802..0e4a624 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -416,7 +416,7 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], + # save current flags + af_check_libtirpc_save_cflags="$CFLAGS" + af_check_libtirpc_save_ldflags="$LDFLAGS" +-CFLAGS="$CFLAGS -I/usr/include/tirpc" ++CFLAGS="$CFLAGS -I=/usr/include/tirpc" + LDFLAGS="$LDFLAGS -ltirpc" + + AC_TRY_LINK( diff --git a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch index cf03635270..c46c0e5ad2 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch @@ -1,17 +1,26 @@ -Index: autofs-5.0.7/samples/auto.net -=================================================================== ---- autofs-5.0.7.orig/samples/auto.net 2012-07-24 23:05:26.000000000 -0700 -+++ autofs-5.0.7/samples/auto.net 2012-10-28 10:44:25.035991715 -0700 +From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:53:10 -0800 + +--- + samples/auto.net | 2 +- + samples/auto.smb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/samples/auto.net b/samples/auto.net +index 0384f61..61215f6 100755 +--- a/samples/auto.net ++++ b/samples/auto.net @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This file must be executable to work! chmod 755! -Index: autofs-5.0.7/samples/auto.smb -=================================================================== ---- autofs-5.0.7.orig/samples/auto.smb 2012-07-24 23:05:26.000000000 -0700 -+++ autofs-5.0.7/samples/auto.smb 2012-10-28 10:44:25.035991715 -0700 +diff --git a/samples/auto.smb b/samples/auto.smb +index 6af5d85..d296b81 100755 +--- a/samples/auto.smb ++++ b/samples/auto.smb @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh diff --git a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch index bf2c964a0e..1c7b11997c 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch @@ -1,13 +1,22 @@ +From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 24 Apr 2017 20:41:25 -0700 +Subject: [PATCH] autofs: Upgrade to 5.1.2 release + Use pkg-config first to look for external libnsl which is now split out from glibc, if it does not exist then see if its provided by glibc itself. -Khem -Index: autofs-5.1.2/configure.in -=================================================================== ---- autofs-5.1.2.orig/configure.in -+++ autofs-5.1.2/configure.in +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 9cf73b8..1016c71 100644 +--- a/configure.in ++++ b/configure.in @@ -186,7 +186,7 @@ fi # # glibc/libc 6 new libraries diff --git a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch index 282d6f0ad2..4183069bb1 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch @@ -1,4 +1,4 @@ -From 79034f969bbd12215d65b4337dfd38a13d02d4ef Mon Sep 17 00:00:00 2001 +From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Sat, 13 Sep 2014 20:19:28 -0700 Subject: [PATCH] autofs.init.in: remove bashism @@ -9,9 +9,10 @@ Upstream-Status: Pending Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- - redhat/autofs.init.in | 12 ++++++------ - samples/rc.autofs.in | 10 +++++----- + redhat/autofs.init.in | 12 ++++++------ + samples/rc.autofs.in | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in @@ -115,6 +116,3 @@ index 487669f..e96cde1 100644 pid=`pidof $prog` if [ -z $pid ]; then echo $"$prog not running" --- -1.7.9.5 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch index 93b76bd66e..3d0c6bd715 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch @@ -1,14 +1,18 @@ -using pkg-config to detect libxml-2.0 and krb5 +From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] using pkg-config to detect libxml-2.0 and krb5 Upstream-status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - configure.in | 16 ++++++++++++++-- - 2 files changed, 14 insertions(+), 2 deletions(-) + configure.in | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index 392d122..a3028aa 100644 +index b226236..9cf73b8 100644 --- a/configure.in +++ b/configure.in @@ -162,8 +162,20 @@ if test x$enable_sloppy_mount = xyes; then @@ -34,6 +38,3 @@ index 392d122..a3028aa 100644 AC_SEARCH_LIBS([versionsort],[]) if test "$ac_cv_search_versionsort" = "no"; then --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index 64d1a76d6f..6dbff87dd2 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb @@ -75,8 +75,8 @@ do_install_append() { USERADD_PACKAGES = "${PN}-bin" USERADD_PARAM_${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "saslauthd.service" +SYSTEMD_PACKAGES = "${PN}-bin" +SYSTEMD_SERVICE_${PN}-bin = "saslauthd.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" diff --git a/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch b/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch index 3cd5259fa6..952e4f0d04 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 4 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 net/ppp_defs.h -diff --git a/cli/cli_readline.c b/cli/cli_readline.c -index 2812e6e..542935c 100644 ---- a/cli/cli_readline.c -+++ b/cli/cli_readline.c +Index: ippool-1.3/cli/cli_readline.c +=================================================================== +--- ippool-1.3.orig/cli/cli_readline.c ++++ ippool-1.3/cli/cli_readline.c @@ -17,13 +17,14 @@ * Boston, MA 02110-1301 USA * @@ -33,7 +33,7 @@ index 2812e6e..542935c 100644 #include <signal.h> #include <readline/readline.h> -@@ -630,7 +631,7 @@ static void cli_rl_uninstall_signal_handlers(void) +@@ -630,7 +631,7 @@ static void cli_rl_uninstall_signal_hand static int cli_rl_install_signal_handlers(void) { @@ -42,11 +42,11 @@ index 2812e6e..542935c 100644 rl_catch_signals = 0; rl_clear_signals(); -diff --git a/ippool_api.c b/ippool_api.c -index 2c10c47..d1127a9 100644 ---- a/ippool_api.c -+++ b/ippool_api.c -@@ -181,10 +181,13 @@ int ippool_api_rpc_check_request(SVCXPRT *xprt) +Index: ippool-1.3/ippool_api.c +=================================================================== +--- ippool-1.3.orig/ippool_api.c ++++ ippool-1.3/ippool_api.c +@@ -181,10 +181,13 @@ int ippool_api_rpc_check_request(SVCXPRT * non-loopback interface, reject the request. */ if ((!ippool_opt_remote_rpc) && @@ -63,210 +63,10 @@ index 2c10c47..d1127a9 100644 } svcerr_auth(xprt, AUTH_TOOWEAK); return -EPERM; -diff --git a/net/ppp_defs.h b/net/ppp_defs.h -new file mode 100644 -index 0000000..b06eda5 ---- /dev/null -+++ b/net/ppp_defs.h -@@ -0,0 +1,194 @@ -+/* $Id: ppp_defs.h,v 1.17 2002/12/06 09:49:15 paulus Exp $ */ -+ -+/* -+ * ppp_defs.h - PPP definitions. -+ * -+ * Copyright (c) 1984 Paul Mackerras. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name(s) of the authors of this software must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Paul Mackerras -+ * <paulus@samba.org>". -+ * -+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#ifndef _PPP_DEFS_H_ -+#define _PPP_DEFS_H_ -+ -+/* -+ * The basic PPP frame. -+ */ -+#define PPP_HDRLEN 4 /* octets for standard ppp header */ -+#define PPP_FCSLEN 2 /* octets for FCS */ -+ -+/* -+ * Packet sizes -+ * -+ * Note - lcp shouldn't be allowed to negotiate stuff outside these -+ * limits. See lcp.h in the pppd directory. -+ * (XXX - these constants should simply be shared by lcp.c instead -+ * of living in lcp.h) -+ */ -+#define PPP_MTU 1500 /* Default MTU (size of Info field) */ -+#define PPP_MAXMTU 65535 - (PPP_HDRLEN + PPP_FCSLEN) -+#define PPP_MINMTU 64 -+#define PPP_MRU 1500 /* default MRU = max length of info field */ -+#define PPP_MAXMRU 65000 /* Largest MRU we allow */ -+#define PPP_MINMRU 128 -+ -+#define PPP_ADDRESS(p) (((u_char *)(p))[0]) -+#define PPP_CONTROL(p) (((u_char *)(p))[1]) -+#define PPP_PROTOCOL(p) ((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3]) -+ -+/* -+ * Significant octet values. -+ */ -+#define PPP_ALLSTATIONS 0xff /* All-Stations broadcast address */ -+#define PPP_UI 0x03 /* Unnumbered Information */ -+#define PPP_FLAG 0x7e /* Flag Sequence */ -+#define PPP_ESCAPE 0x7d /* Asynchronous Control Escape */ -+#define PPP_TRANS 0x20 /* Asynchronous transparency modifier */ -+ -+/* -+ * Protocol field values. -+ */ -+#define PPP_IP 0x21 /* Internet Protocol */ -+#define PPP_AT 0x29 /* AppleTalk Protocol */ -+#define PPP_IPX 0x2b /* IPX protocol */ -+#define PPP_VJC_COMP 0x2d /* VJ compressed TCP */ -+#define PPP_VJC_UNCOMP 0x2f /* VJ uncompressed TCP */ -+#define PPP_IPV6 0x57 /* Internet Protocol Version 6 */ -+#define PPP_COMP 0xfd /* compressed packet */ -+#define PPP_IPCP 0x8021 /* IP Control Protocol */ -+#define PPP_ATCP 0x8029 /* AppleTalk Control Protocol */ -+#define PPP_IPXCP 0x802b /* IPX Control Protocol */ -+#define PPP_IPV6CP 0x8057 /* IPv6 Control Protocol */ -+#define PPP_CCP 0x80fd /* Compression Control Protocol */ -+#define PPP_ECP 0x8053 /* Encryption Control Protocol */ -+#define PPP_LCP 0xc021 /* Link Control Protocol */ -+#define PPP_PAP 0xc023 /* Password Authentication Protocol */ -+#define PPP_LQR 0xc025 /* Link Quality Report protocol */ -+#define PPP_CHAP 0xc223 /* Cryptographic Handshake Auth. Protocol */ -+#define PPP_CBCP 0xc029 /* Callback Control Protocol */ -+#define PPP_EAP 0xc227 /* Extensible Authentication Protocol */ -+ -+/* -+ * Values for FCS calculations. -+ */ -+#define PPP_INITFCS 0xffff /* Initial FCS value */ -+#define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ -+#define PPP_FCS(fcs, c) (((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff]) -+ -+/* -+ * A 32-bit unsigned integral type. -+ */ -+ -+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) \ -+ && !defined(__FreeBSD__) && (NS_TARGET < 40) -+#ifdef UINT32_T -+typedef UINT32_T u_int32_t; -+#else -+typedef unsigned int u_int32_t; -+typedef unsigned short u_int16_t; -+#endif -+#endif -+ -+/* -+ * Extended asyncmap - allows any character to be escaped. -+ */ -+typedef u_int32_t ext_accm[8]; -+ -+/* -+ * What to do with network protocol (NP) packets. -+ */ -+enum NPmode { -+ NPMODE_PASS, /* pass the packet through */ -+ NPMODE_DROP, /* silently drop the packet */ -+ NPMODE_ERROR, /* return an error */ -+ NPMODE_QUEUE /* save it up for later. */ -+}; -+ -+/* -+ * Statistics. -+ */ -+struct pppstat { -+ unsigned int ppp_ibytes; /* bytes received */ -+ unsigned int ppp_ipackets; /* packets received */ -+ unsigned int ppp_ierrors; /* receive errors */ -+ unsigned int ppp_obytes; /* bytes sent */ -+ unsigned int ppp_opackets; /* packets sent */ -+ unsigned int ppp_oerrors; /* transmit errors */ -+}; -+ -+struct vjstat { -+ unsigned int vjs_packets; /* outbound packets */ -+ unsigned int vjs_compressed; /* outbound compressed packets */ -+ unsigned int vjs_searches; /* searches for connection state */ -+ unsigned int vjs_misses; /* times couldn't find conn. state */ -+ unsigned int vjs_uncompressedin; /* inbound uncompressed packets */ -+ unsigned int vjs_compressedin; /* inbound compressed packets */ -+ unsigned int vjs_errorin; /* inbound unknown type packets */ -+ unsigned int vjs_tossed; /* inbound packets tossed because of error */ -+}; -+ -+struct ppp_stats { -+ struct pppstat p; /* basic PPP statistics */ -+ struct vjstat vj; /* VJ header compression statistics */ -+}; -+ -+struct compstat { -+ unsigned int unc_bytes; /* total uncompressed bytes */ -+ unsigned int unc_packets; /* total uncompressed packets */ -+ unsigned int comp_bytes; /* compressed bytes */ -+ unsigned int comp_packets; /* compressed packets */ -+ unsigned int inc_bytes; /* incompressible bytes */ -+ unsigned int inc_packets; /* incompressible packets */ -+ unsigned int ratio; /* recent compression ratio << 8 */ -+}; -+ -+struct ppp_comp_stats { -+ struct compstat c; /* packet compression statistics */ -+ struct compstat d; /* packet decompression statistics */ -+}; -+ -+/* -+ * The following structure records the time in seconds since -+ * the last NP packet was sent or received. -+ */ -+struct ppp_idle { -+ time_t xmit_idle; /* time since last NP packet sent */ -+ time_t recv_idle; /* time since last NP packet received */ -+}; -+ -+#ifndef __P -+#ifdef __STDC__ -+#define __P(x) x -+#else -+#define __P(x) () -+#endif -+#endif -+ -+#endif /* _PPP_DEFS_H_ */ -diff --git a/usl/usl.h b/usl/usl.h -index cdc16db..88d2714 100644 ---- a/usl/usl.h -+++ b/usl/usl.h +Index: ippool-1.3/usl/usl.h +=================================================================== +--- ippool-1.3.orig/usl/usl.h ++++ ippool-1.3/usl/usl.h @@ -38,6 +38,10 @@ #include "usl_fsm.h" #include "usl_list.h" @@ -278,6 +78,3 @@ index cdc16db..88d2714 100644 #define USL_VERSION "0.6" #ifdef DEBUG --- -2.13.3 - diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 6e47483570..6fa46904b3 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -24,8 +24,6 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://0001-read-returns-ssize_t.patch \ file://0002-Mark-first-element-of-a-string-as-null.patch \ file://0003-cli-Mark-return-of-strtol-as-long-int.patch \ - " -SRC_URI_append_libc-musl = "\ file://0002-link-with-libtirpc.patch \ file://0003-musl-fixes.patch \ " @@ -36,8 +34,7 @@ SRC_URI[sha256sum] = "d3eab7d6cad5da8ccc9d1e31d5303e27a39622c07bdb8fa3618eea3144 inherit systemd -DEPENDS = "readline ppp ncurses gzip-native" -DEPENDS_append_libc-musl = " libtirpc" +DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" RDEPENDS_${PN} = "rpcbind" EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" @@ -45,8 +42,7 @@ EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" # enable self tests EXTRA_OEMAKE += "IPPOOL_TEST=y" -CPPFLAGS += "${SELECTED_OPTIMIZATION}" -CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" SYSTEMD_SERVICE_${PN} = "ippool.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch deleted file mode 100644 index 2fd5c08a1c..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch +++ /dev/null @@ -1,135 +0,0 @@ -From eb516ac5f9dddc80564f6becee08a0011e7aa58b Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 10:36:11 -0800 -Subject: [PATCH 1/7] Check for root peer user for iscsiuio IPC - -This fixes a possible vulnerability where a non-root -process could connect with iscsiuio. Fouund by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/Makefile.am | 3 ++- - iscsiuio/src/unix/iscsid_ipc.c | 47 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am -index 71d5463..a989ef0 100644 ---- a/iscsiuio/src/unix/Makefile.am -+++ b/iscsiuio/src/unix/Makefile.am -@@ -20,7 +20,8 @@ iscsiuio_SOURCES = build_date.c \ - nic_utils.c \ - packet.c \ - iscsid_ipc.c \ -- ping.c -+ ping.c \ -+ ${top_srcdir}/../utils/sysdeps/sysdeps.c - - iscsiuio_CFLAGS = $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index a2a59a8..08e49e5 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -37,6 +37,8 @@ - * - */ - -+#define _GNU_SOURCE -+ - #include <errno.h> - #include <pthread.h> - #include <signal.h> -@@ -47,6 +49,8 @@ - #include <sys/socket.h> - #include <sys/time.h> - #include <sys/un.h> -+#include <sys/types.h> -+#include <pwd.h> - - #define PFX "iscsi_ipc " - -@@ -61,6 +65,7 @@ - #include "iscsid_ipc.h" - #include "uip.h" - #include "uip_mgmt_ipc.h" -+#include "sysdeps.h" - - #include "logger.h" - #include "uip.h" -@@ -102,6 +107,7 @@ struct iface_rec_decode { - uint16_t mtu; - }; - -+#define PEERUSER_MAX 64 - - /****************************************************************************** - * iscsid_ipc Constants -@@ -1029,6 +1035,40 @@ static void iscsid_loop_close(void *arg) - LOG_INFO(PFX "iSCSI daemon socket closed"); - } - -+/* -+ * check that the peer user is privilidged -+ * -+ * return 1 if peer is ok else 0 -+ * -+ * XXX: this function is copied from iscsid_ipc.c and should be -+ * moved into a common library -+ */ -+static int -+mgmt_peeruser(int sock, char *user) -+{ -+ struct ucred peercred; -+ socklen_t so_len = sizeof(peercred); -+ struct passwd *pass; -+ -+ errno = 0; -+ if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, -+ &so_len) != 0 || so_len != sizeof(peercred)) { -+ /* We didn't get a valid credentials struct. */ -+ LOG_ERR(PFX "peeruser_unux: error receiving credentials: %m"); -+ return 0; -+ } -+ -+ pass = getpwuid(peercred.uid); -+ if (pass == NULL) { -+ LOG_ERR(PFX "peeruser_unix: unknown local user with uid %d", -+ (int) peercred.uid); -+ return 0; -+ } -+ -+ strlcpy(user, pass->pw_name, PEERUSER_MAX); -+ return 1; -+} -+ - /** - * iscsid_loop() - This is the function which will process the broadcast - * messages from iscsid -@@ -1038,6 +1078,7 @@ static void *iscsid_loop(void *arg) - { - int rc; - sigset_t set; -+ char user[PEERUSER_MAX]; - - pthread_cleanup_push(iscsid_loop_close, arg); - -@@ -1077,6 +1118,12 @@ static void *iscsid_loop(void *arg) - continue; - } - -+ if (!mgmt_peeruser(iscsid_opts.fd, user) || strncmp(user, "root", PEERUSER_MAX)) { -+ close(s2); -+ LOG_ERR(PFX "Access error: non-administrative connection rejected"); -+ break; -+ } -+ - process_iscsid_broadcast(s2); - close(s2); - } --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..f5e1bec8ad --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch @@ -0,0 +1,25 @@ +From cfee58d5863a535b61aa54690ae205b876f57944 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 22:53:29 -0800 +Subject: [PATCH 1/2] libopeniscsiusr: Include limit.h for PATH_MAX + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libopeniscsiusr/iface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c +index 79898df..a48ef36 100644 +--- a/libopeniscsiusr/iface.c ++++ b/libopeniscsiusr/iface.c +@@ -30,6 +30,7 @@ + #include <netdb.h> + #include <assert.h> + #include <inttypes.h> ++#include <limits.h> + + #include "libopeniscsiusr/libopeniscsiusr.h" + #include "misc.h" +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch new file mode 100644 index 0000000000..174aa50d2b --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch @@ -0,0 +1,25 @@ +From 197713ad7e3e944102bbd792e1ab9ec4a67100c0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 23:25:21 -0800 +Subject: [PATCH 1/4] qedi.c: Removed unused linux/ethtool.h + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + iscsiuio/src/unix/libs/qedi.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c +index b81fecd..24cb89a 100644 +--- a/iscsiuio/src/unix/libs/qedi.c ++++ b/iscsiuio/src/unix/libs/qedi.c +@@ -49,7 +49,6 @@ + #include <arpa/inet.h> + #include <linux/types.h> + #include <linux/sockios.h> +-#include <linux/ethtool.h> + #include <linux/netlink.h> + #include <sys/mman.h> + #include <sys/ioctl.h> +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch new file mode 100644 index 0000000000..aecede6eef --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch @@ -0,0 +1,25 @@ +From 2b39f85dcf020647544002cb0b0e734748391dfb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 23:27:25 -0800 +Subject: [PATCH 2/4] idbm.c: Include fcnl.h for O_RDWR and O_CREAT definitions + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + usr/idbm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index 5532202..0a51b85 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -27,6 +27,7 @@ + #include <errno.h> + #include <dirent.h> + #include <limits.h> ++#include <fcntl.h> + #include <sys/stat.h> + #include <sys/file.h> + +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch deleted file mode 100644 index 1f5202ec02..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 035bb16845537351e1bccb16d38981754fd53129 Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 10:37:56 -0800 -Subject: [PATCH 2/7] iscsiuio should ignore bogus iscsid broadcast packets - -When iscsiuio is receiving broadcast packets from iscsid, -if the 'payload_len', carried in the packet, is too -large then ignore the packet and print a message. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/iscsid_ipc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 08e49e5..dfdae63 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -950,6 +950,12 @@ int process_iscsid_broadcast(int s2) - - cmd = data->header.command; - payload_len = data->header.payload_len; -+ if (payload_len > sizeof(data->u)) { -+ LOG_ERR(PFX "Data payload length too large (%d). Corrupt payload?", -+ payload_len); -+ rc = -EINVAL; -+ goto error; -+ } - - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch new file mode 100644 index 0000000000..836ed60487 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch @@ -0,0 +1,29 @@ +From 29571f71692e28ce9a17d1450097a98492f3b465 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 22:54:04 -0800 +Subject: [PATCH 2/2] libopeniscsiusr: Add CFLAGS to linker cmdline + +This will ensure that -fPIC is passed to linker as +well + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libopeniscsiusr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index 8b9b523..4f1d0d6 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -49,7 +49,7 @@ LIBADD = + all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc + + $(LIBS): $(OBJS) +- $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) + ln -sf $@ $(DEVLIB) + + $(LIBS_MAJOR): $(LIBS) +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch deleted file mode 100644 index 825083b741..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81d3106cf8f09c79fe20ad7d234d7e1dda27bddb Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 11:11:17 -0800 -Subject: [PATCH 3/7] Ensure all fields in iscsiuio IPC response are set - -Make sure all fields in the response strcuture are set, -or info from the stack can be leaked to our caller. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/iscsid_ipc.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index dfdae63..61e96cc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -960,6 +960,8 @@ int process_iscsid_broadcast(int s2) - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); - -+ memset(&rsp, 0, sizeof(rsp)); -+ - switch (cmd) { - case ISCSID_UIP_IPC_GET_IFACE: - size = fread(&data->u.iface_rec, payload_len, 1, fd); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch new file mode 100644 index 0000000000..0ce155f7a2 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch @@ -0,0 +1,49 @@ +From 9b7a32903b56ce4d41f264a345ca59a0b00d53b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 23:28:33 -0800 +Subject: [PATCH 3/4] bnx2x.c: Reorder the includes to avoid duplicate defines + with musl + +including nic.h before linux/ethtool.h avoids redefinitions of +eth structs + +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ +usr/include/netinet/if_ether.h:104:8: error: redefinition of 'struct ethhdr' + struct ethhdr { + ^~~~~~ +In file included from /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0. +876-r0/recipe-sysroot/usr/include/linux/ethtool.h:19:0, + from qedi.c:52: +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ +usr/include/linux/if_ether.h:154:8: note: originally defined here + struct ethhdr { + ^~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + iscsiuio/src/unix/libs/bnx2x.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c +index 3df6d5f..62530d1 100644 +--- a/iscsiuio/src/unix/libs/bnx2x.c ++++ b/iscsiuio/src/unix/libs/bnx2x.c +@@ -36,6 +36,7 @@ + * bnx2x.c - bnx2x user space driver + * + */ ++#include "nic.h" + #include <errno.h> + #include <stdio.h> + #include <string.h> +@@ -58,7 +59,6 @@ + #include "bnx2x.h" + #include "cnic.h" + #include "logger.h" +-#include "nic.h" + #include "nic_id.h" + #include "nic_utils.h" + #include "options.h" +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch deleted file mode 100644 index 274722c231..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8167e5ce99682f64918a20966ce393cd33ac67ef Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 11:13:29 -0800 -Subject: [PATCH 4/7] Do not double-close IPC file stream to iscsid - -A double-close of a file descriptor and its associated FILE stream -can be an issue in multi-threaded cases. Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/iscsid_ipc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 61e96cc..bde8d66 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -913,6 +913,9 @@ early_exit: - /** - * process_iscsid_broadcast() - This function is used to process the - * broadcast messages from iscsid -+ * -+ * s2 is an open file descriptor, which -+ * must not be left open upon return - */ - int process_iscsid_broadcast(int s2) - { -@@ -928,6 +931,7 @@ int process_iscsid_broadcast(int s2) - if (fd == NULL) { - LOG_ERR(PFX "Couldn't open file descriptor: %d(%s)", - errno, strerror(errno)); -+ close(s2); - return -EIO; - } - -@@ -1030,7 +1034,8 @@ int process_iscsid_broadcast(int s2) - } - - error: -- free(data); -+ if (data) -+ free(data); - fclose(fd); - - return rc; -@@ -1132,8 +1137,8 @@ static void *iscsid_loop(void *arg) - break; - } - -+ /* this closes the file descriptor s2 */ - process_iscsid_broadcast(s2); -- close(s2); - } - - pthread_cleanup_pop(0); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch new file mode 100644 index 0000000000..57bdc8cb60 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch @@ -0,0 +1,28 @@ +From 6f9c1a04d250388d1574cfaf20a1ff66a64beb48 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 23:42:12 -0800 +Subject: [PATCH 4/4] fwparam_ppc.c: Do not use __compar_fn_t + +__compar_fn_t is not defined in musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + utils/fwparam_ibft/fwparam_ppc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c +index c298b8c..391faa2 100644 +--- a/utils/fwparam_ibft/fwparam_ppc.c ++++ b/utils/fwparam_ibft/fwparam_ppc.c +@@ -356,7 +356,7 @@ static int loop_devs(const char *devtree) + * Sort the nics into "natural" order. The proc fs + * device-tree has them in somewhat random, or reversed order. + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), nic_cmp); + + snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); + dev_count = 0; +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch deleted file mode 100644 index b73b01120e..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c9fc86a50459776d9a7abb609f6503c57d69e034 Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 11:15:26 -0800 -Subject: [PATCH 5/7] Ensure strings from peer are copied correctly. - -The method of using strlen() and strcpy()/strncpy() has -a couple of holes. Do not try to measure the length of -strings supplied from peer, and ensure copied strings are -NULL-terminated. Use the new strlcpy() instead. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/iscsid_ipc.c | 24 ++++++------------------ - 1 file changed, 6 insertions(+), 18 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index bde8d66..52ae8c6 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -152,10 +152,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - struct in_addr ia; - struct in6_addr ia6; - -- if (strlen(in_ipaddr_str) > NI_MAXHOST) -- strncpy(ipaddr_str, in_ipaddr_str, NI_MAXHOST); -- else -- strcpy(ipaddr_str, in_ipaddr_str); -+ strlcpy(ipaddr_str, in_ipaddr_str, NI_MAXHOST); - - /* Find the CIDR if any */ - tmp = strchr(ipaddr_str, '/'); -@@ -287,22 +284,16 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) - - /* For LL on, ignore the IPv6 addr in the iface */ - if (ird->linklocal_autocfg == IPV6_LL_AUTOCFG_OFF) { -- if (strlen(rec->ipv6_linklocal) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->ipv6_linklocal, -- NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->ipv6_linklocal); -+ strlcpy(ipaddr_str, rec->ipv6_linklocal, -+ NI_MAXHOST); - inet_pton(AF_INET6, ipaddr_str, - &ird->ipv6_linklocal); - } - - /* For RTR on, ignore the IPv6 addr in the iface */ - if (ird->router_autocfg == IPV6_RTR_AUTOCFG_OFF) { -- if (strlen(rec->ipv6_router) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->ipv6_router, -- NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->ipv6_router); -+ strlcpy(ipaddr_str, rec->ipv6_router, -+ NI_MAXHOST); - inet_pton(AF_INET6, ipaddr_str, - &ird->ipv6_router); - } -@@ -316,10 +307,7 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) - calculate_default_netmask( - ird->ipv4_addr.s_addr); - -- if (strlen(rec->gateway) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->gateway, NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->gateway); -+ strlcpy(ipaddr_str, rec->gateway, NI_MAXHOST); - inet_pton(AF_INET, ipaddr_str, &ird->ipv4_gateway); - } - } else { --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch deleted file mode 100644 index 0fa24cd10d..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a6efed7601c890ac051ad1425582ec67dbd3f5ff Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 11:18:35 -0800 -Subject: [PATCH 6/7] Skip useless strcopy, and validate CIDR length - -Remove a useless strcpy() that copies a string onto itself, -and ensure the CIDR length "keepbits" is not negative. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/iscsid_ipc.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 52ae8c6..85742da 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -148,7 +148,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - char *tmp, *tok; - char ipaddr_str[NI_MAXHOST]; - char str[INET6_ADDRSTRLEN]; -- int keepbits = 0; -+ unsigned long keepbits = 0; - struct in_addr ia; - struct in6_addr ia6; - -@@ -161,8 +161,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - tmp = ipaddr_str; - tok = strsep(&tmp, "/"); - LOG_INFO(PFX "in cidr: bitmask '%s' ip '%s'", tmp, tok); -- keepbits = atoi(tmp); -- strcpy(ipaddr_str, tok); -+ keepbits = strtoull(tmp, NULL, 10); - } - - /* Determine if the IP address passed from the iface file is --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch deleted file mode 100644 index c63c0a8d56..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5df60ad8b22194391af34c1a7e54776b0372ffed Mon Sep 17 00:00:00 2001 -From: Lee Duncan <lduncan@suse.com> -Date: Fri, 15 Dec 2017 11:21:15 -0800 -Subject: [PATCH 7/7] Check iscsiuio ping data length for validity - -We do not trust that the received ping packet data length -is correct, so sanity check it. Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - iscsiuio/src/unix/iscsid_ipc.c | 5 +++++ - iscsiuio/src/unix/packet.c | 2 +- - iscsiuio/src/unix/packet.h | 2 ++ - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 85742da..a2caacc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -333,6 +333,11 @@ static void *perform_ping(void *arg) - - data = (iscsid_uip_broadcast_t *)png_c->data; - datalen = data->u.ping_rec.datalen; -+ if ((datalen > STD_MTU_SIZE) || (datalen < 0)) { -+ LOG_ERR(PFX "Ping datalen invalid: %d", datalen); -+ rc = -EINVAL; -+ goto ping_done; -+ } - - memset(dst_addr, 0, sizeof(uip_ip6addr_t)); - if (nic_iface->protocol == AF_INET) { -diff --git a/iscsiuio/src/unix/packet.c b/iscsiuio/src/unix/packet.c -index ecea09b..3ce2c6b 100644 ---- a/iscsiuio/src/unix/packet.c -+++ b/iscsiuio/src/unix/packet.c -@@ -112,7 +112,7 @@ int alloc_free_queue(nic_t *nic, size_t num_of_packets) - for (i = 0; i < num_of_packets; i++) { - packet_t *pkt; - -- pkt = alloc_packet(1500, 1500); -+ pkt = alloc_packet(STD_MTU_SIZE, STD_MTU_SIZE); - if (pkt == NULL) { - goto done; - } -diff --git a/iscsiuio/src/unix/packet.h b/iscsiuio/src/unix/packet.h -index b63d688..19d1db9 100644 ---- a/iscsiuio/src/unix/packet.h -+++ b/iscsiuio/src/unix/packet.h -@@ -43,6 +43,8 @@ - - #include "nic.h" - -+#define STD_MTU_SIZE 1500 -+ - struct nic; - struct nic_interface; - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch deleted file mode 100644 index 2c466119cd..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ebab8add4a549c16ab8b124137546c0a7b46a9b Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 15 Nov 2016 11:11:30 -0500 -Subject: [PATCH] Do not clean kernel source - -The default behaviour should not be to attempt to clean the kernel source -tree when building userspace. When not cross-compiling, however, this action is -harmless, but when attempting to build within the sysroot and since this package -is purely userspace, the clean step will fail. - -Removing the clean step eliminates an unnecessary dependency on the kernel build -infrastructure. - -Upstream-status: Inappropriate (embedded specific) - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c8cd00e..9576bba 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,7 +37,7 @@ endif - - all: user - --user: iscsiuio/Makefile -+user: - $(MAKE) -C utils/sysdeps - $(MAKE) -C utils/fwparam_ibft - $(MAKE) -C usr -@@ -75,7 +75,6 @@ clean: - $(MAKE) -C utils/fwparam_ibft clean - $(MAKE) -C utils clean - $(MAKE) -C usr clean -- $(MAKE) -C kernel clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch deleted file mode 100644 index 37d695f49d..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 79bea58a554205dd185509fbc4e76b5fc40f9038 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 15 Nov 2016 12:36:45 -0500 -Subject: [PATCH] fw_context: add include for NI_MAXHOST definiton - -This appears to build successfully with gcc 4.x but fails on gcc 5+, though it's -not immediately clear why NI_MAXHOST isn't being defined from the include -chain. Currently engaging with the upstream devs to determine the best course -of action, but this is an adequate workaround. - -Upstream-status: Pending - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - include/fw_context.h | 4 + - 1 file changed, 1 insertion(+) - -diff --git a/include/fw_context.h b/include/fw_context.h -index 44053d8..0b05cea 100644 ---- a/include/fw_context.h -+++ b/include/fw_context.h -@@ -21,6 +21,10 @@ - #ifndef FWPARAM_CONTEXT_H_ - #define FWPARAM_CONTEXT_H_ - -+#include <sys/socket.h> -+#ifndef NI_MAXHOST -+#define NI_MAXHOST 1025 -+#endif - #include <netdb.h> - #include <net/if.h> - --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb index 6c4a867b52..823227c46c 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb @@ -11,26 +11,22 @@ DEPENDS = "openssl flex-native bison-native open-isns util-linux" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRCREV ?= "8db9717e73d32d2c5131da4f9ad86dfd9065f74b" +SRCREV ?= "24580adc4c174bbc5dde3ae7594a46d57635e906" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \ - file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch \ - file://0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch \ - file://0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch \ - file://0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch \ - file://0005-Ensure-strings-from-peer-are-copied-correctly.patch \ - file://0006-Skip-useless-strcopy-and-validate-CIDR-length.patch \ - file://0007-Check-iscsiuio-ping-data-length-for-validity.patch \ + file://0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch \ + file://0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch \ + file://0001-qedi.c-Removed-unused-linux-ethtool.h.patch \ + file://0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch \ + file://0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch \ + file://0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch \ " - S = "${WORKDIR}/git" B = "${WORKDIR}/build" @@ -39,25 +35,15 @@ inherit update-rc.d systemd autotools EXTRA_OECONF = " \ --target=${TARGET_SYS} \ --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ " EXTRA_OEMAKE = ' \ - CC="${CC}" \ - AR="${AR}" \ - RANLIB="${RANLIB}" \ - CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include -I../../include -I../usr -I../../usr" \ - LDFLAGS="${LDFLAGS}" \ - LD="${LD}" \ OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" \ BASE="${prefix}" \ MANDIR="${mandir}" \ ' -TARGET_CC_ARCH += "${LDFLAGS}" - do_configure () { cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} } @@ -81,12 +67,14 @@ do_install () { ${D}${localstatedir}/lib/iscsi/isns \ ${D}${localstatedir}/lib/iscsi/slp \ ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}/${mandir}/man8 + ${D}${libdir} \ + ${D}${mandir}/man8 install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ ${S}/utils/iscsi-iname \ ${S}/usr/iscsistart ${D}/${sbindir} + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb b/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb index 5e7e6e49f5..36417b72a3 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb @@ -11,9 +11,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" - -SRC_URI[md5sum] = "9964d295ec9d34ed3408b57d28847b68" -SRC_URI[sha256sum] = "c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048" +SRC_URI[md5sum] = "610af6e04071f02d3469191de7499f4e" +SRC_URI[sha256sum] = "4e2d7cc01a6ee29a3955f5c622d47704ba7d9dd758189f15e9def016a2d1faa3" DEPENDS = "libnfnetlink openssl" diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch index 029b857bc1..97c515e00b 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch @@ -6,11 +6,11 @@ Upstream-Status: Pending Signed-of-by: Aws Ismail <aws.ismail@windriver.com> -diff --git a/configure.ac b/configure.ac -index f5a5b74..4a20154 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -605,11 +605,6 @@ AC_ARG_ENABLE([werror], +Index: openhpi-3.6.1/configure.ac +=================================================================== +--- openhpi-3.6.1.orig/configure.ac ++++ openhpi-3.6.1/configure.ac +@@ -656,11 +656,6 @@ AC_ARG_ENABLE([werror], fi], []) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch index 205696e651..60e2e79191 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch @@ -4,10 +4,11 @@ Upstream-Status: Pending Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> -diff -urpN a/openhpid/safhpi.c b/openhpid/safhpi.c ---- a/openhpid/safhpi.c -+++ b/openhpid/safhpi.c -@@ -1976,7 +1976,7 @@ SaErrorT SAHPI_API saHpiSensorThresholds +Index: openhpi-3.6.1/openhpid/safhpi.c +=================================================================== +--- openhpi-3.6.1.orig/openhpid/safhpi.c ++++ openhpi-3.6.1/openhpid/safhpi.c +@@ -1933,7 +1933,7 @@ SaErrorT SAHPI_API saHpiSensorThresholds oh_release_domain(d); /* Unlock domain */ OH_CALL_ABI(h, set_sensor_thresholds, SA_ERR_HPI_INVALID_CMD, rv, @@ -16,10 +17,11 @@ diff -urpN a/openhpid/safhpi.c b/openhpid/safhpi.c oh_release_handler(h); return rv; -diff -urpN a/utils/sahpi_struct_utils.c b/utils/sahpi_struct_utils.c ---- a/utils/sahpi_struct_utils.c -+++ b/utils/sahpi_struct_utils.c -@@ -3855,6 +3855,9 @@ SaHpiBoolT oh_valid_textbuffer(SaHpiText +Index: openhpi-3.6.1/utils/sahpi_struct_utils.c +=================================================================== +--- openhpi-3.6.1.orig/utils/sahpi_struct_utils.c ++++ openhpi-3.6.1/utils/sahpi_struct_utils.c +@@ -3861,6 +3861,9 @@ SaHpiBoolT oh_valid_textbuffer(SaHpiText /* found a unpaired surrogate */ return SAHPI_FALSE; } diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch index 7dac453189..cc21ff8c79 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch @@ -14,11 +14,11 @@ Date: Mon Dec 17 16:23:45 2012 -0500 Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -diff --git a/hpi_shell/session.c b/hpi_shell/session.c -index 85c31bf..187da4c 100644 ---- a/hpi_shell/session.c -+++ b/hpi_shell/session.c -@@ -66,7 +66,7 @@ static void* progress_bar(void *unused) +Index: openhpi-3.6.1/hpi_shell/session.c +=================================================================== +--- openhpi-3.6.1.orig/hpi_shell/session.c ++++ openhpi-3.6.1/hpi_shell/session.c +@@ -73,7 +73,7 @@ static void* progress_bar(void *unused) if (i < (PROGRESS_BUF_SIZE - mes_len - 1)) i++; t++; }; diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch index 6d3b6648a8..c848b35027 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch @@ -6,11 +6,11 @@ Upstream-Status: Pending Signed-of-by: Aws Ismail <aws.ismail@windriver.com> -diff --git a/configure.ac b/configure.ac -index 30a792c..b5f5aad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,7 +175,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/md5.h openssl/bio.h openssl/ssl.h openss +Index: openhpi-3.6.1/configure.ac +=================================================================== +--- openhpi-3.6.1.orig/configure.ac ++++ openhpi-3.6.1/configure.ac +@@ -177,7 +177,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/ dnl xml is used for XML-based communication in ilo2_ribcl and oa_soap AC_CHECK_LIB([xml2],[xmlParseMemory],[XML2_LIB=-lxml2],[XML2_LIB=]) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch index 51537ef128..3e09180d4d 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch @@ -13,19 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/configure.ac b/configure.ac -index 4b51971..16136b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http://dague.net/sean> 4/23/03 +Index: openhpi-3.6.1/configure.ac +=================================================================== +--- openhpi-3.6.1.orig/configure.ac ++++ openhpi-3.6.1/configure.ac +@@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http: AC_PREREQ(2.57) - AC_INIT(openhpi, 3.5.0) + AC_INIT(openhpi, 3.6.1) AC_CONFIG_SRCDIR(openhpi.spec.in) -AM_INIT_AUTOMAKE([1.8]) +AM_INIT_AUTOMAKE([1.8 serial-tests]) AM_CONFIG_HEADER(config.h) AH_TOP([#ifndef __OPENHPI_CONFIG_H --- -1.7.1 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch new file mode 100644 index 0000000000..8f8dba0541 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch @@ -0,0 +1,69 @@ +From 77d50b8d92ef1903cbc50d8f39e05fc828696bb9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Apr 2018 14:33:35 -0700 +Subject: [PATCH 1/2] Catch std::ifstream::failure by reference + +Fixes +error: catching polymorphic type 'class std::ios_base::failure' by value +[-Werror=catch-value=] + } catch (std::ofstream::failure) { + ^~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/base/conf.cc | 4 ++-- + src/dtm/dtmnd/dtm_main.cc | 2 +- + src/dtm/dtmnd/multicast.cc | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/base/conf.cc b/src/base/conf.cc +index d5755a1..4820357 100644 +--- a/src/base/conf.cc ++++ b/src/base/conf.cc +@@ -189,7 +189,7 @@ std::string Conf::ReadFile(const std::string& path_name, + try { + str.open(path_name); + str >> contents; +- } catch (std::ifstream::failure) { ++ } catch (std::ifstream::failure& e) { + contents.clear(); + } + return (str.fail() || contents.empty()) ? default_contents : contents; +@@ -203,7 +203,7 @@ void Conf::WriteFileAtomically(const std::string& path_name, + try { + str.open(tmp_file, std::ofstream::out | std::ofstream::trunc); + str << contents << std::endl; +- } catch (std::ofstream::failure) { ++ } catch (std::ofstream::failure& e) { + success = false; + } + str.close(); +diff --git a/src/dtm/dtmnd/dtm_main.cc b/src/dtm/dtmnd/dtm_main.cc +index 3260a81..a55afac 100644 +--- a/src/dtm/dtmnd/dtm_main.cc ++++ b/src/dtm/dtmnd/dtm_main.cc +@@ -359,7 +359,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) { + try { + str.open(PKGLOCALSTATEDIR "/node_id", std::ofstream::out); + str << std::hex << node_id << std::endl; +- } catch (std::ofstream::failure) { ++ } catch (std::ofstream::failure& e) { + } + str.close(); + } +diff --git a/src/dtm/dtmnd/multicast.cc b/src/dtm/dtmnd/multicast.cc +index bf67b9c..7232066 100644 +--- a/src/dtm/dtmnd/multicast.cc ++++ b/src/dtm/dtmnd/multicast.cc +@@ -198,7 +198,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) { + } + } + } +- } catch (std::ifstream::failure) { ++ } catch (std::ifstream::failure& e) { + LOG_ER("Caught std::ifstream::failure when reading file '%s', peers=%zu", + path_name.c_str(), static_cast<size_t>(peers_.size())); + peers_.clear(); +-- +2.17.0 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch new file mode 100644 index 0000000000..428e462289 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch @@ -0,0 +1,75 @@ +From 8cf323a2d8e02ca0bd36deb38e613c6edac546ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Apr 2018 18:29:17 -0700 +Subject: [PATCH] Fix string overflow in snprintf + +Fixes errors like +error: '%s' dir +ective output may be truncated writing up to 255 bytes into a region of size 32 [-Werror=forma +t-truncation=] + snprintf(reinterpret_cast<char *>(Healthy.key), sizeof(Healthy.key), "%s", + ^~~~ + hlth_str); + ~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/log/logd/lgs_util.cc | 4 ++-- + src/rde/rded/rde_amf.cc | 2 +- + src/smf/smfd/SmfUpgradeCampaign.cc | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/log/logd/lgs_util.cc b/src/log/logd/lgs_util.cc +index ac93d5a..cce80f3 100644 +--- a/src/log/logd/lgs_util.cc ++++ b/src/log/logd/lgs_util.cc +@@ -200,12 +200,12 @@ char *lgs_get_time(time_t *time_in) { + + stringSize = 5 * sizeof(char); + snprintf(srcString, (size_t)stringSize, "%d", +- (timeStampData->tm_year + START_YEAR)); ++ (timeStampData->tm_year + START_YEAR) & 0x4dU); + + strncpy(timeStampString, srcString, stringSize); + + stringSize = 3 * sizeof(char); +- snprintf(srcString, (size_t)stringSize, "%02d", (timeStampData->tm_mon + 1)); ++ snprintf(srcString, (size_t)stringSize, "%02d", (timeStampData->tm_mon + 1) & 0x2dU); + + strncat(timeStampString, srcString, stringSize); + +diff --git a/src/rde/rded/rde_amf.cc b/src/rde/rded/rde_amf.cc +index 81e521e..d53cc48 100644 +--- a/src/rde/rded/rde_amf.cc ++++ b/src/rde/rded/rde_amf.cc +@@ -102,7 +102,7 @@ static uint32_t rde_amf_healthcheck_start(RDE_AMF_CB *rde_amf_cb) { + SaAmfHealthcheckKeyT Healthy; + SaNameT SaCompName; + char *phlth_ptr; +- char hlth_str[256]; ++ char hlth_str[32]; + + TRACE_ENTER(); + +diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc +index 45cdce8..6761bcf 100644 +--- a/src/smf/smfd/SmfUpgradeCampaign.cc ++++ b/src/smf/smfd/SmfUpgradeCampaign.cc +@@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { + TRACE_ENTER(); + SaAisErrorT rc = SA_AIS_OK; + SaImmAttrValuesT_2 **attributes; +- int curCnt = 0; ++ short int curCnt = 0; + + /* Read the SmfCampRestartInfo object smfCampRestartCnt attr */ + std::string obj = "smfRestartInfo=info," + +@@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { + attrsmfCampRestartCnt.setName("smfCampRestartCnt"); + attrsmfCampRestartCnt.setType("SA_IMM_ATTR_SAUINT32T"); + char buf[5]; +- snprintf(buf, 4, "%d", curCnt); ++ snprintf(buf, 4, "%hd", curCnt); + attrsmfCampRestartCnt.addValue(buf); + imoCampRestartInfo.addValue(attrsmfCampRestartCnt); + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch index 512e246c56..effe25c85c 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 -diff --git a/Makefile.am b/Makefile.am -index d63fbbb..1012a2c 100644 ---- a/Makefile.am -+++ b/Makefile.am +Index: opensaf-5.18.02/Makefile.am +=================================================================== +--- opensaf-5.18.02.orig/Makefile.am ++++ opensaf-5.18.02/Makefile.am @@ -52,10 +52,10 @@ AM_CPPFLAGS = \ -pthread \ -D_GNU_SOURCE -DINTERNAL_VERSION_ID='"@INTERNAL_VERSION_ID@"' \ @@ -26,14 +26,14 @@ index d63fbbb..1012a2c 100644 -AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror +AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ +AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ - AM_LDFLAGS = @OSAF_HARDEN_FLAGS@ -Wl,--as-needed -ldl -lrt -pthread -rdynamic - ACLOCAL_AMFLAGS = -I m4 - OSAF_LIB_FLAGS = -diff --git a/configure.ac b/configure.ac -index 02771c6..b76b0fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -557,6 +557,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then + + if ENABLE_GCOV + AM_CFLAGS += --coverage +Index: opensaf-5.18.02/configure.ac +=================================================================== +--- opensaf-5.18.02.orig/configure.ac ++++ opensaf-5.18.02/configure.ac +@@ -593,6 +593,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then fi AC_SUBST(OSAF_HARDEN_FLAGS) @@ -42,11 +42,10 @@ index 02771c6..b76b0fe 100644 ############################################# # List the output Makefiles ############################################# -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..dcabb92 +Index: opensaf-5.18.02/m4/ax_check_compile_flag.m4 +=================================================================== --- /dev/null -+++ b/m4/ax_check_compile_flag.m4 ++++ opensaf-5.18.02/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html @@ -122,6 +121,3 @@ index 0000000..dcabb92 + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch new file mode 100644 index 0000000000..9865a5e1b8 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch @@ -0,0 +1,102 @@ +From 4d58d26cbd3622183afc2e8f85c9c81edaf135df Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Apr 2018 14:56:47 -0700 +Subject: [PATCH 2/2] Fix format-truncation errors + +Fixes errors with gcc8 eg. +error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 0 and 254 [-Werror=format-truncation=] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/base/daemon.c | 4 ++-- + src/mds/mds_c_db.c | 8 ++++---- + src/mds/mds_core.h | 4 ++-- + src/mds/mds_dt2c.h | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/base/daemon.c b/src/base/daemon.c +index 27170d7..da97700 100644 +--- a/src/base/daemon.c ++++ b/src/base/daemon.c +@@ -92,11 +92,11 @@ static int __create_pidfile(const char *pidfile) + { + FILE *file = NULL; + int fd, rc = 0; +- char pidfiletmp[NAME_MAX] = {0}; ++ char pidfiletmp[NAME_MAX+12] = {0}; + pid_t pid; + + pid = getpid(); +- snprintf(pidfiletmp, NAME_MAX, "%s.%u.tmp", pidfile, pid); ++ snprintf(pidfiletmp, NAME_MAX+12, "%s.%u.tmp", pidfile, pid); + + /* open the file and associate a stream with it */ + if (((fd = open(pidfiletmp, O_RDWR | O_CREAT, 0644)) == -1) || +diff --git a/src/mds/mds_c_db.c b/src/mds/mds_c_db.c +index e6b95cd..3d4a222 100644 +--- a/src/mds/mds_c_db.c ++++ b/src/mds/mds_c_db.c +@@ -124,10 +124,10 @@ void get_adest_details(MDS_DEST adest, char *adest_details) + } + + if (remote == true) +- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, ++ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, + "<rem_nodeid[0x%" PRIx32 "]:%s>", ncs_node_id, process_name); + else +- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, ++ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, + "<nodeid[0x%" PRIx32 "]:%s>", ncs_node_id, process_name); + + m_MDS_LOG_DBG("MDS:DB: adest_details: %s ", adest_details); +@@ -207,10 +207,10 @@ void get_subtn_adest_details(MDS_PWE_HDL pwe_hdl, MDS_SVC_ID svc_id, + } + + if (remote == true) +- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, ++ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, + "<rem_node[0x%" PRIx32 "]:%s>", ncs_node_id, process_name); + else +- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, ++ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, + "<node[0x%" PRIx32 "]:%s>", ncs_node_id, process_name); + done: + m_MDS_LOG_DBG("MDS:DB: adest_details: %s ", adest_details); +diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h +index 37696d4..7f5225d 100644 +--- a/src/mds/mds_core.h ++++ b/src/mds/mds_core.h +@@ -163,7 +163,7 @@ typedef struct mds_subscription_results_info { + uint32_t msg_snd_cnt; /* Message send count to this destination */ + uint32_t msg_rcv_cnt; /* Message rcv count from this destination */ + char sub_adest_details +- [MDS_MAX_PROCESS_NAME_LEN]; /* <node[slotno]:processname[pid]> */ ++ [MDS_MAX_PROCESS_NAME_LEN+24]; /* <node[slotno]:processname[pid]> */ + + } MDS_SUBSCRIPTION_RESULTS_INFO; + +@@ -194,7 +194,7 @@ typedef struct mds_subscription_info { + count is grater than ZERO bcast (multi-unicast) */ + uint32_t prev_ver_sub_count; + char sub_adest_details +- [MDS_MAX_PROCESS_NAME_LEN]; /* <node[slotno]:processname[pid]> */ ++ [MDS_MAX_PROCESS_NAME_LEN+24]; /* <node[slotno]:processname[pid]> */ + + } MDS_SUBSCRIPTION_INFO; + +diff --git a/src/mds/mds_dt2c.h b/src/mds/mds_dt2c.h +index 012999c..006b722 100644 +--- a/src/mds/mds_dt2c.h ++++ b/src/mds/mds_dt2c.h +@@ -143,7 +143,7 @@ typedef struct mdtm_send_req { + */ + MDS_DEST adest; /* MDTM to do local/remote routing, destination adest */ + char sub_adest_details +- [MDS_MAX_PROCESS_NAME_LEN]; /* <node[nodeid]:processname[pid]> */ ++ [MDS_MAX_PROCESS_NAME_LEN+24]; /* <node[nodeid]:processname[pid]> */ + MDS_SEND_PRIORITY_TYPE pri; + MDS_CLIENT_MSG_FORMAT_VER + msg_fmt_ver; /* message format version specification */ +-- +2.17.0 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb index 74483d7786..1a7d00ee30 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb @@ -24,9 +24,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ -" -SRC_URI[md5sum] = "125bcd9aabd7412aedcbfbf73f4e6196" -SRC_URI[sha256sum] = "3fb2239bb2c9328c8b45368ff8d8de979ea286a27edc9871d218200e88bb91cc" + file://0001-Catch-std-ifstream-failure-by-reference.patch \ + file://0002-Fix-format-truncation-errors.patch \ + file://0001-Fix-string-overflow-in-snprintf.patch \ + " +SRC_URI[md5sum] = "42064f5ddbc7f560bfc5ff93ea9eecc7" +SRC_URI[sha256sum] = "f9e24897f9cfd63bb3115f6275c706de1702d3d9bae2fc423227db72b23c37f0" inherit autotools useradd systemd pkgconfig diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index fa5eef9f55..ac0589467a 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -6,11 +6,10 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" -DEPENDS = "db icu libpcre openssl postfix-native \ +DEPENDS = "db icu libpcre libnsl2 openssl postfix-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " -DEPENDS_class-native = "db-native icu-native openssl-native libpcre-native" LICENSE = "IPL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=64375f37431336ea1b1b3005fe3fa354" @@ -77,7 +76,6 @@ export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${C export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" -export CCARGS-nonis_libc-musl = "-DNO_NIS" # OPT,DEBUG is aready in CFLAGS # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS EXTRA_OEMAKE += "OPT= DEBUG= OPTS= " @@ -217,6 +215,7 @@ do_install_append_class-native() { do_install_append_class-target() { # Remove references to buildmachine paths in target makedefs.out sed -i 's:-fdebug-prefix-map[^ ]*::g; s:--sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out + sed -i 's:-I${STAGING_DIR_TARGET}:-I:g' ${D}/etc/postfix/makedefs.out } ALTERNATIVE_${PN} = "sendmail" @@ -239,15 +238,20 @@ pkg_postinst_${PN} () { touch /etc/postfix/virtual_alias postmap /etc/postfix/virtual_alias else - touch $D/etc/aliases - newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases - touch $D/etc/postfix/virtual_alias - postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias - if ${@'true' if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) else 'false'}; then # /usr/lib/sendmail is required by LSB core test [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ fi + + touch $D/etc/aliases + # This can fail depending on host setup + if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then + $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} + exit 0 + fi + touch $D/etc/postfix/virtual_alias + postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias + fi } diff --git a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch deleted file mode 100644 index 48674c3c57..0000000000 --- a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f9150a0dc092ab2cbd47ee428436b747dce323a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 23 Apr 2017 10:28:28 -0700 -Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers - -Fixes errors with gcc7 which is more pedantic about c++11 -conformance regarding deprecated features - -include/SquidNew.h:21:51: error: dynamic exception specifications are deprecated in C++11 -_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) - ^~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/SquidNew.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/SquidNew.h b/include/SquidNew.h -index 39fcee0..c960347 100644 ---- a/include/SquidNew.h -+++ b/include/SquidNew.h -@@ -18,19 +18,19 @@ - */ - #include <new> - --_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true) - { - xfree(address); - } --_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true) - { - xfree(address); - } --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index 0c0a3aad10..302136a03c 100644 --- a/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -1,4 +1,4 @@ -From 14d469bc82c758116aef7d549abd49c131b4170f Mon Sep 17 00:00:00 2001 +From c21adbb0b230ffba97cf5d059e2bd024e13a37df Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 22 Apr 2017 11:54:57 -0700 Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler @@ -9,36 +9,18 @@ Fixes client.c:834:23: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Werror=format-truncation=] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - configure.ac | 3 +- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 76 insertions(+), 1 deletion(-) - create mode 100644 m4/ax_check_compile_flag.m4 + acinclude/ax_check_compile_flag.m4 | 74 ++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 ++ + 2 files changed, 76 insertions(+) + create mode 100644 acinclude/ax_check_compile_flag.m4 -Index: squid-3.5.26/configure.ac -=================================================================== ---- squid-3.5.26.orig/configure.ac -+++ squid-3.5.26/configure.ac -@@ -26,6 +26,7 @@ m4_include([acinclude/pkg.m4]) - m4_include([acinclude/lib-checks.m4]) - m4_include([acinclude/ax_cxx_compile_stdcxx_11.m4]) - m4_include([acinclude/ax_cxx_0x_types.m4]) -+m4_include([acinclude/ax_check_compile_flag.m4]) - - HOSTCXX="$BUILD_CXX" - PRESET_CFLAGS="$CFLAGS" -@@ -44,6 +45,7 @@ AC_PROG_CXX - AC_LANG([C++]) - AC_CANONICAL_HOST - -+AX_CHECK_COMPILE_FLAG([-Werror=format-truncation],[CFLAGS="$CFLAGS -Wno-error=format-truncation" CXXFLAGS="$CXXFLAGS -Wno-error=format-truncation"]) - # Clang 3.2 on some CPUs requires -march-native to detect correctly. - # GCC 4.3+ can also produce faster executables when its used. - # But building inside a virtual machine environment has been found to -Index: squid-3.5.26/acinclude/ax_check_compile_flag.m4 -=================================================================== +diff --git a/acinclude/ax_check_compile_flag.m4 b/acinclude/ax_check_compile_flag.m4 +new file mode 100644 +index 0000000..dcabb92 --- /dev/null -+++ squid-3.5.26/acinclude/ax_check_compile_flag.m4 ++++ b/acinclude/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html @@ -114,3 +96,23 @@ Index: squid-3.5.26/acinclude/ax_check_compile_flag.m4 + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS +diff --git a/configure.ac b/configure.ac +index ff4688c..9382fdf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,7 @@ m4_include([acinclude/pkg.m4]) + m4_include([acinclude/lib-checks.m4]) + m4_include([acinclude/ax_cxx_compile_stdcxx_11.m4]) + m4_include([acinclude/ax_cxx_0x_types.m4]) ++m4_include([acinclude/ax_check_compile_flag.m4]) + + HOSTCXX="$BUILD_CXX" + PRESET_CFLAGS="$CFLAGS" +@@ -44,6 +45,7 @@ AC_PROG_CXX + AC_LANG([C++]) + AC_CANONICAL_HOST + ++AX_CHECK_COMPILE_FLAG([-Werror=format-truncation],[CFLAGS="$CFLAGS -Wno-error=format-truncation" CXXFLAGS="$CXXFLAGS -Wno-error=format-truncation"]) + # Clang 3.2 on some CPUs requires -march-native to detect correctly. + # GCC 4.3+ can also produce faster executables when its used. + # But building inside a virtual machine environment has been found to diff --git a/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch b/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch index 082a1114b6..8ea55d0e16 100644 --- a/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch +++ b/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch @@ -1,4 +1,4 @@ -From a78f2f0feda8f92cb59afe8236bd90726908768f Mon Sep 17 00:00:00 2001 +From faaa796a138cbd5033b1e53f33faac0cf4162bf5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 25 Jun 2017 00:59:24 -0700 Subject: [PATCH] tools.cc: fixed unused-result warning @@ -10,9 +10,8 @@ fix | ~~~~~~^~~ Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted +--- src/tools.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -31,6 +30,3 @@ index 8137a03..843e266 100644 #endif #if HAVE_PRCTL && defined(PR_SET_DUMPABLE) /* Set Linux DUMPABLE flag */ --- -2.13.1 - diff --git a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch index 2304c5f1dd..25f68aff8f 100644 --- a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch +++ b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch @@ -1,8 +1,7 @@ -From 0d5b337ff5ef7dd48f970f08bd95d6327917cfd1 Mon Sep 17 00:00:00 2001 -Message-Id: <0d5b337ff5ef7dd48f970f08bd95d6327917cfd1.1382375807.git.Jim.Somerville@windriver.com> +From b4943594654cd340b95aabdc2f3750a4705cc0de Mon Sep 17 00:00:00 2001 From: Jim Somerville <Jim.Somerville@windriver.com> Date: Mon, 21 Oct 2013 12:50:44 -0400 -Subject: [PATCH 1/1] Fix flawed dynamic -ldb link test in configure +Subject: [PATCH] Fix flawed dynamic -ldb link test in configure The test uses dbopen, but just ignores the fact that this function may not exist in the db version @@ -11,15 +10,16 @@ and the configure script just making assumptions about why and setting the need for -ldb incorrectly. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> + --- - configure.ac | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) + configure.ac | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 962a748..42e6a93 100644 +index 57cd1ac..3827222 100644 --- a/configure.ac +++ b/configure.ac -@@ -3051,8 +3051,16 @@ AC_CHECK_DECL(dbopen,,,[ +@@ -3229,8 +3229,16 @@ AC_CHECK_DECL(dbopen,,,[ #include <db.h> #endif]) @@ -38,6 +38,3 @@ index 962a748..42e6a93 100644 if test "x$ac_cv_dbopen_libdb" = "xyes"; then LIB_DB="-ldb" fi --- -1.7.4.1 - diff --git a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch index 4ca27444a4..3852f7c255 100644 --- a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch +++ b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch @@ -1,29 +1,28 @@ -From 17e5a28667f667859c48bee25e575a072d39ee1b Mon Sep 17 00:00:00 2001 -Message-Id: <17e5a28667f667859c48bee25e575a072d39ee1b.1381956170.git.Jim.Somerville@windriver.com> +From 995aaf30799fa972441354b6feb45f0621968929 Mon Sep 17 00:00:00 2001 From: Jim Somerville <Jim.Somerville@windriver.com> Date: Wed, 16 Oct 2013 16:41:03 -0400 -Subject: [PATCH 1/1] Set up for cross compilation +Subject: [PATCH] Set up for cross compilation + +Message-Id: <17e5a28667f667859c48bee25e575a072d39ee1b.1381956170.git.Jim.Somerville@windriver.com> Set the host compiler to BUILD_CXX so proper cross compilation can occur. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> + --- - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + configure.ac | 1 + + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac -index c2d3033..dda9ed9 100644 +index fe80ee0..57cd1ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -19,6 +19,7 @@ m4_include([acinclude/lib-checks.m4]) - m4_include([acinclude/ax_cxx_compile_stdcxx_0x.m4]) +@@ -27,6 +27,7 @@ m4_include([acinclude/lib-checks.m4]) + m4_include([acinclude/ax_cxx_compile_stdcxx_11.m4]) m4_include([acinclude/ax_cxx_0x_types.m4]) +HOSTCXX="$BUILD_CXX" PRESET_CFLAGS="$CFLAGS" PRESET_CXXFLAGS="$CXXFLAGS" PRESET_LDFLAGS="$LDFLAGS" --- -1.7.4.1 - diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index 7b6dcc820d..6a3352548b 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch @@ -1,3 +1,6 @@ +From a85311965707ba2fa78f7ce044e6f61e65e66fd0 Mon Sep 17 00:00:00 2001 +From: Jim Somerville <Jim.Somerville@windriver.com> +Date: Tue, 14 Oct 2014 02:56:08 -0400 Subject: [PATCH] Skip AC_RUN_IFELSE tests Upstream-Status: Inappropriate [cross compiling specific] @@ -7,16 +10,17 @@ environment. Choose sane defaults. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- - acinclude/krb5.m4 | 10 +++++++++- - acinclude/lib-checks.m4 | 8 ++++++-- + acinclude/krb5.m4 | 10 +++++++++- + acinclude/lib-checks.m4 | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 -index 946bea8..7a072a2 100644 +index 5c83d88..c264118 100644 --- a/acinclude/krb5.m4 +++ b/acinclude/krb5.m4 -@@ -82,7 +82,15 @@ main(void) +@@ -61,7 +61,15 @@ main(void) return 0; } @@ -34,31 +38,28 @@ index 946bea8..7a072a2 100644 ]) ]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 -index 2bf98ee..50dba9b 100644 +index c4874da..ba72982 100644 --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 -@@ -128,7 +128,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ - AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1) - AC_MSG_RESULT([yes]) +@@ -177,7 +177,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ + [ + AC_MSG_RESULT([no]) ], - []) + [ + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) + ]) - AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works) - AC_RUN_IFELSE([ -@@ -154,7 +156,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ - [ - AC_MSG_RESULT([no]) + SQUID_STATE_ROLLBACK(check_const_SSL_METHOD) + ] +@@ -265,7 +267,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1) ], -[]) +[ + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) +]) - SQUID_STATE_ROLLBACK(check_SSL_get_certificate) + SQUID_STATE_ROLLBACK(check_TXTDB) ]) --- -1.7.1 - diff --git a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch deleted file mode 100644 index cc1ea78a55..0000000000 --- a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void squidaio_init()': ../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] #define NUMTHREADS (Config.cacheSwap.n_configured*16) - - -Upstream-Status: Backport -Index: squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc -=================================================================== ---- squid-3.5.26.orig/src/DiskIO/DiskThreads/aiops.cc -+++ squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc -@@ -290,7 +290,7 @@ squidaio_init(void) - /* Create threads and get them to sit in their wait loop */ - squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); - -- assert(NUMTHREADS); -+ assert(NUMTHREADS != 0); - - for (i = 0; i < NUMTHREADS; ++i) { - threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); diff --git a/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch index fdcd174d3b..e990480a6d 100644 --- a/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch +++ b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch @@ -1,15 +1,23 @@ -Set the SYSROOT for libxml2 header file to avoid host contamination. +From 702bd881b66dc034e711c0ff47805f2da40b6e0d Mon Sep 17 00:00:00 2001 +From: Yue Tao <yue.tao@windriver.com> +Date: Mon, 8 Aug 2016 16:04:33 +0800 +Subject: [PATCH] Set the SYSROOT for libxml2 header file to avoid host + contamination. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yue Tao <yue.tao@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -diff --git a/configure.ac.old b/configure.ac -index 54eda73..874f48e 100644 ---- a/configure.ac.old +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 504a844..ff4688c 100644 +--- a/configure.ac +++ b/configure.ac -@@ -964,15 +964,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a "x$with_libxml2" != "xno" ; then +@@ -974,15 +974,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a "x$with_libxml2" != "xno" ; then dnl Find the main header and include path... AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ AC_CHECK_HEADERS([libxml/parser.h], [], [ diff --git a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch index 312f44f8eb..e5267ea2b2 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch @@ -1,4 +1,4 @@ -From 54a9c2ba60adc7ec2724786662fd398e7c03999f Mon Sep 17 00:00:00 2001 +From 8786b91488dae3f6dfeadd686e80d2ffc5c29320 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Thu, 25 Aug 2016 15:22:57 +0800 Subject: [PATCH] squid: don't do squid-conf-tests at build time @@ -14,12 +14,13 @@ Subject: [PATCH] squid: don't do squid-conf-tests at build time Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- test-suite/Makefile.am | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am -index d5468be..77fc480 100644 +index 061a463..350dfb2 100644 --- a/test-suite/Makefile.am +++ b/test-suite/Makefile.am @@ -41,8 +41,7 @@ TESTS += debug \ @@ -58,6 +59,3 @@ index d5468be..77fc480 100644 else break; fi; \ done; \ if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi --- -2.8.3 - diff --git a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch index 01ec596223..9c75f17e70 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch @@ -1,4 +1,4 @@ -From bd58d3672bc267824000f34a37561c7ab2bd571f Mon Sep 17 00:00:00 2001 +From 9bcec221a2bb438d8a9ed59aed846ffe3be9cffa Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Tue, 19 Jul 2016 01:56:23 -0400 Subject: [PATCH] squid: use serial-tests config needed by ptest @@ -9,12 +9,13 @@ serial-tests is required to generate those targets. Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 05ad027..e324b93 100644 +index 3827222..504a844 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.61) @@ -26,6 +27,3 @@ index 05ad027..e324b93 100644 AC_REVISION($Revision$)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE --- -2.8.1 - diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.26.bb b/meta-networking/recipes-daemons/squid/squid_3.5.27.bb index 3ee96abb7b..7dae3cd83f 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.26.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.27.bb @@ -21,16 +21,14 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://volatiles.03_squid \ file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ - file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ - file://gcc7-fixes.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ " SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" -SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b" -SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2" +SRC_URI[md5sum] = "c17a3ed3a40cd59c23f48b8539dafcd8" +SRC_URI[sha256sum] = "467da134eaf0f7962ba5881793d106772fb05fefa4aea7d9569eec0412c52433" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=8861130fae91400bcf99b66f133172b3 \ diff --git a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch index 5f2860e846..b69de1d1c3 100644 --- a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch +++ b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch @@ -1,20 +1,25 @@ -vsftpd: change default value of secure_chroot_dir +From ce2be5d4967445828d5ae9d9462cfaa78ae03c73 Mon Sep 17 00:00:00 2001 +From: Ming Liu <ming.liu@windriver.com> +Date: Wed, 18 Sep 2013 09:44:20 +0800 +Subject: [PATCH] vsftpd: change default value of secure_chroot_dir Upstream-Status: Pending Change secure_chroot_dir pointing to a volatile directory. Signed-off-by: Ming Liu <ming.liu@windriver.com> + --- - INSTALL | 6 +++--- - tunables.c | 2 +- - vsftpd.conf.5 | 2 +- + INSTALL | 6 +++--- + tunables.c | 2 +- + vsftpd.conf.5 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -diff -urpN a/INSTALL b/INSTALL ---- a/INSTALL 2013-09-13 10:23:57.504972397 +0800 -+++ b/INSTALL 2013-09-13 10:25:25.664971779 +0800 -@@ -27,11 +27,11 @@ user in case it does not already exist. +diff --git a/INSTALL b/INSTALL +index 4f811aa..427122a 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -27,11 +27,11 @@ user in case it does not already exist. e.g.: [root@localhost root]# useradd nobody useradd: user nobody exists @@ -29,9 +34,10 @@ diff -urpN a/INSTALL b/INSTALL 2c) For anonymous FTP, you will need the user "ftp" to exist, and have a valid home directory (which is NOT owned or writable by the user "ftp"). -diff -urpN a/tunables.c b/tunables.c ---- a/tunables.c 2013-09-13 10:26:29.554972817 +0800 -+++ b/tunables.c 2013-09-13 10:27:18.104972210 +0800 +diff --git a/tunables.c b/tunables.c +index 284a10d..8c63c3f 100644 +--- a/tunables.c ++++ b/tunables.c @@ -254,7 +254,7 @@ tunables_load_defaults() /* -rw------- */ tunable_chown_upload_mode = 0600; @@ -41,10 +47,11 @@ diff -urpN a/tunables.c b/tunables.c install_str_setting("ftp", &tunable_ftp_username); install_str_setting("root", &tunable_chown_username); install_str_setting("/var/log/xferlog", &tunable_xferlog_file); -diff -urpN a/vsftpd.conf.5 b/vsftpd.conf.5 ---- a/vsftpd.conf.5 2013-09-13 10:09:33.774972462 +0800 -+++ b/vsftpd.conf.5 2013-09-13 10:10:41.914971989 +0800 -@@ -969,7 +969,7 @@ This option should be the name of a dire +diff --git a/vsftpd.conf.5 b/vsftpd.conf.5 +index fcc6022..e4ffdee 100644 +--- a/vsftpd.conf.5 ++++ b/vsftpd.conf.5 +@@ -969,7 +969,7 @@ This option should be the name of a directory which is empty. Also, the directory should not be writable by the ftp user. This directory is used as a secure chroot() jail at times vsftpd does not require filesystem access. diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch index c3919e1174..d81c94a4aa 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -1,9 +1,10 @@ -From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From c5caf52b9ed79da8916ef5722efe6df61a856e2f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 28 Mar 2017 20:09:12 -0700 Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- sysdeputil.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) @@ -23,6 +24,3 @@ index 06f01f4..a8cff3b 100644 #define __USE_GNU #include <utmpx.h> --- -2.12.1 - diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch index 7accbbc241..c6c0f80a19 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch @@ -1,4 +1,4 @@ -From 37cc924363515c8c309944c455bcbba7ddcc8eda Mon Sep 17 00:00:00 2001 +From 9c4826c19f04da533886209361a2caddf582d65c Mon Sep 17 00:00:00 2001 From: Mingli Yu <Mingli.Yu@windriver.com> Date: Tue, 6 Sep 2016 17:17:44 +0800 Subject: [PATCH] vsftpd: allow sysinfo() in the seccomp sandbox @@ -24,6 +24,7 @@ ftp> mget small* OOPS: priv_sock_get_cmd Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> + --- seccompsandbox.c | 1 + 1 file changed, 1 insertion(+) @@ -40,6 +41,3 @@ index 2c350a9..67d9ca5 100644 /* Misc */ allow_nr(__NR_umask); --- -2.8.1 - diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch index 1980d09fd4..5ad5c14e7a 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch @@ -1,14 +1,22 @@ -Use DESTDIR within install to allow installing under a prefix +From bab3f62f1fd5b7c2ab197f4311ad191bf18816b9 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Mon, 20 Feb 2012 13:51:49 +0000 +Subject: [PATCH] Use DESTDIR within install to allow installing under a prefix Upstream-Status: Pending Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + Makefile | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + diff --git a/Makefile b/Makefile +index c63ed1b..9e4f35f 100644 --- a/Makefile +++ b/Makefile -@@ -24,21 +24,21 @@ - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) +@@ -29,21 +29,21 @@ vsftpd: $(OBJS) + $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) install: - if [ -x /usr/local/sbin ]; then \ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch index 9a10f722f4..d2e58a3254 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch @@ -1,4 +1,8 @@ -Hardcode LIBS instead of using a script to determine available libs +From 328799d0cd5c523ad7a814fefec16d8a84aa8010 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 16 Apr 2013 10:53:55 +0000 +Subject: [PATCH] Hardcode LIBS instead of using a script to determine + available libs We want to avoid this dynamic detection so we have a deterministic build. @@ -7,15 +11,20 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/Makefile b/Makefile +index 9e4f35f..3a5535d 100644 --- a/Makefile +++ b/Makefile -@@ -5,7 +5,7 @@ - #CFLAGS = -g - CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion +@@ -8,7 +8,7 @@ CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ + -D_FORTIFY_SOURCE=2 \ + #-pedantic -Wconversion -LIBS = `./vsf_findlibs.sh` +LIBS = -lssl -lcrypto -lnsl -lresolv LINK = -Wl,-s + LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now - OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch index fd3160037f..e596073887 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch @@ -1,10 +1,18 @@ -Disable stripping at link time +From 261874ea47973ea156141185082252fc92081906 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 16 Apr 2013 10:53:55 +0000 +Subject: [PATCH] Disable stripping at link time Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + diff --git a/Makefile b/Makefile +index 3a5535d..e78019a 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,6 @@ CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch index fdcf3a02b6..a4387c132b 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch @@ -1,11 +1,20 @@ -Disable PAM +From 71628ddc91b6efb9b922a3fcf8cc18522f5387be Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Mon, 20 Feb 2012 13:51:49 +0000 +Subject: [PATCH] Disable PAM Upstream-Status: Inappropriate [config] Signed-off-by: Roy.Li <rongqing.li@windriver.com> -diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h ---- vsftpd-2.0.1_org/builddefs.h 2004-07-02 16:36:59.000000000 +0200 -+++ vsftpd-2.0.1_patch/builddefs.h 2004-07-21 09:34:49.044900488 +0200 + +--- + builddefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/builddefs.h b/builddefs.h +index 0106d1a..f48a568 100644 +--- a/builddefs.h ++++ b/builddefs.h @@ -2,7 +2,7 @@ #define VSF_BUILDDEFS_H diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch index 32f7e82183..590eb58579 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch @@ -1,4 +1,7 @@ -Fix the CVE-2015-1419 +From b756444854c5ab3b1284fd7113043fe8860e99ec Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Fri, 24 Apr 2015 09:36:48 +0800 +Subject: [PATCH] Fix the CVE-2015-1419 Upstream-Status: Pending @@ -9,10 +12,17 @@ ftp://195.220.108.108/linux/fedora/linux/development/rawhide/source/SRPMS/v/vsft Signed-off-by: Roy Li <rongqing.li@windriver.com> -diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c ---- vsftpd-2.1.0/ls.c.filter 2008-02-02 02:30:41.000000000 +0100 -+++ vsftpd-2.1.0/ls.c 2009-01-08 19:31:15.000000000 +0100 -@@ -239,9 +239,31 @@ vsf_filename_passes_filter(const struct +--- + ls.c | 26 ++++++++++++++++++++++++-- + str.c | 11 +++++++++++ + str.h | 1 + + 3 files changed, 36 insertions(+), 2 deletions(-) + +diff --git a/ls.c b/ls.c +index 7e1376d..e9302dd 100644 +--- a/ls.c ++++ b/ls.c +@@ -246,9 +246,31 @@ vsf_filename_passes_filter(const struct mystr* p_filename_str, int ret = 0; char last_token = 0; int must_match_at_current_pos = 1; @@ -46,10 +56,11 @@ diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX) { static struct mystr s_match_needed_str; -diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c ---- vsftpd-2.1.0/str.c.filter 2008-12-17 06:54:16.000000000 +0100 -+++ vsftpd-2.1.0/str.c 2009-01-08 19:31:15.000000000 +0100 -@@ -680,3 +680,14 @@ str_replace_unprintable(struct mystr* p_ +diff --git a/str.c b/str.c +index 6596204..ba4b92a 100644 +--- a/str.c ++++ b/str.c +@@ -711,3 +711,14 @@ str_replace_unprintable(struct mystr* p_str, char new_char) } } @@ -64,10 +75,11 @@ diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c + if (str_isempty(d_str)) + str_copy (d_str, path); +} -diff -up vsftpd-2.1.0/str.h.filter vsftpd-2.1.0/str.h ---- vsftpd-2.1.0/str.h.filter 2008-12-17 06:53:23.000000000 +0100 -+++ vsftpd-2.1.0/str.h 2009-01-08 19:32:14.000000000 +0100 -@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst +diff --git a/str.h b/str.h +index ab0a9a4..3a21b50 100644 +--- a/str.h ++++ b/str.h +@@ -100,6 +100,7 @@ void str_replace_unprintable(struct mystr* p_str, char new_char); int str_atoi(const struct mystr* p_str); filesize_t str_a_to_filesize_t(const struct mystr* p_str); unsigned int str_octal_to_uint(const struct mystr* p_str); diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch index 69745b3a10..c558aee0aa 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch @@ -1,11 +1,15 @@ -Enable tcp_wrapper. +From c026b0c0de4eebb189bc77b2d4c3b9528454ac04 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Fri, 19 Jul 2013 10:19:25 +0800 +Subject: [PATCH] Enable tcp_wrapper. Upstream-Status: Inappropriate [configuration] Signed-off-by: Roy.Li <rongqing.li@windriver.com> + --- - builddefs.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + builddefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builddefs.h b/builddefs.h index e908352..0106d1a 100644 @@ -20,6 +24,3 @@ index e908352..0106d1a 100644 #define VSF_BUILD_PAM #undef VSF_BUILD_SSL --- -1.7.1 - diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch index 5774e62eb1..5774e62eb1 100644 --- a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch index c3d406ea3d..f8d965294a 100644 --- a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch @@ -1,157 +1,166 @@ -From cc170860e5b77d7c9f3b9ce8730b719976dab2bb Mon Sep 17 00:00:00 2001 +From 8e9bf962a45a82f1c2eb5858e29fa89a3a60b564 Mon Sep 17 00:00:00 2001 From: Alexey Firago <alexey_firago@mentor.com> Date: Mon, 30 Oct 2017 23:24:49 +0300 -Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux +Subject: [PATCH 1/4] CMakeLists.txt: Fix libraries installation for Linux * Set libs versions as in Makefile Signed-off-by: Alexey Firago <alexey_firago@mentor.com> + +%% original patch: 0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch --- - CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 55 insertions(+) + CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++ + CMakeLists.txt => CMakeLists.txt.orig | 0 + 2 files changed, 55 insertions(+) + copy CMakeLists.txt => CMakeLists.txt.orig (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9663934..5719435 100644 +index b1a49df..13e64ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") project(${PACKAGE_NAME} C CXX) - + +set (CORE_VERSION_MAJOR "4") +set (CORE_VERSION "4.0.0") + +set (CPP_VERSION_MAJOR "1") -+set (CPP_VERSION "1.6.6") ++set (CPP_VERSION "${PACKAGE_VERSION}") + +set (CSHARP_VERSION_MAJOR "1") -+set (CSHARP_VERSION "1.6.6") ++set (CSHARP_VERSION "${PACKAGE_VERSION}") + set(gRPC_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") set(gRPC_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") set(gRPC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") -@@ -840,6 +849,10 @@ if(WIN32 AND MSVC) +@@ -841,6 +850,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) +endif() - + target_include_directories(gpr - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -1228,6 +1241,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -1221,6 +1234,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) +endif() - + target_include_directories(grpc - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -1534,6 +1551,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -1535,6 +1552,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) +endif() - + target_include_directories(grpc_cronet - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -2366,6 +2387,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -2377,6 +2398,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) +endif() - + target_include_directories(grpc_unsecure - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -2583,6 +2608,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -2592,6 +2617,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) +endif() - + target_include_directories(grpc++ - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -3013,6 +3042,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -3078,6 +3107,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) +endif() - + target_include_directories(grpc++_cronet - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -3213,6 +3246,11 @@ protobuf_generate_grpc_cpp( + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -3282,6 +3315,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/status/status.proto ) - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) +endif() + target_include_directories(grpc++_error_details - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3343,6 +3381,11 @@ protobuf_generate_grpc_cpp( +@@ -3408,6 +3446,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/reflection/v1alpha/reflection.proto ) - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) +endif() + target_include_directories(grpc++_reflection - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3762,6 +3805,10 @@ if(WIN32 AND MSVC) +@@ -3827,6 +3870,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION}) + set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) +endif() - + target_include_directories(grpc++_unsecure - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -4075,6 +4122,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -4140,6 +4187,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION}) + set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) +endif() - + target_include_directories(grpc_plugin_support - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -4599,6 +4650,10 @@ if(WIN32 AND MSVC) + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +@@ -4649,6 +4700,10 @@ if(WIN32 AND MSVC) endif() endif() - + +if(_gRPC_PLATFORM_LINUX) + set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION}) + set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR}) +endif() - + target_include_directories(grpc_csharp_ext - PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> --- -2.7.4 + PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +diff --git a/CMakeLists.txt b/CMakeLists.txt.orig +similarity index 100% +copy from CMakeLists.txt +copy to CMakeLists.txt.orig +-- +2.16.1 + diff --git a/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch b/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch new file mode 100644 index 0000000000..8985022fad --- /dev/null +++ b/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch @@ -0,0 +1,42 @@ +From a498b56ba96948015f0f2784b2ab8296946716ee Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Feb 2018 23:28:17 -0800 +Subject: [PATCH 4/4] CMakeLists.txt: Find c-ares in target sysroot alone + +Current code lets it look into native sysroot as well +which is then preferred during cross compile and it adds +absolute path to libcares into linker flags +on heterogenous architectures linker complains and build +fails + +| /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/grpc/1.8.5-r0/recipe-sysroot-native/usr/lib/lib +cares.so.2.2.0: file not recognized: File format not recognized +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1d7eef1..058423d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,10 +153,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "module") + set(gRPC_INSTALL FALSE) + endif() + elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package") +- find_package(c-ares REQUIRED CONFIG) +- if(TARGET c-ares::cares) +- set(_gRPC_CARES_LIBRARIES c-ares::cares) +- endif() ++ find_package(c-ares REQUIRED) ++ set(_gRPC_CARES_LIBRARIES cares) + set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n find_package(c-ares CONFIG)\nendif()") + endif() + +-- +2.16.1 + diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb index 6fde33d85a..a0c943d114 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb @@ -10,15 +10,13 @@ DEPENDS_append_class-target = " gtest grpc-native " LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "https://github.com/grpc/grpc/archive/v1.6.6.tar.gz" -SRC_URI[md5sum] = "a960878ad0231189d48ac8ff17eeca3c" -SRC_URI[sha256sum] = "b97eaa0c8a63b0492dc94bdad621795b4815278e841f06b0c78d6bcbd4c8bdec" - -SRC_URI += " \ - file://0001-use-the-right-protoc-executable-regardless-of-protob.patch \ - file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ -" - +S = "${WORKDIR}/git" +SRCREV = "db68cb3652cc7697647e9934b5316d98a6ba04d1" +BRANCH = "v1.8.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ + file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ + file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \ + " SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" inherit cmake diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb index 6593661075..5d1359165a 100644 --- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +++ b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb @@ -60,3 +60,5 @@ FILES_${PN} += "${sbindir} \ RDEPENDS_${PN} = "kernel-module-iscsi-trgt" RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c" + +PNBLACKLIST[iscsitarget] = "error: implicit declaration of function 'init_timer'; did you mean 'init_timers'?; 4.15 kernel issues" diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb index 8b3490d7c2..46168b0ba4 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb @@ -4,11 +4,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ - libnetfilter-cthelper libnetfilter-queue bison-native" + libnetfilter-cthelper libnetfilter-queue bison-native libtirpc" -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +EXTRA_OECONF += "LIBS=-ltirpc CPPFLAGS=-I${STAGING_INCDIR}/tirpc" SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar \ file://conntrack-failover \ diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index d5e7341a01..b9dce69ba8 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -29,9 +29,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://0007-extensions-Use-stdint-types.patch \ file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ - file://0010-Adjust-header-include-sequence.patch \ " +SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" + SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" @@ -42,10 +43,10 @@ inherit update-rc.d systemd python __anonymous () { import re - karch = d.getVar('KARCH') + karch = d.getVar('TARGET_ARCH') multilib = d.getVar('MLPREFIX') - if multilib and karch == 'powerpc64': + if multilib and ( karch == 'powerpc64' or karch == 'arm' ): searchstr = "lib.?32" reg = re.compile(searchstr) if reg.search(multilib): diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch index 9377f57cb0..e717d5b0e3 100644 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch +++ b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch @@ -20,10 +20,10 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> src/libnetfilter_cthelper.c | 83 ++++++++++++++++++--------------------------- 3 files changed, 36 insertions(+), 54 deletions(-) -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index cac9b05..190b7cd 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in +Index: libnetfilter_cthelper-1.0.0/doxygen.cfg.in +=================================================================== +--- libnetfilter_cthelper-1.0.0.orig/doxygen.cfg.in ++++ libnetfilter_cthelper-1.0.0/doxygen.cfg.in @@ -72,7 +72,7 @@ RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO @@ -33,10 +33,10 @@ index cac9b05..190b7cd 100644 EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a..5d78171 100644 ---- a/src/internal.h -+++ b/src/internal.h +Index: libnetfilter_cthelper-1.0.0/src/internal.h +=================================================================== +--- libnetfilter_cthelper-1.0.0.orig/src/internal.h ++++ libnetfilter_cthelper-1.0.0/src/internal.h @@ -3,10 +3,9 @@ #include "config.h" @@ -50,10 +50,10 @@ index 3a88d1a..5d78171 100644 #endif #endif -diff --git a/src/libnetfilter_cthelper.c b/src/libnetfilter_cthelper.c -index f8f58e6..af543a1 100644 ---- a/src/libnetfilter_cthelper.c -+++ b/src/libnetfilter_cthelper.c +Index: libnetfilter_cthelper-1.0.0/src/libnetfilter_cthelper.c +=================================================================== +--- libnetfilter_cthelper-1.0.0.orig/src/libnetfilter_cthelper.c ++++ libnetfilter_cthelper-1.0.0/src/libnetfilter_cthelper.c @@ -99,17 +99,16 @@ struct nfct_helper { * In case of success, this function returns a valid pointer, otherwise NULL * s returned and errno is appropriately set. @@ -74,9 +74,9 @@ index f8f58e6..af543a1 100644 { int i; -@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper *h) +@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper + free(h->expect_policy[i]); } - free(h); } -EXPORT_SYMBOL(nfct_helper_free); @@ -115,7 +115,7 @@ index f8f58e6..af543a1 100644 nfct_helper_policy_attr_set(struct nfct_helper_policy *p, enum nfct_helper_policy_attr_type type, const void *data) -@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_helper_policy *p, +@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_ break; } } @@ -123,7 +123,7 @@ index f8f58e6..af543a1 100644 /** * nfct_helper_attr_set_str - set one attribute the helper object -@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set); +@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_se * \param type attribute type you want to set * \param name string that will be used to set this attribute */ @@ -149,7 +149,7 @@ index f8f58e6..af543a1 100644 /** * nfct_helper_attr_set - set one attribute of the helper object -@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); +@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_se * \param type attribute type you want to set * \param data pointer to data that will be used to set this attribute */ @@ -158,7 +158,7 @@ index f8f58e6..af543a1 100644 nfct_helper_attr_set(struct nfct_helper *h, enum nfct_helper_attr_type type, const void *data) { -@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper *h, +@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper break; } } @@ -216,7 +216,7 @@ index f8f58e6..af543a1 100644 nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type) { switch(type) { -@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_ty +@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helpe break; } } @@ -236,7 +236,7 @@ index f8f58e6..af543a1 100644 { const void *ret = NULL; -@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct nfct_helper *helper, +@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct } return ret; } @@ -321,7 +321,7 @@ index f8f58e6..af543a1 100644 { int ret; -@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size_t size, +@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size return ret; } @@ -338,7 +338,7 @@ index f8f58e6..af543a1 100644 nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, uint16_t flags, uint32_t seq) { -@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, +@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, u return nlh; } @@ -346,7 +346,7 @@ index f8f58e6..af543a1 100644 static void nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, -@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, +@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nl * \param nlh: netlink message that you want to use to add the payload. * \param nfct_helper: pointer to a helper object */ @@ -355,7 +355,7 @@ index f8f58e6..af543a1 100644 nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) { struct nlattr *nest; -@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) +@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct n if (h->bitset & (1 << NFCTH_ATTR_STATUS)) mnl_attr_put_u32(nlh, NFCTH_STATUS, ntohl(h->status)); } @@ -363,7 +363,7 @@ index f8f58e6..af543a1 100644 static int nfct_helper_nlmsg_parse_tuple_cb(const struct nlattr *attr, void *data) -@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) +@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const st * This function returns -1 in case that some mandatory attributes are * missing. On sucess, it returns 0. */ @@ -372,7 +372,7 @@ index f8f58e6..af543a1 100644 nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, struct nfct_helper *h) { -@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, +@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const st } return 0; } @@ -380,6 +380,3 @@ index f8f58e6..af543a1 100644 /** * @} --- -cgit v1.1 - diff --git a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb index 9487fdc2c0..ebe867d776 100644 --- a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb @@ -4,15 +4,15 @@ SECTION = "net" LICENSE = "SPL-1.0" LIC_FILES_CHKSUM = "file://rpcinfo/rpcinfo.c;beginline=2;endline=3;md5=3e6339e3ce266e1122c5ba293e04bc89" -DEPENDS_append_libc-musl = " libtirpc" +DEPENDS += "libtirpc" SRC_URI = "http://sources.openembedded.org/${BPN}-${PV}.tar.gz \ file://gcc4.patch \ file://0001-rpcgen-Fix-printf-formats.patch \ " SRC_URI[md5sum] = "67212720482ea1aea9182a98653a9642" SRC_URI[sha256sum] = "421d63b414162237a72867061f1bd3e3752a0d962cd5d30b5e933ddad8a14d3b" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LIBS_append_libc-musl = " -ltirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LIBS += "-ltirpc" do_configure () { ./configure --prefix=${prefix} diff --git a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/0001-Link-with-libtirpc.patch b/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/0001-Link-with-libtirpc.patch new file mode 100644 index 0000000000..55926468d9 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/0001-Link-with-libtirpc.patch @@ -0,0 +1,79 @@ +From 5746b68ba9dda87586b3ac88fe84031cbc0015f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 11 May 2018 12:20:03 -0700 +Subject: [PATCH] Link with libtirpc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + configure | 2 +- + rpc.rusersd/rusers_proc.c | 7 +------ + rpc.rusersd/rusersd.c | 6 +----- + rup/rup.c | 2 +- + 4 files changed, 4 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index 85f6ca6..2d2d4b7 100755 +--- a/configure ++++ b/configure +@@ -147,7 +147,7 @@ else + fi + + LDFLAGS= +-LIBS= ++LIBS="-ltirpc" + + rm -f __conftest* + +diff --git a/rpc.rusersd/rusers_proc.c b/rpc.rusersd/rusers_proc.c +index 9ae6306..f9e237c 100644 +--- a/rpc.rusersd/rusers_proc.c ++++ b/rpc.rusersd/rusers_proc.c +@@ -57,12 +57,7 @@ char rp_rcsid[] = + #define RUT_TIME ut_time + #endif + +-/* Glibc strikes again */ +-#ifdef __GLIBC__ +- #include <rpcsvc/rusers.h> +-#else +- #include "rusers.h" +-#endif ++#include "rusers.h" + + void rusers_service(struct svc_req *rqstp, SVCXPRT *transp); + +diff --git a/rpc.rusersd/rusersd.c b/rpc.rusersd/rusersd.c +index 762be9b..dd355ac 100644 +--- a/rpc.rusersd/rusersd.c ++++ b/rpc.rusersd/rusersd.c +@@ -38,11 +38,7 @@ char rusersd_rcsid[] = + #include <rpc/pmap_clnt.h> + #include <unistd.h> + #include <grp.h> +-#ifdef __GLIBC__ +- #include <rpcsvc/rusers.h> +-#else +- #include "rusers.h" +-#endif ++#include "rusers.h" + + #include "../version.h" + +diff --git a/rup/rup.c b/rup/rup.c +index e5669ff..887f89d 100644 +--- a/rup/rup.c ++++ b/rup/rup.c +@@ -48,7 +48,7 @@ char rcsid[] = "$Id: rup.c,v 1.8 2000/07/22 19:51:40 dholland Exp $"; + + #undef FSHIFT /* Use protocol's shift and scale values */ + #undef FSCALE +-#include <rpcsvc/rstat.h> ++#include "rstat.h" + + #include "../version.h" + +-- +2.17.0 + diff --git a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb index 459e39e593..113f89b7f5 100644 --- a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb @@ -9,6 +9,7 @@ DEPENDS = " tcp-wrappers libtirpc rpcbind" SRC_URI = "http://http.debian.net/debian/pool/main/n/${BPN}/${BPN}_${PV}.orig.tar.gz;name=archive \ http://http.debian.net/debian/pool/main/n/${BPN}/${BPN}_${PV}-8.diff.gz;name=patch8 \ file://rpc.rusersd-Makefile-fix-parallel-build-issue.patch \ + file://0001-Link-with-libtirpc.patch \ " SRC_URI[archive.md5sum] = "dc99a80b9fde2ab427c874f88f1c1602" @@ -18,10 +19,14 @@ SRC_URI[patch8.sha256sum] = "14882dbdda4e37baa84d55b54b46c7e063a20fc9e04d1be1a28 inherit autotools-brokensep +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LIBS += "-ltirpc" + do_configure () { ./configure --prefix=${prefix} echo "LDFLAGS=${LDFLAGS}" >> MCONFIG echo "USE_GLIBC=1" >> MCONFIG + echo "LIBS=${LIBS}" >> MCONFIG } do_install () { diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb index 92cd24c3ae..c556eb48e8 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb @@ -7,7 +7,9 @@ Accounting needs." HOMEPAGE = "http://www.freediameter.net" -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools" +DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools virtual/kernel" + +PACKAGE_ARCH = "${MACHINE_ARCH}" fd_pkgname = "freeDiameter" @@ -121,8 +123,8 @@ FILES_${PN} += "${libdir}/${fd_pkgname}/*" RDEPENDS_${PN} = "glib-2.0 gnutls libidn" RDEPENDS_${PN} += "openssl openssl-conf openssl-engines" -RDEPENDS_${PN} += "kernel-module-tipc kernel-module-sctp" -RDEPENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip" +RRECOMMENDS_${PN} += "kernel-module-tipc kernel-module-sctp" +RRECOMMENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip" RDEPENDS_${PN}-ptest = "cmake" INITSCRIPT_PACKAGES = "${PN}" diff --git a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch new file mode 100644 index 0000000000..863866d18e --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch @@ -0,0 +1,42 @@ +From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Feb 2018 21:54:11 -0800 +Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc + +Provide nss_status macro instead for non-glibc case +where nss.h is absent + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mDNSPosix/nss_mdns.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +index afadb3c..c469584 100755 +--- a/mDNSPosix/nss_mdns.c ++++ b/mDNSPosix/nss_mdns.c +@@ -378,8 +378,19 @@ init_config (); + + #define ENTNAME hostent + #define DATABASE "hosts" +- ++#ifdef __GLIBC__ + #include <nss.h> ++#else ++enum nss_status ++{ ++ NSS_STATUS_TRYAGAIN = -2, ++ NSS_STATUS_UNAVAIL, ++ NSS_STATUS_NOTFOUND, ++ NSS_STATUS_SUCCESS, ++ NSS_STATUS_RETURN ++}; ++#define NETDB_INTERNAL NULL ++#endif + // For nss_status + #include <netdb.h> + // For hostent +-- +2.16.1 + diff --git a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb index 1a80f7acb6..9a7152fcf0 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb @@ -9,6 +9,7 @@ RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ + file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317" diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch index b05eea56fc..b14b76128a 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch @@ -11,13 +11,13 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> snmplib/transports/snmpUDPIPv6Domain.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c -index 55e3610..aca69ae 100644 ---- a/snmplib/transports/snmpUDPIPv6Domain.c -+++ b/snmplib/transports/snmpUDPIPv6Domain.c -@@ -256,6 +256,27 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) - t->data = NULL; - t->data_length = 0; +Index: net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/transports/snmpUDPIPv6Domain.c ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c +@@ -286,6 +286,27 @@ netsnmp_udp6_transport(struct sockaddr_i + return NULL; + #endif /* NETSNMP_NO_LISTEN_SUPPORT */ } else { + char *client_socket = NULL; + /* @@ -43,6 +43,3 @@ index 55e3610..aca69ae 100644 /* * This is a client session. Save the address in the * transport-specific data pointer for later use by netsnmp_udp6_send. --- -2.9.3 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch new file mode 100644 index 0000000000..7314ab16a5 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch @@ -0,0 +1,2524 @@ +net-snmp: remove U64 typedef + +From git://git.code.sf.net/p/net-snmp/code + +Upstream-Status: Backport (unmodified) + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +From 477b4307ef12ddce3b6a9205e0bdddbfb2e0e9b6 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche <bvanassche@acm.org> +Date: Sat, 20 Feb 2016 18:58:18 -0800 +Subject: [PATCH 1/1] Remove U64 typedef + +The U64 typedef conflicts with a typedef in a Perl header file. Hence +remove the U64 typedef from the Net-SNMP header files. This patch does +not modify the Net-SNMP ABI. +--- + agent/mibgroup/if-mib/ifXTable/ifXTable.c | 16 +- + agent/mibgroup/if-mib/ifXTable/ifXTable.h | 48 +- + .../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 32 +- + .../ip-mib/data_access/systemstats_common.c | 2 +- + .../ipIfStatsTable/ipIfStatsTable_data_get.c | 28 +- + .../ipIfStatsTable/ipIfStatsTable_data_get.h | 28 +- + .../ipIfStatsTable/ipIfStatsTable_interface.c | 56 +- + .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 28 +- + .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 921 ++------------------- + .../ipSystemStatsTable_interface.c | 56 +- + include/net-snmp/data_access/ipstats.h | 42 +- + include/net-snmp/library/int64.h | 34 +- + snmplib/int64.c | 38 +- + snmplib/read_config.c | 6 +- + testing/fulltests/unit-tests/T015int64_clib.c | 10 +- + 15 files changed, 274 insertions(+), 1071 deletions(-) + +Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable.c ++++ net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.c +@@ -722,7 +722,7 @@ The total number of octets received on t + */ + int + ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCInOctets_val_ptr) ++ struct counter64 *ifHCInOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCInOctets_val_ptr); +@@ -779,7 +779,7 @@ The number of packets, delivered by this + */ + int + ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCInUcastPkts_val_ptr) ++ struct counter64 *ifHCInUcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); +@@ -838,7 +838,7 @@ The number of packets, delivered by this + */ + int + ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCInMulticastPkts_val_ptr) ++ struct counter64 *ifHCInMulticastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); +@@ -897,7 +897,7 @@ The number of packets, delivered by this + */ + int + ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCInBroadcastPkts_val_ptr) ++ struct counter64 *ifHCInBroadcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); +@@ -955,7 +955,7 @@ The total number of octets transmitted o + */ + int + ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCOutOctets_val_ptr) ++ struct counter64 *ifHCOutOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCOutOctets_val_ptr); +@@ -1013,7 +1013,7 @@ The total number of packets that higher- + */ + int + ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCOutUcastPkts_val_ptr) ++ struct counter64 *ifHCOutUcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); +@@ -1074,7 +1074,7 @@ The total number of packets that higher- + */ + int + ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCOutMulticastPkts_val_ptr) ++ struct counter64 *ifHCOutMulticastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); +@@ -1134,7 +1134,7 @@ The total number of packets that higher- + */ + int + ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCOutBroadcastPkts_val_ptr) ++ struct counter64 *ifHCOutBroadcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); +Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.h +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable.h ++++ net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.h +@@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_ + u_long * + ifOutBroadcastPkts_val_ptr); + int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCInOctets_val_ptr); ++ struct counter64 *ifHCInOctets_val_ptr); + int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCInUcastPkts_val_ptr); ++ struct counter64 *ifHCInUcastPkts_val_ptr); + int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ifHCInMulticastPkts_val_ptr); + int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ifHCInBroadcastPkts_val_ptr); + int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCOutOctets_val_ptr); ++ struct counter64 *ifHCOutOctets_val_ptr); + int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 * ifHCOutUcastPkts_val_ptr); ++ struct counter64 *ifHCOutUcastPkts_val_ptr); + int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ifHCOutMulticastPkts_val_ptr); + int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ifHCOutBroadcastPkts_val_ptr); + int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * + rowreq_ctx, +@@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_ + + int ifHCInOctets_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCInOctets_val); ++ struct counter64 ifHCInOctets_val); + int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 ifHCInOctets_val); ++ struct counter64 ifHCInOctets_val); + int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); + + int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCInUcastPkts_val); ++ struct counter64 ifHCInUcastPkts_val); + int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 ifHCInUcastPkts_val); ++ struct counter64 ifHCInUcastPkts_val); + int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx); + + int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ++ struct counter64 + ifHCInMulticastPkts_val); + int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCInMulticastPkts_val); ++ struct counter64 ifHCInMulticastPkts_val); + int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx * + rowreq_ctx); + + int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ++ struct counter64 + ifHCInBroadcastPkts_val); + int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCInBroadcastPkts_val); ++ struct counter64 ifHCInBroadcastPkts_val); + int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx * + rowreq_ctx); + + int ifHCOutOctets_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCOutOctets_val); ++ struct counter64 ifHCOutOctets_val); + int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 ifHCOutOctets_val); ++ struct counter64 ifHCOutOctets_val); + int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); + + int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCOutUcastPkts_val); ++ struct counter64 ifHCOutUcastPkts_val); + int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, +- U64 ifHCOutUcastPkts_val); ++ struct counter64 ifHCOutUcastPkts_val); + int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx * + rowreq_ctx); + + int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ++ struct counter64 + ifHCOutMulticastPkts_val); + int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCOutMulticastPkts_val); ++ struct counter64 ifHCOutMulticastPkts_val); + int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx * + rowreq_ctx); + + int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ++ struct counter64 + ifHCOutBroadcastPkts_val); + int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * + rowreq_ctx); + int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx * + rowreq_ctx, +- U64 ifHCOutBroadcastPkts_val); ++ struct counter64 ifHCOutBroadcastPkts_val); + int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * + rowreq_ctx); + +Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c ++++ net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c +@@ -729,72 +729,72 @@ _ifXTable_get_column(ifXTable_rowreq_ctx + * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCINOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCINUCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCINMULTICASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCINBROADCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCOUTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCOUTUCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCOUTMULTICASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* + * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IFHCOUTBROADCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/data_access/systemstats_common.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/data_access/systemstats_common.c ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/data_access/systemstats_common.c +@@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_e + && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] + && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { + +- U64 tmp, tmp2, tmp3; ++ struct counter64 tmp, tmp2, tmp3; + tmp = entry->stats.HCOutRequests; + u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); + u64Incr(&tmp, &entry->stats.HCOutFragCreates); +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c +@@ -270,7 +270,7 @@ The total number of input IP datagrams r + */ + int + ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInReceives_val_ptr) ++ struct counter64 *ipIfStatsHCInReceives_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); +@@ -395,7 +395,7 @@ The total number of octets received in i + */ + int + ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInOctets_val_ptr) ++ struct counter64 *ipIfStatsHCInOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); +@@ -862,7 +862,7 @@ The number of input datagrams for which + */ + int + ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInForwDatagrams_val_ptr) ++ struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); +@@ -1267,7 +1267,7 @@ The total number of datagrams successful + */ + int + ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInDelivers_val_ptr) ++ struct counter64 *ipIfStatsHCInDelivers_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); +@@ -1396,7 +1396,7 @@ The total number of IP datagrams that lo + */ + int + ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutRequests_val_ptr) ++ struct counter64 *ipIfStatsHCOutRequests_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); +@@ -1532,7 +1532,7 @@ The number of datagrams for which this e + */ + int + ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutForwDatagrams_val_ptr) ++ struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); +@@ -1999,7 +1999,7 @@ The total number of IP datagrams that th + */ + int + ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutTransmits_val_ptr) ++ struct counter64 *ipIfStatsHCOutTransmits_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); +@@ -2123,7 +2123,7 @@ The total number of octets in IP datagra + */ + int + ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutOctets_val_ptr) ++ struct counter64 *ipIfStatsHCOutOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); +@@ -2245,7 +2245,7 @@ The number of IP multicast datagrams rec + */ + int + ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInMcastPkts_val_ptr) ++ struct counter64 *ipIfStatsHCInMcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); +@@ -2372,7 +2372,7 @@ The total number of octets received in I + */ + int + ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInMcastOctets_val_ptr) ++ struct counter64 *ipIfStatsHCInMcastOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); +@@ -2497,7 +2497,7 @@ The number of IP multicast datagrams tra + */ + int + ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutMcastPkts_val_ptr) ++ struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); +@@ -2621,7 +2621,7 @@ The total number of octets transmitted i + */ + int + ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutMcastOctets_val_ptr) ++ struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); +@@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams rec + */ + int + ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCInBcastPkts_val_ptr) ++ struct counter64 *ipIfStatsHCInBcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); +@@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams tra + */ + int + ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipIfStatsHCOutBcastPkts_val_ptr) ++ struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h +@@ -50,7 +50,7 @@ extern "C" { + ipIfStatsInReceives_val_ptr); + int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInReceives_val_ptr); + int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -58,7 +58,7 @@ extern "C" { + ipIfStatsInOctets_val_ptr); + int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInOctets_val_ptr); + int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -87,7 +87,7 @@ extern "C" { + int + ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInForwDatagrams_val_ptr); + int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -111,7 +111,7 @@ extern "C" { + ipIfStatsInDelivers_val_ptr); + int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInDelivers_val_ptr); + int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -119,7 +119,7 @@ extern "C" { + ipIfStatsOutRequests_val_ptr); + int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutRequests_val_ptr); + int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx + * rowreq_ctx, +@@ -128,7 +128,7 @@ extern "C" { + int + ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutForwDatagrams_val_ptr); + int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -156,7 +156,7 @@ extern "C" { + ipIfStatsOutTransmits_val_ptr); + int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutTransmits_val_ptr); + int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -164,7 +164,7 @@ extern "C" { + ipIfStatsOutOctets_val_ptr); + int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutOctets_val_ptr); + int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -172,7 +172,7 @@ extern "C" { + ipIfStatsInMcastPkts_val_ptr); + int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInMcastPkts_val_ptr); + int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -180,7 +180,7 @@ extern "C" { + ipIfStatsInMcastOctets_val_ptr); + int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx + * rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInMcastOctets_val_ptr); + int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -188,7 +188,7 @@ extern "C" { + ipIfStatsOutMcastPkts_val_ptr); + int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutMcastPkts_val_ptr); + int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -196,7 +196,7 @@ extern "C" { + ipIfStatsOutMcastOctets_val_ptr); + int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx + * rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutMcastOctets_val_ptr); + int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -204,7 +204,7 @@ extern "C" { + ipIfStatsInBcastPkts_val_ptr); + int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCInBcastPkts_val_ptr); + int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +@@ -212,7 +212,7 @@ extern "C" { + ipIfStatsOutBcastPkts_val_ptr); + int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipIfStatsHCOutBcastPkts_val_ptr); + int + ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c +@@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINRECEIVES: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCInReceives_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* +@@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINDELIVERS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCInDelivers_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTREQUESTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCOutRequests_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTTRANSMITS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCOutTransmits_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; +- rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); ++ rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); + break; + + /* +@@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINMCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINMCASTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTMCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCINBCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl + * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPIFSTATSHCOUTBCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c +@@ -452,7 +452,7 @@ The total number of input IP datagrams r + */ + int + ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCInReceives_val_ptr) ++ struct counter64 *ipSystemStatsHCInReceives_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); +@@ -579,7 +579,7 @@ The total number of octets received in i + */ + int + ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCInOctets_val_ptr) ++ struct counter64 *ipSystemStatsHCInOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); +@@ -1058,7 +1058,7 @@ The number of input datagrams for which + int + ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInForwDatagrams_val_ptr) + { + /** we should have a non-NULL pointer */ +@@ -1474,7 +1474,7 @@ The total number of datagrams successful + */ + int + ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCInDelivers_val_ptr) ++ struct counter64 *ipSystemStatsHCInDelivers_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); +@@ -1602,7 +1602,7 @@ The total number of IP datagrams which l + */ + int + ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCOutRequests_val_ptr) ++ struct counter64 *ipSystemStatsHCOutRequests_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); +@@ -1809,7 +1809,7 @@ The number of datagrams for which this e + int + ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutForwDatagrams_val_ptr) + { + /** we should have a non-NULL pointer */ +@@ -2288,7 +2288,7 @@ The total number of IP datagrams that th + */ + int + ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCOutTransmits_val_ptr) ++ struct counter64 *ipSystemStatsHCOutTransmits_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); +@@ -2415,7 +2415,7 @@ The total number of octets in IP datagra + */ + int + ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCOutOctets_val_ptr) ++ struct counter64 *ipSystemStatsHCOutOctets_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); +@@ -2539,7 +2539,7 @@ The number of IP multicast datagrams rec + */ + int + ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCInMcastPkts_val_ptr) ++ struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); +@@ -2665,7 +2665,7 @@ The total number of octets received in I + int + ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInMcastOctets_val_ptr) + { + /** we should have a non-NULL pointer */ +@@ -2790,7 +2790,7 @@ The number of IP multicast datagrams tra + */ + int + ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCOutMcastPkts_val_ptr) ++ struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); +@@ -2921,7 +2921,7 @@ The total number of octets transmitted i + int + ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutMcastOctets_val_ptr) + { + /** we should have a non-NULL pointer */ +@@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams rec + */ + int + ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCInBcastPkts_val_ptr) ++ struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); +@@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams tra + */ + int + ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, +- U64 * ipSystemStatsHCOutBcastPkts_val_ptr) ++ struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr) + { + /** we should have a non-NULL pointer */ + netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h +@@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable + ********************************************************************* + * function prototypes + */ +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * ++ int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * + user_context); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsTable_post_request(ipSystemStatsTable_registration * ++ int ipSystemStatsTable_post_request(ipSystemStatsTable_registration * + user_context, int rc); + +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + void *user_init_ctx); + void +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx + * rowreq_ctx); + + ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void); + void ipSystemStatsTable_release_data(ipSystemStatsTable_data + * data); +- +- +- +- +- +- +- +- +- ipSystemStatsTable_rowreq_ctx ++ ipSystemStatsTable_rowreq_ctx + * ipSystemStatsTable_row_find_by_mib_index + (ipSystemStatsTable_mib_index * mib_idx); + +@@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable + * indexes + */ + +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInReceives_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInReceives_val_ptr); + int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx + * rowreq_ctx, + u_long * + ipSystemStatsInOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ipSystemStatsHCInOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * ++ struct counter64 *ipSystemStatsHCInOctets_val_ptr); ++ int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInHdrErrors_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInNoRoutes_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInAddrErrors_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInUnknownProtos_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInTruncatedPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInForwDatagrams_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInForwDatagrams_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsReasmReqds_val_ptr); +@@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable + * rowreq_ctx, + u_long * + ipSystemStatsReasmOKs_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsReasmFails_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInDiscards_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInDelivers_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInDelivers_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutRequests_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutRequests_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutNoRoutes_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutForwDatagrams_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutForwDatagrams_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutDiscards_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutFragReqds_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutFragOKs_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutFragFails_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutFragCreates_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutTransmits_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutTransmits_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInMcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInMcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInMcastOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInMcastOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutMcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutMcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutMcastOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutMcastOctets_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsInBcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCInBcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsOutBcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, +- U64 * ++ struct counter64 * + ipSystemStatsHCOutBcastPkts_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsDiscontinuityTime_val_ptr); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long * + ipSystemStatsRefreshRate_val_ptr); +- +- +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index ++ int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index + * tbl_idx, + u_long + ipSystemStatsIPVersion_val); +- int +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * ++ int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * + rowreq_ctx, + u_long ipSystemStatsIPVersion_val); + +- +- + /* + ********************************************************************* + * SET function declarations +Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c ++++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c +@@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINRECEIVES: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInReceives_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInOctets_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINDELIVERS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInDelivers_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutRequests_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutOctets_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +@@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemS + * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + */ + case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: +- var->val_len = sizeof(U64); ++ var->val_len = sizeof(struct counter64); + var->type = ASN_COUNTER64; + rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx, +- (U64 *) var->val.string); ++ (struct counter64 *) var->val.string); + break; + + /* +Index: net-snmp-5.7.3/include/net-snmp/data_access/ipstats.h +=================================================================== +--- net-snmp-5.7.3.orig/include/net-snmp/data_access/ipstats.h ++++ net-snmp-5.7.3/include/net-snmp/data_access/ipstats.h +@@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s { + * other columns, when underlying OS does not provide them. + * Always fill at least 32 bits, the table is periodically polled -> 32 bit + * overflow shall be detected and 64 bit value should be computed automatically. */ +- U64 HCInReceives; +- U64 HCInOctets; ++ struct counter64 HCInReceives; ++ struct counter64 HCInOctets; + u_long InHdrErrors; +- U64 HCInNoRoutes; ++ struct counter64 HCInNoRoutes; + u_long InAddrErrors; + u_long InUnknownProtos; + u_long InTruncatedPkts; + + /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */ +- U64 HCInForwDatagrams; ++ struct counter64 HCInForwDatagrams; + + u_long ReasmReqds; + u_long ReasmOKs; + u_long ReasmFails; + u_long InDiscards; +- U64 HCInDelivers; +- U64 HCOutRequests; +- U64 HCOutNoRoutes; +- U64 HCOutForwDatagrams; +- U64 HCOutDiscards; ++ struct counter64 HCInDelivers; ++ struct counter64 HCOutRequests; ++ struct counter64 HCOutNoRoutes; ++ struct counter64 HCOutForwDatagrams; ++ struct counter64 HCOutDiscards; + + /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/ +- U64 HCOutFragReqds; +- U64 HCOutFragOKs; +- U64 HCOutFragFails; +- U64 HCOutFragCreates; ++ struct counter64 HCOutFragReqds; ++ struct counter64 HCOutFragOKs; ++ struct counter64 HCOutFragFails; ++ struct counter64 HCOutFragCreates; + + /* optional, can be computed from + * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates + * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */ +- U64 HCOutTransmits; ++ struct counter64 HCOutTransmits; + +- U64 HCOutOctets; +- U64 HCInMcastPkts; +- U64 HCInMcastOctets; +- U64 HCOutMcastPkts; +- U64 HCOutMcastOctets; +- U64 HCInBcastPkts; +- U64 HCOutBcastPkts; ++ struct counter64 HCOutOctets; ++ struct counter64 HCInMcastPkts; ++ struct counter64 HCInMcastOctets; ++ struct counter64 HCOutMcastPkts; ++ struct counter64 HCOutMcastOctets; ++ struct counter64 HCInBcastPkts; ++ struct counter64 HCOutBcastPkts; + + /* Array of available columns.*/ + int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; +Index: net-snmp-5.7.3/include/net-snmp/library/int64.h +=================================================================== +--- net-snmp-5.7.3.orig/include/net-snmp/library/int64.h ++++ net-snmp-5.7.3/include/net-snmp/library/int64.h +@@ -5,31 +5,29 @@ + extern "C" { + #endif + +- typedef struct counter64 U64; +- + #define I64CHARSZ 21 + +- void divBy10(U64, U64 *, unsigned int *); +- void multBy10(U64, U64 *); +- void incrByU16(U64 *, unsigned int); +- void incrByU32(U64 *, unsigned int); ++ void divBy10(struct counter64, struct counter64 *, unsigned int *); ++ void multBy10(struct counter64, struct counter64 *); ++ void incrByU16(struct counter64 *, unsigned int); ++ void incrByU32(struct counter64 *, unsigned int); + NETSNMP_IMPORT +- void zeroU64(U64 *); +- int isZeroU64(const U64 *); ++ void zeroU64(struct counter64 *); ++ int isZeroU64(const struct counter64 *); + NETSNMP_IMPORT +- void printU64(char *, const U64 *); ++ void printU64(char *, const struct counter64 *); + NETSNMP_IMPORT +- void printI64(char *, const U64 *); +- int read64(U64 *, const char *); ++ void printI64(char *, const struct counter64 *); ++ int read64(struct counter64 *, const char *); + NETSNMP_IMPORT +- void u64Subtract(const U64 * pu64one, const U64 * pu64two, +- U64 * pu64out); +- void u64Incr(U64 * pu64out, const U64 * pu64one); +- void u64UpdateCounter(U64 * pu64out, const U64 * pu64one, +- const U64 * pu64two); +- void u64Copy(U64 * pu64one, const U64 * pu64two); ++ void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, ++ struct counter64 *pu64out); ++ void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one); ++ void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, ++ const struct counter64 *pu64two); ++ void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two); + +- int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val, ++ int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val, + int adjust); + NETSNMP_IMPORT + int netsnmp_c64_check32_and_update(struct counter64 *prev_val, +Index: net-snmp-5.7.3/snmplib/int64.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/int64.c ++++ net-snmp-5.7.3/snmplib/int64.c +@@ -33,7 +33,7 @@ + * @param[out] puR Remainder. + */ + void +-divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) ++divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR) + { + unsigned long ulT; + unsigned long ulQ; +@@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned i + * @param[out] pu64P Product. + */ + void +-multBy10(U64 u64, U64 * pu64P) ++multBy10(struct counter64 u64, struct counter64 *pu64P) + { + unsigned long ulT; + unsigned long ulP; +@@ -130,7 +130,7 @@ multBy10(U64 u64, U64 * pu64P) + * + */ + void +-incrByU16(U64 * pu64, unsigned int u16) ++incrByU16(struct counter64 *pu64, unsigned int u16) + { + incrByU32(pu64, u16); + } +@@ -143,7 +143,7 @@ incrByU16(U64 * pu64, unsigned int u16) + * + */ + void +-incrByU32(U64 * pu64, unsigned int u32) ++incrByU32(struct counter64 *pu64, unsigned int u32) + { + uint32_t tmp; + +@@ -161,7 +161,7 @@ incrByU32(U64 * pu64, unsigned int u32) + * @param[out] pu64out pu64one - pu64two. + */ + void +-u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) ++u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out) + { + int carry; + +@@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U + * @param[in,out] pu64out pu64out += pu64one. + */ + void +-u64Incr(U64 * pu64out, const U64 * pu64one) ++u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one) + { + pu64out->high = (uint32_t)(pu64out->high + pu64one->high); + incrByU32(pu64out, pu64one->low); +@@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64o + * @param[out] pu64out pu64out += (pu64one - pu64two) + */ + void +-u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two) ++u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two) + { +- U64 tmp; ++ struct counter64 tmp; + + u64Subtract(pu64one, pu64two, &tmp); + u64Incr(pu64out, &tmp); +@@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnm + * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. + */ + void +-u64Copy(U64 * pu64one, const U64 * pu64two) ++u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two) + { + *pu64one = *pu64two; + } +@@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64t + * @param[in] pu64 Number to be zeroed. + */ + void +-zeroU64(U64 * pu64) ++zeroU64(struct counter64 *pu64) + { + pu64->low = 0; + pu64->high = 0; +@@ -232,7 +232,7 @@ zeroU64(U64 * pu64) + * @param[in] pu64 Number to be checked. + */ + int +-isZeroU64(const U64 * pu64) ++isZeroU64(const struct counter64 *pu64) + { + return pu64->low == 0 && pu64->high == 0; + } +@@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct co + /** Convert an unsigned 64-bit number to ASCII. */ + void + printU64(char *buf, /* char [I64CHARSZ+1]; */ +- const U64 * pu64) ++ const struct counter64 *pu64) + { +- U64 u64a; +- U64 u64b; ++ struct counter64 u64a; ++ struct counter64 u64b; + + char aRes[I64CHARSZ + 1]; + unsigned int u; +@@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1 + /** Convert a signed 64-bit number to ASCII. */ + void + printI64(char *buf, /* char [I64CHARSZ+1]; */ +- const U64 * pu64) ++ const struct counter64 *pu64) + { +- U64 u64a; ++ struct counter64 u64a; + + if (pu64->high & 0x80000000) { + u64a.high = (uint32_t) ~pu64->high; +@@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1 + } + } + +-/** Convert a signed 64-bit integer from ASCII to U64. */ ++/** Convert a signed 64-bit integer from ASCII to struct counter64. */ + int +-read64(U64 * i64, const char *str) ++read64(struct counter64 *i64, const char *str) + { +- U64 i64p; ++ struct counter64 i64p; + unsigned int u; + int sign = 0; + int ok = 0; +Index: net-snmp-5.7.3/snmplib/read_config.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/read_config.c ++++ net-snmp-5.7.3/snmplib/read_config.c +@@ -2270,10 +2270,10 @@ read_config_read_memory(int type, char * + return readfrom; + + case ASN_COUNTER64: +- if (*len < sizeof(U64)) ++ if (*len < sizeof(struct counter64)) + return NULL; +- *len = sizeof(U64); +- read64((U64 *) dataptr, readfrom); ++ *len = sizeof(struct counter64); ++ read64((struct counter64 *) dataptr, readfrom); + readfrom = skip_token(readfrom); + return readfrom; + } +Index: net-snmp-5.7.3/testing/fulltests/unit-tests/T015int64_clib.c +=================================================================== +--- net-snmp-5.7.3.orig/testing/fulltests/unit-tests/T015int64_clib.c ++++ net-snmp-5.7.3/testing/fulltests/unit-tests/T015int64_clib.c +@@ -1,4 +1,4 @@ +-/* HEADER Testing 64-bit integer operations (U64). */ ++/* HEADER Testing 64-bit integer operations (struct counter64). */ + + int i, j; + char buf[22]; +@@ -15,7 +15,7 @@ static const int64_t intval[] = { + }; + + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { +- U64 a, b; ++ struct counter64 a, b; + a.low = (uint32_t)intval[i]; + a.high = (uint32_t)(intval[i] >> 32); + printI64(buf, &a); +@@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in + + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { + for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { +- U64 a, b; ++ struct counter64 a, b; + uint64_t d; + a.low = (uint32_t)intval[i]; + a.high = (uint32_t)(intval[i] >> 32); +@@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in + + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { + for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { +- U64 a, b, c; ++ struct counter64 a, b, c; + uint64_t d; + a.low = (uint32_t)intval[i]; + a.high = (uint32_t)(intval[i] >> 32); +@@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in + } + + { +- U64 old_val, new_val; ++ struct counter64 old_val, new_val; + old_val.low = 7; + old_val.high = 0; + new_val = old_val; diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch index c6401fed39..44359bebee 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch @@ -17,11 +17,11 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> configure.d/config_os_headers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers -index 708aa09..0df32ca 100644 ---- a/configure.d/config_os_headers -+++ b/configure.d/config_os_headers -@@ -482,8 +482,8 @@ then +Index: net-snmp-5.7.3/configure.d/config_os_headers +=================================================================== +--- net-snmp-5.7.3.orig/configure.d/config_os_headers ++++ net-snmp-5.7.3/configure.d/config_os_headers +@@ -484,8 +484,8 @@ then unset ac_cv_header_pkg_h netsnmp_save_CPPFLAGS="$CPPFLAGS" netsnmp_save_LDFLAGS="$LDFLAGS" @@ -32,6 +32,3 @@ index 708aa09..0df32ca 100644 AC_CHECK_HEADERS(pkg.h, NETSNMP_SEARCH_LIBS(pkg_init, pkg, AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng]))) --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch index 6255f7ced3..527aa39f2a 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch @@ -12,11 +12,11 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> snmplib/transports/snmpUDPIPv6Domain.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c -index 029b164..11c39bb 100644 ---- a/snmplib/transports/snmpUDPIPv6Domain.c -+++ b/snmplib/transports/snmpUDPIPv6Domain.c -@@ -285,6 +285,7 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) +Index: net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/transports/snmpUDPIPv6Domain.c ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c +@@ -305,6 +305,7 @@ netsnmp_udp6_transport(struct sockaddr_i errno, strerror(errno))); netsnmp_socketbase_close(t); netsnmp_transport_free(t); @@ -24,6 +24,3 @@ index 029b164..11c39bb 100644 } } /* --- -2.9.3 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch index a360c3a120..d29be3395e 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch @@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Roy.Li <rongqing.li@windriver.com> --- -diff --git a/Makefile.top b/Makefile.top -index 862fb94..ed7dcfc 100644 ---- a/Makefile.top -+++ b/Makefile.top -@@ -86,7 +86,7 @@ LIBREVISION = 2 +Index: net-snmp-5.7.3/Makefile.top +=================================================================== +--- net-snmp-5.7.3.orig/Makefile.top ++++ net-snmp-5.7.3/Makefile.top +@@ -87,7 +87,7 @@ LIBREVISION = 3 LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o LIB_EXTENSION = la LIB_VERSION = diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch index efe803876d..fbd274bba4 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch @@ -12,11 +12,11 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> snmplib/snmpv3.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/agent/snmpd.c b/agent/snmpd.c -index 056048a..12a7ea1 100644 ---- a/agent/snmpd.c -+++ b/agent/snmpd.c -@@ -1246,6 +1246,7 @@ receive(void) +Index: net-snmp-5.7.3/agent/snmpd.c +=================================================================== +--- net-snmp-5.7.3.orig/agent/snmpd.c ++++ net-snmp-5.7.3/agent/snmpd.c +@@ -1253,6 +1253,7 @@ receive(void) snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", netsnmp_get_version()); update_config(); @@ -24,11 +24,11 @@ index 056048a..12a7ea1 100644 send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); #if HAVE_SIGHOLD sigrelse(SIGHUP); -diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c -index 435cafd..6ad8208 100644 ---- a/snmplib/snmpv3.c -+++ b/snmplib/snmpv3.c -@@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, +Index: net-snmp-5.7.3/snmplib/snmpv3.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/snmpv3.c ++++ net-snmp-5.7.3/snmplib/snmpv3.c +@@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int /* * if our engineID has changed at all, the boots record must be set to 1 */ @@ -40,6 +40,3 @@ index 435cafd..6ad8208 100644 engineBoots = 1; } --- -1.9.1 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch index 9fb19b3e07..8f8336a497 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch @@ -10,11 +10,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> testing/RUNTESTS | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -diff --git a/testing/RUNTESTS b/testing/RUNTESTS -index e11c969..fb90f76 100755 ---- a/testing/RUNTESTS -+++ b/testing/RUNTESTS -@@ -25,13 +25,17 @@ failed_count=0 +Index: net-snmp-5.7.3/testing/RUNTESTS +=================================================================== +--- net-snmp-5.7.3.orig/testing/RUNTESTS ++++ net-snmp-5.7.3/testing/RUNTESTS +@@ -29,13 +29,17 @@ failed_count=0 rm -f failed_tests for i in "${srcdir}"/testing/fulltests/default/T*$1*; do echo "RUNNING $i" @@ -32,6 +32,3 @@ index e11c969..fb90f76 100755 done if [ -f failed_tests ]; then --- -1.7.1 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb index 3c05874690..faf73a5636 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb @@ -32,6 +32,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ file://0004-configure-fix-incorrect-variable.patch \ file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ file://net-snmp-fix-for-disable-des.patch \ + file://0001-Remove-U64-typedef.patch \ " SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" @@ -60,7 +61,7 @@ EXTRA_OECONF = "--enable-shared \ --with-defaults \ --with-install-prefix=${D} \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ + ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ " # net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp @@ -118,10 +119,10 @@ do_install_append() { sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ - -e "s@${STAGING_DIR_NATIVE}[=]*@@g" \ - -e "s@${STAGING_DIR_HOST}[=]*@@g" \ - -e "s@${WORKDIR}[=]*@@g" \ - -e "s@${D}@@g" \ + -e "s@\([^ ]*-fdebug-prefix-map=[^ ]*\)\1*@@g" \ + -e "s@\([^ ]*--sysroot=[^ ]*\)\1*@@g" \ + -e "s@\([^ ]*--with-libtool-sysroot=[^ ]*\)\1*@@g" \ + -e "s@\([^ ]*--with-install-prefix=[^ ]*\)\1*@@g" \ -i ${D}${bindir}/net-snmp-config if [ "${HAS_PERL}" = "1" ]; then @@ -150,6 +151,7 @@ do_install_ptest() { } SYSROOT_PREPROCESS_FUNCS += "net_snmp_sysroot_preprocess" +SNMP_DBGDIR = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" net_snmp_sysroot_preprocess () { if [ -e ${D}${bindir}/net-snmp-config ]; then @@ -161,6 +163,12 @@ net_snmp_sysroot_preprocess () { -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=${S}@g" \ + -e "s@-fdebug-prefix-map=${SNMP_DBGDIR}@-fdebug-prefix-map=${WORKDIR}=${SNMP_DBGDIR}@g" \ + -e "s@-fdebug-prefix-map= -fdebug-prefix-map=@-fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ + -fdebug-prefix-map=${STAGING_DIR_HOST}=@g" \ + -e "s@--sysroot=@--sysroot=${STAGING_DIR_HOST}@g" \ + -e "s@--with-libtool-sysroot=@--with-libtool-sysroot=${STAGING_DIR_HOST}@g" \ + -e "s@--with-install-prefix=@--with-install-prefix=${D}@g" \ -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config fi } diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch deleted file mode 100644 index a11a97ebde..0000000000 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Sep 2017 13:05:03 -0700 -Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t' - -Fixes - -| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'? | resultproc_t); | ^~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - l2tp_api.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/l2tp_api.c b/l2tp_api.c -index f0946fd..f77881c 100644 ---- a/l2tp_api.c -+++ b/l2tp_api.c -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <rpc/types.h> - #include <rpc/xdr.h> -+#include <rpc/clnt.h> - #include <rpc/pmap_clnt.h> - //#include <netinet/in.h> - --- -2.14.1 - diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch deleted file mode 100644 index 0fcba6546a..0000000000 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 28 Mar 2017 11:46:56 -0700 -Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc - -Fixes build issues e.g. - -In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: -/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier - IFF_LOWER_UP = 1<<16, /* __volatile__ */ - ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugins/ppp_unix.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c -index 869066f..5c1e44f 100644 ---- a/plugins/ppp_unix.c -+++ b/plugins/ppp_unix.c -@@ -21,6 +21,11 @@ - * Plugin to use the standard UNIX pppd - */ - -+/* hack to make sure kernel headers understand that libc (musl) -+ * does define IFF_LOWER_UP et al. -+ */ -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #include <unistd.h> - #include <fcntl.h> - #include <sys/types.h> --- -2.12.1 - diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch new file mode 100644 index 0000000000..4597df80a8 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch @@ -0,0 +1,44 @@ +This fixes a compile issue introduced with linux kernel 4.15 + +include/linux/in.h:222:8: error: redefinition of 'struct in_pktinfo' +| struct in_pktinfo { + + +Upstream-Status: Pending +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: openl2tp-1.8/plugins/ppp_unix.c +=================================================================== +--- openl2tp-1.8.orig/plugins/ppp_unix.c ++++ openl2tp-1.8/plugins/ppp_unix.c +@@ -25,9 +25,14 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <signal.h> ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include <net/ethernet.h> + #include <net/if.h> + #include <netinet/in.h> ++#endif ++ + #include <arpa/inet.h> + #include <sys/stat.h> + #include <unistd.h> +@@ -41,12 +46,12 @@ + #define __user + #endif + #include <sys/ioctl.h> +-#include <linux/if_ether.h> +-#include <linux/if_pppox.h> + #include <linux/ppp_defs.h> + #include <linux/if_ppp.h> ++#include <linux/if_pppox.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include <linux/if_pppol2tp.h> +- ++#endif + #include "usl.h" + #include "l2tp_private.h" + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index bf6850b17c..e51a101a0d 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9d9259cbbf00945adc25a470c1d3585 \ file://usl/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \ " -DEPENDS = "popt flex readline" +DEPENDS = "popt flex readline rpcsvc-proto-native" SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ @@ -33,12 +33,8 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tpd.service \ file://openl2tpd-enable-tests.patch \ file://run-ptest \ - " - -SRC_URI_append_libc-musl = "\ - file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://fix_linux_4.15_compile.patch \ file://0002-user-ipv6-structures.patch \ - file://0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" @@ -48,10 +44,10 @@ inherit autotools-brokensep pkgconfig systemd ptest SYSTEMD_SERVICE_${PN} = "openl2tpd.service" SYSTEMD_AUTO_ENABLE = "disable" -DEPENDS_append_libc-musl = " libtirpc" -CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +DEPENDS += "libtirpc" +CPPFLAGS += "-I${STAGING_INCDIR}/tirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" PARALLEL_MAKE = "" EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' diff --git a/meta-networking/recipes-protocols/quagga/quagga_1.2.2.bb b/meta-networking/recipes-protocols/quagga/quagga_1.2.2.bb deleted file mode 100644 index 653f46b363..0000000000 --- a/meta-networking/recipes-protocols/quagga/quagga_1.2.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require quagga.inc - -SRC_URI[md5sum] = "e84be2938c26c0c872792090f1a6a866" -SRC_URI[sha256sum] = "522e22f2beee64e3f0c2cde3d0155f3b8103f4f6fc8abef92cb40bc3a4cc2931" diff --git a/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb b/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb new file mode 100644 index 0000000000..a7697a1ae9 --- /dev/null +++ b/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb @@ -0,0 +1,4 @@ +require quagga.inc + +SRC_URI[md5sum] = "eced21b054d71c9e1b7c6ac43286a166" +SRC_URI[sha256sum] = "e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3" diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch index 11356ce3f7..7601f0d325 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -1,11 +1,12 @@ -From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From fdb64d21560bfdafeefccc7d20e105e4857faa99 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 28 Mar 2017 19:20:07 -0700 -Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h +Subject: [PATCH] ppoe: Dont include linux/if_ether.h Fixes build with musl Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/pppoe.h | 4 ---- 1 file changed, 4 deletions(-) @@ -25,6 +26,3 @@ index ec067a0..281879c 100644 #include <netinet/in.h> #ifdef HAVE_NETINET_IF_ETHER_H --- -2.12.1 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch index 139d1f089b..2103b38888 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch @@ -1,9 +1,10 @@ -From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From 31b6eecd7e5ebfb9a37915f28823e5af9d1062b4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 28 Mar 2017 19:24:53 -0700 -Subject: [PATCH 2/2] Enable support for the kernel module +Subject: [PATCH] Enable support for the kernel module Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/configure.in | 1 + 1 file changed, 1 insertion(+) @@ -20,6 +21,3 @@ index cae0976..951a042 100644 ]) dnl Checks for typedefs, structures, and compiler characteristics. --- -2.12.1 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch index 2661fd3dbc..bbd516fde9 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch @@ -1,4 +1,4 @@ -From 71956de46feef962dc0645af4c81ae074ca3b818 Mon Sep 17 00:00:00 2001 +From bdd20b7a584a20504dfabb409a41ee2b9ae41657 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Wed, 19 Aug 2015 13:52:57 +0900 Subject: [PATCH] configure.in: Error fix. @@ -9,15 +9,16 @@ No such file or directory #include <ac_nonexistent.h> Upstream-Status: pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> + --- src/configure.in | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/src/configure.in b/src/configure.in -index 0b23df5..31c7fbc 100644 +index 1714e69..cae0976 100644 --- a/src/configure.in +++ b/src/configure.in -@@ -193,36 +193,6 @@ if test "$GCC" = yes; then +@@ -195,36 +195,6 @@ if test "$GCC" = yes; then CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" fi @@ -54,6 +55,3 @@ index 0b23df5..31c7fbc 100644 if test "$rpppoe_cv_pack_bitfields" = "rev" ; then AC_MSG_RESULT(reversed) AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch index 1380ba4891..be892803e6 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch @@ -1,7 +1,15 @@ -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- rp-pppoe-3.8.orig/configure.in 2014-07-16 19:31:33.549991388 +0000 -+++ rp-pppoe-3.8/configure.in 2014-07-17 22:01:18.116590827 +0000 +From c96dda04ec024bdef2a15d374e5f8242e041cad4 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Fri, 18 Jul 2014 08:25:16 +0000 + +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index ac1a7e4..11b9f31 100644 +--- a/configure.in ++++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(src/pppoe.c) -AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch index 88cf7e6777..3b945934f6 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch @@ -1,4 +1,4 @@ -From cab02076afb808a43c6ff3d7b1c64e71f5a1b397 Mon Sep 17 00:00:00 2001 +From 172907f31d64da4c3f289a439fd605d2ab51b24a Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Wed, 19 Aug 2015 12:17:03 +0900 Subject: [PATCH] configure in cross @@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [build system specific changes] 1 file changed, 16 insertions(+), 50 deletions(-) diff --git a/src/configure.in b/src/configure.in -index e194295..82d64d6 100644 +index 90a07df..1d30243 100644 --- a/src/configure.in +++ b/src/configure.in @@ -5,6 +5,13 @@ AC_INIT(pppoe.c) @@ -40,7 +40,7 @@ index e194295..82d64d6 100644 fi dnl Check for N_HDLC line discipline -@@ -56,7 +63,7 @@ AC_TRY_COMPILE([#include <linux/termios.h>], +@@ -58,7 +65,7 @@ AC_TRY_COMPILE([ ac_cv_n_hdlc=no) AC_MSG_RESULT($ac_cv_n_hdlc) if test "$ac_cv_n_hdlc" = yes ; then @@ -49,7 +49,7 @@ index e194295..82d64d6 100644 fi AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no) -@@ -104,7 +111,7 @@ PPPD_INCDIR="" +@@ -106,7 +113,7 @@ PPPD_INCDIR="" if test "$ac_cv_header_linux_if_pppox_h" = yes ; then if test "$ac_cv_pluginpath" != no ; then LINUX_KERNELMODE_PLUGIN=rp-pppoe.so @@ -58,7 +58,7 @@ index e194295..82d64d6 100644 PPPD_INCDIR=$ac_cv_pluginpath fi fi -@@ -114,7 +121,7 @@ if test "$PPPD_INCDIR" = "" ; then +@@ -116,7 +123,7 @@ if test "$PPPD_INCDIR" = "" ; then fi if test "$ac_cv_debugging" = "yes" ; then @@ -67,7 +67,7 @@ index e194295..82d64d6 100644 fi AC_SUBST(LINUX_KERNELMODE_PLUGIN) -@@ -140,15 +147,8 @@ AC_CHECK_SIZEOF(unsigned short) +@@ -142,15 +149,8 @@ AC_CHECK_SIZEOF(unsigned short) AC_CHECK_SIZEOF(unsigned int) AC_CHECK_SIZEOF(unsigned long) @@ -84,7 +84,7 @@ index e194295..82d64d6 100644 dnl Check for Linux-specific kernel support for PPPoE AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) -@@ -193,44 +193,8 @@ if test "$GCC" = yes; then +@@ -195,44 +195,8 @@ if test "$GCC" = yes; then CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" fi @@ -130,7 +130,7 @@ index e194295..82d64d6 100644 if test "${rpppoe_cv_pack_bitfields+set}" != set ; then AC_TRY_RUN([ union foo { -@@ -257,10 +221,11 @@ main(void) +@@ -259,10 +223,11 @@ main(void) }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, $ECHO "no defaults for cross-compiling"; exit 0) fi @@ -143,7 +143,7 @@ index e194295..82d64d6 100644 else AC_MSG_RESULT(normal) fi -@@ -324,6 +289,7 @@ AC_SUBST(PPPOE_SERVER_DEPS) +@@ -326,6 +291,7 @@ AC_SUBST(PPPOE_SERVER_DEPS) AC_SUBST(RDYNAMIC) AC_SUBST(LIBEVENT) AC_SUBST(ECHO) @@ -151,6 +151,3 @@ index e194295..82d64d6 100644 AC_SUBST(LDFLAGS) datadir_evaluated=`eval echo $datadir` --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch index 8b7886485a..9801f6e277 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch @@ -1,4 +1,4 @@ -From 611c9fe719c5aa264a2ad2eb920cf4522ae2ddec Mon Sep 17 00:00:00 2001 +From f658181c58347c3e2b0ee4f0a6a3d19162921471 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Tue, 12 Jun 2012 14:26:16 -0400 Subject: [PATCH] discard use of dnl in Makefile.am @@ -7,9 +7,10 @@ Since Makefile.am is not processed by m4, but by automake, 'dnl' does not introduce a comment. Signed-off-by: Ting Liu <b28495@freescale.com> + --- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index eff6977..3091c33 100644 @@ -22,6 +23,3 @@ index eff6977..3091c33 100644 -dnl AM_CFLAGS = -Wall -DDEBUG +##dnl AM_CFLAGS = -Wall -DDEBUG SUBDIRS = src --- -1.7.6.5 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch index f61337f153..8a857888b3 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch @@ -1,4 +1,4 @@ -From bbdadb803b19f002e76e7bb5ce3faf770dd7c413 Mon Sep 17 00:00:00 2001 +From a9a7322273c51882af58c35ba288a0fae00ba841 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Wed, 19 Aug 2015 12:33:41 +0900 Subject: [PATCH] don't swallow errors @@ -6,15 +6,16 @@ Subject: [PATCH] don't swallow errors Further fixup to the configure scripts to not swallow errors Upstream-Status: Pending + --- src/configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configure.in b/src/configure.in -index 82d64d6..0b23df5 100644 +index 1d30243..1714e69 100644 --- a/src/configure.in +++ b/src/configure.in -@@ -219,7 +219,7 @@ main(void) +@@ -221,7 +221,7 @@ main(void) return 2; } }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, @@ -23,6 +24,3 @@ index 82d64d6..0b23df5 100644 fi ]) --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch index bcf4d1164d..03697ff1f6 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch @@ -1,3 +1,8 @@ +From a6a85ec5c85cbd3c86743b6e2fa391198869bff8 Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + Relax restrictions on the PPPoE src address, as per debian bug 293811: @@ -5,9 +10,15 @@ Relax restrictions on the PPPoE src address, as per debian bug Upstream-Status: Inappropriate [Backport from Debian] ---- rp-pppoe-3.8.orig/src/discovery.c -+++ rp-pppoe-3.8/src/discovery.c -@@ -376,8 +376,8 @@ +--- + src/discovery.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/discovery.c b/src/discovery.c +index 7ee259d..5213a37 100644 +--- a/src/discovery.c ++++ b/src/discovery.c +@@ -472,8 +472,8 @@ waitForPADO(PPPoEConnection *conn, int timeout) if (!packetIsForMe(conn, &packet)) continue; if (packet.code == CODE_PADO) { @@ -17,4 +28,4 @@ Upstream-Status: Inappropriate [Backport from Debian] + printErr("Ignoring broadcast PADO packet"); continue; } - parsePacket(&packet, parsePADOTags, &pc); + #ifdef PLUGIN diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch index 4fe73d0171..f64da4fa2f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch @@ -1,3 +1,8 @@ +From 0b62f71eb5d44d4a57103566ba58022b6304fa4f Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + The autoconf stuff is all in a subdirectory, which is rather annoying as OE expects patches to be applied and autoconf stuff to be done in S. This adds enough autoconf at the top level to allow it to be @@ -6,20 +11,29 @@ directory. Upstream-Status: Inappropriate [build system specific change] -Index: rp-pppoe-3.8/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/Makefile.am 2007-06-08 15:58:16.000000000 +1000 +--- + Makefile.am | 5 +++++ + configure.in | 4 ++++ + 2 files changed, 9 insertions(+) + create mode 100644 Makefile.am + create mode 100644 configure.in + +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..eff6977 +--- /dev/null ++++ b/Makefile.am @@ -0,0 +1,5 @@ +PACKAGE = rp-pppoe +VERSION = 3.8 + +dnl AM_CFLAGS = -Wall -DDEBUG +SUBDIRS = src -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/configure.in 2007-06-08 15:58:16.000000000 +1000 +diff --git a/configure.in b/configure.in +new file mode 100644 +index 0000000..ac1a7e4 +--- /dev/null ++++ b/configure.in @@ -0,0 +1,4 @@ +AC_INIT(src/pppoe.c) +AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch index 42a3bc62c8..c759e09aa0 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch @@ -1,3 +1,8 @@ +From 4d34e0d7d790ec41b0afb731c7dc1b1ee90dd377 Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + Set the timeout to 0 since we don't want pppoe to try reconnecting, we want whatever is calling it to reconnect. Lots of odd things happen when you have pppoe retrying itself. @@ -8,11 +13,15 @@ ppp looks, so that's what we do here. Upstream-Status: Inappropriate [configuration] -Index: rp-pppoe-3.8/configs/pppoe.conf -=================================================================== ---- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 -+++ rp-pppoe-3.8/configs/pppoe.conf 2007-06-08 16:02:47.000000000 +1000 -@@ -66,7 +66,7 @@ +--- + configs/pppoe.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configs/pppoe.conf b/configs/pppoe.conf +index c222b2f..65618a5 100644 +--- a/configs/pppoe.conf ++++ b/configs/pppoe.conf +@@ -66,7 +66,7 @@ DEFAULTROUTE=yes # to connect forever after pppoe-start is called. Otherwise, it will # give out after CONNECT_TIMEOUT seconds and will not attempt to # connect again, making it impossible to reach. @@ -21,7 +30,7 @@ Index: rp-pppoe-3.8/configs/pppoe.conf # How often in seconds pppoe-start polls to check if link is up CONNECT_POLL=2 -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ PPPOE_TIMEOUT=80 FIREWALL=NONE # Linux kernel-mode plugin for pppd. If you want to try the kernel-mode diff --git a/meta-networking/recipes-support/celt051/celt051/0001-configure.ac-make-tools-support-optional.patch b/meta-networking/recipes-support/celt051/celt051/0001-configure.ac-make-tools-support-optional.patch new file mode 100644 index 0000000000..b0809ee947 --- /dev/null +++ b/meta-networking/recipes-support/celt051/celt051/0001-configure.ac-make-tools-support-optional.patch @@ -0,0 +1,39 @@ +From 86df4200c9c33d999df0e8cc3c9771f17a297ec4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 13 Sep 2017 15:01:54 +0200 +Subject: [PATCH] configure.ac: make tools support optional + +* add --enable-tools option +* XIPH_PATH_OGG macro is provided by libogg so we cannot call + it without the libogg dependency + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d4b1a3f..7d6b2dc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -68,8 +68,14 @@ AC_MSG_RESULT($has_alloca) + + AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h) + +-XIPH_PATH_OGG([tools="tools"], [tools=""]) ++AC_ARG_ENABLE(tools, [ --enable-tools Compile ogg tools], ++[if test "$enableval" = yes; then ++ [tools="tools"] ++else ++ [tools=""] ++fi], + AC_SUBST(tools) ++) + + AC_CHECK_LIB(m, sin) + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-networking/recipes-support/celt051/celt051_git.bb new file mode 100644 index 0000000000..850704f5af --- /dev/null +++ b/meta-networking/recipes-support/celt051/celt051_git.bb @@ -0,0 +1,32 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "The CELT codec is a compression algorithm for audio" +DESCRIPTION = "The CELT codec is a compression algorithm for \ +audio. Like MP3, Vorbis, and AAC it is suitable for transmitting music \ +with high quality. Unlike these formats CELT imposes very little delay \ +on the signal, even less than is typical for speech centric formats \ +like Speex, GSM, or G.729." + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=375f60ab360d17f0172737036ff155b2" + +PV = "0.5.1.3+git${SRCPV}" + +SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" + +SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https \ + file://0001-configure.ac-make-tools-support-optional.patch \ +" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools-brokensep + +PACKAGECONFIG_class-native = "" +PACKAGECONFIG ??= "" + +PACKAGECONFIG[ogg] = "--enable-tools,--disable-tools,libogg," + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 92a2dbd934..9f943cdce5 100644 --- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -1,4 +1,7 @@ - chrony: fix build failure for arma9 +From 9ca48a6fef1da1bb0dd67ab94256c7e240da1834 Mon Sep 17 00:00:00 2001 +From: Joe Slater <jslater@windriver.com> +Date: Thu, 9 Mar 2017 10:58:06 -0800 +Subject: [PATCH] chrony: fix build failure for arma9 Eliminate references to syscalls not available for ARM_EABI. Also add a dependency on libseccomp @@ -16,9 +19,15 @@ Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> +--- + sys_linux.c | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/sys_linux.c b/sys_linux.c +index f4b532d..d05fa24 100644 --- a/sys_linux.c +++ b/sys_linux.c -@@ -465,14 +465,14 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -482,14 +482,14 @@ SYS_Linux_EnableSystemCallFilter(int level) const int syscalls[] = { /* Clock */ SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), @@ -36,8 +45,8 @@ SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), /* Filesystem */ SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32), -@@ -483,14 +483,21 @@ - SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), +@@ -500,14 +500,21 @@ SYS_Linux_EnableSystemCallFilter(int level) + SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), - /* TODO: check socketcall arguments */ diff --git a/meta-networking/recipes-support/chrony/chrony_3.2.bb b/meta-networking/recipes-support/chrony/chrony_3.3.bb index 8b90a354ea..2586370fa7 100644 --- a/meta-networking/recipes-support/chrony/chrony_3.2.bb +++ b/meta-networking/recipes-support/chrony/chrony_3.3.bb @@ -35,8 +35,8 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ file://chronyd \ file://arm_eabi.patch \ " -SRC_URI[md5sum] = "f4c4eb0dc92f35ee4bb7d3dcd8029ecb" -SRC_URI[sha256sum] = "329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116" +SRC_URI[md5sum] = "81ab62cf5d60b4b3fa8cd2c1b267ffd9" +SRC_URI[sha256sum] = "0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128" DEPENDS = "pps-tools" diff --git a/meta-networking/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch b/meta-networking/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch new file mode 100644 index 0000000000..56fd704ad7 --- /dev/null +++ b/meta-networking/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch @@ -0,0 +1,59 @@ +Description: install cmake files into /usr/lib/cmake/cpprestsdk +Author: Gianfranco Costamagna <locutusofborg@debian.org> +Upstream-Status: https://github.com/Microsoft/cpprestsdk/pull/737 +Forwarded: https://github.com/Microsoft/cpprestsdk/pull/737 +Last-Update: 2018-04-19 + +Index: cpprest/CMakeLists.txt +=================================================================== +--- cpprest.orig/CMakeLists.txt ++++ cpprest/CMakeLists.txt +@@ -18,7 +18,6 @@ + set(WERROR ON CACHE BOOL "Treat Warnings as Errors.") + set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.") + set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.") +-set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.") + set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.") + set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.") + +@@ -63,6 +62,9 @@ + include(cmake/cpprest_find_openssl.cmake) + include(cmake/cpprest_find_websocketpp.cmake) + include(CheckIncludeFiles) ++if(UNIX) ++include(GNUInstallDirs) ++endif(UNIX) + + find_package(Threads REQUIRED) + if(THREADS_HAVE_PTHREAD_ARG) +Index: cpprest/src/CMakeLists.txt +=================================================================== +--- cpprest.orig/src/CMakeLists.txt ++++ cpprest/src/CMakeLists.txt +@@ -250,21 +250,21 @@ + install( + TARGETS ${CPPREST_TARGETS} + EXPORT cpprestsdk-targets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + + configure_file(../cmake/cpprestsdk-config.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" @ONLY) + + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" +- DESTINATION ${CPPREST_EXPORT_DIR} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + ) + install( + EXPORT cpprestsdk-targets + FILE cpprestsdk-targets.cmake + NAMESPACE cpprestsdk:: +- DESTINATION ${CPPREST_EXPORT_DIR} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + ) + endif() diff --git a/meta-networking/recipes-support/cpprest/cpprest_2.10.2.bb b/meta-networking/recipes-support/cpprest/cpprest_2.10.2.bb new file mode 100644 index 0000000000..2ba6fc66cc --- /dev/null +++ b/meta-networking/recipes-support/cpprest/cpprest_2.10.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/../license.txt;md5=a2e15b954769218ff912468eecd6a02f" +DEPENDS = "openssl websocketpp zlib boost" + +SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master" + +SRC_URI += "file://fix-cmake-install.patch" + +# tag 2.10.2 +SRCREV= "fea848e2a77563cf2a6f28f8eab396fd6e787fbf" + +S = "${WORKDIR}/git/Release" + +inherit cmake diff --git a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch index 1dd9b93a5a..1294fe41b5 100644 --- a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch +++ b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch @@ -2,15 +2,16 @@ link rep_snprintf from lib/replace/snprintf.o for ltdbtool Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> -diff -Nurp ctdb-2.5.1.orig/Makefile.in ctdb-2.5.1/Makefile.in ---- ctdb-2.5.1.orig/Makefile.in 2015-05-07 16:43:39.276000236 +0900 -+++ ctdb-2.5.1/Makefile.in 2015-05-07 16:44:09.627000237 +0900 -@@ -170,7 +170,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. +Index: ctdb-2.5.6/Makefile.in +=================================================================== +--- ctdb-2.5.6.orig/Makefile.in ++++ ctdb-2.5.6/Makefile.in +@@ -176,7 +176,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. @echo Linking $@ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) -bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) +bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS) + $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS) diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index b5a60645c5..df1a19e7a2 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -26,15 +26,15 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" -DEPENDS += "popt libtevent libtalloc libldb" -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +DEPENDS += "popt libtevent libtalloc libldb libtirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" do_configure() { + gnu-configize --force ${S} oe_runconf } diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb b/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb index 5ebda19eb4..882d5d5543 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb @@ -15,11 +15,9 @@ SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ SRC_URI[md5sum] = "d61d1e923a22f9062cc9f47696882666" SRC_URI[sha256sum] = "e9483d68a7698d701bc06124fcf6e1b1f16380c2986c7ec0cf4e1475b9d0c218" -DEPENDS = "openssl xz zlib bzip2 libcap icu" - -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" inherit autotools pkgconfig systemd useradd diff --git a/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb b/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb index e943f2464a..fa4d10b4c1 100644 --- a/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb +++ b/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb @@ -20,3 +20,5 @@ EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" do_install () { oe_runmake install DESTDIR="${D}" } + +PNBLACKLIST[drbd] = "implicit declaration of function 'setup_timer'; 4.15 head file issue?" diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb index 49b11ad335..0fd5f6fed5 100644 --- a/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb +++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb @@ -17,6 +17,9 @@ EXTRA_OECONF = " --with-iptables=/usr/sbin/iptables \ " do_configure () { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config + aclocal libtoolize --automake --copy --force autoconf diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index a8c8bcf580..ed5c3a9799 100644 --- a/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb +++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb @@ -7,19 +7,14 @@ DESCRIPTION = "perl library for country/city/organization to IP address or hostn HOMEPAGE = "http://www.maxmind.com/app/ip-location" SECTION = "libdevel" LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b7a36f55e8ba62aadd74e4f0886a405e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250" -# Note that we do not want to use the upstream file name locally. -# -SRC_URI = "http://github.com/maxmind/geoip-api-perl/archive/v${PV}.tar.gz;downloadfilename=${BPN}-${PV}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "4cdfdc38eca237c19c22a8b90490446ce6d970fa" +SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;protocol=https; \ file://run-ptest \ " -SRC_URI[md5sum] = "2d7f8b1b54e6ba6d9e3fefce52675815" -SRC_URI[sha256sum] = "86da0dd67f417a43dc70f15a49bd3619f668970c117b9e7f737b4ab246c240a6" - -S = "${WORKDIR}/geoip-api-perl-${PV}" - DEPENDS += "geoip" inherit cpan ptest diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.9.bb b/meta-networking/recipes-support/geoip/geoip_1.6.11.bb index 9e8e0714f8..3527d0cba7 100644 --- a/meta-networking/recipes-support/geoip/geoip_1.6.9.bb +++ b/meta-networking/recipes-support/geoip/geoip_1.6.11.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/maxmind/geoip-api-c.git \ http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;apply=no;name=GeoLiteCityv6-dat \ file://run-ptest \ " -SRCREV = "4f487bf95532e0bba7783d591faff178ab0aa462" +SRCREV = "3169a8a88808c8df862e0b0355f99c738cce9f7e" SRC_URI[GeoIP-dat.md5sum] = "37c84ead332dda0362a5ac7b049b72d4" SRC_URI[GeoIP-dat.sha256sum] = "79ff1099e96c2dc1c2539c9a18aaa13a9afd085cae477df60d95f1644d42bc07" diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf index 134cfed1f5..134cfed1f5 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf +++ b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron index 40597a856e..40597a856e 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron +++ b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 3e045bb27d..f4eb2b799d 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb +++ b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -6,17 +6,17 @@ SECTION = "net" DEPENDS = "zlib curl" -SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.4.0/geoipupdate-2.4.0.tar.gz \ +SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.5.0/geoipupdate-2.5.0.tar.gz \ file://GeoIP.conf \ file://geoipupdate.cron \ " -SRC_URI[md5sum] = "02f9712fb80e8e979d3d54cda7f7704f" -SRC_URI[sha256sum] = "8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952" +SRC_URI[md5sum] = "28f633c49ec87ab01ad3c0fb0228a696" +SRC_URI[sha256sum] = "5119fd0e338cd083e886228b26679c64bcbaade8a815be092aecf865a610ab26" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "\ -file://ChangeLog.md;md5=334337b6ecbb65093bae66b3ae21c8c2 \ +file://ChangeLog.md;md5=11d2e31df0de2be3ccc3e2286c4dafcb \ " FILES_${PN} = "/usr/share/GeoIP \ /etc/GeoIP.conf \ diff --git a/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch b/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch new file mode 100644 index 0000000000..38d306475e --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch @@ -0,0 +1,31 @@ +From fd80c0599083013a1b583feba5d7473f52b35938 Mon Sep 17 00:00:00 2001 +From: Mariia Movchan <mmovchan@cisco.com> +Date: Tue, 6 Mar 2018 16:03:39 +0200 +Subject: [PATCH] Makefile: pass extra linker flags + +Fixes +ERROR: QA Issue: No GNU_HASH in the elf binary + +Upstream-Status: Pending + +Signed-off-by: Mariia Movchan <mmovchan@cisco.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8beff8f..047f02a 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ LIBS?= + VERSION=0.2.2 + CC?=gcc + CFLAGS?=-O2 -g -Wall +-LDFLAGS=$(LIBS) ++LDFLAGS+=$(LIBS) + + ifeq ($(USE_GEOIP),yes) + ifeq ($(USE_DYN_GEOIP),yes) +-- +2.15.1 + diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.0.bb b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.0.bb deleted file mode 100644 index bb283c80b5..0000000000 --- a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." -HOMEPAGE = "https://github.com/nmav/ipcalc" - -SECTION = "net" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -SRC_URI = "https://github.com/nmav/ipcalc/archive/${PV}.tar.gz;downloadfilename=ipcalc-${PV}.tar.gz" - -SRC_URI[md5sum] = "edbfc4cb64632e0c4f87cf81c7d8302d" -SRC_URI[sha256sum] = "c965c1296172a6acc50d54dfe81f7e5d589f9762b5d9ae459eee00349675336b" - -export USE_GEOIP = "no" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/ipcalc ${D}/${bindir} -} diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb new file mode 100644 index 0000000000..b45642404c --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." +HOMEPAGE = "https://github.com/nmav/ipcalc" + +SECTION = "net" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" +SRCREV = "8348808a7869ca8f25a5b5deeaa418c2f6d52758" +SRC_URI = "\ + git://github.com/nmav/ipcalc.git;protocol=https; \ + file://0001-Makefile-pass-extra-linker-flags.patch \ +" + +export USE_GEOIP = "no" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/ipcalc ${D}/${bindir} +} diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Disable-gcc8-specific-warnings.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Disable-gcc8-specific-warnings.patch new file mode 100644 index 0000000000..11a9103935 --- /dev/null +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Disable-gcc8-specific-warnings.patch @@ -0,0 +1,86 @@ +From 282d492e4cab7b4d9c7321f4c0c55b615948e280 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 11 May 2018 14:09:17 -0700 +Subject: [PATCH] Disable gcc8 specific warnings + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libipsec/ipsec_dump_policy.c | 5 +++++ + src/libipsec/pfkey_dump.c | 5 +++++ + src/racoon/isakmp.c | 11 ++++++++++- + 3 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/src/libipsec/ipsec_dump_policy.c b/src/libipsec/ipsec_dump_policy.c +index 4d0eb77..c3fc842 100644 +--- a/src/libipsec/ipsec_dump_policy.c ++++ b/src/libipsec/ipsec_dump_policy.c +@@ -275,6 +275,10 @@ ipsec_dump_policy1(policy, delimiter, withports) + return buf; + } + ++#pragma GCC diagnostic push ++#if defined(__GNUC__) && (__GNUC__ >= 8) ++#pragma GCC diagnostic ignored "-Wformat-truncation" ++#endif + static char * + ipsec_dump_ipsecrequest(buf, len, xisr, bound, withports) + char *buf; +@@ -419,3 +423,4 @@ set_address(buf, len, sa, withports) + + return buf; + } ++#pragma GCC diagnostic pop +diff --git a/src/libipsec/pfkey_dump.c b/src/libipsec/pfkey_dump.c +index 4627ebc..451e535 100644 +--- a/src/libipsec/pfkey_dump.c ++++ b/src/libipsec/pfkey_dump.c +@@ -691,6 +691,10 @@ str_ipport(sa) + /* + * set "/prefix[port number]" to buffer. + */ ++#pragma GCC diagnostic push ++#if defined(__GNUC__) && (__GNUC__ >= 8) ++#pragma GCC diagnostic ignored "-Wformat-truncation" ++#endif + static char * + str_prefport(family, pref, port, ulp) + u_int family, pref, port, ulp; +@@ -735,6 +739,7 @@ str_prefport(family, pref, port, ulp) + + return buf; + } ++#pragma GCC diagnostic pop + + static void + str_upperspec(ulp, p1, p2) +diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c +index 7ff53a3..4addf24 100644 +--- a/src/racoon/isakmp.c ++++ b/src/racoon/isakmp.c +@@ -3124,7 +3124,12 @@ script_hook(iph1, script) + #endif + + /* local address */ ++#pragma GCC diagnostic push ++#if defined(__GNUC__) && (__GNUC__ >= 8) ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif + GETNAMEINFO(iph1->local, addrstr, portstr); ++#pragma GCC diagnostic pop + + if (script_env_append(&envp, &envc, "LOCAL_ADDR", addrstr) != 0) { + plog(LLV_ERROR, LOCATION, NULL, "Cannot set LOCAL_ADDR\n"); +@@ -3138,8 +3143,12 @@ script_hook(iph1, script) + + /* Peer address */ + if (iph1->remote != NULL) { ++#pragma GCC diagnostic push ++#if defined(__GNUC__) && (__GNUC__ >= 8) ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif + GETNAMEINFO(iph1->remote, addrstr, portstr); +- ++#pragma GCC diagnostic pop + if (script_env_append(&envp, &envc, + "REMOTE_ADDR", addrstr) != 0) { + plog(LLV_ERROR, LOCATION, NULL, diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb index 5cbeb15ad5..020903d82f 100644 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${P file://0001-Fix-header-issues-found-with-musl-libc.patch \ file://0002-cfparse-clear-memory-equal-to-size-of-array.patch \ file://fix-CVE-2016-10396.patch \ + file://0001-Disable-gcc8-specific-warnings.patch \ " SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41" SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d" diff --git a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch index 93bd4578e1..ffe253b63c 100644 --- a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch @@ -1,7 +1,7 @@ -From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001 +From a4da3ab4d76013aaa731d43d52ccca1ebd37c395 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 21 Sep 2016 10:06:39 +0800 -Subject: [PATCH] ldb: Add configure options for packages +Subject: [PATCH 1/1] ldb: Add configure options for packages Add configure options for the following packages: - acl @@ -16,9 +16,9 @@ Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + lib/replace/wscript | 94 +++++++++++++++++++++++++++--------- wscript | 7 +++ - 3 files changed, 80 insertions(+), 18 deletions(-) + 3 files changed, 83 insertions(+), 24 deletions(-) diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure index 2035474..10f9ae7 100644 @@ -37,7 +37,7 @@ index 2035474..10f9ae7 100644 # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index 145300d..8218fa5 100644 +index 2f94d49..68b2d3a 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -124,18 +124,23 @@ index 145300d..8218fa5 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -266,22 +316,20 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') +- strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -148,17 +153,28 @@ index 145300d..8218fa5 100644 + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +@@ -632,7 +680,7 @@ removeea setea + # look for a method of finding the list of network interfaces + for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: + bsd_for_strlcpy = '' +- if strlcpy_in_bsd: ++ if Options.options.enable_libbsd: + bsd_for_strlcpy = ' bsd' + if conf.CHECK_CODE(''' + #define %s 1 diff --git a/wscript b/wscript -index 2af8571..059408b 100755 +index 8ae5be3..a178cc4 100644 --- a/wscript +++ b/wscript -@@ -29,6 +29,13 @@ def set_options(opt): +@@ -31,6 +31,13 @@ def set_options(opt): opt.RECURSE('lib/replace') opt.tool_options('python') # options for disabling pyc or pyo compilation @@ -173,5 +189,5 @@ index 2af8571..059408b 100755 conf.RECURSE('lib/tdb') conf.RECURSE('lib/tevent') -- -2.8.3 +2.16.2 diff --git a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb index cb9ea92838..7e14cde35f 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb @@ -8,7 +8,7 @@ RDEPENDS_pyldb += "python" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://do-not-import-target-module-while-cross-compile.patch \ - file://ldb-Add-configure-options-for-packages.patch \ + file://options-1.3.1.patch \ " PACKAGECONFIG ??= "\ @@ -29,8 +29,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "91284a12423def99a6592e393e3b7fbb" -SRC_URI[sha256sum] = "0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113" +SRC_URI[md5sum] = "e5233f202bca27f6ce8474fb8ae65983" +SRC_URI[sha256sum] = "b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2" inherit waf-samba diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch index 35f8eaf7da..63f21e7757 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch @@ -25,10 +25,10 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> wscript | 7 ++- 3 files changed, 79 insertions(+), 19 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure +Index: talloc-2.1.11/lib/replace/system/wscript_configure +=================================================================== +--- talloc-2.1.11.orig/lib/replace/system/wscript_configure ++++ talloc-2.1.11/lib/replace/system/wscript_configure @@ -1,6 +1,10 @@ #!/usr/bin/env python @@ -41,10 +41,10 @@ index 2035474..10f9ae7 100644 conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') # solaris varients of getXXent_r -diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript +Index: talloc-2.1.11/lib/replace/wscript +=================================================================== +--- talloc-2.1.11.orig/lib/replace/wscript ++++ talloc-2.1.11/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -129,38 +129,45 @@ index fc43e1a..12d2a70 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): - +@@ -267,21 +317,21 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', + checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -+ if Options.options.enable_libbsd: -+ # libbsd on some platforms provides strlcpy and strlcat -+ if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') ++ strlcpy_in_bsd = True + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; ---- a/wscript -+++ b/wscript +Index: talloc-2.1.11/wscript +=================================================================== +--- talloc-2.1.11.orig/wscript ++++ talloc-2.1.11/wscript @@ -32,7 +32,12 @@ def set_options(opt): opt.add_option('--enable-talloc-compat1', help=("Build talloc 1.x.x compat library [False]"), @@ -172,9 +179,6 @@ index fc43e1a..12d2a70 100644 + opt.add_option('--without-valgrind', + help=("disable use of valgrind"), + action="store_false", dest='enable_valgrind', default=False) - + def configure(conf): conf.RECURSE('lib/replace') --- -2.8.3 - diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb index 23dca15fd8..848cf4d99b 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb @@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://options-2.1.10.patch \ " - -SRC_URI[md5sum] = "48b8822a76797bb143e3e38ed738c320" -SRC_URI[sha256sum] = "c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619" +SRC_URI[md5sum] = "452596f904ca2b10322bdaabf147a721" +SRC_URI[sha256sum] = "639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3" inherit waf-samba diff --git a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch b/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch index 84b1a36881..363c5867cc 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch @@ -1,7 +1,7 @@ -From c00f6d35bdc06dffb54daa815e57b44210a5de04 Mon Sep 17 00:00:00 2001 +From c3e2e4f89cf37b27609fd02ad67eb02d0015cc1e Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 21 Sep 2016 09:57:49 +0800 -Subject: [PATCH] tevent: Add configure options for packages +Subject: [PATCH 1/1] tevent: Add configure options for packages Add configure options for the following packages: - acl @@ -19,30 +19,12 @@ Modified to apply to version 0.9.33. Signed-off-by: Joe Slater <joe.slater@windriver.com> --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 ++- - 3 files changed, 79 insertions(+), 19 deletions(-) - mode change 100755 => 100644 wscript + lib/replace/wscript | 89 ++++++++++++++++++++++++++++++++++++++++------------- + wscript | 7 ++++- + 2 files changed, 73 insertions(+), 23 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 +index 2c638b7..079761d 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -118,32 +100,33 @@ index fc43e1a..12d2a70 100644 conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') +@@ -101,7 +149,8 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -294,22 +343,18 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') +- strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): @@ -153,12 +136,25 @@ index fc43e1a..12d2a70 100644 + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ + +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +@@ -660,7 +705,7 @@ removeea setea + # look for a method of finding the list of network interfaces + for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: + bsd_for_strlcpy = '' +- if strlcpy_in_bsd: ++ if Options.options.enable_libbsd: + bsd_for_strlcpy = ' bsd' + if conf.CHECK_CODE(''' + #define %s 1 +diff --git a/wscript b/wscript +index 94d190f..742f779 100644 --- a/wscript +++ b/wscript @@ -22,7 +22,12 @@ def set_options(opt): @@ -176,5 +172,5 @@ index fc43e1a..12d2a70 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.8.3 +2.16.2 diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb index f508300692..c91b221b1e 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://tevent.samba.org" SECTION = "libs" LICENSE = "LGPLv3+" -DEPENDS += "libtalloc" +DEPENDS += "libtalloc libtirpc" RDEPENDS_python-tevent = "python" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://options-0.9.33.patch \ + file://options-0.9.36.patch \ " LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" -SRC_URI[md5sum] = "527a43f35b4251e46f28921342895223" -SRC_URI[sha256sum] = "22712ee981fd4298fcd5f3afb27d87a72257cebad37812cfbd3da5d968ed1bdc" +SRC_URI[md5sum] = "87d67bca75b231814435c47bec0aff8a" +SRC_URI[sha256sum] = "bd2b6be3fd1601ed7f176e99111e322c57d58e425cc149ee80c7dd4fed263b4c" inherit waf-samba diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch new file mode 100644 index 0000000000..493832bb84 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch @@ -0,0 +1,30 @@ +From f017353b8f3170ce79e7addc127056c0142f087b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Apr 2018 14:31:05 -0700 +Subject: [PATCH] coordinator: Fix strncpy range warning + +Fixes +error: 'strncpy' specified bound 4096 equals destination size [-Werror=stringop-truncation] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/coordinator.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coordinator.c b/src/coordinator.c +index c139aae..ca49418 100644 +--- a/src/coordinator.c ++++ b/src/coordinator.c +@@ -296,7 +296,8 @@ int main(int argc, char **argv) + if(!lease_file) + lease_file = LEASE_FILE; + +- strncpy(pname, argv[0], PATH_MAX); ++ strncpy(pname, argv[0], PATH_MAX - 1); ++ pname[PATH_MAX - 1] = '\0'; + + pid_file = getenv("PID_FILE"); + if (!pid_file) +-- +2.16.3 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index be73f8ae4b..d0fe59c983 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -8,14 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "flex-native bison-native libnl python" PV = "0.3.1+git${SRCPV}" -SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ +SRC_URI = "git://github.com/linux-wpan/lowpan-tools \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ file://0001-src-iz.c-Undef-dprintf-before-redefining.patch \ file://0001-Remove-newline-from-format-line.patch \ + file://0001-coordinator-Fix-strncpy-range-warning.patch \ " -SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" +SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-support/memcached/memcached_1.5.0.bb b/meta-networking/recipes-support/memcached/memcached_1.5.7.bb index fd3d171f0c..0703e7c59a 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.5.0.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.5.7.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ " -SRC_URI[md5sum] = "81326513f60d7ba482f8131975cd55ae" -SRC_URI[sha256sum] = "c001f812024bb461b5e4d7d0506daab63dff9614eea26f46536c3b7e1e601c32" +SRC_URI[md5sum] = "07feaa900181c66753f9b060f40f24aa" +SRC_URI[sha256sum] = "5bb706a8fc7ae7461a6788eaddd85e4a4e84e952d3a80c21926342c2838f4e46" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 58f12309b9..cebc1d9cd8 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -20,6 +20,8 @@ inherit autotools gettext EXTRA_OECONF += "PERL=${USRBINPATH}/perl" LDFLAGS += "-fuse-ld=gold" +LDFLAGS_remove_riscv64 = "-fuse-ld=gold" + TOOLCHAIN = "gcc" USE_NLS = "yes" diff --git a/meta-networking/recipes-support/nis/nis.inc b/meta-networking/recipes-support/nis/nis.inc index e027a1c6f8..200eaf74d4 100644 --- a/meta-networking/recipes-support/nis/nis.inc +++ b/meta-networking/recipes-support/nis/nis.inc @@ -27,5 +27,5 @@ do_install() { python () { os = d.getVar("TARGET_OS", True) if os == "linux-uclibc": - raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") + raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") } diff --git a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch b/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch deleted file mode 100644 index 3d4d4f278d..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 420cb6927553bbca5b49b7681cf208e6df6e4d7c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 08:42:45 -0700 -Subject: [PATCH 1/2] ypbind3_binding_dup.c: Include string.h for strdup - declaration - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - lib/ypbind3_binding_dup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/ypbind3_binding_dup.c b/lib/ypbind3_binding_dup.c -index ce4aadf..8199c0b 100644 ---- a/lib/ypbind3_binding_dup.c -+++ b/lib/ypbind3_binding_dup.c -@@ -19,6 +19,7 @@ - - #if defined(HAVE_YPBIND3) - -+#include <string.h> - #include <rpcsvc/yp_prot.h> - #include "internal.h" - --- -2.14.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch b/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch deleted file mode 100644 index 0562e58afb..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 03ccabb6264c008430c4b1739351df5a63829f8e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 08:52:32 -0700 -Subject: [PATCH 2/2] yp_dump_bindings.c: Include string.h for memset - -Fixes -error: implicitly declaring library function 'memset' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/yp_dump_binding.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/yp_dump_binding.c b/src/yp_dump_binding.c -index a5ab920..d75e2c2 100644 ---- a/src/yp_dump_binding.c -+++ b/src/yp_dump_binding.c -@@ -26,6 +26,7 @@ - #include <libintl.h> - #include <locale.h> - #include <getopt.h> -+#include <string.h> - #include <sys/stat.h> - #include <arpa/inet.h> - #include <rpcsvc/ypclnt.h> --- -2.14.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb index 9ac973812c..4e27e32d48 100644 --- a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb @@ -11,13 +11,14 @@ ypwhich, yppasswd, domainname, nisdomainname \ and ypdomainname. \ " -SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ +# v4.2.3 +SRCREV = "1bfda29c342a81b97cb1995ffd9e8da5de63e7ab" + +SRC_URI = "git://github.com/thkukuk/yp-tools \ file://domainname.service \ - file://0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch \ - file://0002-yp_dump_bindings.c-Include-string.h-for-memset.patch \ " -SRC_URI[md5sum] = "fb4a8bffb44ae5d3390351d67f320ef3" -SRC_URI[sha256sum] = "137f19a986382b275bf4a2b1a69eb26689d6f4ac056ddaa21784d6b80eb98faa" + +S = "${WORKDIR}/git" DEPENDS = "libtirpc libnsl2" diff --git a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch index cb1e2f7341..d45b7e38b7 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch +++ b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch @@ -1,6 +1,16 @@ ---- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 -+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 -@@ -14,6 +14,14 @@ +From 2310898533f059d875dcffd26ab6cf1b280292fd Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 12 Jan 2011 21:38:46 +0100 + +--- + include/ntp_syscall.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/ntp_syscall.h b/include/ntp_syscall.h +index d1ce03e..9e18432 100644 +--- a/include/ntp_syscall.h ++++ b/include/ntp_syscall.h +@@ -10,6 +10,14 @@ # include <sys/timex.h> #endif @@ -13,5 +23,5 @@ +#endif + #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb index 719c60b97e..c698fa0494 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" -SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" +SRC_URI[md5sum] = "00950ca2855579541896513e78295361" +SRC_URI[sha256sum] = "f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e" inherit autotools update-rc.d useradd systemd pkgconfig @@ -109,6 +109,8 @@ PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) RDEPENDS_${PN} = "${PN}-tickadj" +# ntpd require libgcc for execution +RDEPENDS_${PN} += "libgcc" # Handle move from bin to utils package RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" diff --git a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch index 9a568b2b22..449142fcfa 100644 --- a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch +++ b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch @@ -8,11 +8,11 @@ Date: Thu Jun 7 16:00:13 2012 -0400 Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 92d6e83..f6039f9 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -36,6 +36,7 @@ CLEANFILES = libOpenIPMIcmdlang.map +Index: OpenIPMI-2.0.24/cmdlang/Makefile.am +=================================================================== +--- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am ++++ OpenIPMI-2.0.24/cmdlang/Makefile.am +@@ -35,6 +35,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l # compatability. install-data-local: rm -f $(DESTDIR)$(bindir)/ipmish diff --git a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch index 58ec5d8834..082511a67b 100644 --- a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch +++ b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch @@ -3,10 +3,10 @@ include sys/types.h for u_int32_t ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'? u_int32_t addr; ^~~~~~~~~ -Index: OpenIPMI-2.0.22/ui/ui.c +Index: OpenIPMI-2.0.24/ui/ui.c =================================================================== ---- OpenIPMI-2.0.22.orig/ui/ui.c -+++ OpenIPMI-2.0.22/ui/ui.c +--- OpenIPMI-2.0.24.orig/ui/ui.c ++++ OpenIPMI-2.0.24/ui/ui.c @@ -42,6 +42,7 @@ #include <fcntl.h> #include <time.h> @@ -14,4 +14,4 @@ Index: OpenIPMI-2.0.22/ui/ui.c +#include <sys/types.h> #include <ctype.h> - #include <OpenIPMI/selector.h> + #include <OpenIPMI/ipmi_err.h> diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_17.bb b/meta-networking/recipes-support/rdma-core/rdma-core_17.bb new file mode 100644 index 0000000000..5d0329919f --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core_17.bb @@ -0,0 +1,24 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +RDEPENDS_${PN} = "bash perl" + +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;protocol=http" +SRCREV ="5ce12bd51ebb0a4db35dea382b1ebdc701bab224" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*" +INSANE_SKIP_${PN} += "dev-so" + +inherit cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-networking/recipes-support/spice/spice-protocol_git.bb b/meta-networking/recipes-support/spice/spice-protocol_git.bb new file mode 100644 index 0000000000..30d0a76752 --- /dev/null +++ b/meta-networking/recipes-support/spice/spice-protocol_git.bb @@ -0,0 +1,28 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "Simple Protocol for Independent Computing Environments" +DESCRIPTION = "SPICE (the Simple Protocol for Independent Computing \ +Environments) is a remote-display system built for virtual \ +environments which allows users to view a computing 'desktop' \ +environment - not only on its computer-server machine, but also from \ +anywhere on the Internet and using a wide variety of machine \ +architectures." + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95" + +PV = "0.12.13+git${SRCPV}" + +SRCREV = "87441524f4e7b79658e42bd8f1f6c3e3c8649aa5" + +SRC_URI = " \ + git://anongit.freedesktop.org/spice/spice-protocol \ +" + +S = "${WORKDIR}/git" + +inherit autotools gettext pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch b/meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch new file mode 100644 index 0000000000..8d246cc7f3 --- /dev/null +++ b/meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch @@ -0,0 +1,33 @@ +From 812a1a099cc48edcf1280fc329bf5330237f3cc2 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Thu, 1 May 2014 12:09:16 -0400 +Subject: [PATCH] build: allow separated src and build dirs + +We need to expland the list of include dirs to include the build dir since +generated files will be created there instead of in the src dir. + +We also don't want to force using $srcdir for generated files as this will +allow them to be created in the build dir. We account for the slight +deviation in the generated files with expanded include paths. + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 483dbfdf..7d990aaa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -138,7 +138,7 @@ dnl ========================================================================= + dnl Check deps + + AC_CONFIG_SUBDIRS([spice-common]) +-COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/' ++COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/common/ -I ${top_srcdir}/spice-common/spice-protocol/ -I ${top_builddir}/spice-common/' + COMMON_CFLAGS="$COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\"" + AC_SUBST(COMMON_CFLAGS) + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb new file mode 100644 index 0000000000..35482ca865 --- /dev/null +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -0,0 +1,55 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "Simple Protocol for Independent Computing Environments" +DESCRIPTION = "SPICE (the Simple Protocol for Independent Computing \ +Environments) is a remote-display system built for virtual \ +environments which allows users to view a computing 'desktop' \ +environment - not only on its computer-server machine, but also from \ +anywhere on the Internet and using a wide variety of machine \ +architectures." + +LICENSE = "BSD & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +PV = "0.14.0+git${SRCPV}" + +SRCREV_spice = "2a3d5624382ba49c4eb906e69697b92f79d06cf4" +SRCREV_spice-common = "4c2d0e977272c5540634d24f485dd64c424f6748" + +SRCREV_FORMAT = "spice_spice-common" + +SRC_URI = " \ + git://anongit.freedesktop.org/spice/spice;name=spice \ + git://anongit.freedesktop.org/spice/spice-common;destsuffix=git/spice-common;name=spice-common \ +" +FOO = "\ + file://0001-build-allow-separated-src-and-build-dirs.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools gettext pythonnative python-dir pkgconfig + +DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python-pyparsing-native python-six-native glib-2.0-native" +DEPENDS_append_class-nativesdk = "nativesdk-openssl" + +export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" +export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" + +PACKAGECONFIG_class-native = "" +PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG ?= "sasl" + +PACKAGECONFIG[celt051] = "--enable-celt051,--disable-celt051,celt051" +PACKAGECONFIG[smartcard] = "--enable-smartcard,--disable-smartcard,libcacard," +PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl," +PACKAGECONFIG[client] = "--enable-client,--disable-client,," +PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,," +PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,," +PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama," + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/spice/usbredir_git.bb b/meta-networking/recipes-support/spice/usbredir_git.bb new file mode 100644 index 0000000000..3fea7528e5 --- /dev/null +++ b/meta-networking/recipes-support/spice/usbredir_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "usbredir libraries and utilities" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \ +" + +DEPENDS = "libusb1" + +SRCREV = "39aa3c69f61bba28856a3eef3fe4ab37a3968e88" +PV = "0.7.1+git${SRCPV}" + +SRC_URI = " \ + git://anongit.freedesktop.org/spice/usbredir \ +" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch b/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch index 7ebc398180..00178c84a4 100644 --- a/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch +++ b/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch @@ -1,15 +1,16 @@ -From 2a3ab04bbdc4624792886aa51579eadb427ef99e Mon Sep 17 00:00:00 2001 +From 33a53dc13fd924949a582109b45fedd8d0bed59b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 27 Jun 2017 07:42:11 -0700 Subject: [PATCH] memory.h: Include stdint.h for uintptr_t Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/libstrongswan/utils/utils/memory.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libstrongswan/utils/utils/memory.h b/src/libstrongswan/utils/utils/memory.h -index b978e7c..55aaaf5 100644 +index e840330..8a356a8 100644 --- a/src/libstrongswan/utils/utils/memory.h +++ b/src/libstrongswan/utils/utils/memory.h @@ -22,6 +22,8 @@ @@ -21,6 +22,3 @@ index b978e7c..55aaaf5 100644 /** * Helper function that compares two binary blobs for equality */ --- -2.13.2 - diff --git a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch index da96983e6d..be660d1fd8 100644 --- a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch +++ b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch @@ -1,4 +1,7 @@ -fix the function parameter +From 9f97479373f3fceedc471074b81486d77a49618d Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Tue, 4 Mar 2014 14:38:42 +0800 +Subject: [PATCH] fix the function parameter Upstream-Status: pending @@ -31,9 +34,10 @@ on PPC, Now we simply correct the number of parameters. #11 0x4836c378 in process_message (this=0x514005f0, message=0x51500778) at sa/ike_sa.c:1317 #12 0x48362270 in execute (this=0x515008d0) - at processing/jobs/process_message_job.c:74 + at processing/jobs/process_message_job.c:74 Signed-off-by: Roy.Li <rongqing.li@windriver.com> + --- src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c | 8 +++++++- src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h | 4 +++- @@ -41,20 +45,20 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com> 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -index ff33824..bd21446 100644 +index 8e9c118..a73b038 100644 --- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c +++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -@@ -142,7 +142,7 @@ METHOD(diffie_hellman_t, destroy, void, +@@ -192,7 +192,7 @@ METHOD(diffie_hellman_t, destroy, void, /* * Described in header. */ -openssl_diffie_hellman_t *openssl_diffie_hellman_create( +openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p) + diffie_hellman_group_t group, ...) { private_openssl_diffie_hellman_t *this; -@@ -197,5 +197,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create( - +@@ -255,5 +255,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create( + DBG2(DBG_LIB, "size of DH secret exponent: %d bits", BN_num_bits(privkey)); return &this->public; } +openssl_diffie_hellman_t *openssl_diffie_hellman_create( diffie_hellman_group_t group) @@ -66,26 +70,26 @@ index ff33824..bd21446 100644 #endif /* OPENSSL_NO_DH */ diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -index 53dc59c..eb69eaa 100644 +index 5de5520..22586e0 100644 --- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h +++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -@@ -44,8 +44,10 @@ struct openssl_diffie_hellman_t { - * @param p custom prime, if MODP_CUSTOM +@@ -43,8 +43,10 @@ struct openssl_diffie_hellman_t { + * @param ... expects generator and prime as chunk_t if MODP_CUSTOM * @return openssl_diffie_hellman_t object, NULL if not supported */ -openssl_diffie_hellman_t *openssl_diffie_hellman_create( +openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p); + diffie_hellman_group_t group, ...); +openssl_diffie_hellman_t *openssl_diffie_hellman_create( + diffie_hellman_group_t group); #endif /** OPENSSL_DIFFIE_HELLMAN_H_ @}*/ diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c -index ff25086..c76873d 100644 +index 8b0a7c5..114d575 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c -@@ -388,6 +388,7 @@ METHOD(plugin_t, get_features, int, +@@ -609,6 +609,7 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(DH, MODP_1024_BIT), PLUGIN_PROVIDE(DH, MODP_1024_160), PLUGIN_PROVIDE(DH, MODP_768_BIT), @@ -93,6 +97,3 @@ index ff25086..c76873d 100644 PLUGIN_PROVIDE(DH, MODP_CUSTOM), #endif #ifndef OPENSSL_NO_RSA --- -1.8.3 - diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb index 97ebcd8a57..f2fe1f1cbc 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "4afffe3c219bb2e04f09510905af836b" -SRC_URI[sha256sum] = "c5ea54b199174708de11af9b8f4ecf28b5b0743d4bc0e380e741f25b28c0f8d4" +SRC_URI[md5sum] = "46aa3aa18fbc4bd528f9a0345ce79913" +SRC_URI[sha256sum] = "e0a60a30ebf3c534c223559e1686497a21ded709a5d605c5123c2f52bcc22e92" EXTRA_OECONF = " \ --without-lib-prefix \ diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 196cec7f20..b71435a043 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,4 +1,4 @@ -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 +From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" <hongjun.yang@windriver.com> Date: Wed, 22 Oct 2014 10:02:48 +0800 Subject: [PATCH] Add ptest for tcpdump @@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> + --- Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -Index: tcpdump-4.9.0/Makefile.in -=================================================================== ---- tcpdump-4.9.0.orig/Makefile.in -+++ tcpdump-4.9.0/Makefile.in -@@ -436,9 +436,17 @@ distclean: +diff --git a/Makefile.in b/Makefile.in +index 0941f0e..3ce40c6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -437,9 +437,17 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac23b1..8cefadf284 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch @@ -1,4 +1,7 @@ -unnecessary to check libpcap +From 741d77e42fc4af49804f7ee43b7237e01633cbcd Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 8 Jul 2014 13:20:47 +0800 +Subject: [PATCH] unnecessary to check libpcap Upstream-Status: Pending @@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to check if libpcap existed. Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 06fade1..9125de7 100644 +index b2305a5..b3b5dbf 100644 --- a/configure.in +++ b/configure.in -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, - dnl AC_CHECK_LIB(z, uncompress) - dnl AC_CHECK_HEADERS(zlib.h) +@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber. + AC_SEARCH_LIBS(getrpcbynumber, nsl, + AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) # # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -1.7.9.5 - diff --git a/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch new file mode 100644 index 0000000000..2a9ea74cd0 --- /dev/null +++ b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch @@ -0,0 +1,31 @@ +From 1dd07113f2a7489444a8990a95be42e035f8e9df Mon Sep 17 00:00:00 2001 +From: Kurt Roeckx <kroeckx@debian.org> +Date: Tue, 1 Nov 2016 12:57:35 +0100 +Subject: [PATCH] Fix issue #599 +Forwarded: https://github.com/zaphoyd/websocketpp/pull/600 + +--- + websocketpp/transport/asio/security/tls.hpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index 7b32db8..a8aafec 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -355,13 +355,9 @@ protected: + template <typename ErrorCodeType> + lib::error_code translate_ec(ErrorCodeType ec) { + if (ec.category() == lib::asio::error::get_ssl_category()) { +- if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) { +- return make_error_code(transport::error::tls_short_read); +- } else { + // We know it is a TLS related error, but otherwise don't know + // more. Pass through as TLS generic. + return make_error_code(transport::error::tls_error); +- } + } else { + // We don't know any more information about this error so pass + // through +-- +2.7.4 + diff --git a/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch new file mode 100644 index 0000000000..530c960ce5 --- /dev/null +++ b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch @@ -0,0 +1,155 @@ +From 4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4 Mon Sep 17 00:00:00 2001 +From: Peter Thorson <git@zaphoyd.com> +Date: Sun, 11 Jun 2017 16:13:25 -0500 +Subject: [PATCH] minor adjustments to recent extension negotiation related + fixes, refactor a bit more extension negotiation code to be simpler + +--- + websocketpp/impl/connection_impl.hpp | 6 +-- + websocketpp/processors/hybi13.hpp | 92 ++++++++++++++++++------------------ + 2 files changed, 49 insertions(+), 49 deletions(-) + +Index: websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp +=================================================================== +--- websocketpp-0.7.0.orig/websocketpp/impl/connection_impl.hpp ++++ websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp +@@ -1222,17 +1222,17 @@ + std::pair<lib::error_code,std::string> neg_results; + neg_results = m_processor->negotiate_extensions(m_request); + +- if (neg_results.first == error::make_error_code(error::extension_parse_error)) { ++ if (neg_results.first == processor::error::make_error_code(processor::error::extension_parse_error)) { + // There was a fatal error in extension parsing that should result in + // a failed connection attempt. +- m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); ++ m_elog.write(log::elevel::info, "Bad request: " + neg_results.first.message()); + m_response.set_status(http::status_code::bad_request); + return neg_results.first; + } else if (neg_results.first) { + // There was a fatal error in extension processing that is probably our + // fault. Consider extension negotiation to have failed and continue as + // if extensions were not supported +- m_alog.write(log::alevel::info, ++ m_elog.write(log::elevel::info, + "Extension negotiation failed: " + neg_results.first.message()); + } else { + // extension negotiation succeeded, set response header accordingly +Index: websocketpp-0.7.0/websocketpp/processors/hybi13.hpp +=================================================================== +--- websocketpp-0.7.0.orig/websocketpp/processors/hybi13.hpp ++++ websocketpp-0.7.0/websocketpp/processors/hybi13.hpp +@@ -97,11 +97,6 @@ + /** + * This exists mostly because the code for requests and responses is + * identical and I can't have virtual template methods. +- * +- * NOTE: this method makes assumptions that the permessage-deflate +- * extension is the only one supported. If additional extensions are +- * ever supported it should be reviewed carefully. Most cases where +- * that assumption is made are explicitly noted. + */ + template <typename header_type> + err_str_pair negotiate_extensions_helper(header_type const & header) { +@@ -130,55 +125,60 @@ + + http::parameter_list::const_iterator it; + ++ // look through the list of extension requests to find the first ++ // one that we can accept. + if (m_permessage_deflate.is_implemented()) { + err_str_pair neg_ret; + for (it = p.begin(); it != p.end(); ++it) { +- // look through each extension, if the key is permessage-deflate +- if (it->first == "permessage-deflate") { +- // if we have already successfully negotiated this extension +- // then skip any other requests to negotiate the same one +- // with different parameters +- if (m_permessage_deflate.is_enabled()) { +- continue; +- } +- +- +- neg_ret = m_permessage_deflate.negotiate(it->second); +- +- if (neg_ret.first) { +- // Figure out if this is an error that should halt all +- // extension negotiations or simply cause negotiation of +- // this specific extension to fail. +- //std::cout << "permessage-compress negotiation failed: " +- // << neg_ret.first.message() << std::endl; +- } else { +- // Note: this list will need commas if WebSocket++ ever +- // supports more than one extension +- +- // Actually try to initialize the extension before we +- // deem negotiation complete +- ret.first = m_permessage_deflate.init(base::m_server); +- if (!ret.first) { +- +- // TODO: support multiple extensions. +- // right now, because there is only one extension +- // supported, it failing to negotiate means we are +- // done with all negotiating. In the future if more +- // extensions are supported a better solution will +- // be needed here. +- break; +- } else { +- ret.second += neg_ret.second; +- +- // continue looking for more extensions +- continue; +- } +- +- } ++ // not a permessage-deflate extension request, ignore ++ if (it->first != "permessage-deflate") { ++ continue; ++ } ++ ++ // if we have already successfully negotiated this extension ++ // then skip any other requests to negotiate the same one ++ // with different parameters ++ if (m_permessage_deflate.is_enabled()) { ++ continue; ++ } ++ ++ // attempt to negotiate this offer ++ neg_ret = m_permessage_deflate.negotiate(it->second); ++ ++ if (neg_ret.first) { ++ // negotiation offer failed. Do nothing. We will continue ++ // searching for a permessage-deflate config that succeeds ++ continue; ++ } ++ ++ // Negotiation tentatively succeeded ++ ++ // Actually try to initialize the extension before we ++ // deem negotiation complete ++ lib::error_code ec = m_permessage_deflate.init(base::m_server); ++ ++ if (ec) { ++ // Negotiation succeeded but initialization failed this is ++ // an error that should stop negotiation of permessage ++ // deflate. Return the reason for the init failure ++ ++ ret.first = ec; ++ break; ++ } else { ++ // Successfully initialized, push the negotiated response into ++ // the reply and stop looking for additional permessage-deflate ++ // extensions ++ ret.second += neg_ret.second; ++ break; + } + } + } + ++ // support for future extensions would go here. Should check the value of ++ // ret.first before continuing. Might need to consider whether failure of ++ // negotiation of an earlier extension should stop negotiation of subsequent ++ // ones ++ + return ret; + } + diff --git a/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch new file mode 100644 index 0000000000..94bfeb2fd4 --- /dev/null +++ b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch @@ -0,0 +1,600 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +From 9ddb300d874a30db35e3ad58f188944bef0bf31b Mon Sep 17 00:00:00 2001 +From: Peter Thorson <git@zaphoyd.com> +Date: Sun, 11 Jun 2017 15:24:43 -0500 +Subject: [PATCH] Update permessage-deflate support to reflect that zlib + doesn't support a 256 bit window. Improve extension negotiation error + checking and documentation. fixes #596 fixes #653 + +--- + changelog.md | 8 ++ + test/extension/permessage_deflate.cpp | 153 +++++++++++++++++---- + .../extensions/permessage_deflate/enabled.hpp | 94 ++++++++++--- + websocketpp/impl/connection_impl.hpp | 10 +- + websocketpp/processors/hybi13.hpp | 28 +++- + 5 files changed, 247 insertions(+), 46 deletions(-) + +diff --git a/changelog.md b/changelog.md +index bba753cb..de98edd2 100644 +#--- a/changelog.md +#+++ b/changelog.md +#@@ -17,6 +17,14 @@ HEAD +# - Compatibility: Update `telemetry_client` to use a slightly more cross platform +# method of sleeping. Should work on windows now. Thank you Meir Yanovich for +# reporting. +#+- Compatibility: Updated permessage-deflate support to reflect that the zlib +#+ library does not actually support a sliding window size of 256 bits. +#+ WebSocket++ will no longer negotiate 256 bit deflate windows. If the user +#+ of the library tries to request a 256 bit window a 512 bit window will be +#+ specified instead (This was the previous behavior). #596 #653 Thank you +#+ Vinnie Falco and Gianfranco Costamagna for reporting. +#+- Compatibility: Better error handling and logging in cases where extension +#+ requests parse correctly but negotiation fails. +# - Bug: Store loggers in shared pointers to avoid crashes related to connections +# trying to write logs entries after their respective endpoint has been +# deallocated. Thank you Thalhammer for reporting and Jupp Müller for the +diff --git a/test/extension/permessage_deflate.cpp b/test/extension/permessage_deflate.cpp +index 4cd3e7b6..805afcc3 100644 +--- a/test/extension/permessage_deflate.cpp ++++ b/test/extension/permessage_deflate.cpp +@@ -186,15 +186,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) { + + BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) { + ext_vars v; ++ ++ // confirm that a request for a value of 8 is interpreted as 9 + v.attr["server_max_window_bits"] = "8"; ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + ++ v.attr["server_max_window_bits"] = "9"; + v.esp = v.exts.negotiate(v.attr); + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + +- v.attr["server_max_window_bits"] = "15"; + ++ v.attr["server_max_window_bits"] = "15"; + v.esp = v.exts.negotiate(v.attr); + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +@@ -213,7 +220,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) { + + BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) { + ext_vars v; +- v.attr["server_max_window_bits"] = "8"; ++ v.attr["server_max_window_bits"] = "9"; + + v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline); + v.esp = v.exts.negotiate(v.attr); +@@ -223,7 +230,7 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) { + BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept_8 ) { + ext_vars v; + v.attr["server_max_window_bits"] = "8"; + +@@ -232,10 +239,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { ++ ext_vars v; ++ v.attr["server_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest_8 ) { + ext_vars v; + v.attr["server_max_window_bits"] = "8"; + +@@ -244,10 +263,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { ++ ext_vars v; ++ v.attr["server_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest_8 ) { + ext_vars v; + v.attr["server_max_window_bits"] = "8"; + +@@ -256,7 +287,19 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { ++ ext_vars v; ++ v.attr["server_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + } + + // Negotiate server_max_window_bits +@@ -292,7 +335,13 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) { + v.esp = v.exts.negotiate(v.attr); + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++ ++ v.attr["client_max_window_bits"] = "9"; ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + + v.attr["client_max_window_bits"] = "15"; + v.esp = v.exts.negotiate(v.attr); +@@ -311,7 +360,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) { + BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits)); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -323,7 +372,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { + BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(9,pmd_mode::decline); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -332,10 +393,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -344,10 +417,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -356,7 +441,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + } + + +@@ -507,7 +604,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) { + std::string compress_out; + std::string decompress_out; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -520,7 +618,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) { + BOOST_AUTO_TEST_CASE( compress_data_multiple ) { + ext_vars v; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + for (int i = 0; i < 2; i++) { + std::string compress_in = "Hello"; +@@ -545,11 +644,12 @@ BOOST_AUTO_TEST_CASE( compress_data_large ) { + + websocketpp::http::attribute_list alist; + +- alist["server_max_window_bits"] = "8"; +- v.exts.set_server_max_window_bits(8,websocketpp::extensions::permessage_deflate::mode::smallest); ++ alist["server_max_window_bits"] = "9"; ++ v.exts.set_server_max_window_bits(9,websocketpp::extensions::permessage_deflate::mode::smallest); + + v.exts.negotiate(alist); +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -573,7 +673,8 @@ BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) { + v.exts.enable_server_no_context_takeover(); + + v.exts.negotiate(alist); +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out1); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -609,7 +710,8 @@ BOOST_AUTO_TEST_CASE( compress_empty ) { + std::string compress_out; + std::string decompress_out; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -640,7 +742,8 @@ BOOST_AUTO_TEST_CASE( decompress_data ) { + std::string out; + std::string reference = "Hello"; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.decompress(in,11,out); + +diff --git a/websocketpp/extensions/permessage_deflate/enabled.hpp b/websocketpp/extensions/permessage_deflate/enabled.hpp +index 1581f14c..f20a1b1d 100644 +--- a/websocketpp/extensions/permessage_deflate/enabled.hpp ++++ b/websocketpp/extensions/permessage_deflate/enabled.hpp +@@ -46,7 +46,7 @@ + namespace websocketpp { + namespace extensions { + +-/// Implementation of the draft permessage-deflate WebSocket extension ++/// Implementation of RFC 7692, the permessage-deflate WebSocket extension + /** + * ### permessage-deflate interface + * +@@ -174,18 +174,30 @@ namespace websocketpp { + namespace extensions { + namespace permessage_deflate { + +-/// Default value for server_max_window_bits as defined by draft 17 ++/// Default value for server_max_window_bits as defined by RFC 7692 + static uint8_t const default_server_max_window_bits = 15; +-/// Minimum value for server_max_window_bits as defined by draft 17 ++/// Minimum value for server_max_window_bits as defined by RFC 7692 ++/** ++ * NOTE: A value of 8 is not actually supported by zlib, the deflate ++ * library that WebSocket++ uses. To preserve backwards compatibility ++ * with RFC 7692 and previous versions of the library a value of 8 ++ * is accepted by the library but will always be negotiated as 9. ++ */ + static uint8_t const min_server_max_window_bits = 8; +-/// Maximum value for server_max_window_bits as defined by draft 17 ++/// Maximum value for server_max_window_bits as defined by RFC 7692 + static uint8_t const max_server_max_window_bits = 15; + +-/// Default value for client_max_window_bits as defined by draft 17 ++/// Default value for client_max_window_bits as defined by RFC 7692 + static uint8_t const default_client_max_window_bits = 15; +-/// Minimum value for client_max_window_bits as defined by draft 17 ++/// Minimum value for client_max_window_bits as defined by RFC 7692 ++/** ++ * NOTE: A value of 8 is not actually supported by zlib, the deflate ++ * library that WebSocket++ uses. To preserve backwards compatibility ++ * with RFC 7692 and previous versions of the library a value of 8 ++ * is accepted by the library but will always be negotiated as 9. ++ */ + static uint8_t const min_client_max_window_bits = 8; +-/// Maximum value for client_max_window_bits as defined by draft 17 ++/// Maximum value for client_max_window_bits as defined by RFC 7692 + static uint8_t const max_client_max_window_bits = 15; + + namespace mode { +@@ -372,7 +384,7 @@ class enabled { + /** + * The bits setting is the base 2 logarithm of the maximum window size that + * the server must use to compress outgoing messages. The permitted range +- * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB ++ * is 9 to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB + * window. The default setting is 15. + * + * Mode Options: +@@ -386,6 +398,14 @@ class enabled { + * adjusted by the server. A server may unilaterally set this value without + * client support. + * ++ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed. ++ * Prior to version 0.8.0 a value of 8 was also allowed by this library. ++ * zlib, the deflate compression library that WebSocket++ uses has always ++ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 ++ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0 ++ * continues to perform the 8->9 conversion for backwards compatibility ++ * purposes but this should be considered deprecated functionality. ++ * + * @param bits The size to request for the outgoing window size + * @param mode The mode to use for negotiating this parameter + * @return A status code +@@ -394,6 +414,12 @@ class enabled { + if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) { + return error::make_error_code(error::invalid_max_window_bits); + } ++ ++ // See note in doc comment above about what is happening here ++ if (bits == 8) { ++ bits = 9; ++ } ++ + m_server_max_window_bits = bits; + m_server_max_window_bits_mode = mode; + +@@ -403,8 +429,8 @@ class enabled { + /// Limit client LZ77 sliding window size + /** + * The bits setting is the base 2 logarithm of the window size that the +- * client must use to compress outgoing messages. The permitted range is 8 +- * to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB window. ++ * client must use to compress outgoing messages. The permitted range is 9 ++ * to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB window. + * The default setting is 15. + * + * Mode Options: +@@ -417,6 +443,14 @@ class enabled { + * outgoing window size unilaterally. A server may only limit the client's + * window size if the remote client supports that feature. + * ++ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed. ++ * Prior to version 0.8.0 a value of 8 was also allowed by this library. ++ * zlib, the deflate compression library that WebSocket++ uses has always ++ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 ++ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0 ++ * continues to perform the 8->9 conversion for backwards compatibility ++ * purposes but this should be considered deprecated functionality. ++ * + * @param bits The size to request for the outgoing window size + * @param mode The mode to use for negotiating this parameter + * @return A status code +@@ -425,6 +459,12 @@ class enabled { + if (bits < min_client_max_window_bits || bits > max_client_max_window_bits) { + return error::make_error_code(error::invalid_max_window_bits); + } ++ ++ // See note in doc comment above about what is happening here ++ if (bits == 8) { ++ bits = 9; ++ } ++ + m_client_max_window_bits = bits; + m_client_max_window_bits_mode = mode; + +@@ -642,11 +682,17 @@ class enabled { + * client requested that we use. + * + * options: +- * - decline (refuse to use the attribute) +- * - accept (use whatever the client says) +- * - largest (use largest possible value) ++ * - decline (ignore value, offer our default instead) ++ * - accept (use the value requested by the client) ++ * - largest (use largest value acceptable to both) + * - smallest (use smallest possible value) + * ++ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might ++ * be requested for negotiation by an older client/server, if the result of ++ * the negotiation would be to send a value of 8, a value of 9 is offered ++ * instead. This ensures that WebSocket++ will only ever negotiate connections ++ * with compression settings explicitly supported by zlib. ++ * + * @param [in] value The value of the attribute from the offer + * @param [out] ec A reference to the error code to return errors via + */ +@@ -678,6 +724,11 @@ class enabled { + ec = make_error_code(error::invalid_mode); + m_server_max_window_bits = default_server_max_window_bits; + } ++ ++ // See note in doc comment ++ if (m_server_max_window_bits == 8) { ++ m_server_max_window_bits = 9; ++ } + } + + /// Negotiate client_max_window_bits attribute +@@ -687,11 +738,17 @@ class enabled { + * negotiation mode. + * + * options: +- * - decline (refuse to use the attribute) +- * - accept (use whatever the client says) +- * - largest (use largest possible value) ++ * - decline (ignore value, offer our default instead) ++ * - accept (use the value requested by the client) ++ * - largest (use largest value acceptable to both) + * - smallest (use smallest possible value) + * ++ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might ++ * be requested for negotiation by an older client/server, if the result of ++ * the negotiation would be to send a value of 8, a value of 9 is offered ++ * instead. This ensures that WebSocket++ will only ever negotiate connections ++ * with compression settings explicitly supported by zlib. ++ * + * @param [in] value The value of the attribute from the offer + * @param [out] ec A reference to the error code to return errors via + */ +@@ -727,6 +784,11 @@ class enabled { + ec = make_error_code(error::invalid_mode); + m_client_max_window_bits = default_client_max_window_bits; + } ++ ++ // See note in doc comment ++ if (m_client_max_window_bits == 8) { ++ m_client_max_window_bits = 9; ++ } + } + + bool m_enabled; +diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp +index 105911db..ae55c338 100644 +--- a/websocketpp/impl/connection_impl.hpp ++++ b/websocketpp/impl/connection_impl.hpp +@@ -1222,12 +1222,18 @@ lib::error_code connection<config>::process_handshake_request() { + std::pair<lib::error_code,std::string> neg_results; + neg_results = m_processor->negotiate_extensions(m_request); + +- if (neg_results.first) { ++ if (neg_results.first == error::make_error_code(error::extension_parse_error)) { + // There was a fatal error in extension parsing that should result in + // a failed connection attempt. +- m_alog.write(log::alevel::devel, "Bad request: " + neg_results.first.message()); ++ m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); + m_response.set_status(http::status_code::bad_request); + return neg_results.first; ++ } else if (neg_results.first) { ++ // There was a fatal error in extension processing that is probably our ++ // fault. Consider extension negotiation to have failed and continue as ++ // if extensions were not supported ++ m_alog.write(log::alevel::info, ++ "Extension negotiation failed: " + neg_results.first.message()); + } else { + // extension negotiation succeeded, set response header accordingly + // we don't send an empty extensions header because it breaks many +diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp +index 79486654..a95bc649 100644 +--- a/websocketpp/processors/hybi13.hpp ++++ b/websocketpp/processors/hybi13.hpp +@@ -97,6 +97,11 @@ class hybi13 : public processor<config> { + /** + * This exists mostly because the code for requests and responses is + * identical and I can't have virtual template methods. ++ * ++ * NOTE: this method makes assumptions that the permessage-deflate ++ * extension is the only one supported. If additional extensions are ++ * ever supported it should be reviewed carefully. Most cases where ++ * that assumption is made are explicitly noted. + */ + template <typename header_type> + err_str_pair negotiate_extensions_helper(header_type const & header) { +@@ -149,9 +154,26 @@ class hybi13 : public processor<config> { + } else { + // Note: this list will need commas if WebSocket++ ever + // supports more than one extension +- ret.second += neg_ret.second; +- m_permessage_deflate.init(base::m_server); +- continue; ++ ++ // Actually try to initialize the extension before we ++ // deem negotiation complete ++ ret.first = m_permessage_deflate.init(base::m_server); ++ if (!ret.first) { ++ ++ // TODO: support multiple extensions. ++ // right now, because there is only one extension ++ // supported, it failing to negotiate means we are ++ // done with all negotiating. In the future if more ++ // extensions are supported a better solution will ++ // be needed here. ++ break; ++ } else { ++ ret.second += neg_ret.second; ++ ++ // continue looking for more extensions ++ continue; ++ } ++ + } + } + } diff --git a/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch new file mode 100644 index 0000000000..342981d4db --- /dev/null +++ b/meta-networking/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch @@ -0,0 +1,51 @@ +Description: Disable failing test_transport_asio_timers. +Because of "address already in use" error +/«PKGBUILDDIR»/test/transport/asio/timers.cpp(129): error in "tls_handshake_timeout": check ec == make_error_code(tls_handshake_timeout) failed [websocketpp.transport.asio.socket:8 != websocketpp.transport.asio.socket:5] +Author: Gianfranco Costamagna <locutusofborg@debian.org> + +--- websocketpp-0.7.0.orig/test/transport/CMakeLists.txt ++++ websocketpp-0.7.0/test/transport/CMakeLists.txt +@@ -1,24 +1,24 @@ + if (OPENSSL_FOUND) + +-# Test transport integration +-file (GLOB SOURCE integration.cpp) +- +-init_target (test_transport) +-build_test (${TARGET_NAME} ${SOURCE}) +-link_boost () +-link_openssl() +-final_target () +-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") +- +-# Test transport asio timers +-file (GLOB SOURCE asio/timers.cpp) +- +-init_target (test_transport_asio_timers) +-build_test (${TARGET_NAME} ${SOURCE}) +-link_boost () +-link_openssl() +-final_target () +-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") ++## Test transport integration ++#file (GLOB SOURCE integration.cpp) ++# ++#init_target (test_transport) ++#build_test (${TARGET_NAME} ${SOURCE}) ++#link_boost () ++#link_openssl() ++#final_target () ++#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") ++# ++## Test transport asio timers ++#file (GLOB SOURCE asio/timers.cpp) ++# ++#init_target (test_transport_asio_timers) ++#build_test (${TARGET_NAME} ${SOURCE}) ++#link_boost () ++#link_openssl() ++#final_target () ++#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") + + # Test transport asio security + file (GLOB SOURCE asio/security.cpp) diff --git a/meta-networking/recipes-support/websocketpp/websocketpp_0.7.0.bb b/meta-networking/recipes-support/websocketpp/websocketpp_0.7.0.bb new file mode 100644 index 0000000000..65fc974b6c --- /dev/null +++ b/meta-networking/recipes-support/websocketpp/websocketpp_0.7.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "C++/Boost Asio based websocket client/server library." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/zaphoyd/websocketpp" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" +DEPENDS = "openssl boost zlib" + +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master" + +# tag 0.7.0 +SRCREV= "378437aecdcb1dfe62096ffd5d944bf1f640ccc3" + +SRC_URI += "file://0001-Fix-issue-599.patch \ + file://9ddb300d874a30db35e3ad58f188944bef0bf31b.patch \ + file://4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch \ + file://disable-tests.patch \ + " + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-networking/recipes-support/wireshark/files/libgcrypt.patch b/meta-networking/recipes-support/wireshark/files/libgcrypt.patch new file mode 100644 index 0000000000..2aa58f73c2 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/libgcrypt.patch @@ -0,0 +1,53 @@ +use OR PKG_CONFIG scheme for libgcrypt + +Upstream-Status: Inappropriate OE specific + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: wireshark-2.4.4/m4/libgcrypt.m4 +=================================================================== +--- wireshark-2.4.4.orig/m4/libgcrypt.m4 ++++ wireshark-2.4.4/m4/libgcrypt.m4 +@@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then +- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc + fi + fi + +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no) + tmp=ifelse([$1], ,1:1.2.0,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +@@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + req_micro=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt` + major=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + minor=`echo $libgcrypt_config_version | \ +@@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + # If we have a recent libgcrypt, we should also check that the + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBGCRYPT API version]) + if test "$req_libgcrypt_api" -eq "$tmp" ; then +@@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + fi + fi + if test $ok = yes; then +- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` +- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt` ++ LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt` + ifelse([$2], , :, [$2]) + else + LIBGCRYPT_CFLAGS="" diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb b/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb index 5eb372e37e..3da0a7bafc 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb @@ -4,25 +4,27 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native" +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error" -SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" +SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz" +SRC_URI += "file://libgcrypt.patch" -PE = "1" +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[md5sum] = "8cfb73e286dd6427ca4405e6e802d13e" +SRC_URI[sha256sum] = "8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe" -SRC_URI[md5sum] = "a79ba6cda83be2a91bde4110fe194788" -SRC_URI[sha256sum] = "a9f11621e85d7e1d72259157edd94825e72af3fd72e184b8474459f92ad5fc40" +PE = "1" -inherit autotools pkgconfig perlnative +inherit autotools pkgconfig perlnative upstream-version-is-even ARM_INSTRUCTION_SET = "arm" PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" -PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" +PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}/usr, --with-libcap=no --enable-pcap-ng-default , libcap" +PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_DIR_HOST}/usr --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" @@ -30,7 +32,6 @@ PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" -PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" @@ -38,14 +39,15 @@ PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc" - -PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_LIBDIR}, --with-libssh=no, libssh2" - +PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_DIR_HOST}/usr, --with-libssh=no, libssh2" +PACKAGECONFIG[lz4] = "--with-lz4=${STAGING_DIR_HOST}/usr, --with-lz4=no, lz4" # these next two options require addional layers PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" -EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" +EXTRA_OECONF += "--with-libgcrypt-prefix=${PKG_CONFIG_DIR} --with-qt=no --enable-tshark --enable-rawshark" + +LDFLAGS_append = " -lgpg-error" # Currently wireshark does not install header files do_install_append () { diff --git a/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb b/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb new file mode 100644 index 0000000000..b6d2f69235 --- /dev/null +++ b/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Userspace tools for Linux IEEE 802.15.4 stack" +HOMEPAGE = "http://wpan.cakelab.org/releases/" +DESCRIPTION = "This is a set of utils to manage the Linux WPAN stack via \ +netlink interface. This requires recent kernel with nl802154 interface." + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cfd939b1d7e6aba9fcefb7f6e2fd45d" + +DEPENDS = "libnl" + +PV = "0.8+git${SRCPV}" +SRC_URI = "git://github.com/linux-wpan/wpan-tools \ + " +SRCREV = "3f473f5136f89773997cb4fff2d8ed647734e2f5" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-oe/README b/meta-oe/README index 6ad87c52b3..7cde0a2daa 100644 --- a/meta-oe/README +++ b/meta-oe/README @@ -11,5 +11,4 @@ When sending single patches, please use something like: You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Main layer maintainer: Koen Kooi <koen@dominion.thruhere.net> - Martin Jansa <martin.jansa@gmail.com> +Main layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass index 380374ab27..07f44c34b4 100644 --- a/meta-oe/classes/gitver.bbclass +++ b/meta-oe/classes/gitver.bbclass @@ -36,7 +36,7 @@ def get_git_pv(d, tagadjust=None): return "0.0" except Exception as exc: - raise bb.parse.SkipPackage(str(exc)) + raise bb.parse.SkipRecipe(str(exc)) if ver and tagadjust: ver = tagadjust(ver) diff --git a/meta-oe/classes/scancode.bbclass b/meta-oe/classes/scancode.bbclass new file mode 100644 index 0000000000..701660f578 --- /dev/null +++ b/meta-oe/classes/scancode.bbclass @@ -0,0 +1,35 @@ +# We use scancode utlity for extacting licence information. +# scancode itself is an OSS Utlitity. +# For more informaiton https://github.com/nexB/scancode-toolkit + +SCANCODE_FORMAT ?= "html-app" +EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else 'json'}" +SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}" +SCANCODE_TAG = "v2.2.1" +SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" +SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" + +def get_scancode_toolkit(d): + lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock") + if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))): + os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION', True), d.getVar('SCANCODE_SRC_LOCATION', True), d.getVar('SCANCODE_TAG', True))) + bb.utils.unlockfile(lf) + return (d.getVar('SCANCODE_SRC_LOCATION', True)) + +do_scancode() { + mkdir -p ${DEPLOY_DIR_IMAGE}/scancode + cd ${SCANCODE_TOOLKIT} + if [ -d "${S}" ]; then + ./scancode ${S} --format ${SCANCODE_FORMAT} ${DEPLOY_DIR_IMAGE}/scancode/${PN}.${EXT} + fi +} + +addtask scancode after do_patch + +do_scancode_oss() { + echo "We are done running scancode" +} + +do_scancode_oss[recrdeptask] = "do_scancode_oss do_scancode" +do_scancode_oss[nostamp] = "1" +addtask do_scancode_oss after do_scancode diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index d84bd09d31..1a43575304 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -29,6 +29,8 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" +LAYERSERIES_COMPAT_openembedded-layer = "sumo" + LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ diff --git a/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch index fde82381d5..7de05ee583 100644 --- a/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch +++ b/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch @@ -1,13 +1,21 @@ -Index: git/wscript -=================================================================== ---- git.orig/wscript 2016-07-29 13:15:44.954249796 -0500 -+++ git/wscript 2016-07-29 15:52:06.196768865 -0500 -@@ -90,7 +90,7 @@ - ctx.check_cxx(lib = lib, uselib_store = uselib) +From 9fb298c398f88a63d71432be1410d52fae089063 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Mon, 8 Aug 2016 11:39:54 -0500 + +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index ca843f4..eb4a26a 100644 +--- a/wscript ++++ b/wscript +@@ -84,7 +84,7 @@ def configure(ctx): + ctx.check_cc(lib = lib, uselib_store = uselib) # Check required functions - req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])] + req_funcs = [('memset', 'string.h', [])] for func, header, uselib in req_funcs: - ctx.check_cxx(function_name = func, header_name = header, + ctx.check_cc(function_name = func, header_name = header, uselib = uselib, mandatory = True) diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb new file mode 100644 index 0000000000..1322d07883 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics" +HOMEPAGE = "https://sourceforge.net/projects/iperf2/" +SECTION = "console/network" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff" + +SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf2/iperf-${PV}.tar.gz" + +SRC_URI[md5sum] = "097cf0754bc1afa165975c06a91e6906" +SRC_URI[sha256sum] = "7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2" + +S = "${WORKDIR}/iperf-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch deleted file mode 100644 index ae36208000..0000000000 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch +++ /dev/null @@ -1,39 +0,0 @@ -From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 12:59:42 -0700 -Subject: [PATCH 1/2] include stdint.h for various std c99 int types - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/cjson.h | 2 ++ - src/timer.h | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/cjson.h b/src/cjson.h -index fb8cd3b..69cd272 100644 ---- a/src/cjson.h -+++ b/src/cjson.h -@@ -23,6 +23,8 @@ - #ifndef cJSON__h - #define cJSON__h - -+#include <stdint.h> -+ - #ifdef __cplusplus - extern "C" - { -diff --git a/src/timer.h b/src/timer.h -index 0f9c5eb..0b195be 100644 ---- a/src/timer.h -+++ b/src/timer.h -@@ -31,6 +31,7 @@ - #define __TIMER_H - - #include <sys/time.h> -+#include <stdint.h> - - /* TimerClientData is an opaque value that tags along with a timer. The - ** client can use it for whatever, and it gets passed to the callback when --- -2.13.3 - diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb index 4d1b0c4370..2ed08110f4 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb @@ -15,7 +15,6 @@ DEPENDS = "openssl" SRC_URI = "git://github.com/esnet/iperf.git \ file://automake-foreign.patch \ - file://0001-include-stdint.h-for-various-std-c99-int-types.patch \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch index 20791bf239..d7169495fa 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch @@ -1,12 +1,13 @@ -From 31d58ed7e6552781f415501e96d7cc74f83b910d Mon Sep 17 00:00:00 2001 +From ac1657e11cbb0545bdf4d1124def8c013958ed7e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 18:08:51 -0700 -Subject: [PATCH 1/2] Check for musl define guard before redefining socklen_t +Subject: [PATCH] Check for musl define guard before redefining socklen_t musl uses __DEFINED_socklen_t so check for that as well along with HAVE_socklen_t Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/bench.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -24,6 +25,3 @@ index 597d068..2ebdf5a 100644 typedef int socklen_t; #endif --- -2.13.2 - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch index 18ed43d065..943b3ec889 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch @@ -1,9 +1,10 @@ -From 6faa6acdf20aa6f738eed1483b7dceed94286adb Mon Sep 17 00:00:00 2001 +From 7c05fa5353ad91acae6e5e8a01f65d54935ef778 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 27 Jun 2017 14:39:10 -0700 Subject: [PATCH] lat_http.c: Add printf format Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/lat_http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,6 +22,3 @@ index c630d59..28d04f7 100644 } write(sock, buf, strlen(buf)); while ((n = read(sock, buf, XFERSIZE)) > 0) { --- -2.13.2 - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch index d5c8f5f2f0..353d80b3b7 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch @@ -1,13 +1,13 @@ -From 76f3a9abc2ff96155425ef97d8c5520cfbc8fe6a Mon Sep 17 00:00:00 2001 +From b27c253bfb78fa3c5f416e6caee101098a4b58cc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 18:09:46 -0700 -Subject: [PATCH 2/2] build: Adjust CFLAGS/LDFLAGS to append values passed from - env +Subject: [PATCH] build: Adjust CFLAGS/LDFLAGS to append values passed from env For musl we have to pass additional arguments via cflags and ldflags to link in librirpc, make room for those changes to take effect Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- scripts/build | 2 +- src/Makefile | 14 +++++++------- @@ -71,6 +71,3 @@ index d9efd54..96467d7 100644 tag: --- -2.13.2 - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch index 549a114d13..cbab5c424e 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch @@ -1,4 +1,7 @@ -lmbench: Can't proceed on some targets +From 65180976c9963432d166b47a0b692260a69c0d47 Mon Sep 17 00:00:00 2001 +From: Qingming Su <qingming.su@windriver.com> +Date: Tue, 19 Aug 2014 05:16:17 -0400 +Subject: [PATCH] lmbench: Can't proceed on some targets lmbench can't proceed on some targets. The memory check fails because the memory latency of each page is longer then 10us, which is a time limit set @@ -25,13 +28,19 @@ Upstream-status: inappropriate [ configuration ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> +--- + scripts/config-run | 12 +++++++--- + src/Makefile | 4 ++-- + src/memsize.c | 66 +++++++++++++++++++++++++++++++++++------------------- + 3 files changed, 54 insertions(+), 28 deletions(-) + diff --git a/scripts/config-run b/scripts/config-run -index e1f7b6d..31b9256 100755 +index 918cbdf..096ed12 100755 --- a/scripts/config-run +++ b/scripts/config-run -@@ -214,6 +214,12 @@ The bigger the range, the more accurate the results, but larger sizes +@@ -197,6 +197,12 @@ The bigger the range, the more accurate the results, but larger sizes take somewhat longer to run the benchmark. - + EOF + +# By default, use 512M memory as the upper limit for lmbench test @@ -40,12 +49,12 @@ index e1f7b6d..31b9256 100755 +fi + echo $ECHON "MB [default $MB]: $ECHOC" - #read TMP - TMP="" -@@ -718,10 +724,10 @@ case $MAIL in - ;; + read TMP + if [ X$TMP != X ] +@@ -687,10 +693,10 @@ case $MAIL in + ;; esac - + -INFO=`../scripts/info` +INFO=`../scripts/hostinfo` if [ $MAIL = yes ] @@ -54,8 +63,8 @@ index e1f7b6d..31b9256 100755 + then cp ../scripts/hostinfo-template $INFO chmod +w $INFO REUSE=no - else -@@ -765,7 +771,7 @@ EOF + else +@@ -733,7 +739,7 @@ EOF then EDITOR=$TMP fi if [ X$EDITOR != "none" ] @@ -65,10 +74,10 @@ index e1f7b6d..31b9256 100755 fi fi diff --git a/src/Makefile b/src/Makefile -index d1f0dc6..5098998 100644 +index c7e4e3c..d9efd54 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -49,7 +49,7 @@ TARGET=`../scripts/target` +@@ -50,7 +50,7 @@ TARGET=`../scripts/target` BINDIR=../bin/$(OS) CONFIG=../bin/$(OS)/`../scripts/config` UTILS=../scripts/target ../scripts/os ../scripts/gnu-os ../scripts/compiler \ @@ -79,21 +88,21 @@ index d1f0dc6..5098998 100644 INSTALL=cp @@ -240,7 +240,7 @@ $O/getopt.o : getopt.c $(INCS) $(COMPILE) -c getopt.c -o $O/getopt.o - + $(UTILS) : - -cd ../scripts; make get + -cd ../scripts; cp info hostinfo; cp info-template hostinfo-template - + # Do not remove the next line, $(MAKE) depend needs it # MAKEDEPEND follows diff --git a/src/memsize.c b/src/memsize.c -index eb25a09..cf9fe0c 100644 +index eb25a09..82d7faf 100644 --- a/src/memsize.c +++ b/src/memsize.c @@ -14,9 +14,12 @@ char *id = "$Id$\n"; - + #define CHK(x) if ((x) == -1) { perror("x"); exit(1); } - + -#ifndef TOO_LONG -#define TOO_LONG 10 /* usecs */ -#endif @@ -103,12 +112,12 @@ index eb25a09..cf9fe0c 100644 + +#define MEMORY_SIZE_1MB (1024 * 1024) +#define MEMORY_SIZE_8MB (8 * 1024 * 1024) - + int alarm_triggered = 0; - + @@ -35,10 +38,10 @@ main(int ac, char **av) size_t delta; - + if (ac == 2) { - max = size = bytes(av[1]) * 1024 * 1024; + max = size = bytes(av[1]) * MEMORY_SIZE_1MB; @@ -170,7 +179,7 @@ index eb25a09..cf9fe0c 100644 + time_each_page = 1; + //Set the uper limit of time spending on one page + too_long = 10 * time_each_page; - + - range = 1024 * 1024; - incr = 1024 * 1024; - touchRange(where, range, pagesize); diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch index cda2f0c6d1..30708c81db 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch @@ -1,4 +1,7 @@ -lmbench: Fix "make html" graph failure +From b21ca9f3911628fb66f308c6916485bbbcfb29a4 Mon Sep 17 00:00:00 2001 +From: Lin Yu <lin.yu@windriver.com> +Date: Tue, 19 Aug 2014 05:16:16 -0400 +Subject: [PATCH] lmbench: Fix "make html" graph failure The html-list perl script cannot parse the first line of the result files about the lmbench version. @@ -14,6 +17,11 @@ Upstream-status: inappropriate [ configuration ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> +--- + results/Makefile | 1 + + scripts/html-list | 7 ++----- + 2 files changed, 3 insertions(+), 5 deletions(-) + diff --git a/results/Makefile b/results/Makefile index 0935376..1ef9a15 100644 --- a/results/Makefile @@ -38,7 +46,7 @@ index 9850461..6383115 100755 +<h2><a href=summary.out>Summary of results</a></h2> <hr> EOF - + @@ -47,7 +47,7 @@ foreach $os (@os) { open(F, $file); $_ = <F>; diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch index 41a3b3205b..fa5e6dbda3 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch @@ -1,16 +1,22 @@ +From 182a5d3dba3f440bbf35551da6d21ab1c990eb58 Mon Sep 17 00:00:00 2001 +From: Noor Ahsan <noor_ahsan@mentor.com> +Date: Mon, 29 Aug 2011 16:17:51 +0000 +Subject: [PATCH] lmbench: Add version 3.0-a9 (initial recipe) + In some cases the host may have too old of a ranlib to work. Since it's not exactly a great idea to not be using the cross ranlib anyhow, fix the Makefile so we can override ranlib and then override it Upstream-Status: Inappropriate [build system specific change] + --- - src/Makefile | 3 ++- + src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: lmbench-3.0-a9/src/Makefile -=================================================================== ---- lmbench-3.0-a9.orig/src/Makefile -+++ lmbench-3.0-a9/src/Makefile +diff --git a/src/Makefile b/src/Makefile +index 4962815..c7a8c79 100644 +--- a/src/Makefile ++++ b/src/Makefile @@ -38,6 +38,7 @@ CC=`../scripts/compiler` MAKE=`../scripts/make` AR=ar @@ -19,7 +25,7 @@ Index: lmbench-3.0-a9/src/Makefile # base of installation location BASE=/usr/local -@@ -217,7 +218,7 @@ $O/lmbench : ../scripts/lmbench version. +@@ -217,7 +218,7 @@ $O/lmbench : ../scripts/lmbench version.h $O/lmbench.a: $(LIBOBJS) /bin/rm -f $O/lmbench.a $(AR) $(ARCREATE) $O/lmbench.a $(LIBOBJS) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch index b46e09ad15..44bc7bbcde 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch @@ -1,8 +1,18 @@ +From aca1a59d888421c1fc553229b8049be47e8b3ddf Mon Sep 17 00:00:00 2001 +From: Chunrong Guo <b40290@freescale.com> +Date: Fri, 1 Mar 2013 09:50:42 +0000 +Subject: [PATCH] lmbench: update config script + Upstream-Status: Pending -Index: lmbench-3.0-a9/scripts/config -=================================================================== ---- lmbench-3.0-a9/scripts/config 2000-01-31 18:29:31.000000000 -0600 -+++ lmbench-3.0-a9/scripts/config 2013-03-01 00:19:41.032984315 -0600 + +--- + scripts/config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/config b/scripts/config +index b58cb60..25d9d77 100755 +--- a/scripts/config ++++ b/scripts/config @@ -3,5 +3,5 @@ UNAME=`uname -n 2>/dev/null` if [ X$UNAME = X ] diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch index 894f146d42..31c4aecbbe 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch @@ -1,45 +1,24 @@ +From 4955021bc283be404df62b97b86af3943efd29de Mon Sep 17 00:00:00 2001 +From: Noor Ahsan <noor_ahsan@mentor.com> +Date: Mon, 29 Aug 2011 16:17:51 +0000 +Subject: [PATCH] lmbench: Add version 3.0-a9 (initial recipe) + Now that we have our binaries in /usr/bin rather than the normal lmbench hierarchy we need to update the scripts as well to behave well here. Upstream-Status: Inappropriate [This is related to the OE-specific behavior -of installing into /usr/bin, etc, rather than dumping everything into +of installing into /usr/bin, etc, rather than dumping everything into /usr/share/lmbench or similar] -Index: lmbench-3.0-a9/scripts/results -=================================================================== ---- lmbench-3.0-a9.orig/scripts/results -+++ lmbench-3.0-a9/scripts/results -@@ -8,11 +8,11 @@ RESULTS=results/$OS - BASE=../$RESULTS/`uname -n` - EXT=0 - --if [ ! -f "../bin/$OS/$CONFIG" ] -+if [ ! -f "$CONFIG" ] - then echo "No config file?" - exit 1 - fi --. ../bin/$OS/$CONFIG -+. $CONFIG - - if [ ! -d ../$RESULTS ] - then mkdir -p ../$RESULTS -@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` - RESULTS=$BASE.$EXT - done - --cd ../bin/$OS --PATH=.:${PATH}; export PATH - export SYNC_MAX - export OUTPUT --lmbench $CONFIG 2>../${RESULTS} -+lmbench $CONFIG 2>${RESULTS} - - if [ X$MAIL = Xyes ] - then echo Mailing results -Index: lmbench-3.0-a9/scripts/config-run -=================================================================== ---- lmbench-3.0-a9.orig/scripts/config-run -+++ lmbench-3.0-a9/scripts/config-run +--- + scripts/config-run | 40 ++++++++++++++++++++-------------------- + scripts/results | 8 +++----- + 2 files changed, 23 insertions(+), 25 deletions(-) + +diff --git a/scripts/config-run b/scripts/config-run +index a2d5ba4..918cbdf 100755 +--- a/scripts/config-run ++++ b/scripts/config-run @@ -132,20 +132,20 @@ export LMBENCH_SCHED ############################################################################ echo $L; echo ""; @@ -89,7 +68,7 @@ Index: lmbench-3.0-a9/scripts/config-run if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] then MB=`expr $TOTAL_MEM / $SYNC_MAX` -@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB available memory. fi echo "Hang on, we are calculating your cache line size." @@ -158,3 +137,34 @@ Index: lmbench-3.0-a9/scripts/config-run echo DISKS=\"$DISKS\" > $C echo DISK_DESC=\"$DISK_DESC\" >> $C echo OUTPUT=$OUTPUT >> $C +diff --git a/scripts/results b/scripts/results +index cd07c15..d5aa558 100755 +--- a/scripts/results ++++ b/scripts/results +@@ -8,11 +8,11 @@ RESULTS=results/$OS + BASE=../$RESULTS/`uname -n` + EXT=0 + +-if [ ! -f "../bin/$OS/$CONFIG" ] ++if [ ! -f "$CONFIG" ] + then echo "No config file?" + exit 1 + fi +-. ../bin/$OS/$CONFIG ++. $CONFIG + + if [ ! -d ../$RESULTS ] + then mkdir -p ../$RESULTS +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` + RESULTS=$BASE.$EXT + done + +-cd ../bin/$OS +-PATH=.:${PATH}; export PATH + export SYNC_MAX + export OUTPUT +-lmbench $CONFIG 2>../${RESULTS} ++lmbench $CONFIG 2>${RESULTS} + + if [ X$MAIL = Xyes ] + then echo Mailing results diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch index 3351ce8875..c6e9465ac3 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch @@ -1,14 +1,15 @@ -From 0d09e31970616e09beb7f238c2b59bfc541148fb Mon Sep 17 00:00:00 2001 +From 73fdc58ca4eb9e2f24d854b3af3a4e5daac5a33e Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Fri, 22 Nov 2013 15:20:08 +0800 Subject: [PATCH] use base_libdir instead of hardcoded /lib -Upsteam Status: Inappropriate [configuration] +Upstream Status: Inappropriate [configuration] Signed-off-by: Ting Liu <b28495@freescale.com> + --- - src/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index c7a8c79..c7e4e3c 100644 @@ -27,6 +28,3 @@ index c7a8c79..c7e4e3c 100644 cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install --- -1.7.5.4 - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch index 2d8a2468a9..b964bef1f0 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch @@ -1,4 +1,7 @@ -[PATCH] avoid gcc optimize-away the loops +From 25738bb9c75f94b451201acfd6bcab13bdeee512 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Thu, 5 May 2016 09:52:01 +0800 +Subject: [PATCH] [PATCH] avoid gcc optimize-away the loops Upstream-Status: pending @@ -15,6 +18,7 @@ and TEN is macro: #define TEN(a) a a a a a a a a a a Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- src/lat_ops.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) @@ -74,6 +78,3 @@ index d343ff3..457072b 100644 } use_int((int)r); } --- -2.8.1 - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch index 9a405213ad..b42ee7d0fe 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch @@ -1,3 +1,8 @@ +From 16823f5c3d3d5adad0b70e9055c08cb4e18d255b Mon Sep 17 00:00:00 2001 +From: Noor Ahsan <noor_ahsan@mentor.com> +Date: Mon, 29 Aug 2011 16:17:51 +0000 +Subject: [PATCH] lmbench: Add version 3.0-a9 (initial recipe) + Both lmbench and util-linux-ng packages provide own /usr/bin/line binaries. Even though the binaries name is the same, their functionality is different. This patch renames lmbench's line binary as lm_line to avoid conflicts with @@ -6,8 +11,14 @@ instead of line. Upstream-Status: Inappropriate [build system specific change] ---- patches/scripts/config-run 2006-11-26 15:11:04.000000000 -0500 -+++ patches/scripts/config-run 2011-04-01 09:35:50.000000000 -0400 +--- + scripts/config-run | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/config-run b/scripts/config-run +index f620c15..a2d5ba4 100755 +--- a/scripts/config-run ++++ b/scripts/config-run @@ -224,7 +224,7 @@ fi echo "Hang on, we are calculating your cache line size." diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 03b3721ca8..35f2306a06 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ inherit autotools-brokensep -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDLIBS_append_libc-musl = " -ltirpc " +DEPENDS += "libtirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDLIBS += " -ltirpc " PR = "r2" diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb index da2cb4b327..22bb0416ae 100644 --- a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed EXTRA_OEMAKE = "-e MAKEFLAGS=" -TARGET_CC_ARCH += "${CFLAGS} ${LDFLAGS}" +TARGET_CC_ARCH += "${LDFLAGS}" do_compile() { oe_runmake } diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.4.0.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb index 3ccd5db449..1f90a71256 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.4.0.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "86fa3eede43ffff88992fe21368b11b7" -SRC_URI[sha256sum] = "de9aec3ef4f980581756fd0bf7b30dd1ccb20e7aae637078a587606bf75a6b67" +SRC_URI[md5sum] = "850843bd9252823e7e24bc0849773000" +SRC_URI[sha256sum] = "cd6c869841f28e4ac1e8a5e4cda05fafce9a523a6b4f0f3a47805efd30494d88" S = "${WORKDIR}/phoronix-test-suite" @@ -23,7 +23,12 @@ do_install() { fi } +# It is not advisable to enable these services by default since they can cause +# continual target reboots if they encounter network problems. +# +SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" + RDEPENDS_${PN} += "bash python php-cli" FILES_${PN} += " \ diff --git a/meta-oe/recipes-extended/acpitool/acpitool_0.5.1.bb b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb index bc9669d0f3..bc9669d0f3 100644 --- a/meta-oe/recipes-extended/acpitool/acpitool_0.5.1.bb +++ b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch index fb2f07f073..fb2f07f073 100644 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index 88fcc0200f..88fcc0200f 100644 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 2c0914d30a..2c0914d30a 100644 --- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb diff --git a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch b/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch index 87051da906..87051da906 100644 --- a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch +++ b/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service b/meta-oe/recipes-bsp/edac-utils/files/edac.service index f6b211e91b..f6b211e91b 100644 --- a/meta-oe/recipes-support/edac-utils/files/edac.service +++ b/meta-oe/recipes-bsp/edac-utils/files/edac.service diff --git a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch b/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch index fddc25f601..fddc25f601 100644 --- a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch +++ b/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb b/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb index 9cc62a9591..9cc62a9591 100644 --- a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb +++ b/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb diff --git a/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch index 1b8815e9df..b4ce132a25 100644 --- a/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch @@ -1,4 +1,4 @@ -From 3d43c5efdb632da5d7387dcadce4e87b83929c64 Mon Sep 17 00:00:00 2001 +From d65c325dd8681edf2ee3332eeb0a547229c7ffb5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 24 Aug 2017 15:54:47 -0700 Subject: [PATCH] efivar-dp.h: Add -Wunknown-attributes when using clang @@ -7,15 +7,16 @@ change !dp check to a comparision against NULL to silent clang warning nonnull parameter 'dp' will evaluate to 'true' on first encounter Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - src/include/efivar/efivar-dp.h | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) + src/include/efivar/efivar-dp.h | 5 +++++ + 1 file changed, 5 insertions(+) -Index: git/src/include/efivar/efivar-dp.h -=================================================================== ---- git.orig/src/include/efivar/efivar-dp.h -+++ git/src/include/efivar/efivar-dp.h -@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_e +diff --git a/src/include/efivar/efivar-dp.h b/src/include/efivar/efivar-dp.h +index 3a509b7..c140e8d 100644 +--- a/src/include/efivar/efivar-dp.h ++++ b/src/include/efivar/efivar-dp.h +@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_efidp dp, const_efidp dpi, efidp *out); * though older or other compilers might just ignore that attribute if they * don't support it. Ugh. */ diff --git a/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch index 6f6ca6475a..251e50c902 100644 --- a/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch @@ -1,7 +1,7 @@ -From 9a3c480af653b37e62d1be04d49fe7a60a80168f Mon Sep 17 00:00:00 2001 +From a9115d9e6f0f62d6bb735ce3698858d1f89f8d73 Mon Sep 17 00:00:00 2001 From: Kai Kang <kai.kang@windriver.com> Date: Fri, 25 Sep 2015 18:14:31 +0800 -Subject: [PATCH 1/2] efivar: fix for cross compile +Subject: [PATCH] efivar: fix for cross compile It builds and calls elf file makeguids to generate a header file which doesn't work for cross compile. Fix it. @@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 5fc7887..1829d22 100644 +index 0c16597..dcc7fc8 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -29,8 +29,8 @@ all : deps $(TARGETS) +@@ -40,8 +40,8 @@ abicheck : $(patsubst %.so,%.abicheck,$(LIBTARGETS)) ./guid-symbols.c : include/efivar/efivar-guids.h ./guids.bin : include/efivar/efivar-guids.h ./names.bin : include/efivar/efivar-guids.h @@ -30,6 +30,3 @@ index 5fc7887..1829d22 100644 guid-symbols.c include/efivar/efivar-guids.h makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT --- -2.4.3 - diff --git a/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch index 73a772186a..2a6eb065f3 100644 --- a/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch @@ -1,4 +1,4 @@ -From 98b33d4193998687aa3a78c097f7bd4c393e0c85 Mon Sep 17 00:00:00 2001 +From dd4291265b7b3d7d7ffa1d8adf32781ae25dbfeb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 15 Jul 2017 00:29:42 -0700 Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros @@ -6,6 +6,7 @@ Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros not available on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/makeguids.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -32,6 +33,3 @@ index da2f5f7..daf821a 100644 #endif\n\ """); --- -2.13.3 - diff --git a/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch index 3f43f2a93e..83105fe0d1 100644 --- a/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch @@ -1,4 +1,4 @@ -From 7ead29ca6bb5e280ae07551cc3521281ecf73682 Mon Sep 17 00:00:00 2001 +From dea4a55714249b2734a36701120fd22c91c64ec2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 7 May 2016 02:06:47 -0400 Subject: [PATCH] Makefile: fix efivar.pc not found @@ -20,17 +20,18 @@ It fixes efivar.pc not found: Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- src/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index c7a0ca3..ad9c427 100644 +index dcc7fc8..691aa8a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -78,7 +78,9 @@ install : all - ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x).$(MAJOR_VERSION);\ - ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x); ) +@@ -94,7 +94,9 @@ install : all + ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\ + ) $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR) - $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;) + $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\ @@ -39,6 +40,3 @@ index c7a0ca3..ad9c427 100644 $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));) $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) --- -2.8.1 - diff --git a/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch index 96d0c6b3b2..96d0c6b3b2 100644 --- a/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch diff --git a/meta-oe/recipes-extended/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch index 87f555509b..f88af1fe17 100644 --- a/meta-oe/recipes-extended/efivar/efivar/allow-multi-definitions-for-native.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch @@ -1,3 +1,8 @@ +From c801dcb03d42eb533a9bead0b397d7ce4fc5a6fe Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 10 Aug 2016 17:49:50 +0800 +Subject: [PATCH] allow multi definitions for native + Upstream-Status: Pending It fails to create .so file when build efivar-native: @@ -8,16 +13,20 @@ It fails to create .so file when build efivar-native: Add link option '-z muldefs' to fix it. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + Make.rules | 1 + + 1 file changed, 1 insertion(+) + diff --git a/Make.rules b/Make.rules -index d9c0609..874bce0 100644 +index 88b9aa7..799332f 100644 --- a/Make.rules +++ b/Make.rules @@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ - -Wl,-soname,$@.$(MAJOR_VERSION) \ + -Wl,-soname,$@.1 \ -Wl,--version-script=$(MAP) \ + -Wl,-z,muldefs \ -o $@ $^ $(LDLIBS) - %.o : %.c + %.abixml : %.so diff --git a/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch b/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch index e3fa2e1c1a..dbc9a5755e 100644 --- a/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch @@ -1,4 +1,4 @@ -From 1361225abbaba878960f970df39a4570bbc39553 Mon Sep 17 00:00:00 2001 +From 3edce6a0019bcb90febc1f654b5b2e2bad5c59bd Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 26 May 2016 21:50:01 -0400 Subject: [PATCH] fix compile failure with older host gcc (<=4.6) @@ -16,14 +16,15 @@ and directly remove -Wmaybe-uninitialized and -flto. Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- gcc.specs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: git/gcc.specs -=================================================================== ---- git.orig/gcc.specs -+++ git/gcc.specs +diff --git a/gcc.specs b/gcc.specs +index 45d43d1..f1c6944 100644 +--- a/gcc.specs ++++ b/gcc.specs @@ -2,13 +2,13 @@ + -D_GNU_SOURCE diff --git a/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch b/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch new file mode 100644 index 0000000000..5864ac63e4 --- /dev/null +++ b/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch @@ -0,0 +1,25 @@ +From 8000b9afc858472912aace985004b44f8eb467e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 18 Aug 2017 09:49:49 -0700 +Subject: [PATCH] support musl + +Upstream-Status: Pending +--- + src/linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/linux.c b/src/linux.c +index 34ed479..1304f2b 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -40,6 +40,10 @@ + #include <efivar.h> + #include <efiboot.h> + ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + #include "dp.h" + #include "linux.h" + #include "util.h" diff --git a/meta-oe/recipes-extended/efivar/efivar_0.31.bb b/meta-oe/recipes-bsp/efivar/efivar_0.31.bb index 9d4cdc97be..9d4cdc97be 100644 --- a/meta-oe/recipes-extended/efivar/efivar_0.31.bb +++ b/meta-oe/recipes-bsp/efivar/efivar_0.31.bb diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch new file mode 100644 index 0000000000..df8028627a --- /dev/null +++ b/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch @@ -0,0 +1,39 @@ +From e5f68189ab3602b1042cc8423fd6a3a23abd5455 Mon Sep 17 00:00:00 2001 +From: Alex James <theracermaster@gmail.com> +Date: Sat, 14 Apr 2018 22:59:57 -0500 +Subject: [PATCH] ch341a_spi: Avoid deprecated libusb functions + +libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions +of libusb, use libusb_set_option instead. + +Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487 +Signed-off-by: Alex James <theracermaster@gmail.com> +Reviewed-on: https://review.coreboot.org/25681 +Tested-by: Nico Huber <nico.h@gmx.de> +Reviewed-by: David Hendricks <david.hendricks@gmail.com> +--- +Upstream-Status: Backport + ch341a_spi.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/ch341a_spi.c b/ch341a_spi.c +index 6eb2804..d880510 100644 +--- a/ch341a_spi.c ++++ b/ch341a_spi.c +@@ -444,7 +444,12 @@ int ch341a_spi_init(void) + return -1; + } + +- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). ++ /* Enable information, warning, and error messages (only). */ ++#if LIBUSB_API_VERSION < 0x01000106 ++ libusb_set_debug(NULL, 3); ++#else ++ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); ++#endif + + uint16_t vid = devs_ch341a_spi[0].vendor_id; + uint16_t pid = devs_ch341a_spi[0].device_id; +-- +2.17.0 + diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch new file mode 100644 index 0000000000..7ba69a9176 --- /dev/null +++ b/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch @@ -0,0 +1,37 @@ +From d2a28dcdbd1051d2f48320e2eda3393581fe0519 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 17 Mar 2018 23:08:29 -0700 +Subject: [PATCH] platform: Add riscv to known platforms + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://review.coreboot.org/#/c/flashrom/+/25260/] + platform.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/platform.h b/platform.h +index b2fdcd0..2cadbb3 100644 +--- a/platform.h ++++ b/platform.h +@@ -69,6 +69,9 @@ + #elif defined (__m68k__) + #define __FLASHROM_ARCH__ "m68k" + #define IS_M68K 1 ++#elif defined (__riscv) ++ #define __FLASHROM_ARCH__ "riscv" ++ #define IS_RISCV 1 + #elif defined (__sh__) + #define __FLASHROM_ARCH__ "sh" + #define IS_SH 1 +@@ -77,7 +80,7 @@ + #define IS_S390 1 + #endif + +-#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390) ++#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390) + #error Unknown architecture + #endif + +-- +2.16.2 + diff --git a/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch b/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch index 46a01529f7..46a01529f7 100644 --- a/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch +++ b/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch diff --git a/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb index 4cdd8ad234..1c17246681 100644 --- a/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb @@ -5,13 +5,13 @@ HOMEPAGE = "http://flashrom.org" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pciutils libusb libusb-compat" -SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch \ +SRC_URI = "https://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ file://sst26.patch \ - file://0001-Remove-undefined-behavior.patch \ + file://0001-platform-Add-riscv-to-known-platforms.patch \ + file://0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch \ " -SRC_URI[md5sum] = "aab9c98925d9cfb5ffb28b67a6112530" -SRC_URI[sha256sum] = "cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45" +SRC_URI[md5sum] = "42d999990c735d88653627cefcc13b9a" +SRC_URI[sha256sum] = "3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64" inherit pkgconfig diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol index 1f03a2bf2f..1f03a2bf2f 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord index a58362e43d..a58362e43d 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi index b1aad05b6d..b1aad05b6d 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf index 6b48cf6044..6b48cf6044 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf index bb8c93de6e..bb8c93de6e 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index b0091d6574..b0091d6574 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch index abf6e752af..abf6e752af 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch index fb3878dc39..fb3878dc39 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init b/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init index 4433020b38..4433020b38 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init b/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init index 5a09cd3cfc..5a09cd3cfc 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb index 454a69f40b..454a69f40b 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb diff --git a/meta-oe/recipes-extended/lssci/lsscsi_0.28.bb b/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb index 4b8cbaf099..4b8cbaf099 100644 --- a/meta-oe/recipes-extended/lssci/lsscsi_0.28.bb +++ b/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb index c3a1eadfd8..4f81d222ee 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb @@ -1,15 +1,10 @@ +SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" -LICENSE = "GPLv2 | BSD" -LIC_FILES_CHKSUM = "file://${B}/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" -DEPENDS = "libnl openssl" -SUMMARY = "User space daemon for extended IEEE 802.11 management" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://hostapd/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" -inherit update-rc.d systemd -INITSCRIPT_NAME = "hostapd" - -SYSTEMD_SERVICE_${PN} = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +DEPENDS = "libnl openssl" SRC_URI = " \ http://w1.fi/releases/hostapd-${PV}.tar.gz \ @@ -19,16 +14,29 @@ SRC_URI = " \ file://key-replay-cve-multiple.patch \ " +SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" +SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" + S = "${WORKDIR}/hostapd-${PV}" B = "${WORKDIR}/hostapd-${PV}/hostapd" -do_configure() { +inherit update-rc.d systemd pkgconfig distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + +INITSCRIPT_NAME = "hostapd" + +SYSTEMD_SERVICE_${PN} = "hostapd.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +do_configure_append() { install -m 0644 ${WORKDIR}/defconfig ${B}/.config } do_compile() { - export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" - make + export CFLAGS="-MMD -O2 -Wall -g" + export EXTRA_CFLAGS="${CFLAGS}" + make V=1 } do_install() { @@ -42,7 +50,3 @@ do_install() { } CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" - -SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" -SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" - diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch index f0c310c5e8..cbd5d71fdf 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch +++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch @@ -1,18 +1,19 @@ -From ecb62f3467f493cc0d679323f05367eebbf0fb67 Mon Sep 17 00:00:00 2001 +From a9e4057bfda190ad365b503af058b460ab8c7616 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Tue, 1 Oct 2013 22:22:57 +0200 Subject: [PATCH] aclocal: Add parameter to disable keyutils detection Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- aclocal.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 -index 210c473..83b1f02 100644 +index d6d1279..80ce604 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1650,11 +1650,15 @@ fi +@@ -1679,12 +1679,16 @@ fi dnl dnl If libkeyutils exists (on Linux) include it and use keyring ccache AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ @@ -28,6 +29,4 @@ index 210c473..83b1f02 100644 +fi ])dnl dnl --- -1.8.3.2 - + dnl If libkeyutils supports persistent keyrings, use them diff --git a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2017-11462.patch b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2017-11462.patch deleted file mode 100644 index 4b82f02977..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2017-11462.patch +++ /dev/null @@ -1,419 +0,0 @@ -From 56f7b1bc95a2a3eeb420e069e7655fb181ade5cf Mon Sep 17 00:00:00 2001 -From: Greg Hudson <ghudson@mit.edu> -Date: Fri, 14 Jul 2017 13:02:46 -0400 -Subject: [PATCH] Preserve GSS context on init/accept failure - -After gss_init_sec_context() or gss_accept_sec_context() has created a -context, don't delete the mechglue context on failures from subsequent -calls, even if the mechanism deletes the mech-specific context (which -is allowed by RFC 2744 but not preferred). Check for union contexts -with no mechanism context in each GSS function which accepts a -gss_ctx_id_t. - -CVE-2017-11462: - -RFC 2744 permits a GSS-API implementation to delete an existing -security context on a second or subsequent call to -gss_init_sec_context() or gss_accept_sec_context() if the call results -in an error. This API behavior has been found to be dangerous, -leading to the possibility of memory errors in some callers. For -safety, GSS-API implementations should instead preserve existing -security contexts on error until the caller deletes them. - -All versions of MIT krb5 prior to this change may delete acceptor -contexts on error. Versions 1.13.4 through 1.13.7, 1.14.1 through -1.14.5, and 1.15 through 1.15.1 may also delete initiator contexts on -error. - -ticket: 8598 (new) -target_version: 1.15-next -target_version: 1.14-next -tags: pullup - -Upstream-Status: Backport -CVE: CVE-2017-11462 - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> ---- - src/lib/gssapi/mechglue/g_accept_sec_context.c | 22 +++++++++++++++------- - src/lib/gssapi/mechglue/g_complete_auth_token.c | 2 ++ - src/lib/gssapi/mechglue/g_context_time.c | 2 ++ - src/lib/gssapi/mechglue/g_delete_sec_context.c | 14 ++++++++------ - src/lib/gssapi/mechglue/g_exp_sec_context.c | 2 ++ - src/lib/gssapi/mechglue/g_init_sec_context.c | 19 +++++++++++-------- - src/lib/gssapi/mechglue/g_inq_context.c | 2 ++ - src/lib/gssapi/mechglue/g_prf.c | 2 ++ - src/lib/gssapi/mechglue/g_process_context.c | 2 ++ - src/lib/gssapi/mechglue/g_seal.c | 4 ++++ - src/lib/gssapi/mechglue/g_sign.c | 2 ++ - src/lib/gssapi/mechglue/g_unseal.c | 2 ++ - src/lib/gssapi/mechglue/g_unwrap_aead.c | 2 ++ - src/lib/gssapi/mechglue/g_unwrap_iov.c | 4 ++++ - src/lib/gssapi/mechglue/g_verify.c | 2 ++ - src/lib/gssapi/mechglue/g_wrap_aead.c | 2 ++ - src/lib/gssapi/mechglue/g_wrap_iov.c | 8 ++++++++ - 17 files changed, 72 insertions(+), 21 deletions(-) - -diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c -index ddaf874..f28e2b1 100644 ---- a/src/lib/gssapi/mechglue/g_accept_sec_context.c -+++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c -@@ -216,6 +216,8 @@ gss_cred_id_t * d_cred; - } else { - union_ctx_id = (gss_union_ctx_id_t)*context_handle; - selected_mech = union_ctx_id->mech_type; -+ if (union_ctx_id->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - } - - /* Now create a new context if we didn't get one. */ -@@ -234,9 +236,6 @@ gss_cred_id_t * d_cred; - free(union_ctx_id); - return (status); - } -- -- /* set the new context handle to caller's data */ -- *context_handle = (gss_ctx_id_t)union_ctx_id; - } - - /* -@@ -277,8 +276,10 @@ gss_cred_id_t * d_cred; - d_cred ? &tmp_d_cred : NULL); - - /* If there's more work to do, keep going... */ -- if (status == GSS_S_CONTINUE_NEEDED) -+ if (status == GSS_S_CONTINUE_NEEDED) { -+ *context_handle = (gss_ctx_id_t)union_ctx_id; - return GSS_S_CONTINUE_NEEDED; -+ } - - /* if the call failed, return with failure */ - if (status != GSS_S_COMPLETE) { -@@ -364,14 +365,22 @@ gss_cred_id_t * d_cred; - *mech_type = gssint_get_public_oid(actual_mech); - if (ret_flags != NULL) - *ret_flags = temp_ret_flags; -- return (status); -+ *context_handle = (gss_ctx_id_t)union_ctx_id; -+ return GSS_S_COMPLETE; - } else { - - status = GSS_S_BAD_MECH; - } - - error_out: -- if (union_ctx_id) { -+ /* -+ * RFC 2744 5.1 requires that we not create a context on a failed first -+ * call to accept, and recommends that on a failed subsequent call we -+ * make the caller responsible for calling gss_delete_sec_context. -+ * Even if the mech deleted its context, keep the union context around -+ * for the caller to delete. -+ */ -+ if (union_ctx_id && *context_handle == GSS_C_NO_CONTEXT) { - if (union_ctx_id->mech_type) { - if (union_ctx_id->mech_type->elements) - free(union_ctx_id->mech_type->elements); -@@ -384,7 +393,6 @@ error_out: - GSS_C_NO_BUFFER); - } - free(union_ctx_id); -- *context_handle = GSS_C_NO_CONTEXT; - } - - if (src_name) -diff --git a/src/lib/gssapi/mechglue/g_complete_auth_token.c b/src/lib/gssapi/mechglue/g_complete_auth_token.c -index 9181551..4bcb47e 100644 ---- a/src/lib/gssapi/mechglue/g_complete_auth_token.c -+++ b/src/lib/gssapi/mechglue/g_complete_auth_token.c -@@ -52,6 +52,8 @@ gss_complete_auth_token (OM_uint32 *minor_status, - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech != NULL) { -diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c -index 2ff8d09..c947e76 100644 ---- a/src/lib/gssapi/mechglue/g_context_time.c -+++ b/src/lib/gssapi/mechglue/g_context_time.c -@@ -58,6 +58,8 @@ OM_uint32 * time_rec; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c -index 4bf0dec..574ff02 100644 ---- a/src/lib/gssapi/mechglue/g_delete_sec_context.c -+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c -@@ -87,12 +87,14 @@ gss_buffer_t output_token; - if (GSSINT_CHK_LOOP(ctx)) - return (GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT); - -- status = gssint_delete_internal_sec_context(minor_status, -- ctx->mech_type, -- &ctx->internal_ctx_id, -- output_token); -- if (status) -- return status; -+ if (ctx->internal_ctx_id != GSS_C_NO_CONTEXT) { -+ status = gssint_delete_internal_sec_context(minor_status, -+ ctx->mech_type, -+ &ctx->internal_ctx_id, -+ output_token); -+ if (status) -+ return status; -+ } - - /* now free up the space for the union context structure */ - free(ctx->mech_type->elements); -diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c -index b637452..1d7990b 100644 ---- a/src/lib/gssapi/mechglue/g_exp_sec_context.c -+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c -@@ -95,6 +95,8 @@ gss_buffer_t interprocess_token; - */ - - ctx = (gss_union_ctx_id_t) *context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - if (!mech) - return GSS_S_BAD_MECH; -diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c -index 9f154b8..e2df1ce 100644 ---- a/src/lib/gssapi/mechglue/g_init_sec_context.c -+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c -@@ -192,8 +192,13 @@ OM_uint32 * time_rec; - - /* copy the supplied context handle */ - union_ctx_id->internal_ctx_id = GSS_C_NO_CONTEXT; -- } else -+ } else { - union_ctx_id = (gss_union_ctx_id_t)*context_handle; -+ if (union_ctx_id->internal_ctx_id == GSS_C_NO_CONTEXT) { -+ status = GSS_S_NO_CONTEXT; -+ goto end; -+ } -+ } - - /* - * get the appropriate cred handle from the union cred struct. -@@ -224,15 +229,13 @@ OM_uint32 * time_rec; - - if (status != GSS_S_COMPLETE && status != GSS_S_CONTINUE_NEEDED) { - /* -- * The spec says the preferred method is to delete all context info on -- * the first call to init, and on all subsequent calls make the caller -- * responsible for calling gss_delete_sec_context. However, if the -- * mechanism decided to delete the internal context, we should also -- * delete the union context. -+ * RFC 2744 5.19 requires that we not create a context on a failed -+ * first call to init, and recommends that on a failed subsequent call -+ * we make the caller responsible for calling gss_delete_sec_context. -+ * Even if the mech deleted its context, keep the union context around -+ * for the caller to delete. - */ - map_error(minor_status, mech); -- if (union_ctx_id->internal_ctx_id == GSS_C_NO_CONTEXT) -- *context_handle = GSS_C_NO_CONTEXT; - if (*context_handle == GSS_C_NO_CONTEXT) { - free(union_ctx_id->mech_type->elements); - free(union_ctx_id->mech_type); -diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c -index 6f1c71e..6c0d98d 100644 ---- a/src/lib/gssapi/mechglue/g_inq_context.c -+++ b/src/lib/gssapi/mechglue/g_inq_context.c -@@ -104,6 +104,8 @@ gss_inquire_context( - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (!mech || !mech->gss_inquire_context || !mech->gss_display_name || -diff --git a/src/lib/gssapi/mechglue/g_prf.c b/src/lib/gssapi/mechglue/g_prf.c -index fcca3e4..9e168ad 100644 ---- a/src/lib/gssapi/mechglue/g_prf.c -+++ b/src/lib/gssapi/mechglue/g_prf.c -@@ -59,6 +59,8 @@ gss_pseudo_random (OM_uint32 *minor_status, - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech != NULL) { -diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c -index bc260ae..3968b5d 100644 ---- a/src/lib/gssapi/mechglue/g_process_context.c -+++ b/src/lib/gssapi/mechglue/g_process_context.c -@@ -61,6 +61,8 @@ gss_buffer_t token_buffer; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -diff --git a/src/lib/gssapi/mechglue/g_seal.c b/src/lib/gssapi/mechglue/g_seal.c -index f17241c..3db1ee0 100644 ---- a/src/lib/gssapi/mechglue/g_seal.c -+++ b/src/lib/gssapi/mechglue/g_seal.c -@@ -92,6 +92,8 @@ gss_wrap( OM_uint32 *minor_status, - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -@@ -226,6 +228,8 @@ gss_wrap_size_limit(OM_uint32 *minor_status, - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (!mech) -diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c -index 86d641a..03fbd8c 100644 ---- a/src/lib/gssapi/mechglue/g_sign.c -+++ b/src/lib/gssapi/mechglue/g_sign.c -@@ -94,6 +94,8 @@ gss_buffer_t msg_token; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c -index 3e8053c..c208635 100644 ---- a/src/lib/gssapi/mechglue/g_unseal.c -+++ b/src/lib/gssapi/mechglue/g_unseal.c -@@ -76,6 +76,8 @@ gss_qop_t * qop_state; - * call it. - */ - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -diff --git a/src/lib/gssapi/mechglue/g_unwrap_aead.c b/src/lib/gssapi/mechglue/g_unwrap_aead.c -index e78bff2..0682bd8 100644 ---- a/src/lib/gssapi/mechglue/g_unwrap_aead.c -+++ b/src/lib/gssapi/mechglue/g_unwrap_aead.c -@@ -186,6 +186,8 @@ gss_qop_t *qop_state; - * call it. - */ - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (!mech) -diff --git a/src/lib/gssapi/mechglue/g_unwrap_iov.c b/src/lib/gssapi/mechglue/g_unwrap_iov.c -index c0dd314..599be2c 100644 ---- a/src/lib/gssapi/mechglue/g_unwrap_iov.c -+++ b/src/lib/gssapi/mechglue/g_unwrap_iov.c -@@ -89,6 +89,8 @@ int iov_count; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -@@ -128,6 +130,8 @@ gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, - - /* Select the approprate underlying mechanism routine and call it. */ - ctx = (gss_union_ctx_id_t)context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; - mech = gssint_get_mechanism(ctx->mech_type); - if (mech == NULL) - return GSS_S_BAD_MECH; -diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c -index 1578ae1..8996fce 100644 ---- a/src/lib/gssapi/mechglue/g_verify.c -+++ b/src/lib/gssapi/mechglue/g_verify.c -@@ -65,6 +65,8 @@ gss_qop_t * qop_state; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -diff --git a/src/lib/gssapi/mechglue/g_wrap_aead.c b/src/lib/gssapi/mechglue/g_wrap_aead.c -index 96cdf3c..7fe3b7b 100644 ---- a/src/lib/gssapi/mechglue/g_wrap_aead.c -+++ b/src/lib/gssapi/mechglue/g_wrap_aead.c -@@ -256,6 +256,8 @@ gss_buffer_t output_message_buffer; - * call it. - */ - ctx = (gss_union_ctx_id_t)context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - if (!mech) - return (GSS_S_BAD_MECH); -diff --git a/src/lib/gssapi/mechglue/g_wrap_iov.c b/src/lib/gssapi/mechglue/g_wrap_iov.c -index 40cd98f..14447c4 100644 ---- a/src/lib/gssapi/mechglue/g_wrap_iov.c -+++ b/src/lib/gssapi/mechglue/g_wrap_iov.c -@@ -93,6 +93,8 @@ int iov_count; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -@@ -151,6 +153,8 @@ int iov_count; - */ - - ctx = (gss_union_ctx_id_t) context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); - mech = gssint_get_mechanism (ctx->mech_type); - - if (mech) { -@@ -190,6 +194,8 @@ gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, - - /* Select the approprate underlying mechanism routine and call it. */ - ctx = (gss_union_ctx_id_t)context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; - mech = gssint_get_mechanism(ctx->mech_type); - if (mech == NULL) - return GSS_S_BAD_MECH; -@@ -218,6 +224,8 @@ gss_get_mic_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle, - - /* Select the approprate underlying mechanism routine and call it. */ - ctx = (gss_union_ctx_id_t)context_handle; -+ if (ctx->internal_ctx_id == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; - mech = gssint_get_mechanism(ctx->mech_type); - if (mech == NULL) - return GSS_S_BAD_MECH; --- -2.10.2 - diff --git a/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server b/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server index 2835929139..e097353c2b 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server +++ b/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server @@ -1,6 +1,4 @@ # Automatically generated. If you change anything in this file other than the -# values of RUN_KADMIND or DAEMON_ARGS, first run dpkg-reconfigure +# values of DAEMON_ARGS, first run dpkg-reconfigure # krb5-admin-server and disable managing the kadmin configuration with # debconf. Otherwise, changes will be overwritten. - -RUN_KADMIND=true diff --git a/meta-oe/recipes-connectivity/krb5/krb5/fix-CVE-2017-11368.patch b/meta-oe/recipes-connectivity/krb5/krb5/fix-CVE-2017-11368.patch deleted file mode 100644 index a2eb7bc027..0000000000 --- a/meta-oe/recipes-connectivity/krb5/krb5/fix-CVE-2017-11368.patch +++ /dev/null @@ -1,116 +0,0 @@ -Upstream-Status: Backport [https://github.com/krb5/krb5/commit/ffb35baac6981f9e8914f8f3bffd37f284b85970] - -Backport patch to fix CVE-2017-11368. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From ffb35baac6981f9e8914f8f3bffd37f284b85970 Mon Sep 17 00:00:00 2001 -From: Greg Hudson <ghudson@mit.edu> -Date: Thu, 13 Jul 2017 12:14:20 -0400 -Subject: [PATCH] Prevent KDC unset status assertion failures - -Assign status values if S4U2Self padata fails to decode, if an -S4U2Proxy request uses invalid KDC options, or if an S4U2Proxy request -uses an evidence ticket which does not match the canonicalized request -server principal name. Reported by Samuel Cabrero. - -If a status value is not assigned during KDC processing, default to -"UNKNOWN_REASON" rather than failing an assertion. This change will -prevent future denial of service bugs due to similar mistakes, and -will allow us to omit assigning status values for unlikely errors such -as small memory allocation failures. - -CVE-2017-11368: - -In MIT krb5 1.7 and later, an authenticated attacker can cause an -assertion failure in krb5kdc by sending an invalid S4U2Self or -S4U2Proxy request. - - CVSSv3 Vector: AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H/E:H/RL:O/RC:C - -ticket: 8599 (new) -target_version: 1.15-next -target_version: 1.14-next -tags: pullup ---- - src/kdc/do_as_req.c | 4 ++-- - src/kdc/do_tgs_req.c | 3 ++- - src/kdc/kdc_util.c | 10 ++++++++-- - 3 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c -index 2d3ad13..9b256c8 100644 ---- a/src/kdc/do_as_req.c -+++ b/src/kdc/do_as_req.c -@@ -366,8 +366,8 @@ finish_process_as_req(struct as_req_state *state, krb5_error_code errcode) - did_log = 1; - - egress: -- if (errcode != 0) -- assert (state->status != 0); -+ if (errcode != 0 && state->status == NULL) -+ state->status = "UNKNOWN_REASON"; - - au_state->status = state->status; - au_state->reply = &state->reply; -diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c -index cdc79ad..d8d6719 100644 ---- a/src/kdc/do_tgs_req.c -+++ b/src/kdc/do_tgs_req.c -@@ -823,7 +823,8 @@ process_tgs_req(struct server_handle *handle, krb5_data *pkt, - free(reply.enc_part.ciphertext.data); - - cleanup: -- assert(status != NULL); -+ if (status == NULL) -+ status = "UNKNOWN_REASON"; - if (reply_key) - krb5_free_keyblock(kdc_context, reply_key); - if (errcode) -diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c -index 778a629..b710aef 100644 ---- a/src/kdc/kdc_util.c -+++ b/src/kdc/kdc_util.c -@@ -1220,8 +1220,10 @@ kdc_process_for_user(kdc_realm_t *kdc_active_realm, - req_data.data = (char *)pa_data->contents; - - code = decode_krb5_pa_for_user(&req_data, &for_user); -- if (code) -+ if (code) { -+ *status = "DECODE_PA_FOR_USER"; - return code; -+ } - - code = verify_for_user_checksum(kdc_context, tgs_session, for_user); - if (code) { -@@ -1320,8 +1322,10 @@ kdc_process_s4u_x509_user(krb5_context context, - req_data.data = (char *)pa_data->contents; - - code = decode_krb5_pa_s4u_x509_user(&req_data, s4u_x509_user); -- if (code) -+ if (code) { -+ *status = "DECODE_PA_S4U_X509_USER"; - return code; -+ } - - code = verify_s4u_x509_user_checksum(context, - tgs_subkey ? tgs_subkey : -@@ -1624,6 +1628,7 @@ kdc_process_s4u2proxy_req(kdc_realm_t *kdc_active_realm, - * that is validated previously in validate_tgs_request(). - */ - if (request->kdc_options & (NON_TGT_OPTION | KDC_OPT_ENC_TKT_IN_SKEY)) { -+ *status = "INVALID_S4U2PROXY_OPTIONS"; - return KRB5KDC_ERR_BADOPTION; - } - -@@ -1631,6 +1636,7 @@ kdc_process_s4u2proxy_req(kdc_realm_t *kdc_active_realm, - if (!krb5_principal_compare(kdc_context, - server->princ, /* after canon */ - server_princ)) { -+ *status = "EVIDENCE_TICKET_MISMATCH"; - return KRB5KDC_ERR_SERVER_NOMATCH; - } - --- -2.10.1 - diff --git a/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service b/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service index 1b4271643e..21939a1f05 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service +++ b/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service @@ -7,6 +7,7 @@ ConditionPathExists=/etc/krb5.conf Type=forking ExecStartPre=/bin/sh -c "test ! -f /var/log/kadmind.log || test ! -x /sbin/restorecon || /sbin/restorecon -F /var/log/kadmind.log" ExecStart=/usr/sbin/kadmind +EnvironmentFile=-/etc/default/krb5-admin-server SuccessExitStatus=1 2 SIGKILL TimeoutStopSec=30 diff --git a/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service b/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service index d5e5a95794..bf37c45ba4 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service +++ b/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service @@ -6,6 +6,7 @@ ConditionPathExists=/etc/krb5.conf [Service] Type=forking ExecStart=/usr/sbin/krb5kdc +EnvironmentFile=-/etc/default/krb5-kdc SuccessExitStatus=1 2 SIGKILL TimeoutStopSec=30 diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.15.1.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb index e75e861387..f95240f545 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.15.1.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb @@ -14,8 +14,8 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=3e12b8a065cca25dfdcac734fb3ec0b9" -DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=59b8da652f07186b44782a8454574f30" +DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native openssl" inherit autotools-brokensep binconfig perlnative systemd update-rc.d @@ -30,19 +30,17 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://etc/default/krb5-admin-server \ file://krb5-kdc.service \ file://krb5-admin-server.service \ - file://fix-CVE-2017-11368.patch;striplevel=2 \ - file://CVE-2017-11462.patch;striplevel=2 \ " -SRC_URI[md5sum] = "8022f3a1cde8463e44fd35ef42731f85" -SRC_URI[sha256sum] = "437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45" +SRC_URI[md5sum] = "23c5e9f07642db4a67f7a5b6168b1319" +SRC_URI[sha256sum] = "faeb125f83b0fb4cdb2f99f088140631bb47d975982de0956d18c85842969e08" CVE_PRODUCT = "kerberos" S = "${WORKDIR}/${BP}/src" -PACKAGECONFIG ??= "openssl" +PACKAGECONFIG ??= "" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" -PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl" +PACKAGECONFIG[openssl] = "--with-crypto-impl=openssl,,openssl" PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" @@ -53,6 +51,7 @@ CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regc ac_cv_file__etc_TIMEZONE=no" CFLAGS_append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" +CFLAGS_append_riscv64 = " -D_REENTRANT -pthread" LDFLAGS_append = " -pthread" do_configure() { @@ -79,12 +78,17 @@ do_install_append() { mkdir -p ${D}/${sysconfdir}/default/volatiles echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ > ${D}${sysconfdir}/default/volatiles/87_krb5 + + echo "RUN_KADMIND=true" >> ${D}/${sysconfdir}/default/krb5-admin-server fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/krb5kdc - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/krb5.conf + mkdir -p ${D}/${sysconfdir}/default + install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default + install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.16.0.bb index f89ef9d570..5260c0f14e 100644 --- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb +++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.16.0.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://clang.patch \ " -SRC_URI[md5sum] = "2ed809e65c85353d3ab59e372890e549" -SRC_URI[sha256sum] = "ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b" +SRC_URI[md5sum] = "76ea4d8381989919b1d9b91c818fed80" +SRC_URI[sha256sum] = "c8ca50beeddd4b43309df5b698917268303bf176cea58fe4fe53d5bf0e93fac2" diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch index 4047ffbf23..7a3429b9d0 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch +++ b/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch @@ -12,6 +12,7 @@ compiler are accepted. Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending + --- m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) @@ -53,7 +54,7 @@ index de4a8b0..e4ba718 100644 -Wdeclaration-after-statement -Wstrict-prototypes \ @@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security; do + -Wformat-security -Wtype-limits; do SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" + CFLAGS="$CFLAGS $option $WERROR" diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb index 80c26c05ce..9301cbd5ee 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-Detect-clang.patch \ " -SRC_URI[md5sum] = "4970c110f160b33637a3515004c637b2" -SRC_URI[sha256sum] = "7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a" +SRC_URI[md5sum] = "797e365521df76b77b067e6317618b41" +SRC_URI[sha256sum] = "21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4" diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.11.0.bb b/meta-oe/recipes-connectivity/libuv/libuv_1.20.3.bb index 0a5846bb8b..a11ff9d2c4 100644 --- a/meta-oe/recipes-connectivity/libuv/libuv_1.11.0.bb +++ b/meta-oe/recipes-connectivity/libuv/libuv_1.20.3.bb @@ -2,12 +2,12 @@ SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" HOMEPAGE = "https://github.com/libuv/libuv" BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bb5ea0d651f4c3519327171906045775" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRC_URI = "https://github.com/libuv/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" - -SRC_URI[md5sum] = "15550a9f5f45f7f32ae2d9bb0a21a2a7" -SRC_URI[sha256sum] = "6ec7eec6ecc24b1a8ffedebedb2fe9313fffb5410de89aaf784dd01080411c7a" +S = "${WORKDIR}/git" +SRCREV = "8cfd67e59195251dff793ee47c185c9d6a8f3818" +BRANCH = "v1.x" +SRC_URI = "git://github.com/libuv/libuv.git;protocol=https;branch=${BRANCH};" inherit autotools diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb index 9354799871..ea262f855b 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb @@ -1,14 +1,13 @@ SUMMARY = "Canonical libwebsockets.org websocket library" HOMEPAGE = "https://libwebsockets.org/" LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3393a657830d4a118c5a6ed35ba53d0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ce87f3facb6f911c142c8bef9bfb380" DEPENDS = "zlib" -SRC_URI = "https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz" - -SRC_URI[md5sum] = "4df3be57dee43aeebd54a3ed56568f50" -SRC_URI[sha256sum] = "bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66" +S = "${WORKDIR}/git" +SRCREV = "eaa935a80adb38b5cc4d09ce06ec987b87dcddfa" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;" inherit cmake pkgconfig diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch deleted file mode 100644 index a3fb0f3eb8..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes errors found bt Clang - -| ../../ModemManager-1.6.4/src/mm-bearer-qmi.c:774:50: error: implicit conversion from enumeration type 'MMBearerStatus' to different enumeration type 'MMBearerConnectionStatus' [-Werror,-Wenum-conversion] -| MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self)); -| ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - - -Index: ModemManager-1.6.4/src/mm-bearer-qmi.c -=================================================================== ---- ModemManager-1.6.4.orig/src/mm-bearer-qmi.c -+++ ModemManager-1.6.4/src/mm-bearer-qmi.c -@@ -771,7 +771,7 @@ packet_service_status_indication_cb (Qmi - &connection_status, - NULL, - NULL)) { -- MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self)); -+ MMBearerConnectionStatus bearer_status = (MMBearerConnectionStatus)mm_base_bearer_get_status (MM_BASE_BEARER (self)); - - if (connection_status == QMI_WDS_CONNECTION_STATUS_DISCONNECTED && - bearer_status != MM_BEARER_CONNECTION_STATUS_DISCONNECTED && diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb index e60cd4b741..b1a718dbfb 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb @@ -11,11 +11,10 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ - file://enum-conversion.patch \ -" -SRC_URI[md5sum] = "06488186c7dd53f8104183b86f7a1568" -SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668" +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f" +SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745" S = "${WORKDIR}/ModemManager-${PV}" @@ -26,7 +25,7 @@ PACKAGECONFIG ??= "mbim qmi polkit \ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" # Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--enable-mbim=no,libmbim" +PACKAGECONFIG[mbim] = "--with-mbim,--with-mbim=no,libmbim" # Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index e10b89c367..715b02352e 100644 --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -11,6 +11,8 @@ SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz \ SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" SRC_URI[sha256sum] = "b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f" -inherit autotools-brokensep pkgconfig +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" FILES_${PN} += "${datadir}/dbus-1/" diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 2db48f3418..1b56685c57 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -25,6 +25,8 @@ EXTRA_OECMAKE += "-DBUILD_DOCUMENTATION=OFF" #--enable-apps --enable-syslog +ASNEEDED = "" + do_install_append () { rmdir ${D}${bindir} } diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index 489861cb7b..b4a914d929 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -16,6 +16,8 @@ SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1 inherit cmake pkgconfig +OECMAKE_GENERATOR = "Unix Makefiles" + PACKAGECONFIG ?= "" # fuse support will need meta-filesystems layer PACKAGECONFIG[fuse] = "-DENABLE_FUSE=ON,-DENABLE_FUSE=OFF,fuse" diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch index f7529d8cb5..49b4d1ddac 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch @@ -1,29 +1,48 @@ ---- smstools3.orig/scripts/sendsms 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/sendsms 2017-12-30 15:40:28.009169106 -0800 +From 85602c3e531d39e89dc8cee0c4a592f85006a064 Mon Sep 17 00:00:00 2001 +From: Bill Randle <bill.randle@gmail.com> +Date: Sun, 31 Dec 2017 09:08:23 -0800 + +--- + scripts/sendsms | 2 +- + scripts/sms2html | 2 +- + scripts/sms2unicode | 2 +- + scripts/unicode2sms | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scripts/sendsms b/scripts/sendsms +index 512026d..bb56856 100755 +--- a/scripts/sendsms ++++ b/scripts/sendsms @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script send a text sms at the command line by creating # a sms file in the outgoing queue. ---- smstools3.orig/scripts/sms2html 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/sms2html 2017-12-30 15:39:17.496694390 -0800 +diff --git a/scripts/sms2html b/scripts/sms2html +index ff253e3..946185e 100755 +--- a/scripts/sms2html ++++ b/scripts/sms2html @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script converts a received sms file into a html file. ---- smstools3.orig/scripts/sms2unicode 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/sms2unicode 2017-12-30 15:33:14.477250179 -0800 +diff --git a/scripts/sms2unicode b/scripts/sms2unicode +index 46e2756..2826dc1 100755 +--- a/scripts/sms2unicode ++++ b/scripts/sms2unicode @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script converts a received sms file into a pure unicode text file. ---- smstools3/scripts/unicode2sms 2006-02-04 11:52:06.000000000 -0800 -+++ smstools3/scripts/unicode2sms.new 2017-12-30 15:33:56.918536044 -0800 +diff --git a/scripts/unicode2sms b/scripts/unicode2sms +index 2ae86dc..3fccf0d 100755 +--- a/scripts/unicode2sms ++++ b/scripts/unicode2sms @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch index 6220446327..e1d79d3327 100644 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch @@ -1,8 +1,16 @@ -Index: smstools3/scripts/sms3 -=================================================================== ---- smstools3.orig/scripts/sms3 2010-05-04 11:21:44.000000000 +0200 -+++ smstools3/scripts/sms3 2015-02-22 20:05:51.615074469 +0100 -@@ -24,11 +24,11 @@ +From 9a4a872dca78ca9cb6bdc228be61f5a4c2d68b1f Mon Sep 17 00:00:00 2001 +From: Kai Ulrich <kaiu@gmx.de> +Date: Wed, 18 Mar 2015 11:20:53 +0100 + +--- + scripts/sms3 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/sms3 b/scripts/sms3 +index 6b990bf..09c063b 100755 +--- a/scripts/sms3 ++++ b/scripts/sms3 +@@ -24,9 +24,9 @@ INFOFILE="/var/run/smsd.working" # Logfile can also be defined in here: LOGFILE="/var/log/smsd.log" diff --git a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch new file mode 100644 index 0000000000..8192056d13 --- /dev/null +++ b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch @@ -0,0 +1,49 @@ +From f567740cf64978ac9db014c786b6d0267b244f33 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Mar 2018 22:30:30 -0800 +Subject: [PATCH 1/2] replace SIGCLD with SIGCHLD and include sys/types.h + +Fixes +main.c:129:10: error: 'SIGCLD' undeclared (first use in this function); did you mean 'SIGCHLD'? + signal(SIGCLD, sig_child); + ^~~~~~ + SIGCHLD + +main.c:125:2: warning: implicit declaration of function 'umask' [-Wimplicit-function-declaration] + umask(0); + ^~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/main.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 3cf4072..cd34196 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -31,6 +31,7 @@ + #include <sys/ioctl.h> + #include <sys/wait.h> + #include <sys/param.h> ++#include <sys/types.h> + #include <pthread.h> + #include <fcntl.h> + #include <unistd.h> +@@ -126,9 +127,9 @@ static void daemon_start(int ignsigcld) + + if (ignsigcld) { + #ifdef SIGTSTP +- signal(SIGCLD, sig_child); ++ signal(SIGCHLD, sig_child); + #else +- signal(SIGCLD, SIG_IGN); ++ signal(SIGCHLD, SIG_IGN); + #endif + } + } +-- +2.16.2 + diff --git a/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch b/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch new file mode 100644 index 0000000000..90d12da149 --- /dev/null +++ b/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch @@ -0,0 +1,143 @@ +From 19b6cf8099e1974b5fc39086fc54103b0cbc2658 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Mar 2018 23:01:25 -0800 +Subject: [PATCH 2/2] replace PTHREAD_MUTEX_FAST_NP with PTHREAD_MUTEX_NORMAL + +PTHREAD_MUTEX_FAST_NP is not available on non-posix systems +e.g. musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/ha.c | 2 +- + src/icmp6.c | 2 +- + src/mh.c | 2 +- + src/mn.c | 2 +- + src/movement.c | 2 +- + src/mpdisc_ha.c | 2 +- + src/mpdisc_mn.c | 2 +- + src/tqueue.c | 2 +- + src/tunnelctl.c | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/ha.c b/src/ha.c +index fbdcff0..b2f811e 100644 +--- a/src/ha.c ++++ b/src/ha.c +@@ -1246,7 +1246,7 @@ int ha_init(void) + { + pthread_mutexattr_t mattrs; + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&bu_worker_mutex, &mattrs) || + pthread_cond_init(&cond, NULL)) + return -1; +diff --git a/src/icmp6.c b/src/icmp6.c +index 3695135..6460634 100644 +--- a/src/icmp6.c ++++ b/src/icmp6.c +@@ -243,7 +243,7 @@ int icmp6_init(void) + return -1; + /* create ICMP listener thread */ + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&icmp6_sock.send_mutex, &mattrs) || + pthread_rwlock_init(&handler_lock, NULL) || + pthread_create(&icmp6_listener, NULL, icmp6_listen, NULL)) +diff --git a/src/mh.c b/src/mh.c +index 60e345e..7928f4c 100644 +--- a/src/mh.c ++++ b/src/mh.c +@@ -204,7 +204,7 @@ int mh_init(void) + return -1; + + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&mh_sock.send_mutex, &mattrs) || + pthread_rwlock_init(&handler_lock, NULL) || + pthread_create(&mh_listener, NULL, mh_listen, NULL)) +diff --git a/src/mn.c b/src/mn.c +index 092cfcb..8f7f448 100644 +--- a/src/mn.c ++++ b/src/mn.c +@@ -1478,7 +1478,7 @@ static struct home_addr_info *hai_copy(struct home_addr_info *conf_hai) + if (hai != NULL) { + pthread_mutexattr_t mattrs; + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + + memcpy(hai, conf_hai, sizeof(struct home_addr_info)); + +diff --git a/src/movement.c b/src/movement.c +index d985937..6400448 100644 +--- a/src/movement.c ++++ b/src/movement.c +@@ -2013,7 +2013,7 @@ int md_init(void) + int val; + + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&iface_lock, &mattrs)) + return -1; + +diff --git a/src/mpdisc_ha.c b/src/mpdisc_ha.c +index 40ba05f..fd7a90d 100644 +--- a/src/mpdisc_ha.c ++++ b/src/mpdisc_ha.c +@@ -559,7 +559,7 @@ int mpd_ha_init(void) + { + pthread_mutexattr_t mattrs; + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&mpa_lock, &mattrs) || + pthread_rwlock_init(&prefix_lock, NULL) || + hash_init(&mpa_hash, DOUBLE_ADDR, MPA_BUCKETS) < 0) +diff --git a/src/mpdisc_mn.c b/src/mpdisc_mn.c +index 4873bd6..ada02bd 100644 +--- a/src/mpdisc_mn.c ++++ b/src/mpdisc_mn.c +@@ -267,7 +267,7 @@ int mpd_mn_init(void) + { + pthread_mutexattr_t mattrs; + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&mps_lock, &mattrs)) + return -1; + if (hash_init(&mps_hash, DOUBLE_ADDR, MPS_BUCKETS) < 0) +diff --git a/src/tqueue.c b/src/tqueue.c +index 2f7aa0b..9c185b8 100644 +--- a/src/tqueue.c ++++ b/src/tqueue.c +@@ -65,7 +65,7 @@ int taskqueue_init(void) + { + pthread_mutexattr_t mattrs; + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&mutex, &mattrs) || + pthread_cond_init(&cond, NULL) || + pthread_create(&tq_runner, NULL, runner, NULL)) +diff --git a/src/tunnelctl.c b/src/tunnelctl.c +index 23fc20b..813b8ec 100644 +--- a/src/tunnelctl.c ++++ b/src/tunnelctl.c +@@ -433,7 +433,7 @@ int tunnelctl_init(void) + return -1; + + pthread_mutexattr_init(&mattrs); +- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP); ++ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL); + if (pthread_mutex_init(&tnl_lock, &mattrs)) + return -1; + +-- +2.16.2 + diff --git a/meta-oe/recipes-connectivity/umip/umip_1.0.bb b/meta-oe/recipes-connectivity/umip/umip_1.0.bb index 2129e379cb..0c120bfd84 100644 --- a/meta-oe/recipes-connectivity/umip/umip_1.0.bb +++ b/meta-oe/recipes-connectivity/umip/umip_1.0.bb @@ -14,6 +14,8 @@ SRC_URI = "git://github.com/jlanza/umip \ file://mip6d \ file://mip6d.service \ file://0001-Add-format-string-to-fprintf-call.patch \ + file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \ + file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \ " SRCREV = "7d67209cd1bba2dd0e183a0fa07eeef07964dd14" diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index a64745c94a..4920bce8c8 100644 --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "68a7b09cfce01c4c279fba2cf91686fcfc566848" -PV = "4.1.5+git${SRCPV}" +SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6" +PV = "4.2.3+git${SRCPV}" SRC_URI = "git://github.com/zeromq/cppzmq.git" diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.6.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb index e126f32399..356348b43f 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.6.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" PACKAGECONFIG ??= "libsodium" PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium" -SRC_URI = "http://github.com/zeromq/zeromq4-1/releases/download/v${PV}/zeromq-${PV}.tar.gz \ +SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "c89db4dbc0b90c34c9f4983cbff6d321" -SRC_URI[sha256sum] = "02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a" +SRC_URI[md5sum] = "a1c95b34384257e986842f4d006957b8" +SRC_URI[sha256sum] = "cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f" S = "${WORKDIR}/zeromq-${PV}" @@ -28,5 +28,5 @@ do_compile_ptest () { do_install_ptest () { install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/.libs/test_* ${D}${PTEST_PATH}/tests } diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch b/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch new file mode 100644 index 0000000000..f10c49e7c3 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch @@ -0,0 +1,34 @@ +From a92fd7da3a262e21c0970a3908eb0b4502819a01 Mon Sep 17 00:00:00 2001 +From: Yang Lyu <yangl@axis.com> +Date: Fri, 23 Feb 2018 16:31:49 +0100 +Subject: [PATCH] Comment rst2man related stuff + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 56d38e4..3c3b109 100644 +--- a/meson.build ++++ b/meson.build +@@ -15,7 +15,7 @@ add_project_arguments('-DBINDIR="' + join_paths(get_option('prefix'), get_option + cc = meson.get_compiler('c') + conf = configuration_data() + mod_pkgconfig = import('pkgconfig') +-prog_rst2man = find_program('rst2man', 'rst2man.py') ++#prog_rst2man = find_program('rst2man', 'rst2man.py') + + sub_cdvar = subproject('c-dvar', version: '>=1') + sub_clist = subproject('c-list', version: '>=3') +@@ -56,7 +56,7 @@ endif + + conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) + +-subdir('docs') ++#subdir('docs') + subdir('src') + + if use_launcher +-- +2.1.4 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch b/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch new file mode 100644 index 0000000000..4909dea125 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch @@ -0,0 +1,25 @@ +From 4b79f603b948709906c108796087de7b5643f61a Mon Sep 17 00:00:00 2001 +From: Yang Lyu <yangl@axis.com> +Date: Mon, 26 Feb 2018 12:48:34 +0100 +Subject: [PATCH] Correct including directory for conf + +--- + src/launch/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/launch/config.c b/src/launch/config.c +index 6a68699..579471b 100644 +--- a/src/launch/config.c ++++ b/src/launch/config.c +@@ -1022,7 +1022,7 @@ static void config_parser_end_fn(void *userdata, const XML_Char *name) { + state->file, + state->current->include.selinux_root_relative ? + bus_selinux_policy_root() : +- state->file->path, ++ NULL, + state->current->cdata); + if (r) { + state->error = error_trace(r); +-- +2.1.4 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-oe/recipes-core/dbus/dbus-broker_git.bb new file mode 100644 index 0000000000..b62bccf2c9 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker_git.bb @@ -0,0 +1,32 @@ +SUMMARY = "dbus broker" +DESCRIPTION = "Drop-in replacement for dbus-daemon." + +SECTION = "base" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" + +DEPENDS = "dbus glib-2.0 expat" + +PV = "9+git${SRCPV}" +SRCREV = "ccd06b284892182af569e69046262331150e3536" + +SRC_URI = "git://github.com/bus1/dbus-broker;protocol=git" +SRC_URI += "file://0001-Comment-rst2man-related-stuff.patch" +SRC_URI += "file://0002-Correct-including-directory-for-conf.patch" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd distro_features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN} += "${systemd_user_unitdir}" + +RDEPENDS_${PN} = "dbus" + +BBCLASSEXTEND = "native" + diff --git a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch index 0c2c487466..b108a4cd6c 100644 --- a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch +++ b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch @@ -33,10 +33,10 @@ Signed-off-by: André Draszik <adraszik@tycoint.com> src/pipe.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp -index 5776971..271b503 100644 ---- a/src/eventloop-integration.cpp -+++ b/src/eventloop-integration.cpp +Index: libdbus-c++-0.9.0/src/eventloop-integration.cpp +=================================================================== +--- libdbus-c++-0.9.0.orig/src/eventloop-integration.cpp ++++ libdbus-c++-0.9.0/src/eventloop-integration.cpp @@ -36,7 +36,7 @@ /* STD */ #include <string.h> @@ -44,12 +44,12 @@ index 5776971..271b503 100644 -#include <sys/poll.h> +#include <poll.h> #include <fcntl.h> - #include <unistd.h> -diff --git a/src/eventloop.cpp b/src/eventloop.cpp -index f622812..7790e1e 100644 ---- a/src/eventloop.cpp -+++ b/src/eventloop.cpp + using namespace DBus; +Index: libdbus-c++-0.9.0/src/eventloop.cpp +=================================================================== +--- libdbus-c++-0.9.0.orig/src/eventloop.cpp ++++ libdbus-c++-0.9.0/src/eventloop.cpp @@ -28,7 +28,7 @@ #include <dbus-c++/eventloop.h> #include <dbus-c++/debug.h> @@ -59,10 +59,10 @@ index f622812..7790e1e 100644 #include <sys/time.h> #include <dbus/dbus.h> -diff --git a/src/pipe.cpp b/src/pipe.cpp -index 01211b3..45c2ba6 100644 ---- a/src/pipe.cpp -+++ b/src/pipe.cpp +Index: libdbus-c++-0.9.0/src/pipe.cpp +=================================================================== +--- libdbus-c++-0.9.0.orig/src/pipe.cpp ++++ libdbus-c++-0.9.0/src/pipe.cpp @@ -32,7 +32,7 @@ /* STD */ @@ -72,6 +72,3 @@ index 01211b3..45c2ba6 100644 #include <fcntl.h> #include <errno.h> #include <cassert> --- -2.10.2 - diff --git a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch index 903a7209fe..bf6870eb00 100644 --- a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch +++ b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch @@ -24,17 +24,15 @@ Signed-off-by: Thilo Cestonaro <thilo.cestonaro@ts.fujitsu.com> include/dbus-c++/eventloop-integration.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h -index 5108340..1b56ab5 100644 ---- a/include/dbus-c++/eventloop-integration.h -+++ b/include/dbus-c++/eventloop-integration.h -@@ -27,6 +27,7 @@ +Index: libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h +=================================================================== +--- libdbus-c++-0.9.0.orig/include/dbus-c++/eventloop-integration.h ++++ libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h +@@ -26,6 +26,7 @@ + #define __DBUSXX_EVENTLOOP_INTEGRATION_H - #include <cstring> #include <errno.h> +#include <unistd.h> #include "api.h" #include "dispatcher.h" #include "util.h" --- -1.7.9.7 diff --git a/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch b/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..a172a93ca5 --- /dev/null +++ b/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch @@ -0,0 +1,39 @@ +From 4f8c68757b05d12392cd1a8aed174cb8e56f80e3 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Thu, 5 Apr 2018 17:19:44 +0300 +Subject: [PATCH] ell: fix build with musl libc + +musl libc doesn't implement TEMP_FAILURE_RETRY. Use the +TEMP_FAILURE_RETRY from glibc to fix build. + +Upstream-Status: Submitted [https://lists.01.org/pipermail/ell/2018-April/001209.html] + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + ell/dbus.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/ell/dbus.h b/ell/dbus.h +index a7c08d2..3ff5e0f 100644 +--- a/ell/dbus.h ++++ b/ell/dbus.h +@@ -28,6 +28,16 @@ + #include <stddef.h> + #include <stdarg.h> + ++/* taken from glibc unistd.h for musl support */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +-- +2.4.0 + diff --git a/meta-oe/recipes-core/ell/ell_git.bb b/meta-oe/recipes-core/ell/ell_0.4.bb index 4354974bae..1524bd6b91 100644 --- a/meta-oe/recipes-core/ell/ell_git.bb +++ b/meta-oe/recipes-core/ell/ell_0.4.bb @@ -7,8 +7,10 @@ SECTION = "libs" inherit autotools pkgconfig S = "${WORKDIR}/git" -SRCREV = "8192131685be0f27d6f51b14b78ef93fa7f3c692" -SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" +SRCREV = "b4aea06fabb2af1af01f861f8f394c75950b6d47" +SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git \ + file://0001-ell-fix-build-with-musl-libc.patch \ + " do_configure_prepend () { mkdir ${S}/build-aux diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch b/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch new file mode 100644 index 0000000000..7899022f11 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch @@ -0,0 +1,40 @@ +From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 +From: Kjell Ahlstedt <kjellahlstedt@gmail.com> +Date: Wed, 20 Dec 2017 20:00:32 +0100 +Subject: [PATCH] Glib::Threads::Private: Fix gobj() + +Bug 791711 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] + glib/glibmm/threads.h | 2 +- + glib/src/threads.hg | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h +index f7e2b82a..2c0cbe8c 100644 +--- a/glib/glibmm/threads.h ++++ b/glib/glibmm/threads.h +@@ -657,7 +657,7 @@ public: + */ + inline void replace(T* data); + +- GPrivate* gobj() { return gobject_; } ++ GPrivate* gobj() { return &gobject_; } + + private: + GPrivate gobject_; +diff --git a/glib/src/threads.hg b/glib/src/threads.hg +index 86d7a17b..c82a6130 100644 +--- a/glib/src/threads.hg ++++ b/glib/src/threads.hg +@@ -628,7 +628,7 @@ public: + */ + inline void replace(T* data); + +- GPrivate* gobj() { return gobject_; } ++ GPrivate* gobj() { return &gobject_; } + + private: + GPrivate gobject_; diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch b/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch index a5944c2889..d32fe78d32 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch +++ b/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch @@ -1,7 +1,16 @@ -Index: glibmm-2.22.1/Makefile.am -=================================================================== ---- glibmm-2.22.1.orig/Makefile.am -+++ glibmm-2.22.1/Makefile.am +From f48a69fd11b2eda6c43ff046c202cbc4dcd4e92d Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 12 Jul 2011 11:46:37 +0200 + +--- + Makefile.am | 7 +------ + configure.ac | 1 - + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index a0df8af..c3d5e06 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src else src_subdirs = @@ -16,15 +25,15 @@ Index: glibmm-2.22.1/Makefile.am glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME) glibmm_include_HEADERS = glib/glibmm.h -Index: glibmm-2.22.1/configure.ac -=================================================================== ---- glibmm-2.22.1.orig/configure.ac -+++ glibmm-2.22.1/configure.ac -@@ -136,7 +136,6 @@ AC_CONFIG_FILES([Makefile +diff --git a/configure.ac b/configure.ac +index c20e778..74203be 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile gio/src/Makefile gio/giomm/Makefile tests/Makefile - examples/Makefile docs/Makefile docs/reference/Doxyfile - MSVC_Net2005/glibmm/glibmm.rc + MSVC_Net2013/glibmm/glibmm.rc diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb index 3a69a70578..4706432ab7 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb @@ -13,6 +13,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = " \ ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ file://remove-examples.patch \ + file://0001-Glib-Threads-Private-Fix-gobj.patch \ " SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b" SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a" diff --git a/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb index c001c184cb..a38315c4d5 100644 --- a/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb +++ b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f3 DEPENDS = "libxml2 glibmm" -inherit autotools pkgconfig ptest +inherit distro_features_check autotools pkgconfig ptest do_compile_ptest() { oe_runmake -C examples buildtest diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.10.bb b/meta-oe/recipes-core/mm-common/mm-common_0.9.10.bb deleted file mode 100644 index 899eb8a9b6..0000000000 --- a/meta-oe/recipes-core/mm-common/mm-common_0.9.10.bb +++ /dev/null @@ -1,12 +0,0 @@ -inherit gnomebase - -GNOME_COMPRESS_TYPE="xz" - -SRC_URI[archive.md5sum] = "49dc47af8c89ce5b3c768306b9a0f922" -SRC_URI[archive.sha256sum] = "16c0e2bc196b67fbc145edaecb5dbe5818386504fe5703de27002d77140fa217" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -BBCLASSEXTEND = "native" - diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb b/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb new file mode 100644 index 0000000000..591caa75d9 --- /dev/null +++ b/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb @@ -0,0 +1,9 @@ +inherit gnomebase + +SRC_URI[archive.md5sum] = "d6f2a43589480d2315672da0b5839b56" +SRC_URI[archive.sha256sum] = "20d1e7466ca4c83c92e29f9e8dfcc8e5721fdf1337f53157bed97be3b73b32a8" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.4.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb index c13b764f79..c13b764f79 100644 --- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.4.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb diff --git a/meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb b/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb index bc79f356b2..bc79f356b2 100644 --- a/meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb +++ b/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb diff --git a/meta-oe/recipes-support/libmcrypt/libmcrypt_2.5.8.bb b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index 2a133c69ad..2a133c69ad 100644 --- a/meta-oe/recipes-support/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb diff --git a/meta-oe/recipes-support/libsodium/libsodium_1.0.11.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb index cbcbe96cd7..cbcbe96cd7 100644 --- a/meta-oe/recipes-support/libsodium/libsodium_1.0.11.bb +++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb diff --git a/meta-oe/recipes-support/pkcs11-helper/pkcs11-helper_1.11.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb index db71bd03b7..db71bd03b7 100644 --- a/meta-oe/recipes-support/pkcs11-helper/pkcs11-helper_1.11.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch b/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch index 3135d4d5ac..3135d4d5ac 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch +++ b/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch b/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch index 8f93cb325b..8f93cb325b 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch +++ b/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch b/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch index fc708b23ad..fc708b23ad 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch +++ b/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-dbs/leveldb/leveldb_git.bb index 8fec89c6f1..8fec89c6f1 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ b/meta-oe/recipes-dbs/leveldb/leveldb_git.bb diff --git a/meta-oe/recipes-support/libdbi/libdbi.inc b/meta-oe/recipes-dbs/libdbi/libdbi.inc index cea2838e36..cea2838e36 100644 --- a/meta-oe/recipes-support/libdbi/libdbi.inc +++ b/meta-oe/recipes-dbs/libdbi/libdbi.inc diff --git a/meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb b/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb index 24eae28501..24eae28501 100644 --- a/meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb +++ b/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch index 5da34480e7..5da34480e7 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch index 09d49d28cd..aa01e954f7 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch @@ -9,11 +9,11 @@ Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> src/mongo/util/SConscript | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/SConstruct b/SConstruct -index 5082a4b..3370f70 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -507,6 +507,7 @@ def variable_arch_converter(val): +Index: git/SConstruct +=================================================================== +--- git.orig/SConstruct ++++ git/SConstruct +@@ -548,6 +548,7 @@ def variable_arch_converter(val): 'amd64': 'x86_64', 'emt64': 'x86_64', 'x86': 'i386', @@ -21,8 +21,8 @@ index 5082a4b..3370f70 100644 } val = val.lower() -@@ -568,7 +569,8 @@ env_vars.Add('ARFLAGS', - converter=variable_shlex_converter) +@@ -627,7 +628,8 @@ env_vars.Add( + ) env_vars.Add('CC', - help='Select the C compiler to use') @@ -31,7 +31,7 @@ index 5082a4b..3370f70 100644 env_vars.Add('CCFLAGS', help='Sets flags for the C and C++ compiler', -@@ -588,7 +590,8 @@ env_vars.Add('CPPPATH', +@@ -647,7 +649,8 @@ env_vars.Add('CPPPATH', converter=variable_shlex_converter) env_vars.Add('CXX', @@ -41,7 +41,7 @@ index 5082a4b..3370f70 100644 env_vars.Add('CXXFLAGS', help='Sets flags for the C++ compiler', -@@ -818,6 +821,7 @@ envDict = dict(BUILD_ROOT=buildDir, +@@ -895,6 +898,7 @@ envDict = dict(BUILD_ROOT=buildDir, ) env = Environment(variables=env_vars, **envDict) @@ -49,19 +49,16 @@ index 5082a4b..3370f70 100644 del envDict env.AddMethod(env_os_is_wrapper, 'TargetOSIs') -diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript -index 6add602..8d05a62 100644 ---- a/src/mongo/util/SConscript -+++ b/src/mongo/util/SConscript -@@ -251,6 +251,8 @@ if get_option('allocator') == 'tcmalloc': - 'MONGO_HAVE_GPERFTOOLS_GET_THREAD_CACHE_SIZE' +Index: git/src/mongo/util/SConscript +=================================================================== +--- git.orig/src/mongo/util/SConscript ++++ git/src/mongo/util/SConscript +@@ -274,6 +274,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc': + 'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS' ] ) + if not use_system_version_of_library('valgrind'): + tcmspEnv.InjectThirdPartyIncludePaths('valgrind') - tcmspEnv.Library( - target='tcmalloc_set_parameter', --- -1.9.1 - + if not use_system_version_of_library('valgrind'): + # Include valgrind since tcmalloc disables itself while running under valgrind diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch index f8c419d8a3..f8c419d8a3 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch index c43beb4c12..389b302c3c 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch @@ -13,11 +13,11 @@ Upstream-Status: Pending src/mongo/util/procparser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp -index 36f2ae0254..2c164bcbf3 100644 ---- a/src/mongo/util/procparser.cpp -+++ b/src/mongo/util/procparser.cpp -@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector<StringData>& keys, +Index: git/src/mongo/util/procparser.cpp +=================================================================== +--- git.orig/src/mongo/util/procparser.cpp ++++ git/src/mongo/util/procparser.cpp +@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector<S StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); @@ -26,7 +26,7 @@ index 36f2ae0254..2c164bcbf3 100644 if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; -@@ -272,7 +272,7 @@ Status parseProcStat(const std::vector<StringData>& keys, +@@ -272,7 +272,7 @@ Status parseProcStat(const std::vector<S } else { StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); @@ -35,7 +35,7 @@ index 36f2ae0254..2c164bcbf3 100644 if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; -@@ -365,7 +365,7 @@ Status parseProcMemInfo(const std::vector<StringData>& keys, +@@ -365,7 +365,7 @@ Status parseProcMemInfo(const std::vecto StringData stringValue((*partIt).begin(), (*partIt).end()); @@ -44,7 +44,7 @@ index 36f2ae0254..2c164bcbf3 100644 if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; -@@ -426,7 +426,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, +@@ -426,7 +426,7 @@ Status parseProcDiskStats(const std::vec StringData data, BSONObjBuilder* builder) { bool foundKeys = false; @@ -53,7 +53,7 @@ index 36f2ae0254..2c164bcbf3 100644 stats.reserve(kDiskFieldCount); using string_split_iterator = boost::split_iterator<StringData::const_iterator>; -@@ -501,7 +501,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, +@@ -501,7 +501,7 @@ Status parseProcDiskStats(const std::vec StringData stringValue((*partIt).begin(), (*partIt).end()); @@ -62,6 +62,3 @@ index 36f2ae0254..2c164bcbf3 100644 if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; --- -2.14.1 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch index 0334d994e4..0334d994e4 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch index 098306f500..098306f500 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch index 95f9c1c1c6..dc488ad7ea 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/mongo/s/SConscript | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript -index 71720be517..51bd199127 100644 ---- a/src/mongo/s/SConscript -+++ b/src/mongo/s/SConscript +Index: git/src/mongo/s/SConscript +=================================================================== +--- git.orig/src/mongo/s/SConscript ++++ git/src/mongo/s/SConscript @@ -317,5 +317,6 @@ env.Library( "$BUILD_DIR/mongo/db/s/sharding", "$BUILD_DIR/mongo/executor/network_interface_factory", @@ -23,6 +23,3 @@ index 71720be517..51bd199127 100644 + "$BUILD_DIR/mongo/s/local_sharding_info", ], ) --- -2.13.3 - diff --git a/meta-oe/recipes-support/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch index 1591f94c96..1591f94c96 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch index e871f2ba90..e871f2ba90 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/arm64-support.patch b/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch index 9046bb2f45..9046bb2f45 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/arm64-support.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch b/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch index 5c5c20ce34..5c5c20ce34 100644 --- a/meta-oe/recipes-support/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch diff --git a/meta-oe/recipes-support/mongodb/mongodb_git.bb b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb index 0ff7d0b59f..bb3ff3b403 100644 --- a/meta-oe/recipes-support/mongodb/mongodb_git.bb +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb @@ -7,11 +7,10 @@ DEPENDS = "openssl libpcre libpcap zlib python boost" inherit scons dos2unix siteinfo -PV = "3.4.6+git${SRCPV}" -SRCREV = "c55eb86ef46ee7aede3b1e2a5d184a7df4bfb5b5" +PV = "3.4.13+git${SRCPV}" +SRCREV = "fbdef2ccc53e0fcc9afb570063633d992b2aae42" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v3.4 \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ - file://0001-mongo-Add-using-std-string.patch \ file://0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ @@ -58,7 +57,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \ --use-system-zlib \ --js-engine=none \ --nostrip \ - --endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ ${PACKAGECONFIG_CONFARGS} \ mongod mongos" diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb index 4ce960d7da..4ce960d7da 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 263b3139e7..99e7050945 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,8 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://0001-disable-ucontext-on-musl.patch \ " -SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4" -SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641" +SRC_URI[md5sum] = "3cec4afc06b468687ef576c90148d10d" +SRC_URI[sha256sum] = "c3269ce20b45b177239fd1e3d6d9428a94131711f12758ebf5f65222278bb110" S = "${WORKDIR}/mariadb-${PV}" @@ -82,6 +82,10 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DCAT_EXECUTABLE=`which cat` \ -DCMAKE_AR:FILEPATH=${AR}" +# With Ninja it fails with: +# make: *** No rule to make target `install'. Stop. +OECMAKE_GENERATOR = "Unix Makefiles" + ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch index 60e9199f95..60e9199f95 100644 --- a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch diff --git a/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch b/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch index 02bda24f7b..02bda24f7b 100644 --- a/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch diff --git a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch index e97def6021..e97def6021 100644 --- a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch index 0c4e10237c..0c4e10237c 100644 --- a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch index 8d9f558d05..8d9f558d05 100644 --- a/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch index 7516619ebb..a519e42921 100644 --- a/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch @@ -25,9 +25,8 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- cmake/install_macros.cmake | 25 +++++++++++++++---------- - cmake/mysql_version.cmake | 3 ++- - libmysql/CMakeLists.txt | 36 ++++++++++++++++++++++++++++-------- - 3 files changed, 45 insertions(+), 19 deletions(-) + libmysql/CMakeLists.txt | 34 +++++++++++++++++++++++++++------- + 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index b8efdf8..a0d0e68 100644 @@ -39,8 +38,8 @@ index b8efdf8..a0d0e68 100644 # # 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 -@@ -111,28 +111,33 @@ FUNCTION(INSTALL_SCRIPT) - ENDFUNCTION() +@@ -167,28 +167,33 @@ ENDFUNCTION() + # Install symbolic link to CMake target. -# the link is created in the same directory as target @@ -86,8 +85,8 @@ diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index be5760f..96286ff 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt -@@ -180,6 +180,12 @@ IF(MSVC) - INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) +@@ -433,6 +433,12 @@ IF(MSVC) + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() +MACRO(GET_TARGET_NAME target out_name) @@ -99,7 +98,7 @@ index be5760f..96286ff 100644 IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -192,7 +198,13 @@ IF(UNIX) +@@ -445,7 +451,13 @@ IF(UNIX) SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) ENDIF() ENDMACRO() @@ -114,7 +113,7 @@ index be5760f..96286ff 100644 ENDIF() IF(NOT DISABLE_SHARED) -@@ -205,10 +217,9 @@ IF(NOT DISABLE_SHARED) +@@ -456,10 +468,9 @@ IF(NOT DISABLE_SHARED) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") @@ -127,7 +126,7 @@ index be5760f..96286ff 100644 ENDIF() # Name of shared library is mysqlclient on Unix SET_TARGET_PROPERTIES(libmysql PROPERTIES -@@ -239,8 +250,13 @@ IF(NOT DISABLE_SHARED) +@@ -482,8 +493,13 @@ IF(NOT DISABLE_SHARED) "${CMAKE_SHARED_LIBRARY_SUFFIX}" "" linkname) @@ -143,7 +142,7 @@ index be5760f..96286ff 100644 LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) GET_VERSIONED_LIBNAME( -@@ -248,7 +264,11 @@ IF(NOT DISABLE_SHARED) +@@ -491,7 +507,11 @@ IF(NOT DISABLE_SHARED) "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" linkname) diff --git a/meta-oe/recipes-support/mysql/mariadb/install_db b/meta-oe/recipes-dbs/mysql/mariadb/install_db index 512a7da7ee..512a7da7ee 100755 --- a/meta-oe/recipes-support/mysql/mariadb/install_db +++ b/meta-oe/recipes-dbs/mysql/mariadb/install_db diff --git a/meta-oe/recipes-support/mysql/mariadb/install_db.service b/meta-oe/recipes-dbs/mysql/mariadb/install_db.service index c8369f569b..c8369f569b 100644 --- a/meta-oe/recipes-support/mysql/mariadb/install_db.service +++ b/meta-oe/recipes-dbs/mysql/mariadb/install_db.service diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-dbs/mysql/mariadb/my.cnf index dc4c172e54..dc4c172e54 100644 --- a/meta-oe/recipes-support/mysql/mariadb/my.cnf +++ b/meta-oe/recipes-dbs/mysql/mariadb/my.cnf diff --git a/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start index 189c02021d..189c02021d 100644 --- a/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start +++ b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service index d88361703d..d88361703d 100644 --- a/meta-oe/recipes-support/mysql/mariadb/mysqld.service +++ b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service diff --git a/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch b/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch index ff26b0b86c..ff26b0b86c 100644 --- a/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb b/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb index d7895732a6..d7895732a6 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb diff --git a/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb index ac0df4f066..ac0df4f066 100644 --- a/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb +++ b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb diff --git a/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index d08ec6af1d..ce2a60cabf 100644 --- a/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -12,11 +12,11 @@ Signed-off-by: Philip Balister <philip@balister.org> configure.in | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -diff --git a/configure.in b/configure.in -index f8bf466..1f4fabf 100644 ---- a/configure.in -+++ b/configure.in -@@ -734,19 +734,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], +Index: postgresql-9.4.15/configure.in +=================================================================== +--- postgresql-9.4.15.orig/configure.in ++++ postgresql-9.4.15/configure.in +@@ -759,19 +759,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build w [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then @@ -38,6 +38,3 @@ index f8bf466..1f4fabf 100644 fi AC_SUBST(with_libxml) --- -1.8.3.1 - diff --git a/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index e199f39143..971510943d 100644 --- a/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -13,11 +13,11 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index ae1a5a0..9a0970d 100644 ---- a/configure.in -+++ b/configure.in -@@ -1877,7 +1877,7 @@ if test "$with_tcl" = yes; then +Index: postgresql-9.4.15/configure.in +=================================================================== +--- postgresql-9.4.15.orig/configure.in ++++ postgresql-9.4.15/configure.in +@@ -1879,7 +1879,7 @@ if test "$with_tcl" = yes; then fi # check for <perl.h> @@ -26,6 +26,3 @@ index ae1a5a0..9a0970d 100644 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], --- -1.9.1 - diff --git a/meta-oe/recipes-support/postgresql/files/postgresql-bashprofile b/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile index 1c931f37fd..1c931f37fd 100644 --- a/meta-oe/recipes-support/postgresql/files/postgresql-bashprofile +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile diff --git a/meta-oe/recipes-support/postgresql/files/postgresql-setup b/meta-oe/recipes-dbs/postgresql/files/postgresql-setup index 75bb01e05f..75bb01e05f 100644 --- a/meta-oe/recipes-support/postgresql/files/postgresql-setup +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql-setup diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.init b/meta-oe/recipes-dbs/postgresql/files/postgresql.init index 4a4f0cd168..4a4f0cd168 100644 --- a/meta-oe/recipes-support/postgresql/files/postgresql.init +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql.init diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.pam b/meta-oe/recipes-dbs/postgresql/files/postgresql.pam index 0b6fdc5f26..0b6fdc5f26 100644 --- a/meta-oe/recipes-support/postgresql/files/postgresql.pam +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql.pam diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.service b/meta-oe/recipes-dbs/postgresql/files/postgresql.service index 4ec959e842..4ec959e842 100644 --- a/meta-oe/recipes-support/postgresql/files/postgresql.service +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql.service diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 812c2aed48..5462332c56 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -19,7 +19,7 @@ DESCRIPTION = "\ " HOMEPAGE = "http://www.postgresql.com" LICENSE = "BSD" -DEPENDS = "zlib readline tzcode-native" +DEPENDS = "libnsl2 zlib readline tzcode-native" ARM_INSTRUCTION_SET = "arm" diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb b/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb new file mode 100644 index 0000000000..8a01d8604b --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb @@ -0,0 +1,9 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=6dc95e63aa4d72502ff8193dfe2ddd38" + +SRC_URI += "\ + file://not-check-libperl.patch \ +" +SRC_URI[md5sum] = "0a08f4078f5e4a54e764f63ad38a6de3" +SRC_URI[sha256sum] = "7a320cd335052b840d209dc9688f09965763351c590e3cc7bf577591179fd7c6" diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch index 7eda038756..7eda038756 100644 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch index a8f14e7689..a8f14e7689 100644 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch index 1d988182e7..1d988182e7 100644 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch diff --git a/meta-oe/recipes-support/psqlodbc/files/run-ptest b/meta-oe/recipes-dbs/psqlodbc/files/run-ptest index 6b41c63693..6b41c63693 100644 --- a/meta-oe/recipes-support/psqlodbc/files/run-ptest +++ b/meta-oe/recipes-dbs/psqlodbc/files/run-ptest diff --git a/meta-oe/recipes-support/psqlodbc/psqlodbc.inc b/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc index 5337b45695..5337b45695 100644 --- a/meta-oe/recipes-support/psqlodbc/psqlodbc.inc +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc diff --git a/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb index 6e1c8ab4a0..6e1c8ab4a0 100644 --- a/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb diff --git a/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 9b19c1a5f2..b2bd17a8dd 100644 --- a/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "266ac245affd69555643b735d19d3715c4eff91a" -PV = "5.8+git${SRCPV}" +SRCREV = "c60df9d9e7629fe208a9b848293a5599f83d5e77" +SRCBRANCH = "5.13.fb" +PV = "5.13.1" -SRC_URI = "git://github.com/facebook/${BPN}.git" +SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ + " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/soci/soci/soci_libdir.patch b/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch index 00a1a5c862..00a1a5c862 100644 --- a/meta-oe/recipes-support/soci/soci/soci_libdir.patch +++ b/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch diff --git a/meta-oe/recipes-support/soci/soci_3.2.2.bb b/meta-oe/recipes-dbs/soci/soci_3.2.3.bb index 1f5a485a7d..3f22d38181 100644 --- a/meta-oe/recipes-support/soci/soci_3.2.2.bb +++ b/meta-oe/recipes-dbs/soci/soci_3.2.3.bb @@ -12,8 +12,8 @@ DEPENDS = "boost" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ file://soci_libdir.patch \ " -SRC_URI[md5sum] = "bc3c35f6cd3f80a1be19fe30b3c111bf" -SRC_URI[sha256sum] = "30ea2f4d26639ef5b5cdc24fb300b3896746243dbb77b743582de2ff443ccb1c" +SRC_URI[md5sum] = "acfbccf176cd20e06833a8037a2d3699" +SRC_URI[sha256sum] = "2c659db0f4f7b424bbcffe195c03c293a1dbf676189a27b077fb2aab4d53a610" TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ @@ -38,7 +38,7 @@ PACKAGECONFIG ??= "empty" EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}" DISABLE_STATIC = "" -inherit cmake +inherit dos2unix cmake PACKAGES += "${PN}-sqlite3 ${PN}-mysql ${PN}-postgresql ${PN}-odbc ${PN}-oracle" diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch index c5d7c0c81a..c5d7c0c81a 100644 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch +++ b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch index 914422f1df..914422f1df 100644 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch +++ b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch index b84b6486ef..b84b6486ef 100644 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch +++ b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc index 6bc742eecb..6bc742eecb 100644 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc +++ b/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc diff --git a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb b/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb index 501c0e3e77..501c0e3e77 100644 --- a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb +++ b/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch b/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch index 85af81f0f9..5c90397194 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch @@ -1,19 +1,50 @@ +From aa669312a380611d280d126cb509fa282080707e Mon Sep 17 00:00:00 2001 +From: Markus Mayer <mmayer@mmayer.net> +Date: Wed, 7 Sep 2016 12:58:47 +0300 +Subject: [PATCH] android-tools: add recipe from AOSP tag android-5.1.1_r37 + Description: add -o argument to preserve ownership -Author: Markus Mayer <mmayer@mmayer.net> See also https://android-review.googlesource.com/#/c/100312/ Upstream-Status: Inappropriate + --- - system/extras/ext4_utils/make_ext4fs.c | 6 ++++++ - system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++-- + ext4_utils/make_ext4fs.c | 6 ++++++ + ext4_utils/make_ext4fs_main.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---- a/system/extras/ext4_utils/make_ext4fs_main.c -+++ b/system/extras/ext4_utils/make_ext4fs_main.c -@@ -49,13 +49,15 @@ extern struct fs_info info; +diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c +index 2f89ae8a..cc41d623 100644 +--- a/ext4_utils/make_ext4fs.c ++++ b/ext4_utils/make_ext4fs.c +@@ -68,6 +68,8 @@ + + #endif + ++int preserve_owner = 0; ++ + /* TODO: Not implemented: + Allocating blocks in the same block group as the file inode + Hash or binary tree directories +@@ -186,6 +188,10 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path + } else { + dentries[i].mtime = fixed_time; + } ++ if (preserve_owner) { ++ dentries[i].uid = stat.st_uid; ++ dentries[i].gid = stat.st_gid; ++ } + uint64_t capabilities; + if (fs_config_func != NULL) { + #ifdef ANDROID +diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c +index a6c5f616..7af0dddf 100644 +--- a/ext4_utils/make_ext4fs_main.c ++++ b/ext4_utils/make_ext4fs_main.c +@@ -48,13 +48,15 @@ struct selabel_handle; + extern struct fs_info info; - extern struct selabel_handle* selinux_android_file_context_handle(void); +extern int preserve_owner; + @@ -28,7 +59,7 @@ Upstream-Status: Inappropriate fprintf(stderr, " <filename> [<directory>]\n"); } -@@ -81,7 +83,7 @@ int main(int argc, char **argv) +@@ -80,7 +82,7 @@ int main(int argc, char **argv) struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; #endif @@ -37,7 +68,7 @@ Upstream-Status: Inappropriate switch (opt) { case 'l': info.len = parse_num(optarg); -@@ -144,6 +146,10 @@ int main(int argc, char **argv) +@@ -143,6 +145,10 @@ int main(int argc, char **argv) } #endif break; @@ -48,25 +79,3 @@ Upstream-Status: Inappropriate case 'v': verbose = 1; break; ---- a/system/extras/ext4_utils/make_ext4fs.c -+++ b/system/extras/ext4_utils/make_ext4fs.c -@@ -67,6 +67,8 @@ - - #endif - -+int preserve_owner = 0; -+ - /* TODO: Not implemented: - Allocating blocks in the same block group as the file inode - Hash or binary tree directories -@@ -185,6 +187,10 @@ static u32 build_directory_structure(con - } else { - dentries[i].mtime = fixed_time; - } -+ if (preserve_owner) { -+ dentries[i].uid = stat.st_uid; -+ dentries[i].gid = stat.st_gid; -+ } - uint64_t capabilities; - if (fs_config_func != NULL) { - #ifdef ANDROID diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index d3ccd1d064..5d8f8a8435 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -26,7 +26,7 @@ SRC_URI = " \ file://remove-selinux-android.patch \ file://use-capability.patch \ file://use-local-socket.patch \ - file://preserve-ownership.patch \ + file://preserve-ownership.patch;patchdir=system/extras \ file://mkbootimg-Add-dt-parameter-to-specify-DT-image.patch \ file://remove-bionic-android.patch \ file://define-shell-command.patch \ diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch new file mode 100644 index 0000000000..c762754ad1 --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch @@ -0,0 +1,52 @@ +From 57ecf7205feedd23f901e1bb9d193787e559e433 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Tue, 23 Jan 2018 15:13:26 -0800 +Subject: [PATCH] disable calls to getcontext() with musl + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + src/client/linux/handler/exception_handler.cc | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index cca023f..f3e460c 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -495,7 +495,19 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); + ucontext_t context; ++#if defined(__GLIBC__) + getcontext(&context); ++#else ++ // Extreme hack: Allow musl builds to compile - but don't expect them to work. ++ // Although musl provides a definition for getcontext() in ucontext.h (which ++ // enough to build libbreakpad_client) musl does not provide a corresponding ++ // getcontext() function, so builds will fail when attempting to link anything ++ // with libbreakpad_client. Disabling calls to getcontext() is a temporary ++ // hack. The real fix is probably to enable Breakpad's own implementation of ++ // getcontext() when building for musl (it's currently only enabled when ++ // building for Android). ++ memset (&context, 0, sizeof(context)); ++#endif + return HandleSignal(sig, &siginfo, &context); + } + +@@ -680,9 +692,14 @@ bool ExceptionHandler::WriteMinidump() { + sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); + + CrashContext context; ++#if defined(__GLIBC__) + int getcontext_result = getcontext(&context.context); + if (getcontext_result) + return false; ++#else ++ // Extreme hack - see comments above. ++ memset (&context.context, 0, sizeof(&context.context)); ++#endif + + #if defined(__i386__) + // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved +-- +1.9.1 + diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0005-Import-necessary-definitions-from-stab.h.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0005-Import-necessary-definitions-from-stab.h.patch deleted file mode 100644 index 80de8c6843..0000000000 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0005-Import-necessary-definitions-from-stab.h.patch +++ /dev/null @@ -1,199 +0,0 @@ -From fa7a3b7312307acad0045549d5f306e7fd117804 Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sun, 1 Feb 2015 14:34:44 +0100 -Subject: [PATCH 5/6] Import necessary definitions from stab.h - ---- - configure.ac | 1 - - src/common/android/include/stab.h | 100 ------------------------------------ - src/common/common.gyp | 1 - - src/common/stabs_reader.cc | 1 - - src/common/stabs_reader.h | 13 +++-- - src/common/stabs_reader_unittest.cc | 1 - - 6 files changed, 10 insertions(+), 107 deletions(-) - delete mode 100644 src/common/android/include/stab.h - -diff --git a/configure.ac b/configure.ac -index 2223920..0e55cd9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -73,7 +73,6 @@ AC_HEADER_STDC - AC_SYS_LARGEFILE - m4_include(m4/ax_pthread.m4) - AX_PTHREAD --AC_CHECK_HEADERS([a.out.h]) - - # Only build Linux client libs when compiling for Linux - case $host in -diff --git a/src/common/android/include/stab.h b/src/common/android/include/stab.h -deleted file mode 100644 -index cd92902..0000000 ---- a/src/common/android/include/stab.h -+++ /dev/null -@@ -1,100 +0,0 @@ --// Copyright (c) 2012, Google Inc. --// All rights reserved. --// --// Redistribution and use in source and binary forms, with or without --// modification, are permitted provided that the following conditions are --// met: --// --// * Redistributions of source code must retain the above copyright --// notice, this list of conditions and the following disclaimer. --// * Redistributions in binary form must reproduce the above --// copyright notice, this list of conditions and the following disclaimer --// in the documentation and/or other materials provided with the --// distribution. --// * Neither the name of Google Inc. nor the names of its --// contributors may be used to endorse or promote products derived from --// this software without specific prior written permission. --// --// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H --#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H -- --#include <sys/cdefs.h> -- --#ifdef __BIONIC_HAVE_STAB_H --#include <stab.h> --#else -- --#ifdef __cplusplus --extern "C" { --#endif // __cplusplus -- --#define _STAB_CODE_LIST \ -- _STAB_CODE_DEF(UNDF,0x00) \ -- _STAB_CODE_DEF(GSYM,0x20) \ -- _STAB_CODE_DEF(FNAME,0x22) \ -- _STAB_CODE_DEF(FUN,0x24) \ -- _STAB_CODE_DEF(STSYM,0x26) \ -- _STAB_CODE_DEF(LCSYM,0x28) \ -- _STAB_CODE_DEF(MAIN,0x2a) \ -- _STAB_CODE_DEF(PC,0x30) \ -- _STAB_CODE_DEF(NSYMS,0x32) \ -- _STAB_CODE_DEF(NOMAP,0x34) \ -- _STAB_CODE_DEF(OBJ,0x38) \ -- _STAB_CODE_DEF(OPT,0x3c) \ -- _STAB_CODE_DEF(RSYM,0x40) \ -- _STAB_CODE_DEF(M2C,0x42) \ -- _STAB_CODE_DEF(SLINE,0x44) \ -- _STAB_CODE_DEF(DSLINE,0x46) \ -- _STAB_CODE_DEF(BSLINE,0x48) \ -- _STAB_CODE_DEF(BROWS,0x48) \ -- _STAB_CODE_DEF(DEFD,0x4a) \ -- _STAB_CODE_DEF(EHDECL,0x50) \ -- _STAB_CODE_DEF(MOD2,0x50) \ -- _STAB_CODE_DEF(CATCH,0x54) \ -- _STAB_CODE_DEF(SSYM,0x60) \ -- _STAB_CODE_DEF(SO,0x64) \ -- _STAB_CODE_DEF(LSYM,0x80) \ -- _STAB_CODE_DEF(BINCL,0x82) \ -- _STAB_CODE_DEF(SOL,0x84) \ -- _STAB_CODE_DEF(PSYM,0xa0) \ -- _STAB_CODE_DEF(EINCL,0xa2) \ -- _STAB_CODE_DEF(ENTRY,0xa4) \ -- _STAB_CODE_DEF(LBRAC,0xc0) \ -- _STAB_CODE_DEF(EXCL,0xc2) \ -- _STAB_CODE_DEF(SCOPE,0xc4) \ -- _STAB_CODE_DEF(RBRAC,0xe0) \ -- _STAB_CODE_DEF(BCOMM,0xe2) \ -- _STAB_CODE_DEF(ECOMM,0xe4) \ -- _STAB_CODE_DEF(ECOML,0xe8) \ -- _STAB_CODE_DEF(NBTEXT,0xf0) \ -- _STAB_CODE_DEF(NBDATA,0xf2) \ -- _STAB_CODE_DEF(NBBSS,0xf4) \ -- _STAB_CODE_DEF(NBSTS,0xf6) \ -- _STAB_CODE_DEF(NBLCS,0xf8) \ -- _STAB_CODE_DEF(LENG,0xfe) -- --enum __stab_debug_code { --#define _STAB_CODE_DEF(x,y) N_##x = y, --_STAB_CODE_LIST --#undef _STAB_CODE_DEF --}; -- --#ifdef __cplusplus --} // extern "C" --#endif // __cplusplus -- --#endif // __BIONIC_HAVE_STAB_H -- --#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H -diff --git a/src/common/common.gyp b/src/common/common.gyp -index f01ede5..c49ff85 100644 ---- a/src/common/common.gyp -+++ b/src/common/common.gyp -@@ -46,7 +46,6 @@ - 'android/include/elf.h', - 'android/include/link.h', - 'android/include/sgidefs.h', -- 'android/include/stab.h', - 'android/include/sys/procfs.h', - 'android/include/sys/signal.h', - 'android/include/sys/user.h', -diff --git a/src/common/stabs_reader.cc b/src/common/stabs_reader.cc -index 6019fc7..9562caa 100644 ---- a/src/common/stabs_reader.cc -+++ b/src/common/stabs_reader.cc -@@ -34,7 +34,6 @@ - #include "common/stabs_reader.h" - - #include <assert.h> --#include <stab.h> - #include <string.h> - - #include <string> -diff --git a/src/common/stabs_reader.h b/src/common/stabs_reader.h -index d89afc0..591f007 100644 ---- a/src/common/stabs_reader.h -+++ b/src/common/stabs_reader.h -@@ -53,12 +53,19 @@ - #include <config.h> - #endif - --#ifdef HAVE_A_OUT_H --#include <a.out.h> --#endif - #ifdef HAVE_MACH_O_NLIST_H - #include <mach-o/nlist.h> - #endif -+// Definitions from <stab.h> and <a.out.h> for systems which -+// do not have them -+#undef N_UNDF -+#define N_UNDF 0x0 -+#define N_FUN 0x24 -+#define N_SLINE 0x44 -+#define N_SO 0x64 -+#define N_LSYM 0x80 -+#define N_BINCL 0x82 -+#define N_SOL 0x84 - - #include <string> - #include <vector> -diff --git a/src/common/stabs_reader_unittest.cc b/src/common/stabs_reader_unittest.cc -index a84da1c..854ac42 100644 ---- a/src/common/stabs_reader_unittest.cc -+++ b/src/common/stabs_reader_unittest.cc -@@ -33,7 +33,6 @@ - - #include <assert.h> - #include <errno.h> --#include <stab.h> - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> --- -2.0.5 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 5f6d82c945..d9773c9a6e 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -41,6 +41,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \ file://0005-md2core-Replace-basename.patch \ file://0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch \ file://mcontext.patch \ + file://0001-disable-calls-to-getcontext-with-musl.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ " diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch index d3bfab7bbe..9e5058f2ca 100644 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch +++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch @@ -1,8 +1,16 @@ -Index: git/configure -=================================================================== ---- git.orig/configure 2012-11-19 21:07:51.917429465 -0800 -+++ git/configure 2012-11-19 21:13:19.337437278 -0800 -@@ -439,14 +442,18 @@ +From ab0eec78382bd00ce533aec2c84fd50c1733033d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:42:51 -0800 + +--- + configure | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +diff --git a/configure b/configure +index 76c2812..78ce2ff 100755 +--- a/configure ++++ b/configure +@@ -535,14 +535,18 @@ else GZIP_SUFFIX=".gz" fi @@ -25,12 +33,16 @@ Index: git/configure + cat << EOF > .1.c #include <stdio.h> int main(void) { - #if defined(__GNUC__) && (__GNUC__ >= 4) -@@ -569,16 +576,16 @@ + #if defined(_WIN32) +@@ -569,16 +573,16 @@ int main(void) { #endif } EOF -- ++ $CC -o .1 .1.c ++ COMPILER=`./.1` ++ r=$? ++ rm -f .1.c .1 + -$CC -o .1 .1.c -COMPILER=`./.1` -r=$? @@ -40,11 +52,6 @@ Index: git/configure - assert "" "update compiler" -else - echo "success [$CC]" -+ $CC -o .1 .1.c -+ COMPILER=`./.1` -+ r=$? -+ rm -f .1.c .1 -+ + if test "$r" -ne 0; then + assert "" "update compiler" + else diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb new file mode 100644 index 0000000000..7a70f75763 --- /dev/null +++ b/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb @@ -0,0 +1,22 @@ +SUMMARY = "Linux tool to dump x86 CPUID information about the CPU(s)" +DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \ +from the CPUID instruction, and also determines the exact model of CPU(s). \ +It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \ +UMC, NexGen, Rise, and SiS CPUs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz" +SRC_URI[md5sum] = "1c46a6662626c5a6eaca626f23a5a7d7" +SRC_URI[sha256sum] = "667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865" + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" + +# The install rule from the Makefile has hardcoded paths, so we duplicate +# the actions to accommodate different paths. +do_install () { + install -d -m755 ${D}/${bindir} + install -m755 ${B}/cpuid ${D}/${bindir}/cpuid + install -d -m755 ${D}/${mandir} + install -m444 ${B}/cpuid.man.gz ${D}/${mandir} +} diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.7.1.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb index a8df444858..a8df444858 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.7.1.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb index 27fe860262..d8f2f894bb 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb @@ -11,6 +11,7 @@ python () { } DEPENDS = " \ + fribidi \ geany \ libxml2 \ libsoup-2.4 \ @@ -22,7 +23,9 @@ DEPENDS = " \ libgit2 \ " -inherit autotools pkgconfig gtk-icon-cache +inherit distro_features_check autotools pkgconfig gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://plugins.geany.org/${PN}/${PN}-${PV}.tar.bz2" SRC_URI[md5sum] = "808f9048b77fd9704569ed2ba12a56e9" diff --git a/meta-oe/recipes-devtools/geany/geany_1.31.bb b/meta-oe/recipes-devtools/geany/geany_1.31.bb index ce36e1eb93..bb9d8bc298 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.31.bb +++ b/meta-oe/recipes-devtools/geany/geany_1.31.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" DEPENDS = "gtk+ libxml-parser-perl-native python3-docutils-native intltool-native" -inherit autotools pkgconfig perlnative pythonnative gettext +inherit distro_features_check autotools pkgconfig perlnative pythonnative gettext + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://download.geany.org/${BP}.tar.bz2" SRC_URI[md5sum] = "386000be6b26972c6a699939c37cda34" diff --git a/meta-oe/recipes-devtools/glade/glade_3.20.2.bb b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb index ad91ca332c..95e1737c51 100644 --- a/meta-oe/recipes-devtools/glade/glade_3.20.2.bb +++ b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb @@ -9,7 +9,9 @@ DEPENDS = "gtk+ gtk+3 glib-2.0 libxml2 intltool-native \ " -inherit autotools pkgconfig gnomebase gobject-introspection +inherit distro_features_check autotools pkgconfig gnomebase gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.20/glade-${PV}.tar.xz \ file://remove-yelp-help-rules-var.patch \ diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch b/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch deleted file mode 100644 index 31c36422ed..0000000000 --- a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 43ae4e81056888623a73069c11da28a80c39a297 Mon Sep 17 00:00:00 2001 -From: Alexey Firago <alexey_firago@mentor.com> -Date: Thu, 19 Oct 2017 00:20:36 +0300 -Subject: [PATCH] CMakeLists: when cross-compiling, the host grpc_cpp_plugin - should be used - -Signed-off-by: Alexey Firago <alexey_firago@mentor.com> ---- - CMakeLists.txt | 9 ++++++++- - templates/CMakeLists.txt.template | 9 ++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f66066..af2046c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -333,6 +333,13 @@ function(protobuf_generate_grpc_cpp) - get_filename_component(REL_DIR ${REL_FIL} DIRECTORY) - set(RELFIL_WE "${REL_DIR}/${FIL_WE}") - -+ #if cross-compiling, find host plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin) -+ else() -+ set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) -+ endif() -+ - add_custom_command( - OUTPUT "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc" - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h" -@@ -342,7 +349,7 @@ function(protobuf_generate_grpc_cpp) - COMMAND ${_gRPC_PROTOBUF_PROTOC} - ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} - --cpp_out=${_gRPC_PROTO_GENS_DIR} -- --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> -+ --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} - ${_protobuf_include_path} - ${REL_FIL} - DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin -diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index 850404b..09c1388 100644 ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -378,6 +378,13 @@ - get_filename_component(REL_DIR <%text>${REL_FIL}</%text> DIRECTORY) - set(RELFIL_WE "<%text>${REL_DIR}/${FIL_WE}</%text>") - -+ #if cross-compiling, find host plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin) -+ else() -+ set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>) -+ endif() -+ - add_custom_command( - OUTPUT <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc"</%text> - <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h"</%text> -@@ -387,7 +394,7 @@ - COMMAND <%text>$<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}></%text> - ARGS --grpc_out=<%text>generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}</%text> - --cpp_out=<%text>${_gRPC_PROTO_GENS_DIR}</%text> -- --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> -+ --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} - <%text>${_protobuf_include_path}</%text> - <%text>${REL_FIL}</%text> - DEPENDS <%text>${ABS_FIL}</%text> <%text>${_gRPC_PROTOBUF_PROTOC}</%text> grpc_cpp_plugin --- -2.7.4 diff --git a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch b/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch deleted file mode 100644 index 4621dc6fd3..0000000000 --- a/meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch +++ /dev/null @@ -1,77 +0,0 @@ -From f640fcc81c76953b2e84fc3087f905141b6643b9 Mon Sep 17 00:00:00 2001 -From: Jan Tattermusch <jtattermusch@google.com> -Date: Thu, 24 Aug 2017 17:51:47 +0200 -Subject: [PATCH] use the right protoc executable regardless of protobuf - provider - ---- - CMakeLists.txt | 5 ++++- - templates/CMakeLists.txt.template | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bde8946..f9cd630 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -190,6 +190,7 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "module") - endif() - if(TARGET protoc) - set(_gRPC_PROTOBUF_PROTOC protoc) -+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protoc>) - endif() - else() - message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong") -@@ -213,8 +214,10 @@ elseif("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "package") - endif() - if(TARGET protobuf::protoc) - set(_gRPC_PROTOBUF_PROTOC protobuf::protoc) -+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protobuf::protoc>) - else() - set(_gRPC_PROTOBUF_PROTOC ${PROTOBUF_PROTOC_EXECUTABLE}) -+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE}) - endif() - set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf ${gRPC_PROTOBUF_PACKAGE_TYPE})\nendif()") - endif() -@@ -339,7 +342,7 @@ function(protobuf_generate_grpc_cpp) - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" -- COMMAND $<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}> -+ COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} - ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} - --cpp_out=${_gRPC_PROTO_GENS_DIR} - --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> -diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index 850404b..64daf04 100644 ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -235,6 +235,7 @@ - endif() - if(TARGET protoc) - set(_gRPC_PROTOBUF_PROTOC protoc) -+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protoc>) - endif() - else() - message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong") -@@ -258,8 +259,10 @@ - endif() - if(TARGET protobuf::protoc) - set(_gRPC_PROTOBUF_PROTOC protobuf::protoc) -+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $<TARGET_FILE:protobuf::protoc>) - else() - set(_gRPC_PROTOBUF_PROTOC <%text>${PROTOBUF_PROTOC_EXECUTABLE}</%text>) -+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE <%text>${PROTOBUF_PROTOC_EXECUTABLE}</%text>) - endif() - set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf <%text>${gRPC_PROTOBUF_PACKAGE_TYPE}</%text>)\nendif()") - endif() -@@ -384,7 +387,7 @@ - <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h"</%text> - <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"</%text> - <%text>"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"</%text> -- COMMAND <%text>$<TARGET_FILE:${_gRPC_PROTOBUF_PROTOC}></%text> -+ COMMAND <%text>${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}</%text> - ARGS --grpc_out=<%text>generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}</%text> - --cpp_out=<%text>${_gRPC_PROTO_GENS_DIR}</%text> - --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin> --- -2.7.4 diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb index 43eff72a3d..267c0e79f5 100644 --- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb @@ -50,3 +50,5 @@ FILES_${PN}-demos = "${bindir}/*" FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibRcf.cmake" BBCLASSEXTEND = "nativesdk" + +PNBLACKLIST[librcf] = " error: invalid use of incomplete type 'RCF::AsioIoService {aka class boost::asio::io_service}; among others?" diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index 2e91875640..3052eb0484 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -3,14 +3,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" HOMEPAGE = "http://luajit.org" -SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ +PV .= "+git${SRCPV}" +SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ file://clang.patch \ " -SRC_URI[md5sum] = "48353202cbcacab84ee41a5a70ea0a2c" -SRC_URI[sha256sum] = "874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979" -S = "${WORKDIR}/LuaJIT-${PV}" +S = "${WORKDIR}/git" inherit pkgconfig binconfig siteinfo @@ -49,7 +49,6 @@ EXTRA_OEMAKE = "\ 'TARGET_SHLDFLAGS=${LDFLAGS}' \ 'HOST_CC=${BUILD_CC}' \ 'HOST_CFLAGS=${BUILD_CFLAGS}' \ - 'HOST_LDFLAGS=${BUILD_LDFLAGS}' \ \ 'PREFIX=${prefix}' \ 'MULTILIB=${baselib}' \ @@ -91,3 +90,5 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" +# Aarch64 is not supported in this release +COMPATIBLE_HOST = "^(?!aarch64).*" diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.2.bb b/meta-oe/recipes-devtools/mpich/mpich_3.2.bb index 4a2c37723c..51b313cef4 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_3.2.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_3.2.bb @@ -31,6 +31,11 @@ EXTRA_OECONF = "--enable-debuginfo \ inherit autotools-brokensep gettext do_configure_prepend() { + for d in confdb test/mpi/confdb src/openpa/confdb src/pm/hydra/confdb src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb src/mpl/confdb src/mpi/romio/confdb; do + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d + done + autoreconf --verbose --install --force -I . -I confdb/ -I maint/ oe_runconf exit diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch new file mode 100644 index 0000000000..b0d772d937 --- /dev/null +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch @@ -0,0 +1,35 @@ +From a05d92ae85024d0648f69f95307a1d3e8e51109c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Apr 2018 19:55:38 -0700 +Subject: [PATCH] Fix -Werror=class-memaccess + +Casting to void* make gcc happy since its upset about +object types and rightly so + +Fixes + +'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'struct msgpack::v2::object' from an array of 'const msgpack_object' {aka 'const struct msgpack_object'} [-Werror=class-memaccess] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/msgpack/msgpack-c/pull/659] + + include/msgpack/v1/object.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/msgpack/v1/object.hpp b/include/msgpack/v1/object.hpp +index 64da8c53..9721f705 100644 +--- a/include/msgpack/v1/object.hpp ++++ b/include/msgpack/v1/object.hpp +@@ -661,7 +661,7 @@ inline object::object(const msgpack_object& o) + inline void operator<< (msgpack::object& o, const msgpack_object& v) + { + // FIXME beter way? +- std::memcpy(&o, &v, sizeof(v)); ++ std::memcpy(static_cast<void*>(&o), &v, sizeof(v)); + } + + inline object::operator msgpack_object() const +-- +2.16.3 + diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb index d9f6956690..02c0cd2964 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ PV .= "+git${SRCPV}" -SRCREV = "7a98138f27f27290e680bf8fbf1f8d1b089bf138" +SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449" SRC_URI = "git://github.com/msgpack/msgpack-c \ + file://0001-Fix-Werror-class-memaccess.patch \ " inherit cmake pkgconfig diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb index 1cab6a4978..8930cd9022 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=14045ee6ae930d784435884f8aa1be0d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=270f7477a1705f7cd3e29d3d4512915d" DEPENDS = "openssl10 zlib" @@ -12,8 +12,8 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ " -SRC_URI[md5sum] = "49001b4037b2ddf10c2174c38a40f112" -SRC_URI[sha256sum] = "ae8258f89e127a76d4b4aff6fdb8dc395b7da0069cba054b913dfc36b3c91189" +SRC_URI[md5sum] = "631ed102fe58c13cf63bc92a68cf4759" +SRC_URI[sha256sum] = "6cdcde9c9c1ca9f450a0b24eafa229ca759e576daa0fae892ce74d541ecdc86f" S = "${WORKDIR}/node-v${PV}" @@ -26,7 +26,7 @@ def map_nodejs_arch(a, d): if re.match('i.86$', a): return 'ia32' elif re.match('x86_64$', a): return 'x64' elif re.match('aarch64$', a): return 'arm64' - elif re.match('powerpc64$', a): return 'ppc64' + elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' elif re.match('powerpc$', a): return 'ppc' return a @@ -80,7 +80,8 @@ do_install_append_class-target() { PACKAGES =+ "${PN}-npm" FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python-shell python-datetime python-subprocess python-textutils" +RDEPENDS_${PN}-npm = "bash python-shell python-datetime python-subprocess python-textutils \ + python-compiler python-misc python-multiprocessing" PACKAGES =+ "${PN}-systemtap" FILES_${PN}-systemtap = "${datadir}/systemtap" diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch deleted file mode 100644 index 644146c4da..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 8f85163b030e7b957648f90cd8fa599fb04d5d65 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 23:32:49 -0700 -Subject: [PATCH 1/5] Add fallthrough comments - -Fixes - -src/svf/svf.c:663:7: error: this statement may fall through [-Werror=implicit-fallthrough=] - i = -1; - ~~^~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/flash/mflash.c | 3 ++- - src/flash/nand/mx3.c | 1 + - src/jtag/drivers/ftdi.c | 1 + - src/svf/svf.c | 2 ++ - src/target/arm_adi_v5.c | 9 +++++++++ - src/target/arm_disassembler.c | 1 + - src/target/target.c | 1 + - 7 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/flash/mflash.c b/src/flash/mflash.c -index b69995542..3254a3d56 100644 ---- a/src/flash/mflash.c -+++ b/src/flash/mflash.c -@@ -259,10 +259,11 @@ static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var) - case mg_io_wait_rdy: - if (status & mg_io_rbit_status_ready) - return ERROR_OK; -- -+ /* fallthru */ - case mg_io_wait_drq: - if (status & mg_io_rbit_status_data_req) - return ERROR_OK; -+ /* fallthru */ - - default: - break; -diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c -index b61e47535..0a55929ed 100644 ---- a/src/flash/nand/mx3.c -+++ b/src/flash/nand/mx3.c -@@ -281,6 +281,7 @@ static int imx31_command(struct nand_device *nand, uint8_t command) - * offset == one half of page size - */ - in_sram_address = MX3_NF_MAIN_BUFFER0 + (nand->page_size >> 1); -+ /* fallthru */ - default: - in_sram_address = MX3_NF_MAIN_BUFFER0; - } -diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c -index 00fe37faf..20f17d810 100644 ---- a/src/jtag/drivers/ftdi.c -+++ b/src/jtag/drivers/ftdi.c -@@ -855,6 +855,7 @@ COMMAND_HANDLER(ftdi_handle_set_signal_command) - ftdi_set_signal(sig, *CMD_ARGV[1]); - break; - } -+ /* fallthru */ - default: - LOG_ERROR("unknown signal level '%s', use 0, 1 or z", CMD_ARGV[1]); - return ERROR_COMMAND_SYNTAX_ERROR; -diff --git a/src/svf/svf.c b/src/svf/svf.c -index e7e815c10..7b261cc72 100644 ---- a/src/svf/svf.c -+++ b/src/svf/svf.c -@@ -661,11 +661,13 @@ static int svf_read_command_from_file(FILE *fd) - if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0) - return ERROR_FAIL; - i = -1; -+ /* fallthru */ - case '\r': - slash = 0; - /* Don't save '\r' and '\n' if no data is parsed */ - if (!cmd_pos) - break; -+ /* fallthru */ - default: - /* The parsing code currently expects a space - * before parentheses -- "TDI (123)". Also a -diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c -index eafc2ddc0..d444db2b1 100644 ---- a/src/target/arm_adi_v5.c -+++ b/src/target/arm_adi_v5.c -@@ -346,10 +346,13 @@ static int mem_ap_write(struct adiv5_ap *ap, const uint8_t *buffer, uint32_t siz - case 4: - outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); - outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); -+ /* fallthru */ - case 2: - outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); -+ /* fallthru */ - case 1: - outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3); -+ /* fallthru */ - } - } - -@@ -509,20 +512,26 @@ static int mem_ap_read(struct adiv5_ap *ap, uint8_t *buffer, uint32_t size, uint - case 4: - *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); - *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); -+ /* fallthru */ - case 2: - *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); -+ /* fallthru */ - case 1: - *buffer++ = *read_ptr >> 8 * (3 - (address++ & 3)); -+ /* fallthru */ - } - } else { - switch (this_size) { - case 4: - *buffer++ = *read_ptr >> 8 * (address++ & 3); - *buffer++ = *read_ptr >> 8 * (address++ & 3); -+ /* fallthru */ - case 2: - *buffer++ = *read_ptr >> 8 * (address++ & 3); -+ /* fallthru */ - case 1: - *buffer++ = *read_ptr >> 8 * (address++ & 3); -+ /* fallthru */ - } - } - -diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c -index 5277b94d8..2eb21ea33 100644 ---- a/src/target/arm_disassembler.c -+++ b/src/target/arm_disassembler.c -@@ -3299,6 +3299,7 @@ static int t2ev_data_immed(uint32_t opcode, uint32_t address, - case 0x10: - case 0x12: - is_signed = true; -+ /* fallthru */ - case 0x18: - case 0x1a: - /* signed/unsigned saturated add */ -diff --git a/src/target/target.c b/src/target/target.c -index e04ecc470..597b4b13d 100644 ---- a/src/target/target.c -+++ b/src/target/target.c -@@ -3684,6 +3684,7 @@ COMMAND_HANDLER(handle_bp_command) - addr = 0; - return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); - } -+ /* fallthru */ - - case 4: - hw = BKPT_HARD; --- -2.13.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch b/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch deleted file mode 100644 index aa99735f6c..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8daaa8c27794653d02854c5982669a7638473224 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 23:52:46 -0700 -Subject: [PATCH 2/5] Workaround new warnings generated by GCC 7 - -src/flash/nor/xmc4xxx.c: In function 'xmc4xxx_get_info_command': -src/flash/nor/xmc4xxx.c:939:43: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 6 [-Werror=format-truncation=] - snprintf(otp_str, sizeof(otp_str), "- %d\n", i); - ^~ -src/flash/nor/xmc4xxx.c:939:40: note: directive argument in the range [0, 2147483647] - snprintf(otp_str, sizeof(otp_str), "- %d\n", i); - ^~~~~~~~ -src/flash/nor/xmc4xxx.c:939:5: note: 'snprintf' output between 5 and 14 bytes into a destination of size 8 - snprintf(otp_str, sizeof(otp_str), "- %d\n", i); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/flash/nor/xmc4xxx.c | 2 +- - src/target/arm_adi_v5.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c -index 02df46a3f..e6c398ff9 100644 ---- a/src/flash/nor/xmc4xxx.c -+++ b/src/flash/nor/xmc4xxx.c -@@ -931,7 +931,7 @@ static int xmc4xxx_get_info_command(struct flash_bank *bank, char *buf, int buf_ - - /* If OTP Write protection is enabled (User 2), list each - * sector that has it enabled */ -- char otp_str[8]; -+ char otp_str[14]; - if (otp_enabled) { - strcat(prot_str, "\nOTP Protection is enabled for sectors:\n"); - for (int i = 0; i < bank->num_sectors; i++) { -diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c -index d444db2b1..d0d95121f 100644 ---- a/src/target/arm_adi_v5.c -+++ b/src/target/arm_adi_v5.c -@@ -1062,7 +1062,7 @@ static int dap_rom_display(struct command_context *cmd_ctx, - int retval; - uint64_t pid; - uint32_t cid; -- char tabs[7] = ""; -+ char tabs[16] = ""; - - if (depth > 16) { - command_print(cmd_ctx, "\tTables too deep"); --- -2.13.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch b/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch deleted file mode 100644 index bcfbfc92b3..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8e5051e83fedb078170565a24d1f5de6c2ce4428 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 00:01:51 -0700 -Subject: [PATCH 3/5] armv7a: Add missing break to fix fallthrough warning - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/target/armv7a.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/target/armv7a.c b/src/target/armv7a.c -index 6021def4e..bad806b3d 100644 ---- a/src/target/armv7a.c -+++ b/src/target/armv7a.c -@@ -355,6 +355,7 @@ int armv7a_mmu_translate_va_pa(struct target *target, uint32_t va, - break; - case 7: - LOG_INFO("inner: Write-Back, no Write-Allocate"); -+ break; - - default: - LOG_INFO("inner: %" PRIx32 " ???", INNER); --- -2.13.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch b/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch deleted file mode 100644 index bfc5627c1d..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d3ca56370a2be7e737d48bd14d474d790a0ab8ac Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 00:04:00 -0700 -Subject: [PATCH 4/5] Fix overflow warning - -Remove an empty space which makes it fit into 11 byte string - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/target/nds32_cmd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/target/nds32_cmd.c b/src/target/nds32_cmd.c -index edb4872e4..73355073c 100644 ---- a/src/target/nds32_cmd.c -+++ b/src/target/nds32_cmd.c -@@ -821,7 +821,7 @@ static int jim_nds32_bulk_read(Jim_Interp *interp, int argc, Jim_Obj * const *ar - jim_wide i; - Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - for (i = 0; i < count; i++) { -- sprintf(data_str, "0x%08" PRIx32 " ", data[i]); -+ sprintf(data_str, "0x%08" PRIx32 "", data[i]); - Jim_AppendStrings(interp, Jim_GetResult(interp), data_str, NULL); - } - --- -2.13.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch b/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch deleted file mode 100644 index 60f75da2c7..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 29dbf92ffdbdda29662b4190a2f8eb09caad8b51 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 00:06:32 -0700 -Subject: [PATCH 5/5] command: Move the fall through comment to right scope - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/helper/command.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/helper/command.c b/src/helper/command.c -index 5deaee859..287c14857 100644 ---- a/src/helper/command.c -+++ b/src/helper/command.c -@@ -1456,8 +1456,8 @@ COMMAND_HELPER(handle_command_parse_bool, bool *out, const char *label) - LOG_ERROR("%s: argument '%s' is not valid", CMD_NAME, in); - return ERROR_COMMAND_SYNTAX_ERROR; - } -- /* fall through */ - } -+ /* fall through */ - case 0: - LOG_INFO("%s is %s", label, *out ? "enabled" : "disabled"); - break; --- -2.13.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 20bc663f98..67abeede93 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -5,13 +5,8 @@ DEPENDS = "libusb-compat libftdi" RDEPENDS_${PN} = "libusb1" SRC_URI = "git://repo.or.cz/openocd.git \ - file://0001-Add-fallthrough-comments.patch \ - file://0002-Workaround-new-warnings-generated-by-GCC-7.patch \ - file://0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch \ - file://0004-Fix-overflow-warning.patch \ - file://0005-command-Move-the-fall-through-comment-to-right-scope.patch \ " -SRCREV = "1025be363e2bf42f1613083223a2322cc3a9bd4c" +SRCREV = "3737dd69e73816d186ba418d7b833462a8041079" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/ipc-run_0.94.bb b/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb index 3b58939b17..08c966da9d 100644 --- a/meta-oe/recipes-devtools/perl/ipc-run_0.94.bb +++ b/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" DEPENDS = "perl" SRC_URI = "git://github.com/toddr/IPC-Run.git" -SRCREV = "6bdf41e276e06d23e140783b13a6eaef4745c216" +SRCREV = "96066366ac8c401dff9c979d04f25dc8219ffcc1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.036.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb index f5dbef2afd..bd8ba780ae 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.036.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb @@ -17,8 +17,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ " -SRC_URI[md5sum] = "fdee1d8dc4ae54bc6cb7cd5a3f3d3342" -SRC_URI[sha256sum] = "5c48a823f86b8110ccb6504c6176ca248b52f56829dd4548bc39c3509f4154cf" +SRC_URI[md5sum] = "4a00dd7f1c057931147c65dfc4901c36" +SRC_URI[sha256sum] = "629f865e8317f52602b2f2efd2b688002903d2e4bbcba5427cb6188b043d6f99" S = "${WORKDIR}/DBD-mysql-${PV}" diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.636.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb index 085b904938..24a1245fc0 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.636.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb @@ -13,14 +13,24 @@ RDEPENDS_${PN} = " perl-module-carp \ perl-module-dynaloader \ " -LIC_FILES_CHKSUM = "file://DBI.pm;beginline=8147;endline=8151;md5=2e5f6cf47e5ad7b77dcb6172edc29292" +LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" -SRC_URI[md5sum] = "60f291e5f015550dde71d1858dfe93ba" -SRC_URI[sha256sum] = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c" +SRC_URI[md5sum] = "e77fd37fcf77fc88fde029c1b75ded54" +SRC_URI[sha256sum] = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1" S = "${WORKDIR}/DBI-${PV}" -inherit cpan +inherit cpan ptest-perl + +do_install_prepend() { + # test requires "-T" (taint) command line option + rm -rf ${B}/t/pod-coverage.t + rm -rf ${B}/t/13taint.t + # source of test failure not obvious + rm -rf ${B}/t/85gofer.t + # unclear why there are several duplicates of tests in tarball + rm -rf ${B}/t/z*.t +} BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch b/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch deleted file mode 100644 index 18b4937dbd..0000000000 --- a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 5c84b039e97abd88f6a18da0e6d27383c00fea92 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 26 Jul 2017 23:06:56 -0700 -Subject: [PATCH] Specify --tag with libtool - -This helps in compiling with external toolchains -with -fPIE appended to CC e.g. via hardening flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - acinclude.m4 | 8 ++++---- - configure.in | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index a114a98..1cc7a26 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -806,10 +806,10 @@ dnl - dnl PHP_BUILD_PROGRAM - dnl - AC_DEFUN([PHP_BUILD_PROGRAM],[ -- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' -+ php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= -- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' -+ php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo -@@ -819,10 +819,10 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[ - no) pic_setting='-prefer-non-pic';; - esac - -- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' -+ shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= -- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' -+ shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo -diff --git a/configure.in b/configure.in -index 7d65b63..7221af9 100644 ---- a/configure.in -+++ b/configure.in -@@ -1431,8 +1431,8 @@ PHP_SET_LIBTOOL_VARIABLE([--silent]) - dnl libtool 1.4.3 needs this. - PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps]) - --test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' --test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' -+test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --tag=CC --mode=compile $(COMPILE) -c $<' -+test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --tag=CXX --mode=compile $(CXX_COMPILE) -c $<' - SHARED_LIBTOOL='$(LIBTOOL)' - - CC=$old_CC --- -2.13.3 - diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch b/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch deleted file mode 100644 index 41d2a0f612..0000000000 --- a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch +++ /dev/null @@ -1,5241 +0,0 @@ -From f2f90767311355cafabff604a7a857ca60ee3f01 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Wed, 22 Nov 2017 21:14:59 -0800 -Subject: [PATCH] Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() - -Upstream-Status: Backport -CVE: CVE-2017-16642 -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - ext/date/lib/parse_date.c | 1544 +++++++++++++++++++++---------------- - ext/date/lib/parse_date.re | 4 +- - ext/date/tests/bug53437_var3.phpt | 2 +- - ext/wddx/tests/bug75055.phpt | 20 + - ext/wddx/tests/bug75055.wddx | 13 + - 5 files changed, 911 insertions(+), 672 deletions(-) - create mode 100644 ext/wddx/tests/bug75055.phpt - create mode 100644 ext/wddx/tests/bug75055.wddx - -diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c -index f929619..6b11418 100644 ---- a/ext/date/lib/parse_date.c -+++ b/ext/date/lib/parse_date.c -@@ -1,4 +1,5 @@ --/* Generated by re2c 0.15.3 on Tue Jul 4 21:15:17 2017 */ -+/* Generated by re2c 0.15.3 on Wed Nov 22 21:14:47 2017 */ -+#line 1 "ext/date/lib/parse_date.re" - /* - * The MIT License (MIT) - * -@@ -837,9 +838,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) - std: - s->tok = cursor; - s->len = 0; -+#line 965 "ext/date/lib/parse_date.re" - - - -+#line 846 "ext/date/lib/parse_date.c" - { - YYCTYPE yych; - unsigned int yyaccept = 0; -@@ -962,18 +965,19 @@ yy2: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy165; -- goto yy1521; -+ goto yy1523; - } - } else { - if (yych <= 'd') { - if (yych <= 'Z') goto yy165; - if (yych >= 'a') goto yy170; - } else { -- if (yych <= 'e') goto yy1530; -+ if (yych <= 'e') goto yy1532; - if (yych <= 'z') goto yy170; - } - } - yy3: -+#line 1673 "ext/date/lib/parse_date.re" - { - int tz_not_found; - DEBUG_OUTPUT("tzcorrection | tz"); -@@ -986,6 +990,7 @@ yy3: - TIMELIB_DEINIT; - return TIMELIB_TIMEZONE; - } -+#line 994 "ext/date/lib/parse_date.c" - yy4: - yych = *++YYCURSOR; - if (yych <= 'E') { -@@ -995,7 +1000,7 @@ yy4: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy165; -- goto yy1521; -+ goto yy1523; - } - } else { - if (yych <= 'd') { -@@ -1003,7 +1008,7 @@ yy4: - if (yych <= '`') goto yy3; - goto yy165; - } else { -- if (yych <= 'e') goto yy1521; -+ if (yych <= 'e') goto yy1523; - if (yych <= 'z') goto yy165; - goto yy3; - } -@@ -1017,12 +1022,12 @@ yy5: - goto yy165; - } else { - if (yych <= 'H') { -- if (yych <= 'E') goto yy1492; -+ if (yych <= 'E') goto yy1494; - goto yy165; - } else { -- if (yych <= 'I') goto yy1493; -+ if (yych <= 'I') goto yy1495; - if (yych <= 'N') goto yy165; -- goto yy1491; -+ goto yy1493; - } - } - } else { -@@ -1031,15 +1036,15 @@ yy5: - if (yych <= 'Z') goto yy165; - goto yy3; - } else { -- if (yych == 'e') goto yy1508; -+ if (yych == 'e') goto yy1510; - goto yy170; - } - } else { - if (yych <= 'n') { -- if (yych <= 'i') goto yy1509; -+ if (yych <= 'i') goto yy1511; - goto yy170; - } else { -- if (yych <= 'o') goto yy1507; -+ if (yych <= 'o') goto yy1509; - if (yych <= 'z') goto yy170; - goto yy3; - } -@@ -1054,12 +1059,12 @@ yy6: - goto yy165; - } else { - if (yych <= 'H') { -- if (yych <= 'E') goto yy1492; -+ if (yych <= 'E') goto yy1494; - goto yy165; - } else { -- if (yych <= 'I') goto yy1493; -+ if (yych <= 'I') goto yy1495; - if (yych <= 'N') goto yy165; -- goto yy1491; -+ goto yy1493; - } - } - } else { -@@ -1068,15 +1073,15 @@ yy6: - if (yych <= 'Z') goto yy165; - goto yy3; - } else { -- if (yych == 'e') goto yy1492; -+ if (yych == 'e') goto yy1494; - goto yy165; - } - } else { - if (yych <= 'n') { -- if (yych <= 'i') goto yy1493; -+ if (yych <= 'i') goto yy1495; - goto yy165; - } else { -- if (yych <= 'o') goto yy1491; -+ if (yych <= 'o') goto yy1493; - if (yych <= 'z') goto yy165; - goto yy3; - } -@@ -1088,24 +1093,24 @@ yy7: - if (yych <= 'A') { - if (yych == ')') goto yy164; - if (yych <= '@') goto yy3; -- goto yy1461; -+ goto yy1463; - } else { -- if (yych == 'I') goto yy1462; -+ if (yych == 'I') goto yy1464; - if (yych <= 'N') goto yy165; -- goto yy1463; -+ goto yy1465; - } - } else { - if (yych <= 'h') { - if (yych <= 'Z') goto yy165; - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1476; -+ if (yych <= 'a') goto yy1478; - goto yy170; - } else { - if (yych <= 'n') { -- if (yych <= 'i') goto yy1477; -+ if (yych <= 'i') goto yy1479; - goto yy170; - } else { -- if (yych <= 'o') goto yy1478; -+ if (yych <= 'o') goto yy1480; - if (yych <= 'z') goto yy170; - goto yy3; - } -@@ -1117,24 +1122,24 @@ yy8: - if (yych <= 'A') { - if (yych == ')') goto yy164; - if (yych <= '@') goto yy3; -- goto yy1461; -+ goto yy1463; - } else { -- if (yych == 'I') goto yy1462; -+ if (yych == 'I') goto yy1464; - if (yych <= 'N') goto yy165; -- goto yy1463; -+ goto yy1465; - } - } else { - if (yych <= 'h') { - if (yych <= 'Z') goto yy165; - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1461; -+ if (yych <= 'a') goto yy1463; - goto yy165; - } else { - if (yych <= 'n') { -- if (yych <= 'i') goto yy1462; -+ if (yych <= 'i') goto yy1464; - goto yy165; - } else { -- if (yych <= 'o') goto yy1463; -+ if (yych <= 'o') goto yy1465; - if (yych <= 'z') goto yy165; - goto yy3; - } -@@ -1146,15 +1151,15 @@ yy9: - switch (yych) { - case ')': goto yy164; - case '0': -- case '1': goto yy1391; -- case '2': goto yy1392; -+ case '1': goto yy1393; -+ case '2': goto yy1394; - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': -- case '9': goto yy1393; -+ case '9': goto yy1395; - case 'A': - case 'B': - case 'C': -@@ -1176,11 +1181,11 @@ yy9: - case 'X': - case 'Y': - case 'Z': goto yy165; -- case 'E': goto yy1386; -- case 'H': goto yy1387; -- case 'O': goto yy1388; -- case 'U': goto yy1389; -- case 'W': goto yy1390; -+ case 'E': goto yy1388; -+ case 'H': goto yy1389; -+ case 'O': goto yy1390; -+ case 'U': goto yy1391; -+ case 'W': goto yy1392; - case 'a': - case 'b': - case 'c': -@@ -1202,11 +1207,11 @@ yy9: - case 'x': - case 'y': - case 'z': goto yy170; -- case 'e': goto yy1429; -- case 'h': goto yy1430; -- case 'o': goto yy1431; -- case 'u': goto yy1432; -- case 'w': goto yy1433; -+ case 'e': goto yy1431; -+ case 'h': goto yy1432; -+ case 'o': goto yy1433; -+ case 'u': goto yy1434; -+ case 'w': goto yy1435; - default: goto yy3; - } - yy10: -@@ -1215,15 +1220,15 @@ yy10: - switch (yych) { - case ')': goto yy164; - case '0': -- case '1': goto yy1391; -- case '2': goto yy1392; -+ case '1': goto yy1393; -+ case '2': goto yy1394; - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': -- case '9': goto yy1393; -+ case '9': goto yy1395; - case 'A': - case 'B': - case 'C': -@@ -1267,28 +1272,30 @@ yy10: - case 'y': - case 'z': goto yy165; - case 'E': -- case 'e': goto yy1386; -+ case 'e': goto yy1388; - case 'H': -- case 'h': goto yy1387; -+ case 'h': goto yy1389; - case 'O': -- case 'o': goto yy1388; -+ case 'o': goto yy1390; - case 'U': -- case 'u': goto yy1389; -+ case 'u': goto yy1391; - case 'W': -- case 'w': goto yy1390; -+ case 'w': goto yy1392; - default: goto yy3; - } - yy11: - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); -- if (yych == '-') goto yy1374; -+ if (yych == '-') goto yy1376; - if (yych <= '/') goto yy12; -- if (yych <= '9') goto yy1375; -+ if (yych <= '9') goto yy1377; - yy12: -+#line 1768 "ext/date/lib/parse_date.re" - { - add_error(s, "Unexpected character"); - goto std; - } -+#line 1299 "ext/date/lib/parse_date.c" - yy13: - yych = *++YYCURSOR; - if (yych <= 'R') { -@@ -1299,16 +1306,16 @@ yy13: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy165; -- goto yy1310; -+ goto yy1311; - } - } else { - if (yych <= 'N') { -- if (yych == 'I') goto yy1311; -+ if (yych == 'I') goto yy1312; - goto yy165; - } else { -- if (yych <= 'O') goto yy1312; -+ if (yych <= 'O') goto yy1313; - if (yych <= 'Q') goto yy165; -- goto yy1313; -+ goto yy1314; - } - } - } else { -@@ -1318,16 +1325,16 @@ yy13: - if (yych <= '`') goto yy3; - goto yy170; - } else { -- if (yych <= 'e') goto yy1351; -+ if (yych <= 'e') goto yy1353; - if (yych <= 'h') goto yy170; -- goto yy1352; -+ goto yy1354; - } - } else { - if (yych <= 'q') { -- if (yych == 'o') goto yy1353; -+ if (yych == 'o') goto yy1355; - goto yy170; - } else { -- if (yych <= 'r') goto yy1354; -+ if (yych <= 'r') goto yy1356; - if (yych <= 'z') goto yy170; - goto yy3; - } -@@ -1343,16 +1350,16 @@ yy14: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy165; -- goto yy1310; -+ goto yy1311; - } - } else { - if (yych <= 'N') { -- if (yych == 'I') goto yy1311; -+ if (yych == 'I') goto yy1312; - goto yy165; - } else { -- if (yych <= 'O') goto yy1312; -+ if (yych <= 'O') goto yy1313; - if (yych <= 'Q') goto yy165; -- goto yy1313; -+ goto yy1314; - } - } - } else { -@@ -1362,16 +1369,16 @@ yy14: - if (yych <= '`') goto yy3; - goto yy165; - } else { -- if (yych <= 'e') goto yy1310; -+ if (yych <= 'e') goto yy1311; - if (yych <= 'h') goto yy165; -- goto yy1311; -+ goto yy1312; - } - } else { - if (yych <= 'q') { -- if (yych == 'o') goto yy1312; -+ if (yych == 'o') goto yy1313; - goto yy165; - } else { -- if (yych <= 'r') goto yy1313; -+ if (yych <= 'r') goto yy1314; - if (yych <= 'z') goto yy165; - goto yy3; - } -@@ -1382,13 +1389,13 @@ yy15: - if (yych <= 'A') { - if (yych == ')') goto yy164; - if (yych <= '@') goto yy3; -- goto yy1296; -+ goto yy1297; - } else { - if (yych <= '`') { - if (yych <= 'Z') goto yy165; - goto yy3; - } else { -- if (yych <= 'a') goto yy1307; -+ if (yych <= 'a') goto yy1308; - if (yych <= 'z') goto yy170; - goto yy3; - } -@@ -1398,13 +1405,13 @@ yy16: - if (yych <= 'A') { - if (yych == ')') goto yy164; - if (yych <= '@') goto yy3; -- goto yy1296; -+ goto yy1297; - } else { - if (yych <= '`') { - if (yych <= 'Z') goto yy165; - goto yy3; - } else { -- if (yych <= 'a') goto yy1296; -+ if (yych <= 'a') goto yy1297; - if (yych <= 'z') goto yy165; - goto yy3; - } -@@ -1420,7 +1427,7 @@ yy17: - if (yych <= 'Z') goto yy165; - goto yy3; - } else { -- if (yych <= 'a') goto yy1293; -+ if (yych <= 'a') goto yy1294; - if (yych <= 'z') goto yy170; - goto yy3; - } -@@ -2495,18 +2502,22 @@ yy48: - if (yych <= '/') goto yy49; - if (yych <= '9') goto yy54; - yy49: -+#line 1757 "ext/date/lib/parse_date.re" - { - goto std; - } -+#line 2510 "ext/date/lib/parse_date.c" - yy50: - yych = *++YYCURSOR; - goto yy49; - yy51: - ++YYCURSOR; -+#line 1762 "ext/date/lib/parse_date.re" - { - s->pos = cursor; s->line++; - goto std; - } -+#line 2521 "ext/date/lib/parse_date.c" - yy53: - yych = *++YYCURSOR; - goto yy12; -@@ -2693,23 +2704,23 @@ yy56: - } - } else { - if (yyaccept == 28) { -- goto yy1377; -+ goto yy1379; - } else { -- goto yy1415; -+ goto yy1417; - } - } - } else { - if (yyaccept <= 31) { - if (yyaccept == 30) { -- goto yy1418; -+ goto yy1420; - } else { -- goto yy1498; -+ goto yy1500; - } - } else { - if (yyaccept == 32) { -- goto yy1506; -+ goto yy1508; - } else { -- goto yy1529; -+ goto yy1531; - } - } - } -@@ -2920,6 +2931,7 @@ yy73: - if (yych == 'S') goto yy75; - if (yych == 's') goto yy75; - yy74: -+#line 1741 "ext/date/lib/parse_date.re" - { - timelib_ull i; - DEBUG_OUTPUT("relative"); -@@ -2934,6 +2946,7 @@ yy74: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } -+#line 2950 "ext/date/lib/parse_date.c" - yy75: - yych = *++YYCURSOR; - if (yych == 'D') goto yy76; -@@ -3719,6 +3732,7 @@ yy190: - } - } - yy191: -+#line 1604 "ext/date/lib/parse_date.re" - { - const timelib_relunit* relunit; - DEBUG_OUTPUT("daytext"); -@@ -3735,6 +3749,7 @@ yy191: - TIMELIB_DEINIT; - return TIMELIB_WEEKDAY; - } -+#line 3753 "ext/date/lib/parse_date.c" - yy192: - yych = *++YYCURSOR; - if (yych <= 'K') { -@@ -4227,6 +4242,7 @@ yy217: - } - } - yy218: -+#line 1663 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("monthtext"); - TIMELIB_INIT; -@@ -4235,6 +4251,7 @@ yy218: - TIMELIB_DEINIT; - return TIMELIB_DATE_TEXT; - } -+#line 4255 "ext/date/lib/parse_date.c" - yy219: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 23) YYFILL(23); -@@ -4469,6 +4486,7 @@ yy231: - if (yych == 't') goto yy319; - goto yy237; - yy232: -+#line 1409 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("datetextual | datenoyear"); -@@ -4481,6 +4499,7 @@ yy232: - TIMELIB_DEINIT; - return TIMELIB_DATE_TEXT; - } -+#line 4503 "ext/date/lib/parse_date.c" - yy233: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); -@@ -4593,6 +4612,7 @@ yy245: - if (yych <= ':') goto yy248; - } - yy246: -+#line 1711 "ext/date/lib/parse_date.re" - { - int tz_not_found; - DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); -@@ -4621,6 +4641,7 @@ yy246: - TIMELIB_DEINIT; - return TIMELIB_SHORTDATE_WITH_TIME; - } -+#line 4645 "ext/date/lib/parse_date.c" - yy247: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); -@@ -4893,6 +4914,7 @@ yy269: - } - yy270: - ++YYCURSOR; -+#line 1687 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); - TIMELIB_INIT; -@@ -4915,6 +4937,7 @@ yy270: - TIMELIB_DEINIT; - return TIMELIB_SHORTDATE_WITH_TIME; - } -+#line 4941 "ext/date/lib/parse_date.c" - yy272: - yych = *++YYCURSOR; - if (yych <= 0x1F) { -@@ -5470,6 +5493,7 @@ yy320: - if (yych <= '/') goto yy56; - if (yych >= ':') goto yy56; - ++YYCURSOR; -+#line 1381 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("datenoday"); -@@ -5482,6 +5506,7 @@ yy320: - TIMELIB_DEINIT; - return TIMELIB_DATE_NO_DAY; - } -+#line 5510 "ext/date/lib/parse_date.c" - yy323: - yych = *++YYCURSOR; - if (yych <= '9') { -@@ -5704,6 +5729,7 @@ yy327: - if ((yych = *YYCURSOR) <= '/') goto yy330; - if (yych <= '9') goto yy331; - yy330: -+#line 1525 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("pgtextshort"); -@@ -5716,6 +5742,7 @@ yy330: - TIMELIB_DEINIT; - return TIMELIB_PG_TEXT; - } -+#line 5746 "ext/date/lib/parse_date.c" - yy331: - yych = *++YYCURSOR; - if (yych <= '/') goto yy330; -@@ -6270,6 +6297,7 @@ yy356: - if (yych <= 'z') goto yy167; - } - yy357: -+#line 1583 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("ago"); - TIMELIB_INIT; -@@ -6289,6 +6317,7 @@ yy357: - TIMELIB_DEINIT; - return TIMELIB_AGO; - } -+#line 6321 "ext/date/lib/parse_date.c" - yy358: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); -@@ -8009,6 +8038,7 @@ yy417: - yy418: - ++YYCURSOR; - yy419: -+#line 1286 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); - TIMELIB_INIT; -@@ -8019,6 +8049,7 @@ yy419: - TIMELIB_DEINIT; - return TIMELIB_ISO_DATE; - } -+#line 8053 "ext/date/lib/parse_date.c" - yy420: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); -@@ -8641,6 +8672,7 @@ yy439: - } - } - yy440: -+#line 1423 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("datenoyearrev"); - TIMELIB_INIT; -@@ -8651,6 +8683,7 @@ yy440: - TIMELIB_DEINIT; - return TIMELIB_DATE_TEXT; - } -+#line 8687 "ext/date/lib/parse_date.c" - yy441: - yyaccept = 9; - yych = *(YYMARKER = ++YYCURSOR); -@@ -8778,6 +8811,7 @@ yy450: - } - yy452: - ++YYCURSOR; -+#line 1141 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); - TIMELIB_INIT; -@@ -8793,6 +8827,7 @@ yy452: - TIMELIB_DEINIT; - return TIMELIB_TIME12; - } -+#line 8831 "ext/date/lib/parse_date.c" - yy454: - yyaccept = 10; - yych = *(YYMARKER = ++YYCURSOR); -@@ -8803,6 +8838,7 @@ yy454: - if (yych <= ':') goto yy457; - } - yy455: -+#line 1178 "ext/date/lib/parse_date.re" - { - int tz_not_found; - DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long"); -@@ -8827,6 +8863,7 @@ yy455: - TIMELIB_DEINIT; - return TIMELIB_TIME24_WITH_ZONE; - } -+#line 8867 "ext/date/lib/parse_date.c" - yy456: - yyaccept = 10; - yych = *(YYMARKER = ++YYCURSOR); -@@ -9103,6 +9140,7 @@ yy485: - } - yy487: - ++YYCURSOR; -+#line 1158 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("mssqltime"); - TIMELIB_INIT; -@@ -9121,6 +9159,7 @@ yy487: - TIMELIB_DEINIT; - return TIMELIB_TIME24_WITH_ZONE; - } -+#line 9163 "ext/date/lib/parse_date.c" - yy489: - yyaccept = 10; - YYMARKER = ++YYCURSOR; -@@ -9215,6 +9254,7 @@ yy498: - if ((yych = *YYCURSOR) <= '/') goto yy499; - if (yych <= '9') goto yy505; - yy499: -+#line 1340 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("datefull"); -@@ -9228,6 +9268,7 @@ yy499: - TIMELIB_DEINIT; - return TIMELIB_DATE_FULL; - } -+#line 9272 "ext/date/lib/parse_date.c" - yy500: - yych = *++YYCURSOR; - if (yych == 'M') goto yy501; -@@ -9891,6 +9932,7 @@ yy569: - if (yych <= '/') goto yy56; - if (yych >= ':') goto yy56; - ++YYCURSOR; -+#line 1355 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("pointed date YYYY"); - TIMELIB_INIT; -@@ -9901,6 +9943,7 @@ yy569: - TIMELIB_DEINIT; - return TIMELIB_DATE_FULL_POINTED; - } -+#line 9947 "ext/date/lib/parse_date.c" - yy572: - yyaccept = 10; - yych = *(YYMARKER = ++YYCURSOR); -@@ -9931,6 +9974,7 @@ yy575: - if (yych <= '/') goto yy576; - if (yych <= '9') goto yy569; - yy576: -+#line 1367 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("pointed date YY"); -@@ -9943,6 +9987,7 @@ yy576: - TIMELIB_DEINIT; - return TIMELIB_DATE_FULL_POINTED; - } -+#line 9991 "ext/date/lib/parse_date.c" - yy577: - yyaccept = 10; - yych = *(YYMARKER = ++YYCURSOR); -@@ -10538,6 +10583,7 @@ yy620: - } - } - yy621: -+#line 1326 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("gnudateshort"); -@@ -10550,6 +10596,7 @@ yy621: - TIMELIB_DEINIT; - return TIMELIB_ISO_DATE; - } -+#line 10600 "ext/date/lib/parse_date.c" - yy622: - yyaccept = 12; - yych = *(YYMARKER = ++YYCURSOR); -@@ -10645,6 +10692,7 @@ yy630: - } - } - yy631: -+#line 1270 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("americanshort | american"); -@@ -10659,6 +10707,7 @@ yy631: - TIMELIB_DEINIT; - return TIMELIB_AMERICAN; - } -+#line 10711 "ext/date/lib/parse_date.c" - yy632: - yyaccept = 13; - yych = *(YYMARKER = ++YYCURSOR); -@@ -10857,6 +10906,7 @@ yy664: - if (yych <= '9') goto yy667; - if (yych <= ':') goto yy668; - yy665: -+#line 1553 "ext/date/lib/parse_date.re" - { - int tz_not_found; - DEBUG_OUTPUT("clf"); -@@ -10876,6 +10926,7 @@ yy665: - TIMELIB_DEINIT; - return TIMELIB_CLF; - } -+#line 10930 "ext/date/lib/parse_date.c" - yy666: - yych = *++YYCURSOR; - if (yych <= '5') { -@@ -11362,6 +11413,7 @@ yy727: - if (yych <= 't') goto yy627; - } - yy728: -+#line 1298 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("iso8601date2"); -@@ -11374,6 +11426,7 @@ yy728: - TIMELIB_DEINIT; - return TIMELIB_ISO_DATE; - } -+#line 11430 "ext/date/lib/parse_date.c" - yy729: - yych = *++YYCURSOR; - if (yych == 'C') goto yy730; -@@ -11404,6 +11457,7 @@ yy734: - if (yych >= '2') goto yy56; - yy735: - ++YYCURSOR; -+#line 1539 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("pgtextreverse"); -@@ -11416,6 +11470,7 @@ yy735: - TIMELIB_DEINIT; - return TIMELIB_PG_TEXT; - } -+#line 11474 "ext/date/lib/parse_date.c" - yy737: - yych = *++YYCURSOR; - if (yych == 'V') goto yy730; -@@ -11568,6 +11623,7 @@ yy747: - } - } - yy748: -+#line 1574 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("year4"); - TIMELIB_INIT; -@@ -11575,6 +11631,7 @@ yy748: - TIMELIB_DEINIT; - return TIMELIB_CLF; - } -+#line 11635 "ext/date/lib/parse_date.c" - yy749: - yych = *++YYCURSOR; - switch (yych) { -@@ -11769,6 +11826,7 @@ yy757: - if (yych <= 'X') goto yy848; - } - yy758: -+#line 1395 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("datenodayrev"); -@@ -11781,6 +11839,7 @@ yy758: - TIMELIB_DEINIT; - return TIMELIB_DATE_NO_DAY; - } -+#line 11843 "ext/date/lib/parse_date.c" - yy759: - yych = *++YYCURSOR; - if (yych == 'I') goto yy892; -@@ -11980,6 +12039,7 @@ yy778: - if (yych <= '/') goto yy779; - if (yych <= '7') goto yy781; - yy779: -+#line 1506 "ext/date/lib/parse_date.re" - { - timelib_sll w, d; - DEBUG_OUTPUT("isoweek"); -@@ -11997,12 +12057,14 @@ yy779: - TIMELIB_DEINIT; - return TIMELIB_ISO_WEEK; - } -+#line 12061 "ext/date/lib/parse_date.c" - yy780: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych >= '8') goto yy56; - yy781: - ++YYCURSOR; -+#line 1487 "ext/date/lib/parse_date.re" - { - timelib_sll w, d; - DEBUG_OUTPUT("isoweekday"); -@@ -12020,6 +12082,7 @@ yy781: - TIMELIB_DEINIT; - return TIMELIB_ISO_WEEK; - } -+#line 12086 "ext/date/lib/parse_date.c" - yy783: - yych = *++YYCURSOR; - if (yych <= '/') goto yy60; -@@ -12085,6 +12148,7 @@ yy785: - } - } - yy786: -+#line 1473 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("pgydotd"); -@@ -12097,6 +12161,7 @@ yy786: - TIMELIB_DEINIT; - return TIMELIB_PG_YEARDAY; - } -+#line 12165 "ext/date/lib/parse_date.c" - yy787: - yych = *++YYCURSOR; - if (yych <= '/') goto yy60; -@@ -12178,6 +12243,7 @@ yy805: - yy806: - ++YYCURSOR; - yy807: -+#line 1447 "ext/date/lib/parse_date.re" - { - int tz_not_found; - DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif"); -@@ -12202,6 +12268,7 @@ yy807: - TIMELIB_DEINIT; - return TIMELIB_XMLRPC_SOAP; - } -+#line 12272 "ext/date/lib/parse_date.c" - yy808: - yych = *++YYCURSOR; - if (yych <= '2') { -@@ -12490,6 +12557,7 @@ yy812: - } - } - yy813: -+#line 1435 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("datenocolon"); - TIMELIB_INIT; -@@ -12500,6 +12568,7 @@ yy813: - TIMELIB_DEINIT; - return TIMELIB_DATE_NOCOLON; - } -+#line 12572 "ext/date/lib/parse_date.c" - yy814: - yych = *++YYCURSOR; - if (yych <= 'H') { -@@ -13293,6 +13362,7 @@ yy937: - if (yych <= '/') goto yy938; - if (yych <= '9') goto yy960; - yy938: -+#line 1312 "ext/date/lib/parse_date.re" - { - int length = 0; - DEBUG_OUTPUT("gnudateshorter"); -@@ -13305,6 +13375,7 @@ yy938: - TIMELIB_DEINIT; - return TIMELIB_ISO_DATE; - } -+#line 13379 "ext/date/lib/parse_date.c" - yy939: - yyaccept = 21; - yych = *(YYMARKER = ++YYCURSOR); -@@ -14303,6 +14374,7 @@ yy1030: - } - } - yy1032: -+#line 1204 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("gnunocolon"); - TIMELIB_INIT; -@@ -14324,6 +14396,7 @@ yy1032: - TIMELIB_DEINIT; - return TIMELIB_GNU_NOCOLON; - } -+#line 14400 "ext/date/lib/parse_date.c" - yy1033: - yych = *++YYCURSOR; - if (yych <= '/') goto yy60; -@@ -14413,6 +14486,7 @@ yy1039: - } - } - yy1040: -+#line 1250 "ext/date/lib/parse_date.re" - { - int tz_not_found; - DEBUG_OUTPUT("iso8601nocolon"); -@@ -14431,6 +14505,7 @@ yy1040: - TIMELIB_DEINIT; - return TIMELIB_ISO_NOCOLON; - } -+#line 14509 "ext/date/lib/parse_date.c" - yy1041: - yyaccept = 24; - yych = *(YYMARKER = ++YYCURSOR); -@@ -15362,6 +15437,7 @@ yy1083: - } - } - yy1084: -+#line 1646 "ext/date/lib/parse_date.re" - { - timelib_sll i; - int behavior = 0; -@@ -15377,6 +15453,7 @@ yy1084: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } -+#line 15457 "ext/date/lib/parse_date.c" - yy1085: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); -@@ -15418,6 +15495,7 @@ yy1091: - if (yych != 'f') goto yy56; - yy1092: - ++YYCURSOR; -+#line 1119 "ext/date/lib/parse_date.re" - { - timelib_sll i; - int behavior = 0; -@@ -15438,6 +15516,7 @@ yy1092: - TIMELIB_DEINIT; - return TIMELIB_WEEK_DAY_OF_MONTH; - } -+#line 15520 "ext/date/lib/parse_date.c" - yy1094: - yyaccept = 25; - yych = *(YYMARKER = ++YYCURSOR); -@@ -15530,6 +15609,7 @@ yy1107: - } - } - yy1108: -+#line 1622 "ext/date/lib/parse_date.re" - { - timelib_sll i; - int behavior = 0; -@@ -15552,6 +15632,7 @@ yy1108: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } -+#line 15636 "ext/date/lib/parse_date.c" - yy1109: - yych = *++YYCURSOR; - goto yy1084; -@@ -18206,10 +18287,25 @@ yy1281: - yy1283: - yyaccept = 27; - yych = *(YYMARKER = ++YYCURSOR); -- if (yych <= '/') goto yy1287; -- if (yych <= '9') goto yy1286; -- goto yy1287; -+ if (yych <= '@') { -+ if (yych <= 0x1F) { -+ if (yych == '\t') goto yy1287; -+ } else { -+ if (yych <= ' ') goto yy1287; -+ if (yych <= '/') goto yy1284; -+ if (yych <= '9') goto yy1286; -+ } -+ } else { -+ if (yych <= '`') { -+ if (yych <= 'A') goto yy1289; -+ if (yych == 'P') goto yy1289; -+ } else { -+ if (yych <= 'a') goto yy1289; -+ if (yych == 'p') goto yy1289; -+ } -+ } - yy1284: -+#line 1096 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("backof | frontof"); - TIMELIB_INIT; -@@ -18231,66 +18327,104 @@ yy1284: - TIMELIB_DEINIT; - return TIMELIB_LF_DAY_OF_MONTH; - } -+#line 18331 "ext/date/lib/parse_date.c" - yy1285: - yyaccept = 27; - yych = *(YYMARKER = ++YYCURSOR); -- if (yych <= '/') goto yy1287; -- if (yych >= '5') goto yy1287; -+ if (yych <= '@') { -+ if (yych <= 0x1F) { -+ if (yych == '\t') goto yy1287; -+ goto yy1284; -+ } else { -+ if (yych <= ' ') goto yy1287; -+ if (yych <= '/') goto yy1284; -+ if (yych >= '5') goto yy1284; -+ } -+ } else { -+ if (yych <= '`') { -+ if (yych <= 'A') goto yy1289; -+ if (yych == 'P') goto yy1289; -+ goto yy1284; -+ } else { -+ if (yych <= 'a') goto yy1289; -+ if (yych == 'p') goto yy1289; -+ goto yy1284; -+ } -+ } - yy1286: - yyaccept = 27; -- YYMARKER = ++YYCURSOR; -+ yych = *(YYMARKER = ++YYCURSOR); -+ if (yych <= 'A') { -+ if (yych <= 0x1F) { -+ if (yych != '\t') goto yy1284; -+ } else { -+ if (yych <= ' ') goto yy1287; -+ if (yych <= '@') goto yy1284; -+ goto yy1289; -+ } -+ } else { -+ if (yych <= '`') { -+ if (yych == 'P') goto yy1289; -+ goto yy1284; -+ } else { -+ if (yych <= 'a') goto yy1289; -+ if (yych == 'p') goto yy1289; -+ goto yy1284; -+ } -+ } -+yy1287: -+ ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); - yych = *YYCURSOR; --yy1287: - if (yych <= 'A') { - if (yych <= 0x1F) { -- if (yych == '\t') goto yy1286; -- goto yy1284; -+ if (yych == '\t') goto yy1287; -+ goto yy56; - } else { -- if (yych <= ' ') goto yy1286; -- if (yych <= '@') goto yy1284; -+ if (yych <= ' ') goto yy1287; -+ if (yych <= '@') goto yy56; - } - } else { - if (yych <= '`') { -- if (yych != 'P') goto yy1284; -+ if (yych != 'P') goto yy56; - } else { -- if (yych <= 'a') goto yy1288; -- if (yych != 'p') goto yy1284; -+ if (yych <= 'a') goto yy1289; -+ if (yych != 'p') goto yy56; - } - } --yy1288: -+yy1289: - yych = *++YYCURSOR; - if (yych <= 'L') { - if (yych != '.') goto yy56; - } else { -- if (yych <= 'M') goto yy1290; -- if (yych == 'm') goto yy1290; -+ if (yych <= 'M') goto yy1291; -+ if (yych == 'm') goto yy1291; - goto yy56; - } - yych = *++YYCURSOR; -- if (yych == 'M') goto yy1290; -+ if (yych == 'M') goto yy1291; - if (yych != 'm') goto yy56; --yy1290: -+yy1291: - yych = *++YYCURSOR; - if (yych <= 0x1F) { -- if (yych <= 0x00) goto yy1292; -- if (yych == '\t') goto yy1292; -+ if (yych <= 0x00) goto yy1293; -+ if (yych == '\t') goto yy1293; - goto yy56; - } else { -- if (yych <= ' ') goto yy1292; -+ if (yych <= ' ') goto yy1293; - if (yych != '.') goto yy56; - } - yych = *++YYCURSOR; - if (yych <= '\t') { -- if (yych <= 0x00) goto yy1292; -+ if (yych <= 0x00) goto yy1293; - if (yych <= 0x08) goto yy56; - } else { - if (yych != ' ') goto yy56; - } --yy1292: -+yy1293: - yych = *++YYCURSOR; - goto yy1284; --yy1293: -+yy1294: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'B') { -@@ -18314,13 +18448,13 @@ yy1293: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'c') goto yy1294; -+ if (yych <= 'c') goto yy1295; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1294: -+yy1295: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'J') { -@@ -18344,13 +18478,13 @@ yy1294: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'k') goto yy1295; -+ if (yych <= 'k') goto yy1296; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1295: -+yy1296: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '.') { -@@ -18375,7 +18509,7 @@ yy1295: - goto yy3; - } - } --yy1296: -+yy1297: - yych = *++YYCURSOR; - if (yych <= 'S') { - if (yych <= ')') { -@@ -18391,12 +18525,12 @@ yy1296: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 's') goto yy1297; -+ if (yych <= 's') goto yy1298; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1297: -+yy1298: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -18412,12 +18546,12 @@ yy1297: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 't') goto yy1298; -+ if (yych <= 't') goto yy1299; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1298: -+yy1299: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '(') { -@@ -18438,19 +18572,19 @@ yy1298: - goto yy3; - } - } --yy1299: -+yy1300: - yych = *++YYCURSOR; -- if (yych == 'D') goto yy1300; -+ if (yych == 'D') goto yy1301; - if (yych != 'd') goto yy1070; --yy1300: -+yy1301: - yych = *++YYCURSOR; -- if (yych == 'A') goto yy1301; -+ if (yych == 'A') goto yy1302; - if (yych != 'a') goto yy56; --yy1301: -+yy1302: - yych = *++YYCURSOR; -- if (yych == 'Y') goto yy1302; -+ if (yych == 'Y') goto yy1303; - if (yych != 'y') goto yy56; --yy1302: -+yy1303: - yyaccept = 25; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -18461,14 +18595,15 @@ yy1302: - goto yy1084; - } - yych = *++YYCURSOR; -- if (yych == 'O') goto yy1304; -+ if (yych == 'O') goto yy1305; - if (yych != 'o') goto yy56; --yy1304: -+yy1305: - yych = *++YYCURSOR; -- if (yych == 'F') goto yy1305; -+ if (yych == 'F') goto yy1306; - if (yych != 'f') goto yy56; --yy1305: -+yy1306: - ++YYCURSOR; -+#line 1079 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("firstdayof | lastdayof"); - TIMELIB_INIT; -@@ -18484,7 +18619,8 @@ yy1305: - TIMELIB_DEINIT; - return TIMELIB_LF_DAY_OF_MONTH; - } --yy1307: -+#line 18623 "ext/date/lib/parse_date.c" -+yy1308: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -18499,7 +18635,7 @@ yy1307: - } - } else { - if (yych <= '_') { -- if (yych <= 'S') goto yy1297; -+ if (yych <= 'S') goto yy1298; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -18508,13 +18644,13 @@ yy1307: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 's') goto yy1308; -+ if (yych <= 's') goto yy1309; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1308: -+yy1309: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -18529,7 +18665,7 @@ yy1308: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1298; -+ if (yych <= 'T') goto yy1299; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -18538,20 +18674,20 @@ yy1308: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 't') goto yy1309; -+ if (yych <= 't') goto yy1310; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1309: -+yy1310: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= ' ') { - if (yych == '\t') goto yy1069; - if (yych <= 0x1F) goto yy3; -- goto yy1299; -+ goto yy1300; - } else { - if (yych == ')') goto yy164; - if (yych <= ',') goto yy3; -@@ -18573,7 +18709,7 @@ yy1309: - } - } - } --yy1310: -+yy1311: - yych = *++YYCURSOR; - if (yych <= 'B') { - if (yych <= ')') { -@@ -18582,7 +18718,7 @@ yy1310: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy166; -- goto yy1346; -+ goto yy1348; - } - } else { - if (yych <= 'a') { -@@ -18590,35 +18726,35 @@ yy1310: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'b') goto yy1346; -+ if (yych <= 'b') goto yy1348; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1311: -+yy1312: - yych = *++YYCURSOR; - if (yych <= 'R') { - if (yych <= '@') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych == 'F') goto yy1336; -+ if (yych == 'F') goto yy1338; - if (yych <= 'Q') goto yy166; -- goto yy1335; -+ goto yy1337; - } - } else { - if (yych <= 'f') { - if (yych <= 'Z') goto yy166; - if (yych <= '`') goto yy3; - if (yych <= 'e') goto yy166; -- goto yy1336; -+ goto yy1338; - } else { -- if (yych == 'r') goto yy1335; -+ if (yych == 'r') goto yy1337; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1312: -+yy1313: - yych = *++YYCURSOR; - if (yych <= 'U') { - if (yych <= ')') { -@@ -18627,7 +18763,7 @@ yy1312: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'T') goto yy166; -- goto yy1332; -+ goto yy1334; - } - } else { - if (yych <= 't') { -@@ -18635,19 +18771,19 @@ yy1312: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'u') goto yy1332; -+ if (yych <= 'u') goto yy1334; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1313: -+yy1314: - yych = *++YYCURSOR; - if (yych <= 'O') { - if (yych <= '@') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych == 'I') goto yy1315; -+ if (yych == 'I') goto yy1316; - if (yych <= 'N') goto yy166; - } - } else { -@@ -18655,14 +18791,14 @@ yy1313: - if (yych <= 'Z') goto yy166; - if (yych <= '`') goto yy3; - if (yych <= 'h') goto yy166; -- goto yy1315; -+ goto yy1316; - } else { -- if (yych == 'o') goto yy1314; -+ if (yych == 'o') goto yy1315; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1314: -+yy1315: - yych = *++YYCURSOR; - if (yych <= 'N') { - if (yych <= ')') { -@@ -18671,7 +18807,7 @@ yy1314: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy167; -- goto yy1318; -+ goto yy1319; - } - } else { - if (yych <= 'm') { -@@ -18679,12 +18815,12 @@ yy1314: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'n') goto yy1318; -+ if (yych <= 'n') goto yy1319; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1315: -+yy1316: - yych = *++YYCURSOR; - if (yych <= 'D') { - if (yych <= ')') { -@@ -18700,12 +18836,12 @@ yy1315: - if (yych <= '`') goto yy191; - goto yy167; - } else { -- if (yych <= 'd') goto yy1316; -+ if (yych <= 'd') goto yy1317; - if (yych <= 'z') goto yy167; - goto yy191; - } - } --yy1316: -+yy1317: - yych = *++YYCURSOR; - if (yych <= 'A') { - if (yych == ')') goto yy164; -@@ -18715,12 +18851,12 @@ yy1316: - if (yych <= 'Z') goto yy168; - goto yy3; - } else { -- if (yych <= 'a') goto yy1317; -+ if (yych <= 'a') goto yy1318; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1317: -+yy1318: - yych = *++YYCURSOR; - if (yych <= 'Y') { - if (yych <= ')') { -@@ -18742,7 +18878,7 @@ yy1317: - goto yy3; - } - } --yy1318: -+yy1319: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -18758,16 +18894,16 @@ yy1318: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 't') goto yy1319; -+ if (yych <= 't') goto yy1320; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1319: -+yy1320: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ')') { -- if (yych == ' ') goto yy1320; -+ if (yych == ' ') goto yy1321; - if (yych <= '(') goto yy3; - goto yy164; - } else { -@@ -18780,88 +18916,143 @@ yy1319: - goto yy3; - } - } --yy1320: -+yy1321: - yych = *++YYCURSOR; -- if (yych == 'O') goto yy1321; -+ if (yych == 'O') goto yy1322; - if (yych != 'o') goto yy56; --yy1321: -+yy1322: - yych = *++YYCURSOR; -- if (yych == 'F') goto yy1322; -+ if (yych == 'F') goto yy1323; - if (yych != 'f') goto yy56; --yy1322: -+yy1323: - yych = *++YYCURSOR; - if (yych != ' ') goto yy56; - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; -- if (yych <= '1') goto yy1324; -- if (yych <= '2') goto yy1325; -- if (yych <= '9') goto yy1326; -+ if (yych <= '1') goto yy1325; -+ if (yych <= '2') goto yy1326; -+ if (yych <= '9') goto yy1327; - goto yy56; --yy1324: -- yyaccept = 27; -- yych = *(YYMARKER = ++YYCURSOR); -- if (yych <= '/') goto yy1327; -- if (yych <= '9') goto yy1326; -- goto yy1327; - yy1325: - yyaccept = 27; - yych = *(YYMARKER = ++YYCURSOR); -- if (yych <= '/') goto yy1327; -- if (yych >= '5') goto yy1327; -+ if (yych <= '@') { -+ if (yych <= 0x1F) { -+ if (yych == '\t') goto yy1328; -+ goto yy1284; -+ } else { -+ if (yych <= ' ') goto yy1328; -+ if (yych <= '/') goto yy1284; -+ if (yych <= '9') goto yy1327; -+ goto yy1284; -+ } -+ } else { -+ if (yych <= '`') { -+ if (yych <= 'A') goto yy1330; -+ if (yych == 'P') goto yy1330; -+ goto yy1284; -+ } else { -+ if (yych <= 'a') goto yy1330; -+ if (yych == 'p') goto yy1330; -+ goto yy1284; -+ } -+ } - yy1326: - yyaccept = 27; -- YYMARKER = ++YYCURSOR; -- if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); -- yych = *YYCURSOR; -+ yych = *(YYMARKER = ++YYCURSOR); -+ if (yych <= '@') { -+ if (yych <= 0x1F) { -+ if (yych == '\t') goto yy1328; -+ goto yy1284; -+ } else { -+ if (yych <= ' ') goto yy1328; -+ if (yych <= '/') goto yy1284; -+ if (yych >= '5') goto yy1284; -+ } -+ } else { -+ if (yych <= '`') { -+ if (yych <= 'A') goto yy1330; -+ if (yych == 'P') goto yy1330; -+ goto yy1284; -+ } else { -+ if (yych <= 'a') goto yy1330; -+ if (yych == 'p') goto yy1330; -+ goto yy1284; -+ } -+ } - yy1327: -+ yyaccept = 27; -+ yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'A') { - if (yych <= 0x1F) { -- if (yych == '\t') goto yy1326; -- goto yy1284; -+ if (yych != '\t') goto yy1284; - } else { -- if (yych <= ' ') goto yy1326; -+ if (yych <= ' ') goto yy1328; - if (yych <= '@') goto yy1284; -+ goto yy1330; - } - } else { - if (yych <= '`') { -- if (yych != 'P') goto yy1284; -+ if (yych == 'P') goto yy1330; -+ goto yy1284; - } else { -- if (yych <= 'a') goto yy1328; -- if (yych != 'p') goto yy1284; -+ if (yych <= 'a') goto yy1330; -+ if (yych == 'p') goto yy1330; -+ goto yy1284; - } - } - yy1328: -+ ++YYCURSOR; -+ if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); -+ yych = *YYCURSOR; -+ if (yych <= 'A') { -+ if (yych <= 0x1F) { -+ if (yych == '\t') goto yy1328; -+ goto yy56; -+ } else { -+ if (yych <= ' ') goto yy1328; -+ if (yych <= '@') goto yy56; -+ } -+ } else { -+ if (yych <= '`') { -+ if (yych != 'P') goto yy56; -+ } else { -+ if (yych <= 'a') goto yy1330; -+ if (yych != 'p') goto yy56; -+ } -+ } -+yy1330: - yych = *++YYCURSOR; - if (yych <= 'L') { - if (yych != '.') goto yy56; - } else { -- if (yych <= 'M') goto yy1330; -- if (yych == 'm') goto yy1330; -+ if (yych <= 'M') goto yy1332; -+ if (yych == 'm') goto yy1332; - goto yy56; - } - yych = *++YYCURSOR; -- if (yych == 'M') goto yy1330; -+ if (yych == 'M') goto yy1332; - if (yych != 'm') goto yy56; --yy1330: -+yy1332: - yych = *++YYCURSOR; - if (yych <= 0x1F) { -- if (yych <= 0x00) goto yy1292; -- if (yych == '\t') goto yy1292; -+ if (yych <= 0x00) goto yy1293; -+ if (yych == '\t') goto yy1293; - goto yy56; - } else { -- if (yych <= ' ') goto yy1292; -+ if (yych <= ' ') goto yy1293; - if (yych != '.') goto yy56; - } - yych = *++YYCURSOR; - if (yych <= '\t') { -- if (yych <= 0x00) goto yy1292; -+ if (yych <= 0x00) goto yy1293; - if (yych <= 0x08) goto yy56; -- goto yy1292; -+ goto yy1293; - } else { -- if (yych == ' ') goto yy1292; -+ if (yych == ' ') goto yy1293; - goto yy56; - } --yy1332: -+yy1334: - yych = *++YYCURSOR; - if (yych <= 'R') { - if (yych <= ')') { -@@ -18877,12 +19068,12 @@ yy1332: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'r') goto yy1333; -+ if (yych <= 'r') goto yy1335; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1333: -+yy1335: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -18898,12 +19089,12 @@ yy1333: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 't') goto yy1334; -+ if (yych <= 't') goto yy1336; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1334: -+yy1336: - yych = *++YYCURSOR; - if (yych <= 'H') { - if (yych <= ')') { -@@ -18925,7 +19116,7 @@ yy1334: - goto yy3; - } - } --yy1335: -+yy1337: - yych = *++YYCURSOR; - if (yych <= 'S') { - if (yych <= ')') { -@@ -18934,7 +19125,7 @@ yy1335: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy167; -- goto yy1338; -+ goto yy1340; - } - } else { - if (yych <= 'r') { -@@ -18942,12 +19133,12 @@ yy1335: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 's') goto yy1338; -+ if (yych <= 's') goto yy1340; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1336: -+yy1338: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -18963,12 +19154,12 @@ yy1336: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 't') goto yy1337; -+ if (yych <= 't') goto yy1339; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1337: -+yy1339: - yych = *++YYCURSOR; - if (yych <= 'H') { - if (yych <= ')') { -@@ -18990,7 +19181,7 @@ yy1337: - goto yy3; - } - } --yy1338: -+yy1340: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -19006,12 +19197,12 @@ yy1338: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 't') goto yy1339; -+ if (yych <= 't') goto yy1341; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1339: -+yy1341: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '(') { -@@ -19032,19 +19223,19 @@ yy1339: - goto yy3; - } - } --yy1340: -+yy1342: - yych = *++YYCURSOR; -- if (yych == 'D') goto yy1341; -+ if (yych == 'D') goto yy1343; - if (yych != 'd') goto yy1197; --yy1341: -+yy1343: - yych = *++YYCURSOR; -- if (yych == 'A') goto yy1342; -+ if (yych == 'A') goto yy1344; - if (yych != 'a') goto yy56; --yy1342: -+yy1344: - yych = *++YYCURSOR; -- if (yych == 'Y') goto yy1343; -+ if (yych == 'Y') goto yy1345; - if (yych != 'y') goto yy56; --yy1343: -+yy1345: - yyaccept = 25; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -19055,14 +19246,14 @@ yy1343: - goto yy1084; - } - yych = *++YYCURSOR; -- if (yych == 'O') goto yy1345; -+ if (yych == 'O') goto yy1347; - if (yych != 'o') goto yy56; --yy1345: -+yy1347: - yych = *++YYCURSOR; -- if (yych == 'F') goto yy1305; -- if (yych == 'f') goto yy1305; -+ if (yych == 'F') goto yy1306; -+ if (yych == 'f') goto yy1306; - goto yy56; --yy1346: -+yy1348: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { -@@ -19097,13 +19288,13 @@ yy1346: - if (yych <= '`') goto yy218; - goto yy167; - } else { -- if (yych <= 'r') goto yy1347; -+ if (yych <= 'r') goto yy1349; - if (yych <= 'z') goto yy167; - goto yy218; - } - } - } --yy1347: -+yy1349: - yych = *++YYCURSOR; - if (yych <= 'U') { - if (yych <= ')') { -@@ -19119,12 +19310,12 @@ yy1347: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'u') goto yy1348; -+ if (yych <= 'u') goto yy1350; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1348: -+yy1350: - yych = *++YYCURSOR; - if (yych <= 'A') { - if (yych == ')') goto yy164; -@@ -19134,27 +19325,27 @@ yy1348: - if (yych <= 'Z') goto yy169; - goto yy3; - } else { -- if (yych <= 'a') goto yy1349; -+ if (yych <= 'a') goto yy1351; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1349: -+yy1351: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych <= 'R') goto yy1350; -+ if (yych <= 'R') goto yy1352; - if (yych != 'r') goto yy3; - } --yy1350: -+yy1352: - yych = *++YYCURSOR; - if (yych == 'Y') goto yy229; - if (yych == 'y') goto yy229; - goto yy56; --yy1351: -+yy1353: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'A') { -@@ -19169,7 +19360,7 @@ yy1351: - } - } else { - if (yych <= '_') { -- if (yych <= 'B') goto yy1346; -+ if (yych <= 'B') goto yy1348; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19178,13 +19369,13 @@ yy1351: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'b') goto yy1369; -+ if (yych <= 'b') goto yy1371; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1352: -+yy1354: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -19201,14 +19392,14 @@ yy1352: - if (yych <= '/') goto yy172; - goto yy3; - } else { -- if (yych == 'F') goto yy1336; -+ if (yych == 'F') goto yy1338; - goto yy166; - } - } - } else { - if (yych <= '`') { - if (yych <= 'Z') { -- if (yych <= 'R') goto yy1335; -+ if (yych <= 'R') goto yy1337; - goto yy166; - } else { - if (yych == '_') goto yy172; -@@ -19216,16 +19407,16 @@ yy1352: - } - } else { - if (yych <= 'q') { -- if (yych == 'f') goto yy1365; -+ if (yych == 'f') goto yy1367; - goto yy171; - } else { -- if (yych <= 'r') goto yy1364; -+ if (yych <= 'r') goto yy1366; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1353: -+yy1355: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'T') { -@@ -19240,7 +19431,7 @@ yy1353: - } - } else { - if (yych <= '_') { -- if (yych <= 'U') goto yy1332; -+ if (yych <= 'U') goto yy1334; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19249,13 +19440,13 @@ yy1353: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'u') goto yy1361; -+ if (yych <= 'u') goto yy1363; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1354: -+yy1356: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'N') { -@@ -19272,14 +19463,14 @@ yy1354: - if (yych <= '/') goto yy172; - goto yy3; - } else { -- if (yych == 'I') goto yy1315; -+ if (yych == 'I') goto yy1316; - goto yy166; - } - } - } else { - if (yych <= '`') { - if (yych <= 'Z') { -- if (yych <= 'O') goto yy1314; -+ if (yych <= 'O') goto yy1315; - goto yy166; - } else { - if (yych == '_') goto yy172; -@@ -19287,16 +19478,16 @@ yy1354: - } - } else { - if (yych <= 'n') { -- if (yych == 'i') goto yy1356; -+ if (yych == 'i') goto yy1358; - goto yy171; - } else { -- if (yych <= 'o') goto yy1355; -+ if (yych <= 'o') goto yy1357; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1355: -+yy1357: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'M') { -@@ -19311,7 +19502,7 @@ yy1355: - } - } else { - if (yych <= '_') { -- if (yych <= 'N') goto yy1318; -+ if (yych <= 'N') goto yy1319; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19320,13 +19511,13 @@ yy1355: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'n') goto yy1359; -+ if (yych <= 'n') goto yy1361; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1356: -+yy1358: - yyaccept = 4; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -19341,7 +19532,7 @@ yy1356: - } - } else { - if (yych <= '_') { -- if (yych <= 'D') goto yy1316; -+ if (yych <= 'D') goto yy1317; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy191; - goto yy172; -@@ -19350,13 +19541,13 @@ yy1356: - if (yych <= '`') goto yy191; - goto yy175; - } else { -- if (yych <= 'd') goto yy1357; -+ if (yych <= 'd') goto yy1359; - if (yych <= 'z') goto yy175; - goto yy191; - } - } - } --yy1357: -+yy1359: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { -@@ -19370,18 +19561,18 @@ yy1357: - } - } else { - if (yych <= '_') { -- if (yych <= 'A') goto yy1317; -+ if (yych <= 'A') goto yy1318; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; - } else { - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1358; -+ if (yych <= 'a') goto yy1360; - if (yych <= 'z') goto yy176; - goto yy3; - } - } --yy1358: -+yy1360: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'X') { -@@ -19411,7 +19602,7 @@ yy1358: - } - } - } --yy1359: -+yy1361: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -19426,7 +19617,7 @@ yy1359: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1319; -+ if (yych <= 'T') goto yy1320; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19435,18 +19626,18 @@ yy1359: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 't') goto yy1360; -+ if (yych <= 't') goto yy1362; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1360: -+yy1362: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '.') { - if (yych <= '(') { -- if (yych == ' ') goto yy1320; -+ if (yych == ' ') goto yy1321; - goto yy3; - } else { - if (yych <= ')') goto yy164; -@@ -19466,7 +19657,7 @@ yy1360: - goto yy3; - } - } --yy1361: -+yy1363: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -19481,7 +19672,7 @@ yy1361: - } - } else { - if (yych <= '_') { -- if (yych <= 'R') goto yy1333; -+ if (yych <= 'R') goto yy1335; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19490,13 +19681,13 @@ yy1361: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'r') goto yy1362; -+ if (yych <= 'r') goto yy1364; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1362: -+yy1364: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -19511,7 +19702,7 @@ yy1362: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1334; -+ if (yych <= 'T') goto yy1336; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19520,13 +19711,13 @@ yy1362: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 't') goto yy1363; -+ if (yych <= 't') goto yy1365; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1363: -+yy1365: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -19556,7 +19747,7 @@ yy1363: - } - } - } --yy1364: -+yy1366: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -19571,7 +19762,7 @@ yy1364: - } - } else { - if (yych <= '_') { -- if (yych <= 'S') goto yy1338; -+ if (yych <= 'S') goto yy1340; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19580,13 +19771,13 @@ yy1364: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 's') goto yy1367; -+ if (yych <= 's') goto yy1369; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1365: -+yy1367: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -19601,7 +19792,7 @@ yy1365: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1337; -+ if (yych <= 'T') goto yy1339; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19610,13 +19801,13 @@ yy1365: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 't') goto yy1366; -+ if (yych <= 't') goto yy1368; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1366: -+yy1368: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -19646,7 +19837,7 @@ yy1366: - } - } - } --yy1367: -+yy1369: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -19661,7 +19852,7 @@ yy1367: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1339; -+ if (yych <= 'T') goto yy1341; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19670,20 +19861,20 @@ yy1367: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 't') goto yy1368; -+ if (yych <= 't') goto yy1370; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1368: -+yy1370: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= ' ') { - if (yych == '\t') goto yy1196; - if (yych <= 0x1F) goto yy3; -- goto yy1340; -+ goto yy1342; - } else { - if (yych == ')') goto yy164; - if (yych <= ',') goto yy3; -@@ -19705,7 +19896,7 @@ yy1368: - } - } - } --yy1369: -+yy1371: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { -@@ -19733,7 +19924,7 @@ yy1369: - if (yych <= '@') goto yy218; - goto yy167; - } else { -- if (yych <= 'R') goto yy1347; -+ if (yych <= 'R') goto yy1349; - if (yych <= 'Z') goto yy167; - goto yy218; - } -@@ -19743,13 +19934,13 @@ yy1369: - if (yych <= '`') goto yy218; - goto yy175; - } else { -- if (yych <= 'r') goto yy1370; -+ if (yych <= 'r') goto yy1372; - if (yych <= 'z') goto yy175; - goto yy218; - } - } - } --yy1370: -+yy1372: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'T') { -@@ -19764,7 +19955,7 @@ yy1370: - } - } else { - if (yych <= '_') { -- if (yych <= 'U') goto yy1348; -+ if (yych <= 'U') goto yy1350; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -19773,13 +19964,13 @@ yy1370: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'u') goto yy1371; -+ if (yych <= 'u') goto yy1373; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1371: -+yy1373: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { -@@ -19793,18 +19984,18 @@ yy1371: - } - } else { - if (yych <= '_') { -- if (yych <= 'A') goto yy1349; -+ if (yych <= 'A') goto yy1351; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; - } else { - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1372; -+ if (yych <= 'a') goto yy1374; - if (yych <= 'z') goto yy177; - goto yy3; - } - } --yy1372: -+yy1374: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -19818,33 +20009,34 @@ yy1372: - } - } else { - if (yych <= '`') { -- if (yych <= 'R') goto yy1350; -+ if (yych <= 'R') goto yy1352; - if (yych == '_') goto yy172; - goto yy3; - } else { -- if (yych == 'r') goto yy1373; -+ if (yych == 'r') goto yy1375; - if (yych <= 'z') goto yy178; - goto yy3; - } - } --yy1373: -+yy1375: - yych = *++YYCURSOR; - if (yych == 'Y') goto yy229; - if (yych == 'y') goto yy341; - goto yy179; --yy1374: -+yy1376: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych >= ':') goto yy56; --yy1375: -+yy1377: - yyaccept = 28; - YYMARKER = ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7); - yych = *YYCURSOR; -- if (yych == '.') goto yy1378; -- if (yych <= '/') goto yy1377; -- if (yych <= '9') goto yy1375; --yy1377: -+ if (yych == '.') goto yy1380; -+ if (yych <= '/') goto yy1379; -+ if (yych <= '9') goto yy1377; -+yy1379: -+#line 1025 "ext/date/lib/parse_date.re" - { - timelib_ull i; - -@@ -19869,7 +20061,8 @@ yy1377: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1378: -+#line 20065 "ext/date/lib/parse_date.c" -+yy1380: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych >= ':') goto yy56; -@@ -19889,6 +20082,7 @@ yy1378: - if (yych <= '/') goto yy56; - if (yych >= ':') goto yy56; - ++YYCURSOR; -+#line 1051 "ext/date/lib/parse_date.re" - { - timelib_ull i, ms; - -@@ -19915,7 +20109,8 @@ yy1378: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1386: -+#line 20113 "ext/date/lib/parse_date.c" -+yy1388: - yych = *++YYCURSOR; - if (yych <= 'N') { - if (yych <= ')') { -@@ -19924,7 +20119,7 @@ yy1386: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy166; -- goto yy1427; -+ goto yy1429; - } - } else { - if (yych <= 'm') { -@@ -19932,58 +20127,58 @@ yy1386: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'n') goto yy1427; -+ if (yych <= 'n') goto yy1429; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1387: -+yy1389: - yych = *++YYCURSOR; - if (yych <= 'U') { - if (yych <= '@') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych == 'I') goto yy1419; -+ if (yych == 'I') goto yy1421; - if (yych <= 'T') goto yy166; -- goto yy1420; -+ goto yy1422; - } - } else { - if (yych <= 'i') { - if (yych <= 'Z') goto yy166; - if (yych <= '`') goto yy3; - if (yych <= 'h') goto yy166; -- goto yy1419; -+ goto yy1421; - } else { -- if (yych == 'u') goto yy1420; -+ if (yych == 'u') goto yy1422; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1388: -+yy1390: - yych = *++YYCURSOR; - if (yych <= 'M') { - if (yych <= '@') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych == 'D') goto yy1408; -+ if (yych == 'D') goto yy1410; - if (yych <= 'L') goto yy166; -- goto yy1409; -+ goto yy1411; - } - } else { - if (yych <= 'd') { - if (yych <= 'Z') goto yy166; - if (yych <= '`') goto yy3; - if (yych <= 'c') goto yy166; -- goto yy1408; -+ goto yy1410; - } else { -- if (yych == 'm') goto yy1409; -+ if (yych == 'm') goto yy1411; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1389: -+yy1391: - yych = *++YYCURSOR; - if (yych <= 'E') { - if (yych <= ')') { -@@ -19992,7 +20187,7 @@ yy1389: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy166; -- goto yy1404; -+ goto yy1406; - } - } else { - if (yych <= 'd') { -@@ -20000,12 +20195,12 @@ yy1389: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'e') goto yy1404; -+ if (yych <= 'e') goto yy1406; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1390: -+yy1392: - yych = *++YYCURSOR; - if (yych <= 'E') { - if (yych <= ')') { -@@ -20014,7 +20209,7 @@ yy1390: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy166; -- goto yy1400; -+ goto yy1402; - } - } else { - if (yych <= 'd') { -@@ -20022,68 +20217,68 @@ yy1390: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'e') goto yy1400; -+ if (yych <= 'e') goto yy1402; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1391: -+yy1393: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy1029; - goto yy56; - } else { -- if (yych <= '9') goto yy1394; -+ if (yych <= '9') goto yy1396; - if (yych <= ':') goto yy1029; - goto yy56; - } --yy1392: -+yy1394: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy1029; - goto yy56; - } else { -- if (yych <= '4') goto yy1394; -+ if (yych <= '4') goto yy1396; - if (yych == ':') goto yy1029; - goto yy56; - } --yy1393: -+yy1395: - yych = *++YYCURSOR; - if (yych == '.') goto yy1029; - if (yych == ':') goto yy1029; - goto yy56; --yy1394: -+yy1396: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy1029; - goto yy56; - } else { -- if (yych <= '5') goto yy1395; -+ if (yych <= '5') goto yy1397; - if (yych == ':') goto yy1029; - goto yy56; - } --yy1395: -+yy1397: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych >= ':') goto yy56; - yyaccept = 23; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1032; -- if (yych <= '5') goto yy1397; -- if (yych <= '6') goto yy1398; -+ if (yych <= '5') goto yy1399; -+ if (yych <= '6') goto yy1400; - goto yy1032; --yy1397: -+yy1399: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; -- if (yych <= '9') goto yy1399; -+ if (yych <= '9') goto yy1401; - goto yy56; --yy1398: -+yy1400: - yych = *++YYCURSOR; - if (yych != '0') goto yy56; --yy1399: -+yy1401: - yych = *++YYCURSOR; - goto yy1040; --yy1400: -+yy1402: - yych = *++YYCURSOR; - if (yych <= 'L') { - if (yych <= ')') { -@@ -20099,12 +20294,12 @@ yy1400: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'l') goto yy1401; -+ if (yych <= 'l') goto yy1403; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1401: -+yy1403: - yych = *++YYCURSOR; - if (yych <= 'F') { - if (yych <= ')') { -@@ -20120,12 +20315,12 @@ yy1401: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'f') goto yy1402; -+ if (yych <= 'f') goto yy1404; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1402: -+yy1404: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -20141,12 +20336,12 @@ yy1402: - if (yych <= '`') goto yy3; - goto yy169; - } else { -- if (yych <= 't') goto yy1403; -+ if (yych <= 't') goto yy1405; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1403: -+yy1405: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -20157,7 +20352,7 @@ yy1403: - if (yych == 'h') goto yy1195; - goto yy3; - } --yy1404: -+yy1406: - yych = *++YYCURSOR; - if (yych <= 'S') { - if (yych <= ')') { -@@ -20173,12 +20368,12 @@ yy1404: - if (yych <= '`') goto yy191; - goto yy167; - } else { -- if (yych <= 's') goto yy1405; -+ if (yych <= 's') goto yy1407; - if (yych <= 'z') goto yy167; - goto yy191; - } - } --yy1405: -+yy1407: - yych = *++YYCURSOR; - if (yych <= 'D') { - if (yych <= ')') { -@@ -20194,12 +20389,12 @@ yy1405: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'd') goto yy1406; -+ if (yych <= 'd') goto yy1408; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1406: -+yy1408: - yych = *++YYCURSOR; - if (yych <= 'A') { - if (yych == ')') goto yy164; -@@ -20209,12 +20404,12 @@ yy1406: - if (yych <= 'Z') goto yy169; - goto yy3; - } else { -- if (yych <= 'a') goto yy1407; -+ if (yych <= 'a') goto yy1409; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1407: -+yy1409: - yych = *++YYCURSOR; - if (yych <= 'X') { - if (yych == ')') goto yy164; -@@ -20224,23 +20419,23 @@ yy1407: - if (yych == 'y') goto yy197; - goto yy3; - } --yy1408: -+yy1410: - yych = *++YYCURSOR; - if (yych <= 'A') { - if (yych == ')') goto yy164; - if (yych <= '@') goto yy3; -- goto yy1416; -+ goto yy1418; - } else { - if (yych <= '`') { - if (yych <= 'Z') goto yy167; - goto yy3; - } else { -- if (yych <= 'a') goto yy1416; -+ if (yych <= 'a') goto yy1418; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1409: -+yy1411: - yych = *++YYCURSOR; - if (yych <= 'O') { - if (yych <= ')') { -@@ -20256,12 +20451,12 @@ yy1409: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'o') goto yy1410; -+ if (yych <= 'o') goto yy1412; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1410: -+yy1412: - yych = *++YYCURSOR; - if (yych <= 'R') { - if (yych <= ')') { -@@ -20277,12 +20472,12 @@ yy1410: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'r') goto yy1411; -+ if (yych <= 'r') goto yy1413; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1411: -+yy1413: - yych = *++YYCURSOR; - if (yych <= 'R') { - if (yych <= ')') { -@@ -20298,28 +20493,29 @@ yy1411: - if (yych <= '`') goto yy3; - goto yy169; - } else { -- if (yych <= 'r') goto yy1412; -+ if (yych <= 'r') goto yy1414; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1412: -+yy1414: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'N') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych <= 'O') goto yy1413; -+ if (yych <= 'O') goto yy1415; - if (yych != 'o') goto yy3; - } --yy1413: -+yy1415: - yych = *++YYCURSOR; -- if (yych == 'W') goto yy1414; -+ if (yych == 'W') goto yy1416; - if (yych != 'w') goto yy56; --yy1414: -+yy1416: - ++YYCURSOR; --yy1415: -+yy1417: -+#line 1013 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("tomorrow"); - TIMELIB_INIT; -@@ -20330,7 +20526,8 @@ yy1415: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1416: -+#line 20530 "ext/date/lib/parse_date.c" -+yy1418: - yych = *++YYCURSOR; - if (yych <= 'Y') { - if (yych <= ')') { -@@ -20346,21 +20543,22 @@ yy1416: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'y') goto yy1417; -+ if (yych <= 'y') goto yy1419; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1417: -+yy1419: - ++YYCURSOR; - if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy164; - } else { - if (yych <= 'Z') goto yy169; -- if (yych <= '`') goto yy1418; -+ if (yych <= '`') goto yy1420; - if (yych <= 'z') goto yy169; - } --yy1418: -+yy1420: -+#line 1003 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("midnight | today"); - TIMELIB_INIT; -@@ -20369,7 +20567,8 @@ yy1418: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1419: -+#line 20571 "ext/date/lib/parse_date.c" -+yy1421: - yych = *++YYCURSOR; - if (yych <= 'S') { - if (yych <= '@') { -@@ -20377,8 +20576,8 @@ yy1419: - goto yy3; - } else { - if (yych <= 'Q') goto yy167; -- if (yych <= 'R') goto yy1425; -- goto yy1426; -+ if (yych <= 'R') goto yy1427; -+ goto yy1428; - } - } else { - if (yych <= 'q') { -@@ -20386,13 +20585,13 @@ yy1419: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'r') goto yy1425; -- if (yych <= 's') goto yy1426; -+ if (yych <= 'r') goto yy1427; -+ if (yych <= 's') goto yy1428; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1420: -+yy1422: - yych = *++YYCURSOR; - if (yych <= 'R') { - if (yych <= ')') { -@@ -20408,12 +20607,12 @@ yy1420: - if (yych <= '`') goto yy191; - goto yy167; - } else { -- if (yych <= 'r') goto yy1421; -+ if (yych <= 'r') goto yy1423; - if (yych <= 'z') goto yy167; - goto yy191; - } - } --yy1421: -+yy1423: - yych = *++YYCURSOR; - if (yych <= 'S') { - if (yych <= ')') { -@@ -20429,12 +20628,12 @@ yy1421: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 's') goto yy1422; -+ if (yych <= 's') goto yy1424; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1422: -+yy1424: - yych = *++YYCURSOR; - if (yych <= 'D') { - if (yych <= ')') { -@@ -20450,27 +20649,27 @@ yy1422: - if (yych <= '`') goto yy3; - goto yy169; - } else { -- if (yych <= 'd') goto yy1423; -+ if (yych <= 'd') goto yy1425; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1423: -+yy1425: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych <= 'A') goto yy1424; -+ if (yych <= 'A') goto yy1426; - if (yych != 'a') goto yy3; - } --yy1424: -+yy1426: - yych = *++YYCURSOR; - if (yych == 'Y') goto yy197; - if (yych == 'y') goto yy197; - goto yy56; --yy1425: -+yy1427: - yych = *++YYCURSOR; - if (yych <= 'D') { - if (yych <= ')') { -@@ -20492,7 +20691,7 @@ yy1425: - goto yy3; - } - } --yy1426: -+yy1428: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '(') { -@@ -20514,7 +20713,7 @@ yy1426: - goto yy3; - } - } --yy1427: -+yy1429: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -20530,12 +20729,12 @@ yy1427: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 't') goto yy1428; -+ if (yych <= 't') goto yy1430; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1428: -+yy1430: - yych = *++YYCURSOR; - if (yych <= 'H') { - if (yych <= ')') { -@@ -20557,7 +20756,7 @@ yy1428: - goto yy3; - } - } --yy1429: -+yy1431: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'M') { -@@ -20572,7 +20771,7 @@ yy1429: - } - } else { - if (yych <= '_') { -- if (yych <= 'N') goto yy1427; -+ if (yych <= 'N') goto yy1429; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20581,13 +20780,13 @@ yy1429: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'n') goto yy1459; -+ if (yych <= 'n') goto yy1461; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1430: -+yy1432: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'T') { -@@ -20604,14 +20803,14 @@ yy1430: - if (yych <= '/') goto yy172; - goto yy3; - } else { -- if (yych == 'I') goto yy1419; -+ if (yych == 'I') goto yy1421; - goto yy166; - } - } - } else { - if (yych <= '`') { - if (yych <= 'Z') { -- if (yych <= 'U') goto yy1420; -+ if (yych <= 'U') goto yy1422; - goto yy166; - } else { - if (yych == '_') goto yy172; -@@ -20619,16 +20818,16 @@ yy1430: - } - } else { - if (yych <= 't') { -- if (yych == 'i') goto yy1451; -+ if (yych == 'i') goto yy1453; - goto yy171; - } else { -- if (yych <= 'u') goto yy1452; -+ if (yych <= 'u') goto yy1454; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1431: -+yy1433: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { -@@ -20645,14 +20844,14 @@ yy1431: - if (yych <= '/') goto yy172; - goto yy3; - } else { -- if (yych == 'D') goto yy1408; -+ if (yych == 'D') goto yy1410; - goto yy166; - } - } - } else { - if (yych <= '`') { - if (yych <= 'Z') { -- if (yych <= 'M') goto yy1409; -+ if (yych <= 'M') goto yy1411; - goto yy166; - } else { - if (yych == '_') goto yy172; -@@ -20660,16 +20859,16 @@ yy1431: - } - } else { - if (yych <= 'l') { -- if (yych == 'd') goto yy1442; -+ if (yych == 'd') goto yy1444; - goto yy171; - } else { -- if (yych <= 'm') goto yy1443; -+ if (yych <= 'm') goto yy1445; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1432: -+yy1434: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'D') { -@@ -20684,7 +20883,7 @@ yy1432: - } - } else { - if (yych <= '_') { -- if (yych <= 'E') goto yy1404; -+ if (yych <= 'E') goto yy1406; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20693,13 +20892,13 @@ yy1432: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'e') goto yy1438; -+ if (yych <= 'e') goto yy1440; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1433: -+yy1435: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'D') { -@@ -20714,7 +20913,7 @@ yy1433: - } - } else { - if (yych <= '_') { -- if (yych <= 'E') goto yy1400; -+ if (yych <= 'E') goto yy1402; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20723,13 +20922,13 @@ yy1433: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'e') goto yy1434; -+ if (yych <= 'e') goto yy1436; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1434: -+yy1436: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'K') { -@@ -20744,7 +20943,7 @@ yy1434: - } - } else { - if (yych <= '_') { -- if (yych <= 'L') goto yy1401; -+ if (yych <= 'L') goto yy1403; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20753,13 +20952,13 @@ yy1434: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'l') goto yy1435; -+ if (yych <= 'l') goto yy1437; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1435: -+yy1437: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'E') { -@@ -20774,7 +20973,7 @@ yy1435: - } - } else { - if (yych <= '_') { -- if (yych <= 'F') goto yy1402; -+ if (yych <= 'F') goto yy1404; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20783,13 +20982,13 @@ yy1435: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'f') goto yy1436; -+ if (yych <= 'f') goto yy1438; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1436: -+yy1438: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -20804,7 +21003,7 @@ yy1436: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1403; -+ if (yych <= 'T') goto yy1405; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20813,13 +21012,13 @@ yy1436: - if (yych <= '`') goto yy3; - goto yy177; - } else { -- if (yych <= 't') goto yy1437; -+ if (yych <= 't') goto yy1439; - if (yych <= 'z') goto yy177; - goto yy3; - } - } - } --yy1437: -+yy1439: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -20842,7 +21041,7 @@ yy1437: - goto yy3; - } - } --yy1438: -+yy1440: - yyaccept = 4; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -20857,7 +21056,7 @@ yy1438: - } - } else { - if (yych <= '_') { -- if (yych <= 'S') goto yy1405; -+ if (yych <= 'S') goto yy1407; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy191; - goto yy172; -@@ -20866,13 +21065,13 @@ yy1438: - if (yych <= '`') goto yy191; - goto yy175; - } else { -- if (yych <= 's') goto yy1439; -+ if (yych <= 's') goto yy1441; - if (yych <= 'z') goto yy175; - goto yy191; - } - } - } --yy1439: -+yy1441: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -20887,7 +21086,7 @@ yy1439: - } - } else { - if (yych <= '_') { -- if (yych <= 'D') goto yy1406; -+ if (yych <= 'D') goto yy1408; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20896,13 +21095,13 @@ yy1439: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'd') goto yy1440; -+ if (yych <= 'd') goto yy1442; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1440: -+yy1442: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { -@@ -20916,18 +21115,18 @@ yy1440: - } - } else { - if (yych <= '_') { -- if (yych <= 'A') goto yy1407; -+ if (yych <= 'A') goto yy1409; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; - } else { - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1441; -+ if (yych <= 'a') goto yy1443; - if (yych <= 'z') goto yy177; - goto yy3; - } - } --yy1441: -+yy1443: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'X') { -@@ -20950,7 +21149,7 @@ yy1441: - goto yy3; - } - } --yy1442: -+yy1444: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { -@@ -20964,18 +21163,18 @@ yy1442: - } - } else { - if (yych <= '_') { -- if (yych <= 'A') goto yy1416; -+ if (yych <= 'A') goto yy1418; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; - } else { - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1449; -+ if (yych <= 'a') goto yy1451; - if (yych <= 'z') goto yy175; - goto yy3; - } - } --yy1443: -+yy1445: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'N') { -@@ -20990,7 +21189,7 @@ yy1443: - } - } else { - if (yych <= '_') { -- if (yych <= 'O') goto yy1410; -+ if (yych <= 'O') goto yy1412; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -20999,13 +21198,13 @@ yy1443: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'o') goto yy1444; -+ if (yych <= 'o') goto yy1446; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1444: -+yy1446: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -21020,7 +21219,7 @@ yy1444: - } - } else { - if (yych <= '_') { -- if (yych <= 'R') goto yy1411; -+ if (yych <= 'R') goto yy1413; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21029,13 +21228,13 @@ yy1444: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'r') goto yy1445; -+ if (yych <= 'r') goto yy1447; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1445: -+yy1447: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -21050,7 +21249,7 @@ yy1445: - } - } else { - if (yych <= '_') { -- if (yych <= 'R') goto yy1412; -+ if (yych <= 'R') goto yy1414; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21059,13 +21258,13 @@ yy1445: - if (yych <= '`') goto yy3; - goto yy177; - } else { -- if (yych <= 'r') goto yy1446; -+ if (yych <= 'r') goto yy1448; - if (yych <= 'z') goto yy177; - goto yy3; - } - } - } --yy1446: -+yy1448: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'N') { -@@ -21079,18 +21278,18 @@ yy1446: - } - } else { - if (yych <= '`') { -- if (yych <= 'O') goto yy1413; -+ if (yych <= 'O') goto yy1415; - if (yych == '_') goto yy172; - goto yy3; - } else { -- if (yych == 'o') goto yy1447; -+ if (yych == 'o') goto yy1449; - if (yych <= 'z') goto yy178; - goto yy3; - } - } --yy1447: -+yy1449: - yych = *++YYCURSOR; -- if (yych == 'W') goto yy1414; -+ if (yych == 'W') goto yy1416; - if (yych != 'w') goto yy179; - yyaccept = 29; - yych = *(YYMARKER = ++YYCURSOR); -@@ -21099,13 +21298,13 @@ yy1447: - } - if (yych <= '.') { - if (yych == '-') goto yy172; -- goto yy1415; -+ goto yy1417; - } else { - if (yych <= '/') goto yy172; - if (yych == '_') goto yy172; -- goto yy1415; -+ goto yy1417; - } --yy1449: -+yy1451: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'X') { -@@ -21120,7 +21319,7 @@ yy1449: - } - } else { - if (yych <= '_') { -- if (yych <= 'Y') goto yy1417; -+ if (yych <= 'Y') goto yy1419; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21129,36 +21328,36 @@ yy1449: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'y') goto yy1450; -+ if (yych <= 'y') goto yy1452; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1450: -+yy1452: - yyaccept = 30; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych <= ',') { - if (yych == ')') goto yy164; -- goto yy1418; -+ goto yy1420; - } else { -- if (yych == '.') goto yy1418; -+ if (yych == '.') goto yy1420; - goto yy172; - } - } else { - if (yych <= '^') { -- if (yych <= '@') goto yy1418; -+ if (yych <= '@') goto yy1420; - if (yych <= 'Z') goto yy169; -- goto yy1418; -+ goto yy1420; - } else { - if (yych <= '_') goto yy172; -- if (yych <= '`') goto yy1418; -+ if (yych <= '`') goto yy1420; - if (yych <= 'z') goto yy177; -- goto yy1418; -+ goto yy1420; - } - } --yy1451: -+yy1453: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -21173,13 +21372,13 @@ yy1451: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy167; -- goto yy1425; -+ goto yy1427; - } - } - } else { - if (yych <= '`') { - if (yych <= 'Z') { -- if (yych <= 'S') goto yy1426; -+ if (yych <= 'S') goto yy1428; - goto yy167; - } else { - if (yych == '_') goto yy172; -@@ -21188,15 +21387,15 @@ yy1451: - } else { - if (yych <= 'r') { - if (yych <= 'q') goto yy175; -- goto yy1457; -+ goto yy1459; - } else { -- if (yych <= 's') goto yy1458; -+ if (yych <= 's') goto yy1460; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1452: -+yy1454: - yyaccept = 4; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -21211,7 +21410,7 @@ yy1452: - } - } else { - if (yych <= '_') { -- if (yych <= 'R') goto yy1421; -+ if (yych <= 'R') goto yy1423; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy191; - goto yy172; -@@ -21220,13 +21419,13 @@ yy1452: - if (yych <= '`') goto yy191; - goto yy175; - } else { -- if (yych <= 'r') goto yy1453; -+ if (yych <= 'r') goto yy1455; - if (yych <= 'z') goto yy175; - goto yy191; - } - } - } --yy1453: -+yy1455: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -21241,7 +21440,7 @@ yy1453: - } - } else { - if (yych <= '_') { -- if (yych <= 'S') goto yy1422; -+ if (yych <= 'S') goto yy1424; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21250,13 +21449,13 @@ yy1453: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 's') goto yy1454; -+ if (yych <= 's') goto yy1456; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1454: -+yy1456: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -21271,7 +21470,7 @@ yy1454: - } - } else { - if (yych <= '_') { -- if (yych <= 'D') goto yy1423; -+ if (yych <= 'D') goto yy1425; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21280,13 +21479,13 @@ yy1454: - if (yych <= '`') goto yy3; - goto yy177; - } else { -- if (yych <= 'd') goto yy1455; -+ if (yych <= 'd') goto yy1457; - if (yych <= 'z') goto yy177; - goto yy3; - } - } - } --yy1455: -+yy1457: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { -@@ -21300,22 +21499,22 @@ yy1455: - } - } else { - if (yych <= '_') { -- if (yych <= 'A') goto yy1424; -+ if (yych <= 'A') goto yy1426; - if (yych <= '^') goto yy3; - goto yy172; - } else { - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1456; -+ if (yych <= 'a') goto yy1458; - if (yych <= 'z') goto yy178; - goto yy3; - } - } --yy1456: -+yy1458: - yych = *++YYCURSOR; - if (yych == 'Y') goto yy197; - if (yych == 'y') goto yy210; - goto yy179; --yy1457: -+yy1459: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -21345,7 +21544,7 @@ yy1457: - } - } - } --yy1458: -+yy1460: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { -@@ -21374,7 +21573,7 @@ yy1458: - } - } - } --yy1459: -+yy1461: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -21389,7 +21588,7 @@ yy1459: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1428; -+ if (yych <= 'T') goto yy1430; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21398,13 +21597,13 @@ yy1459: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 't') goto yy1460; -+ if (yych <= 't') goto yy1462; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1460: -+yy1462: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -21434,30 +21633,30 @@ yy1460: - } - } - } --yy1461: -+yy1463: - yych = *++YYCURSOR; - if (yych <= 'Y') { - if (yych <= '@') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych == 'R') goto yy1473; -+ if (yych == 'R') goto yy1475; - if (yych <= 'X') goto yy166; -- goto yy1474; -+ goto yy1476; - } - } else { - if (yych <= 'r') { - if (yych <= 'Z') goto yy166; - if (yych <= '`') goto yy3; - if (yych <= 'q') goto yy166; -- goto yy1473; -+ goto yy1475; - } else { -- if (yych == 'y') goto yy1474; -+ if (yych == 'y') goto yy1476; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1462: -+yy1464: - yych = *++YYCURSOR; - if (yych <= 'D') { - if (yych <= ')') { -@@ -21466,7 +21665,7 @@ yy1462: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy166; -- goto yy1467; -+ goto yy1469; - } - } else { - if (yych <= 'c') { -@@ -21474,12 +21673,12 @@ yy1462: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'd') goto yy1467; -+ if (yych <= 'd') goto yy1469; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1463: -+yy1465: - yych = *++YYCURSOR; - if (yych <= 'N') { - if (yych <= ')') { -@@ -21495,12 +21694,12 @@ yy1463: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'n') goto yy1464; -+ if (yych <= 'n') goto yy1466; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1464: -+yy1466: - yych = *++YYCURSOR; - if (yych <= 'D') { - if (yych <= ')') { -@@ -21516,12 +21715,12 @@ yy1464: - if (yych <= '`') goto yy191; - goto yy167; - } else { -- if (yych <= 'd') goto yy1465; -+ if (yych <= 'd') goto yy1467; - if (yych <= 'z') goto yy167; - goto yy191; - } - } --yy1465: -+yy1467: - yych = *++YYCURSOR; - if (yych <= 'A') { - if (yych == ')') goto yy164; -@@ -21531,12 +21730,12 @@ yy1465: - if (yych <= 'Z') goto yy168; - goto yy3; - } else { -- if (yych <= 'a') goto yy1466; -+ if (yych <= 'a') goto yy1468; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1466: -+yy1468: - yych = *++YYCURSOR; - if (yych <= 'Y') { - if (yych <= ')') { -@@ -21558,7 +21757,7 @@ yy1466: - goto yy3; - } - } --yy1467: -+yy1469: - yych = *++YYCURSOR; - if (yych <= 'N') { - if (yych <= ')') { -@@ -21574,12 +21773,12 @@ yy1467: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'n') goto yy1468; -+ if (yych <= 'n') goto yy1470; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1468: -+yy1470: - yych = *++YYCURSOR; - if (yych <= 'I') { - if (yych <= ')') { -@@ -21595,12 +21794,12 @@ yy1468: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'i') goto yy1469; -+ if (yych <= 'i') goto yy1471; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1469: -+yy1471: - yych = *++YYCURSOR; - if (yych <= 'G') { - if (yych <= ')') { -@@ -21616,29 +21815,29 @@ yy1469: - if (yych <= '`') goto yy3; - goto yy169; - } else { -- if (yych <= 'g') goto yy1470; -+ if (yych <= 'g') goto yy1472; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1470: -+yy1472: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych <= 'H') goto yy1471; -+ if (yych <= 'H') goto yy1473; - if (yych != 'h') goto yy3; - } --yy1471: -+yy1473: - yych = *++YYCURSOR; -- if (yych == 'T') goto yy1472; -+ if (yych == 'T') goto yy1474; - if (yych != 't') goto yy56; --yy1472: -+yy1474: - yych = *++YYCURSOR; -- goto yy1418; --yy1473: -+ goto yy1420; -+yy1475: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { -@@ -21666,7 +21865,7 @@ yy1473: - if (yych <= '9') goto yy220; - goto yy218; - } else { -- if (yych == 'C') goto yy1475; -+ if (yych == 'C') goto yy1477; - goto yy167; - } - } else { -@@ -21674,13 +21873,13 @@ yy1473: - if (yych <= '`') goto yy218; - goto yy167; - } else { -- if (yych <= 'c') goto yy1475; -+ if (yych <= 'c') goto yy1477; - if (yych <= 'z') goto yy167; - goto yy218; - } - } - } --yy1474: -+yy1476: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { -@@ -21705,7 +21904,7 @@ yy1474: - goto yy218; - } - } --yy1475: -+yy1477: - yych = *++YYCURSOR; - if (yych <= 'H') { - if (yych <= ')') { -@@ -21727,7 +21926,7 @@ yy1475: - goto yy3; - } - } --yy1476: -+yy1478: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'X') { -@@ -21744,14 +21943,14 @@ yy1476: - if (yych <= '/') goto yy172; - goto yy3; - } else { -- if (yych == 'R') goto yy1473; -+ if (yych == 'R') goto yy1475; - goto yy166; - } - } - } else { - if (yych <= '`') { - if (yych <= 'Z') { -- if (yych <= 'Y') goto yy1474; -+ if (yych <= 'Y') goto yy1476; - goto yy166; - } else { - if (yych == '_') goto yy172; -@@ -21759,16 +21958,16 @@ yy1476: - } - } else { - if (yych <= 'x') { -- if (yych == 'r') goto yy1488; -+ if (yych == 'r') goto yy1490; - goto yy171; - } else { -- if (yych <= 'y') goto yy1489; -+ if (yych <= 'y') goto yy1491; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1477: -+yy1479: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -21783,7 +21982,7 @@ yy1477: - } - } else { - if (yych <= '_') { -- if (yych <= 'D') goto yy1467; -+ if (yych <= 'D') goto yy1469; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21792,13 +21991,13 @@ yy1477: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'd') goto yy1482; -+ if (yych <= 'd') goto yy1484; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1478: -+yy1480: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'M') { -@@ -21813,7 +22012,7 @@ yy1478: - } - } else { - if (yych <= '_') { -- if (yych <= 'N') goto yy1464; -+ if (yych <= 'N') goto yy1466; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21822,13 +22021,13 @@ yy1478: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'n') goto yy1479; -+ if (yych <= 'n') goto yy1481; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1479: -+yy1481: - yyaccept = 4; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -21843,7 +22042,7 @@ yy1479: - } - } else { - if (yych <= '_') { -- if (yych <= 'D') goto yy1465; -+ if (yych <= 'D') goto yy1467; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy191; - goto yy172; -@@ -21852,13 +22051,13 @@ yy1479: - if (yych <= '`') goto yy191; - goto yy175; - } else { -- if (yych <= 'd') goto yy1480; -+ if (yych <= 'd') goto yy1482; - if (yych <= 'z') goto yy175; - goto yy191; - } - } - } --yy1480: -+yy1482: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '@') { -@@ -21872,18 +22071,18 @@ yy1480: - } - } else { - if (yych <= '_') { -- if (yych <= 'A') goto yy1466; -+ if (yych <= 'A') goto yy1468; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; - } else { - if (yych <= '`') goto yy3; -- if (yych <= 'a') goto yy1481; -+ if (yych <= 'a') goto yy1483; - if (yych <= 'z') goto yy176; - goto yy3; - } - } --yy1481: -+yy1483: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'X') { -@@ -21913,7 +22112,7 @@ yy1481: - } - } - } --yy1482: -+yy1484: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'M') { -@@ -21928,7 +22127,7 @@ yy1482: - } - } else { - if (yych <= '_') { -- if (yych <= 'N') goto yy1468; -+ if (yych <= 'N') goto yy1470; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21937,13 +22136,13 @@ yy1482: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'n') goto yy1483; -+ if (yych <= 'n') goto yy1485; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1483: -+yy1485: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'H') { -@@ -21958,7 +22157,7 @@ yy1483: - } - } else { - if (yych <= '_') { -- if (yych <= 'I') goto yy1469; -+ if (yych <= 'I') goto yy1471; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21967,13 +22166,13 @@ yy1483: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'i') goto yy1484; -+ if (yych <= 'i') goto yy1486; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1484: -+yy1486: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'F') { -@@ -21988,7 +22187,7 @@ yy1484: - } - } else { - if (yych <= '_') { -- if (yych <= 'G') goto yy1470; -+ if (yych <= 'G') goto yy1472; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; -@@ -21997,13 +22196,13 @@ yy1484: - if (yych <= '`') goto yy3; - goto yy177; - } else { -- if (yych <= 'g') goto yy1485; -+ if (yych <= 'g') goto yy1487; - if (yych <= 'z') goto yy177; - goto yy3; - } - } - } --yy1485: -+yy1487: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -22017,18 +22216,18 @@ yy1485: - } - } else { - if (yych <= '`') { -- if (yych <= 'H') goto yy1471; -+ if (yych <= 'H') goto yy1473; - if (yych == '_') goto yy172; - goto yy3; - } else { -- if (yych == 'h') goto yy1486; -+ if (yych == 'h') goto yy1488; - if (yych <= 'z') goto yy178; - goto yy3; - } - } --yy1486: -+yy1488: - yych = *++YYCURSOR; -- if (yych == 'T') goto yy1472; -+ if (yych == 'T') goto yy1474; - if (yych != 't') goto yy179; - yyaccept = 30; - yych = *(YYMARKER = ++YYCURSOR); -@@ -22037,13 +22236,13 @@ yy1486: - } - if (yych <= '.') { - if (yych == '-') goto yy172; -- goto yy1418; -+ goto yy1420; - } else { - if (yych <= '/') goto yy172; - if (yych == '_') goto yy172; -- goto yy1418; -+ goto yy1420; - } --yy1488: -+yy1490: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { -@@ -22071,7 +22270,7 @@ yy1488: - if (yych <= '@') goto yy218; - goto yy167; - } else { -- if (yych <= 'C') goto yy1475; -+ if (yych <= 'C') goto yy1477; - if (yych <= 'Z') goto yy167; - goto yy218; - } -@@ -22081,13 +22280,13 @@ yy1488: - if (yych <= '`') goto yy218; - goto yy175; - } else { -- if (yych <= 'c') goto yy1490; -+ if (yych <= 'c') goto yy1492; - if (yych <= 'z') goto yy175; - goto yy218; - } - } - } --yy1489: -+yy1491: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '.') { -@@ -22122,7 +22321,7 @@ yy1489: - } - } - } --yy1490: -+yy1492: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -22152,7 +22351,7 @@ yy1490: - } - } - } --yy1491: -+yy1493: - yych = *++YYCURSOR; - if (yych <= 'W') { - if (yych <= 'N') { -@@ -22160,29 +22359,29 @@ yy1491: - if (yych <= '@') goto yy3; - goto yy166; - } else { -- if (yych <= 'O') goto yy1499; -+ if (yych <= 'O') goto yy1501; - if (yych <= 'U') goto yy166; -- if (yych <= 'V') goto yy1500; -- goto yy1497; -+ if (yych <= 'V') goto yy1502; -+ goto yy1499; - } - } else { - if (yych <= 'o') { - if (yych <= 'Z') goto yy166; - if (yych <= '`') goto yy3; - if (yych <= 'n') goto yy166; -- goto yy1499; -+ goto yy1501; - } else { - if (yych <= 'v') { - if (yych <= 'u') goto yy166; -- goto yy1500; -+ goto yy1502; - } else { -- if (yych <= 'w') goto yy1497; -+ if (yych <= 'w') goto yy1499; - if (yych <= 'z') goto yy166; - goto yy3; - } - } - } --yy1492: -+yy1494: - yych = *++YYCURSOR; - if (yych <= 'X') { - if (yych <= ')') { -@@ -22191,7 +22390,7 @@ yy1492: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'W') goto yy166; -- goto yy1496; -+ goto yy1498; - } - } else { - if (yych <= 'w') { -@@ -22199,12 +22398,12 @@ yy1492: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'x') goto yy1496; -+ if (yych <= 'x') goto yy1498; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1493: -+yy1495: - yych = *++YYCURSOR; - if (yych <= 'N') { - if (yych <= ')') { -@@ -22220,12 +22419,12 @@ yy1493: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 'n') goto yy1494; -+ if (yych <= 'n') goto yy1496; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1494: -+yy1496: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -22241,12 +22440,12 @@ yy1494: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 't') goto yy1495; -+ if (yych <= 't') goto yy1497; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1495: -+yy1497: - yych = *++YYCURSOR; - if (yych <= 'H') { - if (yych <= ')') { -@@ -22268,7 +22467,7 @@ yy1495: - goto yy3; - } - } --yy1496: -+yy1498: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -22277,7 +22476,7 @@ yy1496: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy167; -- goto yy1426; -+ goto yy1428; - } - } else { - if (yych <= 's') { -@@ -22285,21 +22484,22 @@ yy1496: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 't') goto yy1426; -+ if (yych <= 't') goto yy1428; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1497: -+yy1499: - ++YYCURSOR; - if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy164; - } else { - if (yych <= 'Z') goto yy167; -- if (yych <= '`') goto yy1498; -+ if (yych <= '`') goto yy1500; - if (yych <= 'z') goto yy167; - } --yy1498: -+yy1500: -+#line 982 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("now"); - TIMELIB_INIT; -@@ -22307,7 +22507,8 @@ yy1498: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1499: -+#line 22511 "ext/date/lib/parse_date.c" -+yy1501: - yych = *++YYCURSOR; - if (yych <= 'N') { - if (yych <= ')') { -@@ -22316,7 +22517,7 @@ yy1499: - } else { - if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy167; -- goto yy1505; -+ goto yy1507; - } - } else { - if (yych <= 'm') { -@@ -22324,12 +22525,12 @@ yy1499: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 'n') goto yy1505; -+ if (yych <= 'n') goto yy1507; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1500: -+yy1502: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { -@@ -22364,13 +22565,13 @@ yy1500: - if (yych <= '`') goto yy218; - goto yy167; - } else { -- if (yych <= 'e') goto yy1501; -+ if (yych <= 'e') goto yy1503; - if (yych <= 'z') goto yy167; - goto yy218; - } - } - } --yy1501: -+yy1503: - yych = *++YYCURSOR; - if (yych <= 'M') { - if (yych <= ')') { -@@ -22386,12 +22587,12 @@ yy1501: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'm') goto yy1502; -+ if (yych <= 'm') goto yy1504; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1502: -+yy1504: - yych = *++YYCURSOR; - if (yych <= 'B') { - if (yych <= ')') { -@@ -22407,36 +22608,37 @@ yy1502: - if (yych <= '`') goto yy3; - goto yy169; - } else { -- if (yych <= 'b') goto yy1503; -+ if (yych <= 'b') goto yy1505; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1503: -+yy1505: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'D') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych <= 'E') goto yy1504; -+ if (yych <= 'E') goto yy1506; - if (yych != 'e') goto yy3; - } --yy1504: -+yy1506: - yych = *++YYCURSOR; - if (yych == 'R') goto yy229; - if (yych == 'r') goto yy229; - goto yy56; --yy1505: -+yy1507: - ++YYCURSOR; - if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy164; - } else { - if (yych <= 'Z') goto yy168; -- if (yych <= '`') goto yy1506; -+ if (yych <= '`') goto yy1508; - if (yych <= 'z') goto yy168; - } --yy1506: -+yy1508: -+#line 991 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("noon"); - TIMELIB_INIT; -@@ -22447,7 +22649,8 @@ yy1506: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1507: -+#line 22653 "ext/date/lib/parse_date.c" -+yy1509: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'V') { -@@ -22465,15 +22668,15 @@ yy1507: - if (yych <= '@') goto yy3; - goto yy166; - } else { -- if (yych <= 'O') goto yy1499; -+ if (yych <= 'O') goto yy1501; - if (yych <= 'U') goto yy166; -- goto yy1500; -+ goto yy1502; - } - } - } else { - if (yych <= 'n') { - if (yych <= '^') { -- if (yych <= 'W') goto yy1497; -+ if (yych <= 'W') goto yy1499; - if (yych <= 'Z') goto yy166; - goto yy3; - } else { -@@ -22483,17 +22686,17 @@ yy1507: - } - } else { - if (yych <= 'v') { -- if (yych <= 'o') goto yy1514; -+ if (yych <= 'o') goto yy1516; - if (yych <= 'u') goto yy171; -- goto yy1515; -+ goto yy1517; - } else { -- if (yych <= 'w') goto yy1513; -+ if (yych <= 'w') goto yy1515; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1508: -+yy1510: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'W') { -@@ -22508,7 +22711,7 @@ yy1508: - } - } else { - if (yych <= '_') { -- if (yych <= 'X') goto yy1496; -+ if (yych <= 'X') goto yy1498; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22517,13 +22720,13 @@ yy1508: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'x') goto yy1512; -+ if (yych <= 'x') goto yy1514; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1509: -+yy1511: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'M') { -@@ -22538,7 +22741,7 @@ yy1509: - } - } else { - if (yych <= '_') { -- if (yych <= 'N') goto yy1494; -+ if (yych <= 'N') goto yy1496; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22547,13 +22750,13 @@ yy1509: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 'n') goto yy1510; -+ if (yych <= 'n') goto yy1512; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1510: -+yy1512: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -22568,7 +22771,7 @@ yy1510: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1495; -+ if (yych <= 'T') goto yy1497; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22577,13 +22780,13 @@ yy1510: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 't') goto yy1511; -+ if (yych <= 't') goto yy1513; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1511: -+yy1513: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'G') { -@@ -22613,7 +22816,7 @@ yy1511: - } - } - } --yy1512: -+yy1514: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -22628,7 +22831,7 @@ yy1512: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1426; -+ if (yych <= 'T') goto yy1428; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22637,36 +22840,36 @@ yy1512: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 't') goto yy1458; -+ if (yych <= 't') goto yy1460; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1513: -+yy1515: - yyaccept = 31; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych <= ',') { - if (yych == ')') goto yy164; -- goto yy1498; -+ goto yy1500; - } else { -- if (yych == '.') goto yy1498; -+ if (yych == '.') goto yy1500; - goto yy172; - } - } else { - if (yych <= '^') { -- if (yych <= '@') goto yy1498; -+ if (yych <= '@') goto yy1500; - if (yych <= 'Z') goto yy167; -- goto yy1498; -+ goto yy1500; - } else { - if (yych <= '_') goto yy172; -- if (yych <= '`') goto yy1498; -+ if (yych <= '`') goto yy1500; - if (yych <= 'z') goto yy175; -- goto yy1498; -+ goto yy1500; - } - } --yy1514: -+yy1516: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'M') { -@@ -22681,7 +22884,7 @@ yy1514: - } - } else { - if (yych <= '_') { -- if (yych <= 'N') goto yy1505; -+ if (yych <= 'N') goto yy1507; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22690,13 +22893,13 @@ yy1514: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 'n') goto yy1520; -+ if (yych <= 'n') goto yy1522; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1515: -+yy1517: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { -@@ -22724,7 +22927,7 @@ yy1515: - if (yych <= '@') goto yy218; - goto yy167; - } else { -- if (yych <= 'E') goto yy1501; -+ if (yych <= 'E') goto yy1503; - if (yych <= 'Z') goto yy167; - goto yy218; - } -@@ -22734,13 +22937,13 @@ yy1515: - if (yych <= '`') goto yy218; - goto yy175; - } else { -- if (yych <= 'e') goto yy1516; -+ if (yych <= 'e') goto yy1518; - if (yych <= 'z') goto yy175; - goto yy218; - } - } - } --yy1516: -+yy1518: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { -@@ -22755,7 +22958,7 @@ yy1516: - } - } else { - if (yych <= '_') { -- if (yych <= 'M') goto yy1502; -+ if (yych <= 'M') goto yy1504; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22764,13 +22967,13 @@ yy1516: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'm') goto yy1517; -+ if (yych <= 'm') goto yy1519; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1517: -+yy1519: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'A') { -@@ -22785,7 +22988,7 @@ yy1517: - } - } else { - if (yych <= '_') { -- if (yych <= 'B') goto yy1503; -+ if (yych <= 'B') goto yy1505; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22794,13 +22997,13 @@ yy1517: - if (yych <= '`') goto yy3; - goto yy177; - } else { -- if (yych <= 'b') goto yy1518; -+ if (yych <= 'b') goto yy1520; - if (yych <= 'z') goto yy177; - goto yy3; - } - } - } --yy1518: -+yy1520: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'D') { -@@ -22814,44 +23017,44 @@ yy1518: - } - } else { - if (yych <= '`') { -- if (yych <= 'E') goto yy1504; -+ if (yych <= 'E') goto yy1506; - if (yych == '_') goto yy172; - goto yy3; - } else { -- if (yych == 'e') goto yy1519; -+ if (yych == 'e') goto yy1521; - if (yych <= 'z') goto yy178; - goto yy3; - } - } --yy1519: -+yy1521: - yych = *++YYCURSOR; - if (yych == 'R') goto yy229; - if (yych == 'r') goto yy341; - goto yy179; --yy1520: -+yy1522: - yyaccept = 32; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych <= ',') { - if (yych == ')') goto yy164; -- goto yy1506; -+ goto yy1508; - } else { -- if (yych == '.') goto yy1506; -+ if (yych == '.') goto yy1508; - goto yy172; - } - } else { - if (yych <= '^') { -- if (yych <= '@') goto yy1506; -+ if (yych <= '@') goto yy1508; - if (yych <= 'Z') goto yy168; -- goto yy1506; -+ goto yy1508; - } else { - if (yych <= '_') goto yy172; -- if (yych <= '`') goto yy1506; -+ if (yych <= '`') goto yy1508; - if (yych <= 'z') goto yy176; -- goto yy1506; -+ goto yy1508; - } - } --yy1521: -+yy1523: - yych = *++YYCURSOR; - if (yych <= 'S') { - if (yych <= ')') { -@@ -22867,12 +23070,12 @@ yy1521: - if (yych <= '`') goto yy3; - goto yy166; - } else { -- if (yych <= 's') goto yy1522; -+ if (yych <= 's') goto yy1524; - if (yych <= 'z') goto yy166; - goto yy3; - } - } --yy1522: -+yy1524: - yych = *++YYCURSOR; - if (yych <= 'T') { - if (yych <= ')') { -@@ -22888,12 +23091,12 @@ yy1522: - if (yych <= '`') goto yy3; - goto yy167; - } else { -- if (yych <= 't') goto yy1523; -+ if (yych <= 't') goto yy1525; - if (yych <= 'z') goto yy167; - goto yy3; - } - } --yy1523: -+yy1525: - yych = *++YYCURSOR; - if (yych <= 'E') { - if (yych <= ')') { -@@ -22909,12 +23112,12 @@ yy1523: - if (yych <= '`') goto yy3; - goto yy168; - } else { -- if (yych <= 'e') goto yy1524; -+ if (yych <= 'e') goto yy1526; - if (yych <= 'z') goto yy168; - goto yy3; - } - } --yy1524: -+yy1526: - yych = *++YYCURSOR; - if (yych <= 'R') { - if (yych <= ')') { -@@ -22930,32 +23133,33 @@ yy1524: - if (yych <= '`') goto yy3; - goto yy169; - } else { -- if (yych <= 'r') goto yy1525; -+ if (yych <= 'r') goto yy1527; - if (yych <= 'z') goto yy169; - goto yy3; - } - } --yy1525: -+yy1527: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { - if (yych == ')') goto yy164; - goto yy3; - } else { -- if (yych <= 'D') goto yy1526; -+ if (yych <= 'D') goto yy1528; - if (yych != 'd') goto yy3; - } --yy1526: -+yy1528: - yych = *++YYCURSOR; -- if (yych == 'A') goto yy1527; -+ if (yych == 'A') goto yy1529; - if (yych != 'a') goto yy56; --yy1527: -+yy1529: - yych = *++YYCURSOR; -- if (yych == 'Y') goto yy1528; -+ if (yych == 'Y') goto yy1530; - if (yych != 'y') goto yy56; --yy1528: -+yy1530: - ++YYCURSOR; --yy1529: -+yy1531: -+#line 970 "ext/date/lib/parse_date.re" - { - DEBUG_OUTPUT("yesterday"); - TIMELIB_INIT; -@@ -22966,7 +23170,8 @@ yy1529: - TIMELIB_DEINIT; - return TIMELIB_RELATIVE; - } --yy1530: -+#line 23174 "ext/date/lib/parse_date.c" -+yy1532: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'R') { -@@ -22981,7 +23186,7 @@ yy1530: - } - } else { - if (yych <= '_') { -- if (yych <= 'S') goto yy1522; -+ if (yych <= 'S') goto yy1524; - if (yych <= 'Z') goto yy166; - if (yych <= '^') goto yy3; - goto yy172; -@@ -22990,13 +23195,13 @@ yy1530: - if (yych <= '`') goto yy3; - goto yy171; - } else { -- if (yych <= 's') goto yy1531; -+ if (yych <= 's') goto yy1533; - if (yych <= 'z') goto yy171; - goto yy3; - } - } - } --yy1531: -+yy1533: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { -@@ -23011,7 +23216,7 @@ yy1531: - } - } else { - if (yych <= '_') { -- if (yych <= 'T') goto yy1523; -+ if (yych <= 'T') goto yy1525; - if (yych <= 'Z') goto yy167; - if (yych <= '^') goto yy3; - goto yy172; -@@ -23020,13 +23225,13 @@ yy1531: - if (yych <= '`') goto yy3; - goto yy175; - } else { -- if (yych <= 't') goto yy1532; -+ if (yych <= 't') goto yy1534; - if (yych <= 'z') goto yy175; - goto yy3; - } - } - } --yy1532: -+yy1534: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'D') { -@@ -23041,7 +23246,7 @@ yy1532: - } - } else { - if (yych <= '_') { -- if (yych <= 'E') goto yy1524; -+ if (yych <= 'E') goto yy1526; - if (yych <= 'Z') goto yy168; - if (yych <= '^') goto yy3; - goto yy172; -@@ -23050,13 +23255,13 @@ yy1532: - if (yych <= '`') goto yy3; - goto yy176; - } else { -- if (yych <= 'e') goto yy1533; -+ if (yych <= 'e') goto yy1535; - if (yych <= 'z') goto yy176; - goto yy3; - } - } - } --yy1533: -+yy1535: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'Q') { -@@ -23071,7 +23276,7 @@ yy1533: - } - } else { - if (yych <= '_') { -- if (yych <= 'R') goto yy1525; -+ if (yych <= 'R') goto yy1527; - if (yych <= 'Z') goto yy169; - if (yych <= '^') goto yy3; - goto yy172; -@@ -23080,13 +23285,13 @@ yy1533: - if (yych <= '`') goto yy3; - goto yy177; - } else { -- if (yych <= 'r') goto yy1534; -+ if (yych <= 'r') goto yy1536; - if (yych <= 'z') goto yy177; - goto yy3; - } - } - } --yy1534: -+yy1536: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'C') { -@@ -23100,21 +23305,21 @@ yy1534: - } - } else { - if (yych <= '`') { -- if (yych <= 'D') goto yy1526; -+ if (yych <= 'D') goto yy1528; - if (yych == '_') goto yy172; - goto yy3; - } else { -- if (yych == 'd') goto yy1535; -+ if (yych == 'd') goto yy1537; - if (yych <= 'z') goto yy178; - goto yy3; - } - } --yy1535: -+yy1537: - yych = *++YYCURSOR; -- if (yych == 'A') goto yy1527; -+ if (yych == 'A') goto yy1529; - if (yych != 'a') goto yy179; - yych = *++YYCURSOR; -- if (yych == 'Y') goto yy1528; -+ if (yych == 'Y') goto yy1530; - if (yych != 'y') goto yy179; - yyaccept = 33; - yych = *(YYMARKER = ++YYCURSOR); -@@ -23123,13 +23328,14 @@ yy1535: - } - if (yych <= '.') { - if (yych == '-') goto yy172; -- goto yy1529; -+ goto yy1531; - } else { - if (yych <= '/') goto yy172; - if (yych == '_') goto yy172; -- goto yy1529; -+ goto yy1531; - } - } -+#line 1772 "ext/date/lib/parse_date.re" - - } - -diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re -index 74d9ea3..f26e276 100644 ---- a/ext/date/lib/parse_date.re -+++ b/ext/date/lib/parse_date.re -@@ -931,8 +931,8 @@ isoweek = year4 "-"? "W" weekofyear; - exif = year4 ":" monthlz ":" daylz " " hour24lz ":" minutelz ":" secondlz; - firstdayof = 'first day of'; - lastdayof = 'last day of'; --backof = 'back of ' hour24 space? meridian?; --frontof = 'front of ' hour24 space? meridian?; -+backof = 'back of ' hour24 (space? meridian)?; -+frontof = 'front of ' hour24 (space? meridian)?; - - /* Common Log Format: 10/Oct/2000:13:55:36 -0700 */ - clf = day "/" monthabbr "/" year4 ":" hour24lz ":" minutelz ":" secondlz space tzcorrection; -diff --git a/ext/date/tests/bug53437_var3.phpt b/ext/date/tests/bug53437_var3.phpt -index 8f48b1b..8dcd4c8 100644 ---- a/ext/date/tests/bug53437_var3.phpt -+++ b/ext/date/tests/bug53437_var3.phpt -@@ -40,7 +40,7 @@ object(DateInterval)#%d (16) { - ["special_amount"]=> - int(-1) - ["have_weekday_relative"]=> -- int(9) -+ int(0) - ["have_special_relative"]=> - int(0) - ["f"]=> -diff --git a/ext/wddx/tests/bug75055.phpt b/ext/wddx/tests/bug75055.phpt -new file mode 100644 -index 0000000..2956284 ---- /dev/null -+++ b/ext/wddx/tests/bug75055.phpt -@@ -0,0 +1,20 @@ -+--TEST-- -+Bug #75055 Out-Of-Bounds Read in timelib_meridian() -+--SKIPIF-- -+<?php if (!extension_loaded("wddx")) print "skip"; ?> -+--FILE-- -+<?php -+ -+$file_str = dirname(__FILE__) . "/bug75055.wddx"; -+ -+$wddx_str = file_get_contents($file_str); -+print strlen($wddx_str) . " bytes read.\n"; -+ -+var_dump(wddx_deserialize($wddx_str)); -+?> -+--EXPECT-- -+323 bytes read. -+array(1) { -+ ["aDateTime"]=> -+ string(12) "frONt of 0 0" -+} -diff --git a/ext/wddx/tests/bug75055.wddx b/ext/wddx/tests/bug75055.wddx -new file mode 100644 -index 0000000..6493352 ---- /dev/null -+++ b/ext/wddx/tests/bug75055.wddx -@@ -0,0 +1,13 @@ -+<?xml version='1.0'?> -+<!DOCTYPE wddxPacket SYSTEM 'wddx_0100.dtd'> -+<wddxPacket version='1.0'> -+<header/> -+ <data> -+ <struct> -+ <var name='aDateTime'> -+ <dateTime>frONt of 0 0</dateTime> -+ </var> -+ </struct> -+ </data> -+</wddxPacket> -+ --- -2.11.0 - diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index e466cdaf61..066b97cd26 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -6,26 +6,22 @@ LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ - openssl libmcrypt" + openssl" DEPENDS_class-native = "zlib-native libxml2-native" PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ - file://acinclude-xml2-config.patch \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ - file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ " SRC_URI_append_class-target = " \ file://iconv.patch \ file://imap-fix-autofoo.patch \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ file://php_exec_native.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ - file://configure.patch \ + file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ file://php-fpm.service \ " @@ -44,7 +40,6 @@ PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}" COMMON_EXTRA_OECONF = "--enable-sockets \ --enable-pcntl \ --enable-shared \ - --disable-opcache \ --disable-rpath \ --with-pic \ --libdir=${PHP_LIBDIR} \ @@ -57,20 +52,22 @@ EXTRA_OECONF = "--enable-mbstring \ --with-gettext=${STAGING_LIBDIR}/.. \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ - --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ + ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ ${COMMON_EXTRA_OECONF} \ " + +CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes" + EXTRA_OECONF_class-native = " \ --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ --without-iconv \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3 imap \ +PACKAGECONFIG ??= "mysql sqlite3 imap opcache \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ " PACKAGECONFIG_class-native = "" @@ -94,7 +91,7 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ ,--without-imap --without-imap-ssl \ ,uw-imap" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - +PACKAGECONFIG[opcache] = ",--disable-opcache" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" @@ -201,14 +198,14 @@ php_sysroot_preprocess () { MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" RDEPENDS_${PN} += "libgcc" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-phar = "${PN}-cli" RDEPENDS_${PN}-cli = "${PN}" RDEPENDS_${PN}-modphp = "${PN} apache2" -RDEPENDS_${PN}-dev = "${PN}" +RDEPENDS_${PN}-opcache = "${PN}" INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d @@ -237,6 +234,8 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" +FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" +FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" FILES_${PN} = "${PHP_LIBDIR}/php" FILES_${PN} += "${bindir}" diff --git a/meta-oe/recipes-devtools/php/php-5.6.31/0001-Add-lpthread-to-link.patch b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch index f70e550ff6..f70e550ff6 100644 --- a/meta-oe/recipes-devtools/php/php-5.6.31/0001-Add-lpthread-to-link.patch +++ b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch new file mode 100644 index 0000000000..a250cac83a --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch @@ -0,0 +1,39 @@ +From dfebe81f946a83fe2499fc84d4f3dbdc5612276c Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Tue, 3 Apr 2018 11:35:03 +0800 +Subject: [PATCH] acinclude.m4: don't unset cache variables + +Unsetting prevents cache variable from being passed to configure. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + acinclude.m4 | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index f6a55ec..d3346df 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) + dnl + AC_DEFUN([PHP_CHECK_FUNC_LIB],[ + ifelse($2,,:,[ +- unset ac_cv_lib_$2[]_$1 +- unset ac_cv_lib_$2[]___$1 + unset found + AC_CHECK_LIB($2, $1, [found=yes], [ + AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) +@@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library. + dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. + dnl + AC_DEFUN([PHP_CHECK_FUNC],[ +- unset ac_cv_func_$1 +- unset ac_cv_func___$1 + unset found + + AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch new file mode 100644 index 0000000000..15329261bf --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch @@ -0,0 +1,56 @@ +From a2d146b8dd9d02f523d1e205d79792626a71dec3 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Mon, 2 Apr 2018 15:27:09 +0800 +Subject: [PATCH] acinclude.m4: skip binconfig check for libxml + +We want libxml flags to be picked up using pkg-config instead of the +xml2-config file. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +--- + acinclude.m4 | 29 ----------------------------- + 1 file changed, 29 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index d42d708..d32766a 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2525,35 +2525,6 @@ dnl + AC_DEFUN([PHP_SETUP_LIBXML], [ + found_libxml=no + +- dnl First try to find xml2-config +- AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, +- [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done +- ]) +- +- if test -x "$ac_cv_php_xml2_config_path"; then +- XML2_CONFIG="$ac_cv_php_xml2_config_path" +- libxml_full_version=`$XML2_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $libxml_full_version +- IFS=$ac_IFS +- LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` +- if test "$LIBXML_VERSION" -ge "2006011"; then +- found_libxml=yes +- LIBXML_LIBS=`$XML2_CONFIG --libs` +- LIBXML_INCS=`$XML2_CONFIG --cflags` +- else +- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) +- fi +- fi +- +- dnl If xml2-config fails, try pkg-config + if test "$found_libxml" = "no"; then + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch b/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch new file mode 100644 index 0000000000..6ab101b410 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch @@ -0,0 +1,45 @@ +From 0d88d735887c6f2fa00a743c27124c7a52006a41 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 15 Apr 2018 19:17:27 -0700 +Subject: [PATCH] fix error caused by a new variable is declared after the + label + +There is a build failure on mips: +... +|sljitNativeMIPS_common.c: In function 'sljit_has_cpu_feature': +|sljitNativeMIPS_common.c:506:3: error: a label can only be part +of a statement and a declaration is not a statement +| sljit_sw fir; +| ^~~~~~~~ +... + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c +index ee207fe..adfd342 100644 +--- a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c ++++ b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c +@@ -498,12 +498,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil + + SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type) + { ++#if defined(__GNUC__) ++ sljit_sw fir; ++#endif + switch (feature_type) { + case SLJIT_HAS_FPU: + #ifdef SLJIT_IS_FPU_AVAILABLE + return SLJIT_IS_FPU_AVAILABLE; + #elif defined(__GNUC__) +- sljit_sw fir; + asm ("cfc1 %0, $0" : "=r"(fir)); + return (fir >> 22) & 0x1; + #else +-- +2.10.2 + diff --git a/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch new file mode 100644 index 0000000000..fce9738f54 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch @@ -0,0 +1,63 @@ +From 2842aa2a078eb1cad55540b61e7edf111395150d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Date: Mon, 26 Feb 2018 19:30:55 +0100 +Subject: [PATCH] main/php_ini.c: build empty php_load_zend_extension_cb() when + !HAVE_LIBDL + +Commit 0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7 ("Fixed bug #74866 +extension_dir = "./ext" now use current directory for base") modified +the php_load_zend_extension_cb() function to use php_load_shlib(), and +pass a handle to the newly introduced zend_load_extension_handle() +function instead of passing the extension path to +zend_load_extension(). + +While doing so, it introduced a call to php_load_shlib() from code +that is built even when HAVE_LIBDL is not defined. However, +php_load_shlib() is not implemented when HAVE_LIBDL is not defined, +for obvious reasons. + +It turns out that zend_load_extension_handle() anyway doesn't do +anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and +ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined +(Zend/zend_portability.h). + +Fixes the following build failure when building on a system that +doesn't have libdl: + +main/php_ini.o: In function `php_load_zend_extension_cb': +php_ini.c:(.text+0x478): undefined reference to `php_load_shlib' +php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib' +collect2: error: ld returned 1 exit status + +Upstream-Status: Backport [http://git.php.net/?p=php-src.git;a=commit;h=2842aa2a078eb1cad55540b61e7edf111395150d] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + main/php_ini.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/main/php_ini.c b/main/php_ini.c +index ba58eb1..fca263e 100644 +--- a/main/php_ini.c ++++ b/main/php_ini.c +@@ -350,6 +350,7 @@ static void php_load_php_extension_cb(void *arg) + + /* {{{ php_load_zend_extension_cb + */ ++#ifdef HAVE_LIBDL + static void php_load_zend_extension_cb(void *arg) + { + char *filename = *((char **) arg); +@@ -409,6 +410,9 @@ static void php_load_zend_extension_cb(void *arg) + efree(libpath); + } + } ++#else ++static void php_load_zend_extension_cb(void *arg) { } ++#endif + /* }}} */ + + /* {{{ php_init_config +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch new file mode 100644 index 0000000000..0d24d34f2b --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch @@ -0,0 +1,385 @@ +From b2fb725dc404d471371731b663234e87cb0fca84 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Mon, 2 Apr 2018 17:54:52 +0800 +Subject: [PATCH] opcache/config.m4: enable opcache + +We can't use AC_TRY_RUN to run programs in a cross compile environment. Set +the variables directly instead since we know that we'd be running on latest +enough linux kernel. + +Upstream-Status: Inappropriate [Configuration] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + ext/opcache/config.m4 | 349 ++------------------------------------------------ + 1 file changed, 8 insertions(+), 341 deletions(-) + +diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 +index 7b500f0..10bb99a 100644 +--- a/ext/opcache/config.m4 ++++ b/ext/opcache/config.m4 +@@ -28,353 +28,20 @@ if test "$PHP_OPCACHE" != "no"; then + + AC_CHECK_HEADERS([unistd.h sys/uio.h]) + +- AC_MSG_CHECKING(for sysvipc shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/ipc.h> +-#include <sys/shm.h> +-#include <unistd.h> +-#include <string.h> ++ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) + +-int main() { +- pid_t pid; +- int status; +- int ipc_id; +- char *shm; +- struct shmid_ds shmbuf; ++ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) + +- ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W)); +- if (ipc_id == -1) { +- return 1; +- } ++ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) + +- shm = shmat(ipc_id, NULL, 0); +- if (shm == (void *)-1) { +- shmctl(ipc_id, IPC_RMID, NULL); +- return 2; +- } +- +- if (shmctl(ipc_id, IPC_STAT, &shmbuf) != 0) { +- shmdt(shm); +- shmctl(ipc_id, IPC_RMID, NULL); +- return 3; +- } +- +- shmbuf.shm_perm.uid = getuid(); +- shmbuf.shm_perm.gid = getgid(); +- shmbuf.shm_perm.mode = 0600; +- +- if (shmctl(ipc_id, IPC_SET, &shmbuf) != 0) { +- shmdt(shm); +- shmctl(ipc_id, IPC_RMID, NULL); +- return 4; +- } +- +- shmctl(ipc_id, IPC_RMID, NULL); +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <unistd.h> +-#include <string.h> +- +-#ifndef MAP_ANON +-# ifdef MAP_ANONYMOUS +-# define MAP_ANON MAP_ANONYMOUS +-# endif +-#endif +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- char *shm; +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0); +- if (shm == MAP_FAILED) { +- return 1; +- } +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +- AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <string.h> +- +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- int fd; +- char *shm; +- +- fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR); +- if (fd == -1) { +- return 1; +- } +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); +- if (shm == MAP_FAILED) { +- return 2; +- } +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +- AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <string.h> +-#include <stdlib.h> +-#include <stdio.h> +- +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- int fd; +- char *shm; +- char tmpname[4096]; +- +- sprintf(tmpname,"test.shm.%dXXXXXX", getpid()); +- if (mktemp(tmpname) == NULL) { +- return 1; +- } +- fd = shm_open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +- if (fd == -1) { +- return 2; +- } +- if (ftruncate(fd, 4096) < 0) { +- close(fd); +- shm_unlink(tmpname); +- return 3; +- } +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); +- if (shm == MAP_FAILED) { +- return 4; +- } +- shm_unlink(tmpname); +- close(fd); +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) ++ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) + + AC_MSG_CHECKING(for mmap() using regular file shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <string.h> +-#include <stdlib.h> +-#include <stdio.h> +- +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- int fd; +- char *shm; +- char tmpname[4096]; +- +- sprintf(tmpname,"test.shm.%dXXXXXX", getpid()); +- if (mktemp(tmpname) == NULL) { +- return 1; +- } +- fd = open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +- if (fd == -1) { +- return 2; +- } +- if (ftruncate(fd, 4096) < 0) { +- close(fd); +- unlink(tmpname); +- return 3; +- } +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); +- if (shm == MAP_FAILED) { +- return 4; +- } +- unlink(tmpname); +- close(fd); +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +-flock_type=unknown +-AC_MSG_CHECKING("whether flock struct is linux ordered") +-AC_TRY_RUN([ +- #include <fcntl.h> +- struct flock lock = { 1, 2, 3, 4, 5 }; +- int main() { +- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { +- return 0; +- } +- return 1; +- } +-], [ +- flock_type=linux +- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) +- AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++ ++ AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) + +-AC_MSG_CHECKING("whether flock struct is BSD ordered") +-AC_TRY_RUN([ +- #include <fcntl.h> +- struct flock lock = { 1, 2, 3, 4, 5 }; +- int main() { +- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { +- return 0; +- } +- return 1; +- } +-], [ +- flock_type=bsd +- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) +- AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++ flock_type=linux ++ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) + + if test "$flock_type" = "unknown"; then + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch index 39c334f39d..3e901841be 100644 --- a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch @@ -1,20 +1,25 @@ -[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK +From 3bfcc7fdd22261eaed10949714de0a90d31e10ab Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Thu, 20 Aug 2015 16:29:35 +0800 +Subject: [PATCH] [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK Upstream-Status: Pending AC_TRY_RUN is not suitable for cross-compile Signed-off-by: Roy Li <rongqing.li@windriver.com> + +%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch --- ext/fileinfo/config.m4 | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 -index 7e98d62..8a8ea0e 100644 +index 523b4fd..0aaa4c8 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then - libmagic/readcdf.c libmagic/softmagic.c" + libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c" AC_MSG_CHECKING([for strcasestr]) - AC_TRY_RUN([ @@ -52,5 +57,5 @@ index 7e98d62..8a8ea0e 100644 dnl using the platform implementation AC_MSG_RESULT(yes) -- -1.9.1 +2.7.4 diff --git a/meta-oe/recipes-devtools/php/php/configure.patch b/meta-oe/recipes-devtools/php/php/configure.patch deleted file mode 100644 index c5334c706e..0000000000 --- a/meta-oe/recipes-devtools/php/php/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-5.1.6/configure.old 2006-09-12 07:54:14.000000000 -0700 -+++ php-5.1.6/configure 2006-09-12 07:54:37.000000000 -0700 -@@ -14715,8 +14715,6 @@ - - - -- unset ac_cv_func_dlopen -- unset ac_cv_func___dlopen - unset found - - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch index 255fbb062c..b6e3ceb0b9 100644 --- a/meta-oe/recipes-devtools/php/php/iconv.patch +++ b/meta-oe/recipes-devtools/php/php/iconv.patch @@ -1,10 +1,18 @@ -Upstream-status: Unknown +From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Upstream-status: Unknown + +--- + acinclude.m4 | 3 ++- + ext/iconv/config.m4 | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index a6c0d84..df11abd 100644 +index d32766a..ad5166e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -2452,7 +2452,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -2445,7 +2445,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl Check libc first if no path is provided in --with-iconv dnl @@ -15,7 +23,7 @@ index a6c0d84..df11abd 100644 dnl -liconv in. LIBS_save="$LIBS" diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 -index d673b0a..1fbef13 100644 +index 6a05697..973e750 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then @@ -27,6 +35,3 @@ index d673b0a..1fbef13 100644 if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then PHP_ICONV_PREFIX="$i" break --- -1.9.3 - diff --git a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch index da04c2d953..b5fb7d4fd7 100644 --- a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch +++ b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch @@ -1,10 +1,18 @@ -Upstream-status: Unknown +From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Upstream-status: Unknown + +--- + acinclude.m4 | 2 +- + ext/imap/config.m4 | 10 ++-------- + 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index df11abd..06e7236 100644 +index ad5166e..f6a55ec 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -2357,7 +2357,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ +@@ -2350,7 +2350,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi @@ -14,7 +22,7 @@ index df11abd..06e7236 100644 OPENSSL_INCDIR=$i/include fi diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 -index 3fcf674..f08caf7 100644 +index badb6e2..8ff803c 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -109,7 +109,7 @@ if test "$PHP_IMAP" != "no"; then @@ -41,6 +49,3 @@ index 3fcf674..f08caf7 100644 IMAP_LIB=$lib IMAP_LIB_CHK($PHP_LIBDIR) IMAP_LIB_CHK(c-client) --- -1.9.3 - diff --git a/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-oe/recipes-devtools/php/php/pear-makefile.patch index 9927d2d967..4bc1025261 100644 --- a/meta-oe/recipes-devtools/php/php/pear-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/pear-makefile.patch @@ -1,11 +1,18 @@ -Upstream-status: Unknown +From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Upstream-status: Unknown + +--- + pear/Makefile.frag | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pear/Makefile.frag b/pear/Makefile.frag -index 00bacae..739eeca 100644 +index bbe8ec3..16f43e2 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag -@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix} - PEAR_SUFFIX = -ds a$(program_suffix) +@@ -12,7 +12,7 @@ PEAR_SUFFIX = -ds a$(program_suffix) + PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar install-pear-installer: $(SAPI_CLI_PATH) - @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} @@ -13,6 +20,3 @@ index 00bacae..739eeca 100644 install-pear: @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" --- -1.9.3 - diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/phar-makefile.patch index 2f7fe34c7f..336cf0d629 100644 --- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/phar-makefile.patch @@ -1,17 +1,24 @@ -Fix phar packaging +From 08962a56f69963e01892d98ca5b75de8354bd3f5 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Fix phar packaging Inherited from OE-Classic, with some additions to fix host paths leaking into the target package. Upstream-Status: Inappropriate [config] +--- + ext/phar/Makefile.frag | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag -index 6516ddf..36e6cf4 100644 +index 0e3713f..22f7898 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag -@@ -5,20 +5,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar +@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar - PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' + PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' PHP_PHARCMD_EXECUTABLE = ` \ - if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ - $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ diff --git a/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch new file mode 100644 index 0000000000..7be67ea94d --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch @@ -0,0 +1,387 @@ +From fafcfac0933c17e1bf551600080eb0541186caf5 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Mon, 2 Apr 2018 17:54:52 +0800 +Subject: [PATCH] opcache/config.m4: enable opcache + +We can't use AC_TRY_RUN to run programs in a cross compile environment. Set +the variables directly instead since we know that we'd be running on latest +enough linux kernel. + +Upstream-Status: Inappropriate [Configuration] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +%% original patch: php5-0001-opcache-config.m4-enable-opcache.patch +--- + ext/opcache/config.m4 | 349 ++------------------------------------------------ + 1 file changed, 8 insertions(+), 341 deletions(-) + +diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 +index 5a8b86c..6e87fa5 100644 +--- a/ext/opcache/config.m4 ++++ b/ext/opcache/config.m4 +@@ -11,353 +11,20 @@ if test "$PHP_OPCACHE" != "no"; then + AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function]) + ]) + +- AC_MSG_CHECKING(for sysvipc shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/ipc.h> +-#include <sys/shm.h> +-#include <unistd.h> +-#include <string.h> ++ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) + +-int main() { +- pid_t pid; +- int status; +- int ipc_id; +- char *shm; +- struct shmid_ds shmbuf; ++ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) + +- ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W)); +- if (ipc_id == -1) { +- return 1; +- } ++ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) + +- shm = shmat(ipc_id, NULL, 0); +- if (shm == (void *)-1) { +- shmctl(ipc_id, IPC_RMID, NULL); +- return 2; +- } +- +- if (shmctl(ipc_id, IPC_STAT, &shmbuf) != 0) { +- shmdt(shm); +- shmctl(ipc_id, IPC_RMID, NULL); +- return 3; +- } +- +- shmbuf.shm_perm.uid = getuid(); +- shmbuf.shm_perm.gid = getgid(); +- shmbuf.shm_perm.mode = 0600; +- +- if (shmctl(ipc_id, IPC_SET, &shmbuf) != 0) { +- shmdt(shm); +- shmctl(ipc_id, IPC_RMID, NULL); +- return 4; +- } +- +- shmctl(ipc_id, IPC_RMID, NULL); +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <unistd.h> +-#include <string.h> +- +-#ifndef MAP_ANON +-# ifdef MAP_ANONYMOUS +-# define MAP_ANON MAP_ANONYMOUS +-# endif +-#endif +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- char *shm; +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0); +- if (shm == MAP_FAILED) { +- return 1; +- } +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +- AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <string.h> +- +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- int fd; +- char *shm; +- +- fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR); +- if (fd == -1) { +- return 1; +- } +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); +- if (shm == MAP_FAILED) { +- return 2; +- } +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +- AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <string.h> +-#include <stdlib.h> +-#include <stdio.h> +- +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- int fd; +- char *shm; +- char tmpname[4096]; +- +- sprintf(tmpname,"test.shm.%dXXXXXX", getpid()); +- if (mktemp(tmpname) == NULL) { +- return 1; +- } +- fd = shm_open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +- if (fd == -1) { +- return 2; +- } +- if (ftruncate(fd, 4096) < 0) { +- close(fd); +- shm_unlink(tmpname); +- return 3; +- } +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); +- if (shm == MAP_FAILED) { +- return 4; +- } +- shm_unlink(tmpname); +- close(fd); +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) ++ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) + + AC_MSG_CHECKING(for mmap() using regular file shared memory support) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/wait.h> +-#include <sys/mman.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <string.h> +-#include <stdlib.h> +-#include <stdio.h> +- +-#ifndef MAP_FAILED +-# define MAP_FAILED ((void*)-1) +-#endif +- +-int main() { +- pid_t pid; +- int status; +- int fd; +- char *shm; +- char tmpname[4096]; +- +- sprintf(tmpname,"test.shm.%dXXXXXX", getpid()); +- if (mktemp(tmpname) == NULL) { +- return 1; +- } +- fd = open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +- if (fd == -1) { +- return 2; +- } +- if (ftruncate(fd, 4096) < 0) { +- close(fd); +- unlink(tmpname); +- return 3; +- } +- +- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); +- if (shm == MAP_FAILED) { +- return 4; +- } +- unlink(tmpname); +- close(fd); +- +- strcpy(shm, "hello"); +- +- pid = fork(); +- if (pid < 0) { +- return 5; +- } else if (pid == 0) { +- strcpy(shm, "bye"); +- return 6; +- } +- if (wait(&status) != pid) { +- return 7; +- } +- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) { +- return 8; +- } +- if (strcmp(shm, "bye") != 0) { +- return 9; +- } +- return 0; +-} +-],dnl +- AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) +- msg=yes,msg=no,msg=no) +- AC_MSG_RESULT([$msg]) +- +-flock_type=unknown +-AC_MSG_CHECKING("whether flock struct is linux ordered") +-AC_TRY_RUN([ +- #include <fcntl.h> +- struct flock lock = { 1, 2, 3, 4, 5 }; +- int main() { +- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { +- return 0; +- } +- return 1; +- } +-], [ +- flock_type=linux +- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) +- AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++ ++ AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) + +-AC_MSG_CHECKING("whether flock struct is BSD ordered") +-AC_TRY_RUN([ +- #include <fcntl.h> +- struct flock lock = { 1, 2, 3, 4, 5 }; +- int main() { +- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { +- return 0; +- } +- return 1; +- } +-], [ +- flock_type=bsd +- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) +- AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++ flock_type=linux ++ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) + + if test "$flock_type" = "unknown"; then + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php-5.6.31/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch index 39c334f39d..1d21f8c56f 100644 --- a/meta-oe/recipes-devtools/php/php-5.6.31/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ b/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch @@ -1,10 +1,17 @@ -[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK +From 5f49987e88dfcbdb84be6e0c9025432fbd998709 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Thu, 20 Aug 2015 16:29:35 +0800 +Subject: [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK Upstream-Status: Pending AC_TRY_RUN is not suitable for cross-compile Signed-off-by: Roy Li <rongqing.li@windriver.com> + +%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch + +%% original patch: php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch --- ext/fileinfo/config.m4 | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) @@ -52,5 +59,5 @@ index 7e98d62..8a8ea0e 100644 dnl using the platform implementation AC_MSG_RESULT(yes) -- -1.9.1 +2.7.4 diff --git a/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch new file mode 100644 index 0000000000..cff6426ab3 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch @@ -0,0 +1,26 @@ +From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Upstream-status: Unknown + +%% original patch: php5-pear-makefile.patch +--- + pear/Makefile.frag | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pear/Makefile.frag b/pear/Makefile.frag +index 00bacae..739eeca 100644 +--- a/pear/Makefile.frag ++++ b/pear/Makefile.frag +@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix} + PEAR_SUFFIX = -ds a$(program_suffix) + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch b/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch new file mode 100644 index 0000000000..4e1efd40cd --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch @@ -0,0 +1,46 @@ +From 3ea626a8d081f56b01004b7992534d4e6b81a9cc Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Fix phar packaging + +Inherited from OE-Classic, with some additions to fix host paths leaking +into the target package. + +Upstream-Status: Inappropriate [config] + +%% original patch: php5-phar-makefile.patch +--- + ext/phar/Makefile.frag | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag +index b8b1b42..1005b2d 100644 +--- a/ext/phar/Makefile.frag ++++ b/ext/phar/Makefile.frag +@@ -5,20 +5,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar + + PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' + PHP_PHARCMD_EXECUTABLE = ` \ +- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ +- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ +- if test "x$(PHP_MODULES)" != "x"; then \ +- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ +- for i in bz2 zlib phar; do \ +- if test -f "$(top_builddir)/modules/$$i.la"; then \ +- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ +- fi; \ +- done; \ +- fi; \ +- else \ +- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ +- fi;` +-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` ++ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` ++ ++PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + + $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc + -@test -d $(builddir)/phar || mkdir $(builddir)/phar +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-oe/recipes-devtools/php/php/php_exec_native.patch index 0506bddaf4..6af0dc81a1 100644 --- a/meta-oe/recipes-devtools/php/php/php_exec_native.patch +++ b/meta-oe/recipes-devtools/php/php/php_exec_native.patch @@ -1,10 +1,17 @@ -Upstream-status: Inappriate +From d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 2 Nov 2011 16:54:57 +0100 +Subject: [PATCH] Upstream-status: Inappriate + +--- + sapi/cli/config.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 -index cdfa1f7..0fe11e3 100644 +index 2168151..20a81db 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 -@@ -36,7 +36,7 @@ if test "$PHP_CLI" != "no"; then +@@ -50,7 +50,7 @@ if test "$PHP_CLI" != "no"; then esac dnl Set executable for tests @@ -13,6 +20,3 @@ index cdfa1f7..0fe11e3 100644 PHP_SUBST(PHP_EXECUTABLE) dnl Expose to Makefile --- -1.9.3 - diff --git a/meta-oe/recipes-devtools/php/php_5.6.31.bb b/meta-oe/recipes-devtools/php/php_5.6.31.bb deleted file mode 100644 index dd8047be29..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.6.31.bb +++ /dev/null @@ -1,10 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4" - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ - file://pthread-check-threads-m4.patch \ - file://0001-Add-lpthread-to-link.patch \ - " -SRC_URI[md5sum] = "620abe25e0d6cd5f041a360a30ce5783" -SRC_URI[sha256sum] = "8f397169cb65f0539f3bcb04060f97770d73e19074a37bd2c58b98ebf6ecb10f" diff --git a/meta-oe/recipes-devtools/php/php_5.6.35.bb b/meta-oe/recipes-devtools/php/php_5.6.35.bb new file mode 100644 index 0000000000..c17c0d6a25 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.6.35.bb @@ -0,0 +1,23 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4" + +SRC_URI += "file://php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ + file://pthread-check-threads-m4.patch \ + file://0001-Add-lpthread-to-link.patch \ + file://acinclude-xml2-config.patch \ + file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ + " + +SRC_URI_append_class-target = " \ + file://php5-pear-makefile.patch \ + file://php5-phar-makefile.patch \ + file://php5-0001-opcache-config.m4-enable-opcache.patch \ + " + +SRC_URI[md5sum] = "905ae5f586351f3ca29d044c9484d475" +SRC_URI[sha256sum] = "ee78a7e9ca21d8ea394d037c55effff477a49dbae31c7753c547036f5bd73b92" + +DEPENDS += "libmcrypt" +EXTRA_OECONF += "--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ + " diff --git a/meta-oe/recipes-devtools/php/php_7.1.9.bb b/meta-oe/recipes-devtools/php/php_7.1.9.bb deleted file mode 100644 index acf68a0594..0000000000 --- a/meta-oe/recipes-devtools/php/php_7.1.9.bb +++ /dev/null @@ -1,17 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=c0af599f66d0461c5837c695fcbc5c1e" - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ - file://0001-Specify-tag-with-libtool.patch \ - file://CVE-2017-16642.patch \ - " -SRC_URI[md5sum] = "2397be54f3281cdf30c7ef076b28f7d0" -SRC_URI[sha256sum] = "314dcc10dfdd7c4443edb4fe1e133a44f2b2a8351be8c9eb6ab9222d45fd9bae" - -PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ - --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-oe/recipes-devtools/php/php_7.2.4.bb b/meta-oe/recipes-devtools/php/php_7.2.4.bb new file mode 100644 index 0000000000..2fd1e66c78 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_7.2.4.bb @@ -0,0 +1,24 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" + +SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ + file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ + file://0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch \ + file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ + " +SRC_URI_append_class-target = " \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + " + +SRC_URI[md5sum] = "864c64ffd2f1686b035ef8ce6a6d8478" +SRC_URI[sha256sum] = "11658a0d764dc94023b9fb60d4b5eb75d438ad17981efe70abb0d0d09a447ef3" + +PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ + --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" + +FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb b/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb index 8f6532c531..156e52a3a5 100644 --- a/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb +++ b/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb @@ -3,14 +3,9 @@ SECTION = "devel/python" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRCNAME = "cpuset" - -SRC_URI = "https://github.com/lpechacek/${SRCNAME}/archive/v${PV}.tar.gz" - -SRC_URI[md5sum] = "6ad79b26ba03f559604d74513cc34392" -SRC_URI[sha256sum] = "32334e164415ed5aec83c5ffc3dc01c418406eb02d96d881fdfd495587ff0c01" - -S = "${WORKDIR}/${SRCNAME}-${PV}" +S = "${WORKDIR}/git" +SRCREV = "ae629aa1dc959342745ad97406adddf63bb6dbdd" +SRC_URI = "git://github.com/lpechacek/cpuset.git;protocol=https;" inherit distutils diff --git a/meta-oe/recipes-devtools/python/python-futures_3.0.5.bb b/meta-oe/recipes-devtools/python/python-futures_3.0.5.bb deleted file mode 100644 index c85fc56b83..0000000000 --- a/meta-oe/recipes-devtools/python/python-futures_3.0.5.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "The concurrent.futures module provides a high-level interface for asynchronously executing callables." -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=3d78c5bb15ac641d34f2ddc3bd7f51fa" -HOMEPAGE = "http://code.google.com/p/pythonfutures" -DEPENDS = "python" - -SRC_URI = "https://pypi.python.org/packages/source/f/futures/futures-${PV}.tar.gz" -SRC_URI[md5sum] = "ced2c365e518242512d7a398b515ff95" -SRC_URI[sha256sum] = "0542525145d5afc984c88f914a0c85c77527f65946617edb5274f72406f981df" - -S = "${WORKDIR}/futures-${PV}" - -inherit setuptools - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb b/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb new file mode 100644 index 0000000000..3ee945fc9c --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "The concurrent.futures module provides a high-level interface for asynchronously executing callables." +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=834d982f973c48b6d662b5944c5ab567" +HOMEPAGE = "https://github.com/agronholm/pythonfutures" +DEPENDS = "python" + +SRC_URI[md5sum] = "d1b299a06b96ccb59f70324716dc0016" +SRC_URI[sha256sum] = "9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265" + +inherit pypi setuptools + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch index a391f7e74e..9a11442f1c 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch +++ b/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch @@ -14,28 +14,15 @@ diff --git a/configure.ac b/configure.ac index 2c0cfbd..cfcb3bf 100644 --- a/configure.ac +++ b/configure.ac -@@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI, - gobject-introspection-1.0 >= introspection_required_version - ) +@@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, + + GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) +GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) AC_SUBST(GI_DATADIR) if test "$enable_cairo" != no; then -@@ -219,12 +219,6 @@ AC_ARG_WITH(common, - with_common=yes) - AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes") - --INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` --INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- --AC_SUBST(INTROSPECTION_SCANNER) --AC_SUBST(INTROSPECTION_COMPILER) -- - # compiler warnings, errors, required cflags, and code coverage support - GNOME_COMPILE_WARNINGS([maximum]) - AC_MSG_CHECKING(for Gnome code coverage support) -- 2.1.4 diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.22.0.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb index 9d2e165548..ab65ba1dcf 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.22.0.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb @@ -17,8 +17,8 @@ SRC_URI = " \ file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ " -SRC_URI[md5sum] = "ed4117ed5d554d25fd7718807fbf819f" -SRC_URI[sha256sum] = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7" +SRC_URI[md5sum] = "b29d69edb63ae1f555afeb19f90b9996" +SRC_URI[sha256sum] = "42b47b261b45aedfc77e02e3c90a01cd74d6f86c3273c1860a054d531d606e5a" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -26,7 +26,7 @@ BBCLASSEXTEND = "native" EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}" -RDEPENDS_${PN} += "python-setuptools python-importlib" +RDEPENDS_${PN} += "python-setuptools" RDEPENDS_${PN}_class-native = "" do_install_append() { diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.2.bb b/meta-oe/recipes-devtools/sip/sip_4.19.8.bb index 1d837c59f8..ea944b32ff 100644 --- a/meta-oe/recipes-devtools/sip/sip_4.19.2.bb +++ b/meta-oe/recipes-devtools/sip/sip_4.19.8.bb @@ -9,8 +9,8 @@ inherit python-dir DEPENDS = "python" SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz" -SRC_URI[md5sum] = "4f48e212890ebe584e8d804cfbcfc61e" -SRC_URI[sha256sum] = "432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533" +SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727" +SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index c51e475426..4dbd9a4f16 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -4,29 +4,32 @@ installation. --- tk8.5-8.5.8.orig/unix/configure +++ tk8.5-8.5.8/unix/configure -@@ -1431,6 +1431,7 @@ - `ls -d ${prefix}/lib 2>/dev/null` \ - `ls -d /usr/local/lib 2>/dev/null` \ +@@ -1431,7 +1431,8 @@ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/local/lib 2>/dev/null` \ + `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then --- tk8.5-8.5.8.orig/unix/tcl.m4 +++ tk8.5-8.5.8/unix/tcl.m4 -@@ -93,6 +93,7 @@ - `ls -d ${prefix}/lib 2>/dev/null` \ - `ls -d /usr/local/lib 2>/dev/null` \ +@@ -93,7 +93,8 @@ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/local/lib 2>/dev/null` \ + `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then -@@ -223,6 +224,7 @@ +@@ -223,7 +224,8 @@ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb index d3bf397b48..13dc4d7513 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb @@ -26,8 +26,8 @@ SRC_URI = "\ file://fix-xft.diff \ file://configure.use.fontconfig.with.xft.patch \ " -SRC_URI[md5sum] = "dd7dbb3a6523c42d05f6ab6e86096e99" -SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d" +SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba" +SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" S = "${WORKDIR}/${BPN}${PV}/unix" diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb index 25166ab580..987c09fe52 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb @@ -24,6 +24,10 @@ inherit cmake python3native EXTRA_OECMAKE = "-DLIB='${baselib}' \ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" +# With Ninja it fails with: +# ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) +OECMAKE_GENERATOR = "Unix Makefiles" + do_configure_prepend() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch index 1ceacd8c40..5ee75cb4de 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch @@ -1,28 +1,31 @@ -[PATCH] conditionally check libvirt +From 385bf1c2ec57942e17ee529e57eef0dcd99904e6 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 1 Sep 2015 17:00:33 +0800 +Subject: [PATCH] [PATCH] conditionally check libvirt Upstream-Statue: Pending check if libvirt is available only when a user wants to use libvirt Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) + configure.ac | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) -Index: collectd-5.7.1/configure.ac -=================================================================== ---- collectd-5.7.1.orig/configure.ac -+++ collectd-5.7.1/configure.ac -@@ -5556,12 +5556,14 @@ else - with_libxml2="no (pkg-config doesn't know libxml-2.0)" +diff --git a/configure.ac b/configure.ac +index 101d6f9f..a7eca97d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5758,11 +5758,14 @@ else + with_libxml2="no (pkg-config doesn't know libxml-2.0)" fi -$PKG_CONFIG --exists libvirt 2>/dev/null --if test "$?" = "0" --then -- with_libvirt="yes" +-if test $? = 0; then +- with_libvirt="yes" -else -- with_libvirt="no (pkg-config doesn't know libvirt)" +- with_libvirt="no (pkg-config doesn't know libvirt)" +if test "x$enable_libvirt" = "xyes"; then + $PKG_CONFIG --exists libvirt 2>/dev/null + if test "$?" = "0" @@ -32,5 +35,5 @@ Index: collectd-5.7.1/configure.ac + with_libvirt="no (pkg-config doesn't know libvirt)" + fi fi - if test "x$with_libxml2" = "xyes" - then + + if test "x$with_libxml2" = "xyes"; then diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index 5069a639c1..d2c7268005 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -1,4 +1,4 @@ -From b459c55e4968321e5a82272cb39aa69d4054990f Mon Sep 17 00:00:00 2001 +From b0a64db90a24469e36978c748417ebe456b34d59 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 22 Apr 2017 11:54:57 -0700 Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler @@ -14,35 +14,26 @@ client.c:834:23: error: '%s' directive output may be truncated writing up to 102 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - configure.ac | 3 +- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 76 insertions(+), 1 deletion(-) + configure.ac | 1 + + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/configure.ac b/configure.ac -index 8854542..edb8cfb 100644 +index a7eca97d..560eb988 100644 --- a/configure.ac +++ b/configure.ac -@@ -4,7 +4,6 @@ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) - AC_CONFIG_SRCDIR(src/target_set.c) - AC_CONFIG_HEADERS(src/config.h) - AC_CONFIG_AUX_DIR([libltdl/config]) -- - dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; - dnl we don't really need the 'u' even in older toolchains. Then there is - dnl older libtool, which spelled it AR_FLAGS -@@ -6688,6 +6687,8 @@ then - AM_CFLAGS="$AM_CFLAGS -Werror" - AM_CXXFLAGS="$AM_CXXFLAGS -Werror" +@@ -6794,6 +6794,7 @@ if test "x$enable_werror" != "xno"; then + AM_CFLAGS="$AM_CFLAGS -Werror" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror" fi +AX_CHECK_COMPILE_FLAG([-Werror -Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) -+ + AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS]) - diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 -index 0000000..dcabb92 +index 00000000..dcabb92a --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ @@ -120,6 +111,3 @@ index 0000000..dcabb92 + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS --- -2.13.4 - diff --git a/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch b/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch new file mode 100644 index 0000000000..b12690b327 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch @@ -0,0 +1,65 @@ +From d65e48b68076d5b304e6d865967003ae1fea0e6c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 9 May 2018 21:45:38 -0700 +Subject: [PATCH] Disable new gcc8 warnings + +GCC seems to be not able to detect the checks for size are +already in place + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/2768] + src/libcollectdclient/network_parse.c | 7 +++++++ + src/write_sensu.c | 7 +++++++ + 2 files changed, 14 insertions(+) + +diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c +index 2365ab0a..79e6ed96 100644 +--- a/src/libcollectdclient/network_parse.c ++++ b/src/libcollectdclient/network_parse.c +@@ -163,6 +163,11 @@ static int parse_int(void *payload, size_t payload_size, uint64_t *out) { + return 0; + } + ++#pragma GCC diagnostic push ++#if __GNUC__ == 8 ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif ++ + static int parse_string(void *payload, size_t payload_size, char *out, + size_t out_size) { + char *in = payload; +@@ -175,6 +180,8 @@ static int parse_string(void *payload, size_t payload_size, char *out, + return 0; + } + ++#pragma GCC diagnostic pop ++ + static int parse_identifier(uint16_t type, void *payload, size_t payload_size, + lcc_value_list_t *state) { + char buf[LCC_NAME_LEN]; +diff --git a/src/write_sensu.c b/src/write_sensu.c +index ce23e654..63e1f599 100644 +--- a/src/write_sensu.c ++++ b/src/write_sensu.c +@@ -569,6 +569,11 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */ + return ret_str; + } /* }}} char *sensu_value_to_json */ + ++#pragma GCC diagnostic push ++#if __GNUC__ == 8 ++#pragma GCC diagnostic ignored "-Wstringop-overflow" ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif + /* + * Uses replace_str2() implementation from + * http://creativeandcritical.net/str-replace-c/ +@@ -631,6 +636,8 @@ static char *replace_str(const char *str, const char *old, /* {{{ */ + return ret; + } /* }}} char *replace_str */ + ++#pragma GCC diagnostic pop ++ + static char *replace_json_reserved(const char *message) /* {{{ */ + { + char *msg = replace_str(message, "\\", "\\\\"); diff --git a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch index 1fde6a0711..f12b16cb91 100644 --- a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch +++ b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch @@ -1,43 +1,37 @@ -Index: collectd-5.7.1/configure.ac -=================================================================== ---- collectd-5.7.1.orig/configure.ac -+++ collectd-5.7.1/configure.ac -@@ -2305,7 +2305,7 @@ AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([ - with_libgcrypt="yes" - else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config" - then -- with_libgcrypt_config="$withval/bin/gcrypt-config" -+ with_libgcrypt_config="$withval/bin/pkg-config" - with_libgcrypt="yes" - else if test -d "$withval" - then -@@ -2313,12 +2313,12 @@ AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([ - GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib" - with_libgcrypt="yes" - else -- with_libgcrypt_config="gcrypt-config" -+ with_libgcrypt_config="pkg-config" - with_libgcrypt="$withval" - fi; fi; fi - ], - [ -- with_libgcrypt_config="libgcrypt-config" -+ with_libgcrypt_config="pkg-config" - with_libgcrypt="yes" - ]) - -@@ -2326,12 +2326,12 @@ if test "x$with_libgcrypt" = "xyes" && t - then - if test "x$GCRYPT_CPPFLAGS" = "x" - then -- GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null` -+ GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags libgcrypt 2>/dev/null` - fi - - if test "x$GCRYPT_LIBS" = "x" - then -- GCRYPT_LIBS=`"$with_libgcrypt_config" --libs 2>/dev/null` -+ GCRYPT_LIBS=`"$with_libgcrypt_config" --lib libgcrypt 2>/dev/null` - fi - fi - +From d9b954bd9d0b084d9a1f5159a9f0c45802a51809 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Mon, 22 Apr 2013 16:28:16 +0000 + +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e869a6a0..101d6f9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2514,20 +2514,20 @@ AC_ARG_WITH([libgcrypt], + if test -f "$withval" && test -x "$withval"; then + with_libgcrypt_config="$withval" + with_libgcrypt="yes" +- else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config"; then +- with_libgcrypt_config="$withval/bin/gcrypt-config" ++ else if test -f "$withval/bin/pkg-config" && test -x "$withval/bin/pkg-config"; then ++ with_libgcrypt_config="$withval/bin/pkg-config" + with_libgcrypt="yes" + else if test -d "$withval"; then + GCRYPT_CPPFLAGS="$GCRYPT_CPPFLAGS -I$withval/include" + GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib" + with_libgcrypt="yes" + else +- with_libgcrypt_config="gcrypt-config" ++ with_libgcrypt_config="pkg-config" + with_libgcrypt="$withval" + fi; fi; fi + ], + [ +- with_libgcrypt_config="libgcrypt-config" ++ with_libgcrypt_config="libpkg-config" + with_libgcrypt="yes" + ] + ) diff --git a/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb b/meta-oe/recipes-extended/collectd/collectd_5.8.0.bb index c156ea19c9..92b619e227 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.8.0.bb @@ -12,9 +12,10 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-conditionally-check-libvirt.patch \ file://0001-fix-to-build-with-glibc-2.25.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ -" -SRC_URI[md5sum] = "5da2b69c286a064db35c6cc1e758b039" -SRC_URI[sha256sum] = "9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592" + file://0005-Disable-new-gcc8-warnings.patch \ + " +SRC_URI[md5sum] = "a841159323624f18bf03198e9f5aa364" +SRC_URI[sha256sum] = "b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9" inherit autotools pythonnative update-rc.d pkgconfig systemd @@ -62,7 +63,7 @@ do_install_append() { sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/collectd - + install -Dm 0640 ${B}/src/collectd.conf ${D}${sysconfdir}/collectd.conf # Fix configuration file to allow collectd to start up sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb index 85dede1779..63c65c4fcc 100644 --- a/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb +++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "a39ec183517bc1feaff017d067300b8c" -SRC_URI[sha256sum] = "453095abaec288bfbc1ca9faced917e17742cff1ea45ec46210071ac153562f9" +SRC_URI[md5sum] = "f66f28beca900b54f5fc90fdcce93508" +SRC_URI[sha256sum] = "20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch b/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch deleted file mode 100644 index fc8f8c8b21..0000000000 --- a/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch +++ /dev/null @@ -1,17 +0,0 @@ -Taken from void linux - -Index: git/src/linux.c -=================================================================== ---- git.orig/src/linux.c -+++ git/src/linux.c -@@ -40,6 +40,10 @@ - #include <efivar.h> - #include <efiboot.h> - -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - #include "dp.h" - #include "linux.h" - #include "util.h" diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch deleted file mode 100644 index 51397dc55e..0000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d2a03b3e43043b596a79803bcb93f70e513bbb50 Mon Sep 17 00:00:00 2001 -From: Patrick Georgi <pgeorgi@google.com> -Date: Mon, 13 Mar 2017 13:48:03 +0100 -Subject: [PATCH] Remove undefined behavior - -Per clang-3.9, the compiler fails on #define ...defined(...) statements -as they're undefined behavior (apparently with different behavior -between gcc/clang and msvc, too). - -See clang's cfe repo commit r258128 for details. - -Change-Id: I82b6235e11b425fae45eebbe06b08f81c5bdbb98 -Signed-off-by: Patrick Georgi <pgeorgi@google.com> -Reviewed-on: https://review.coreboot.org/18792 -Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> -Tested-by: build bot (Jenkins) <no-reply@coreboot.org> ---- - hwaccess.c | 18 +++++++++++++++--- - platform.h | 18 +++++++++++++++--- - 2 files changed, 30 insertions(+), 6 deletions(-) - -diff --git a/hwaccess.c b/hwaccess.c -index aede7e3..2bf6f42 100644 ---- a/hwaccess.c -+++ b/hwaccess.c -@@ -37,9 +37,21 @@ - #error "Unknown operating system" - #endif - --#define USE_IOPL (IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__)) --#define USE_DEV_IO (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) --#define USE_IOPERM (defined(__gnu_hurd__)) -+#if IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) -+#define USE_IOPL 1 -+#else -+#define USE_IOPL 0 -+#endif -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+#define USE_DEV_IO 1 -+#else -+#define USE_DEV_IO 0 -+#endif -+#if defined(__gnu_hurd__) -+#define USE_IOPERM 1 -+#else -+#define USE_IOPERM 0 -+#endif - - #if USE_IOPERM - #include <sys/io.h> -diff --git a/platform.h b/platform.h -index c5a52ef..b2fdcd0 100644 ---- a/platform.h -+++ b/platform.h -@@ -25,9 +25,21 @@ - #define __PLATFORM_H__ 1 - - // Helper defines for operating systems --#define IS_LINUX (defined(__gnu_linux__) || defined(__linux__)) --#define IS_MACOSX (defined(__APPLE__) && defined(__MACH__)) /* yes, both. */ --#define IS_WINDOWS (defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)) -+#if defined(__gnu_linux__) || defined(__linux__) -+#define IS_LINUX 1 -+#else -+#define IS_LINUX 0 -+#endif -+#if defined(__APPLE__) && defined(__MACH__) /* yes, both. */ -+#define IS_MACOSX 1 -+#else -+#define IS_MACOSX 0 -+#endif -+#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__) -+#define IS_WINDOWS 1 -+#else -+#define IS_WINDOWS 0 -+#endif - - // Likewise for target architectures - #if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) --- -2.13.3 - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch deleted file mode 100644 index 4170fefd2a..0000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c65a465a3ddeb7afb9a7c49d010ae7e5d5b1ad1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 18 Jul 2017 20:25:49 -0700 -Subject: [PATCH] spi: Define _XOPEN_SOURCE to enable ffs() libc API - -musl exposes this issue - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - spi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spi.c b/spi.c -index 894f73f..aeb6518 100644 ---- a/spi.c -+++ b/spi.c -@@ -21,7 +21,7 @@ - /* - * Contains the generic SPI framework - */ -- -+#define _XOPEN_SOURCE - #include <strings.h> - #include <string.h> - #include "flash.h" --- -2.13.3 - diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb index e2edd095a4..99f680f9ab 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb @@ -21,6 +21,10 @@ inherit cmake systemd EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" +# With Ninja it fails with: +# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) +OECMAKE_GENERATOR = "Unix Makefiles" + SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc deleted file mode 100644 index 19ee874e2d..0000000000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ -(text or binary) and function plotting utility." -HOMEPAGE = "http://www.gnuplot.info/" -SECTION = "console/scientific" -LICENSE = "gnuplot" -LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" -DEPENDS = "virtual/libx11 gd readline" - -inherit autotools distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -acpaths = "" - -PACKAGECONFIG ??= "cairo" -PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" -# there's compilation failure if qt4 is enabled -PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free" - -EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-tutorial \ - --disable-wxwidgets" - -do_compile_prepend() { - install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ -} - -do_install_append() { - install -d ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ -} - -PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" -DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." -SECTION_${PN}-x11 = "x11/scientific" -FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " - -FILES_${PN} += "${datadir}/texmf" -FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch new file mode 100644 index 0000000000..f8f1fd00f7 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch @@ -0,0 +1,31 @@ +From a2ac966813fdc04b788be9c8474a4c5e36c109a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 21:53:26 +0100 +Subject: [PATCH] reduce build to conversion tools for native build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9241ce5..b24e291 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = config m4 term src docs man demo tutorial share ++SUBDIRS = docs + + EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ +-- +2.14.3 + diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch new file mode 100644 index 0000000000..8e0b4a271d --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch @@ -0,0 +1,31 @@ +From a2ac966813fdc04b788be9c8474a4c5e36c109a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 21:53:26 +0100 +Subject: [PATCH] Do not build demos +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9241ce5..b24e291 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = config m4 term src docs man demo tutorial share ++SUBDIRS = config m4 term src docs man tutorial share + + EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ +-- +2.14.3 + diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch new file mode 100644 index 0000000000..a4039c3170 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch @@ -0,0 +1,111 @@ +From 1128a98fd1676981e536d8773f363cb832cfa6bb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 22:28:56 +0100 +Subject: [PATCH] Use native tools to build docs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + docs/Makefile.am | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 3baf0c4..e82f87d 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -152,7 +152,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms + + ### doc2xxx dependencies + gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ms "$(srcdir)/titlepag.ms" ++ $(AM_V_GEN) doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ms "$(srcdir)/titlepag.ms" + + doc2ms_SOURCES = doc2ms.c termdoc.c + doc2ms_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) +@@ -173,10 +173,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu + $(AM_V_GEN)touch $@ + + figures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2tex$(EXEEXT) -figures $(srcdir)/gnuplot.doc $@ ++ $(AM_V_GEN) doc2tex$(EXEEXT) -figures $(srcdir)/gnuplot.doc $@ + + nofigures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc $@ ++ $(AM_V_GEN) doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc $@ + + pdf: gnuplot.pdf + pdf_nofig: nofigures.pdf +@@ -256,7 +256,7 @@ gnuplot.ps: gnuplot.dvi + hlp: gnuplot.hlp + + gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp ++ $(AM_V_GEN)doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp + + doc2hlp_SOURCES = doc2hlp.c termdoc.c + +@@ -264,14 +264,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c + gih: gnuplot.gih + + gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih ++ $(AM_V_GEN)doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih + + doc2gih_SOURCES = doc2gih.c termdoc.c + + # To include all terminals in the .gih file + allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc + @echo "generate gnuplot.gih with all terminals" +- $(AM_V_at)./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih ++ $(AM_V_at)alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih + + alldoc2gih_SOURCES = doc2gih.c termdoc.c + alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) +@@ -286,7 +286,7 @@ $(srcdir)/windows/wgnuplot.hhk + wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk wxhelp/*.html windows/*.png + + wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/ ++ $(AM_V_GEN) doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/ + + #doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h + #doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS) +@@ -336,7 +336,7 @@ install-info: gnuplot.info + ipf: gnuplot.ipf + + gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf ++ $(AM_V_GEN) doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf + + doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c + +@@ -344,7 +344,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c + rtf: gnuplot.rtf + + gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf ++ $(AM_V_GEN) doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf + + doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c + +@@ -352,13 +352,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c + rnh: gnuplot.rnh + + gnuplot.rnh: doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rnh ++ $(AM_V_GEN) doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rnh + + doc2rnh_SOURCES = doc2rnh.c termdoc.c + + # this is how to check the gnuplot.doc file + check-local: checkdoc$(EXEEXT) +- $(AM_V_at)./checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \ ++ $(AM_V_at)checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \ + if test $$? -eq 0; then \ + echo "PASS: gnuplot.doc"; \ + else \ +-- +2.14.3 + diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch new file mode 100644 index 0000000000..7ed9e761f2 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch @@ -0,0 +1,42 @@ +From 577e21622475fa29fd471149cf2380c53fdbfcbd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 22:26:48 +0100 +Subject: [PATCH] Add configure option to find qt5 native tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Pkg-config checks for target locations. With these qt5 tools as uic/moc.. +cannot be used. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cdd831a..fdd192b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1133,11 +1133,15 @@ if test "${enable_qt}" = yes ; then + else + try_qt4=yes + fi ++ AC_ARG_WITH(qt5nativesysroot, ++ AC_HELP_STRING([--with-qt5nativesysroot=PATH], [prepend path - for native qt5 tools]), ++ [QT5NATIVESYSROOT="$withval"], [QT5NATIVESYSROOT=""]) ++ + if test "x${with_qt}" != "xqt4"; then + PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport]) + if test $pkg_failed = no; then + try_qt4=no +- QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core` ++ QT5LOC=${QT5NATIVESYSROOT}`$PKG_CONFIG --variable=host_bins Qt5Core` + if test "x${QT5LOC}" != "x"; then + UIC=${QT5LOC}/uic + MOC=${QT5LOC}/moc +-- +2.14.3 + diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop index f67df9e193..1012e477f7 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Name=Gnuplot Comment=Plot data and function graphs -Exec=x-terminal-emulator -e gnuplot -Terminal=false +Exec=gnuplot +Terminal=true Type=Application Icon=gnuplot Categories=Science; diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch deleted file mode 100644 index 23f2cd26a5..0000000000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - else diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm deleted file mode 100644 index b52f9bb975..0000000000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm +++ /dev/null @@ -1,483 +0,0 @@ -/* - * $Id: dumb.trm,v 1.16 2004/04/13 17:24:16 broeker Exp $ - * - */ - -/* GNUPLOT - qtopia.trm */ - -/*[ - * Copyright 1991 - 1993, 1998, 2004 Thomas Williams, Colin Kelley - * - * Permission to use, copy, and distribute this software and its - * documentation for any purpose with or without fee is hereby granted, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. - * - * Permission to modify the software is granted, but not the right to - * distribute the complete modified source code. Modifications are to - * be distributed as patches to the released version. Permission to - * distribute binaries produced by compiling modified sources is granted, - * provided you - * 1. distribute the corresponding source modifications from the - * released version in the form of a patch file along with the binaries, - * 2. add special version identification to distinguish your version - * in addition to the base release version number, - * 3. provide your name and address as the primary contact for the - * support of your modified version, and - * 4. retain our contact information in regard to use of the base - * software. - * Permission to distribute the released version of the source code along - * with corresponding source modifications in the form of a patch file is - * granted with same provisions 2 through 4 for binary distributions. - * - * This software is provided "as is" without express or implied warranty - * to the extent permitted by applicable law. -]*/ - -/* - * This file is included by ../term.c. - * - * This terminal driver supports: - * qtopia terminals - * - * AUTHORS - * Michael Neuroth, 2004-05-16 - * INTERNET: michael.neuroth@freenet.de - * - * send your comments or suggestions to (gnuplot-info@lists.sourceforge.net). - * - */ -#include "driver.h" - -#define NO_QTOPIA_ENHANCED_SUPPORT - -#ifdef TERM_REGISTER -register_term(qtopia_driver) -#endif - -#ifdef TERM_PROTO -TERM_PUBLIC void QTOPIA_options __PROTO((void)); -TERM_PUBLIC void QTOPIA_init __PROTO((void)); -TERM_PUBLIC void QTOPIA_graphics __PROTO((void)); -TERM_PUBLIC void QTOPIA_text __PROTO((void)); -TERM_PUBLIC void QTOPIA_reset __PROTO((void)); -TERM_PUBLIC void QTOPIA_linetype __PROTO((int linetype)); -TERM_PUBLIC void QTOPIA_move __PROTO((unsigned int x, unsigned int y)); -TERM_PUBLIC void QTOPIA_point __PROTO((unsigned int x, unsigned int y, - int point)); -TERM_PUBLIC void QTOPIA_vector __PROTO((unsigned int x, unsigned int y)); -TERM_PUBLIC void QTOPIA_put_text __PROTO((unsigned int x, unsigned int y, - const char *str)); -TERM_PUBLIC void QTOPIA_arrow __PROTO((unsigned int sx, unsigned int sy, - unsigned int ex, unsigned int ey, - int head)); - -#define ENHqtopia_put_text NULL - - -#define QTOPIA_XMAX 4096 -#define QTOPIA_YMAX 4096 - -#ifdef ZAURUS -#define QTOPIA_VCHAR (QTOPIA_YMAX/25) -#define QTOPIA_HCHAR (QTOPIA_XMAX/40) -#define QTOPIA_VTIC (QTOPIA_YMAX/50) -#define QTOPIA_HTIC (QTOPIA_XMAX/40) -#else -#define QTOPIA_VCHAR (QTOPIA_YMAX/25) -#define QTOPIA_HCHAR (QTOPIA_XMAX/50) -#define QTOPIA_VTIC (QTOPIA_YMAX/100) -#define QTOPIA_HTIC (QTOPIA_XMAX/150) -#endif - -#endif /* TERM_PROTO */ - -#ifdef TERM_BODY - -/*#include <winsock2.h>*/ -/* needs: ws2_32.lib */ -#ifndef _MSC_VER -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#endif - -#define QTOPIA_MAX_BUFFER 512 -#define QTOPIA_MAX_DELAY_COUNT 20 /* * 100 ms = 2 s */ - -#ifdef _MSC_VER -#define QTOPIA_BAD_SOCKET INVALID_SOCKET /* -1 */ -#define QTOPIA_BAD_CONNECT SOCKET_ERROR -#else -#define QTOPIA_BAD_SOCKET -1 -#define QTOPIA_BAD_CONNECT -1 -#endif -#define QTOPIA_PORT_NO 5050 - -static int qtopia_client_socket = QTOPIA_BAD_SOCKET; -static unsigned short qtopia_port_no = QTOPIA_PORT_NO; -static char qtopia_host_name[QTOPIA_MAX_BUFFER+1] = { "localhost" }; - -static int OpenClient __PROTO(( int test)); -static void CloseClient(); - -static void MySleep( delay ) -int delay; -{ -#ifdef _MSC_VER - Sleep( delay ); -#else - usleep( delay ); -#endif -} - -static void InitSockets() -{ -#ifdef _MSC_VER - WORD wVersionRequested; - WSADATA wsaData; - int err; - - wVersionRequested = MAKEWORD( 2, 2 ); - - err = WSAStartup( wVersionRequested, &wsaData ); -#endif -} - -static void ExitSockets() -{ -#ifdef _MSC_VER - WSACleanup(); -#endif -} - -static int CheckForQtplot( count ) -int count; -{ - /* test (via sockets) if qtplot is allready running */ - if( !OpenClient( 1 ) ) - { - /* give qtplot a litle bit time to start... */ - if( count < QTOPIA_MAX_DELAY_COUNT ) - { - if( count == 0 ) - { -#ifdef _MSC_VER - system( "start qtplot" ); -#else - system( "qtplot&" ); -#endif - } - - MySleep(100); - - return CheckForQtplot( count+1 ); - } - else - { - return 0; - } - } - else - { - CloseClient(); - - return 1; - } -} - -static int OpenClient( test ) -int test; -{ - int len; - struct sockaddr_in address; - int result; - - /* Create a socket for the client. */ - - qtopia_client_socket = socket(AF_INET, SOCK_STREAM, 0); - - if( qtopia_client_socket != QTOPIA_BAD_SOCKET ) - { - /* Name the socket, as agreed with the server. */ - - address.sin_family = AF_INET; - address.sin_addr.s_addr = inet_addr(/*qtopia_host_name*/"127.0.0.1"); /* localhost */ - address.sin_port = htons(qtopia_port_no); - len = sizeof(address); - - /* Now connect our socket to the server's socket. */ - - result = connect(qtopia_client_socket, (struct sockaddr *)&address, len); - - if( result == QTOPIA_BAD_SOCKET ) - { - /* mark this socket as bad */ - - close( qtopia_client_socket ); - - qtopia_client_socket = QTOPIA_BAD_SOCKET; - - if( !test ) - { - fprintf( gpoutfile, "error connecting to server !\n" ); - } - return 0; /* something went wrong */ - } - } - else - { - if( !test ) - { - fprintf( gpoutfile, "error creating socket !\n" ); - } - return 0; /* something went wrong */ - } - - return 1; /* everything ist ok ! */ -} - -static void CloseClient() -{ - close( qtopia_client_socket ); -} - -static int IsClientOk() -{ - return qtopia_client_socket != QTOPIA_BAD_SOCKET; -} - -static void SendDataToSocket( sLine ) -const char * sLine; -{ - if( IsClientOk() ) - { - int send_count; - - send_count = send( qtopia_client_socket, sLine, strlen( sLine ), 0 ); - - if( send_count <= 0 ) - { - fprintf( gpoutfile, "error writing to socket str=%s!\n", sLine ); - } - /* - else - { - fprintf( gpoutfile, "wrote %d bytes\n", send_count ); - } - */ - } - else - { - /* for testing... */ - /*fprintf( gpoutfile, sLine );*/ - } -} - -/* ************************************************** */ - -enum QTOPIA_id { QTOPIA_PORT, QTOPIA_HOST, QTOPIA_OTHER }; - -static struct gen_table QTOPIA_opts[] = -{ - { "po$rt", QTOPIA_PORT }, - { "ho$st", QTOPIA_HOST }, - { NULL, QTOPIA_OTHER } -}; - -TERM_PUBLIC void -QTOPIA_options() -{ - /* this is not for the qtopia terminal ! */ - /*SendDataToSocket( "qtd options\n" );*/ - - int x, y; - struct value a; - - while (!END_OF_COMMAND) - { - switch(lookup_table(&QTOPIA_opts[0],c_token)) - { - case QTOPIA_PORT: - c_token++; - if (END_OF_COMMAND) - int_error(c_token, "expecting port number"); - qtopia_port_no = (int) real(const_express(&a)); - break; - case QTOPIA_HOST: - c_token++; - if (END_OF_COMMAND) - int_error(c_token, "expecting host name"); - if (isstring(c_token)) - quote_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); - else - copy_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); - c_token++; - break; - case QTOPIA_OTHER: - default: - break; - } - } - - sprintf(term_options, "host=%s port=%d",qtopia_host_name,qtopia_port_no); -} - - -TERM_PUBLIC void -QTOPIA_init() -{ - /* initialize lib (if necassary) */ - InitSockets(); - CheckForQtplot( 0 ); - OpenClient( 0 ); - - SendDataToSocket( "qtd init\n" ); -} - - -TERM_PUBLIC void -QTOPIA_graphics() -{ - SendDataToSocket( "qtd graphics\n" ); -} - -TERM_PUBLIC void -QTOPIA_text() -{ - SendDataToSocket( "qtd text\n" ); -} - - -TERM_PUBLIC void -QTOPIA_reset() -{ - SendDataToSocket( "qtd reset\n" ); - - /* give the qtplot a litle bit time to shutdown */ - MySleep(100); - - CloseClient(); - ExitSockets(); -} - - -TERM_PUBLIC void -QTOPIA_linetype(linetype) -int linetype; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd linetype type=%d\n",linetype ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_move(x, y) -unsigned int x, y; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd move x=%d y=%d\n",x,y ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_point(x, y, point) -unsigned int x, y; -int point; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd point x=%d y=%d point=%d\n",x,y,point ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_vector(_x, _y) -unsigned int _x, _y; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd vector x=%d y=%d\n",_x,_y ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_put_text(x, y, str) -unsigned int x, y; -const char *str; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd put_text x=%d y=%d str=%s\n",x,y,str ); - - SendDataToSocket( sBuffer ); -} - -/* not suported yet ! */ -TERM_PUBLIC void -QTOPIA_arrow(sx, sy, ex, ey, head) - unsigned int sx, sy, ex, ey; - int head; /* ignored */ -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd arrow sx=%d sy=%d ex=%d ey=%d head=%d\n",sx,sy,ex,ey,head ); - - SendDataToSocket( sBuffer ); -} - - -#endif /* TERM_BODY */ - -#ifdef TERM_TABLE -TERM_TABLE_START(qtopia_driver) - "qtopia", "qtopia or Qt", - QTOPIA_XMAX, QTOPIA_YMAX, QTOPIA_VCHAR, QTOPIA_HCHAR, - QTOPIA_VTIC, QTOPIA_HTIC, QTOPIA_options, QTOPIA_init, QTOPIA_reset, - QTOPIA_text, null_scale, QTOPIA_graphics, QTOPIA_move, QTOPIA_vector, - QTOPIA_linetype, QTOPIA_put_text, null_text_angle, - null_justify_text, QTOPIA_point, /*QTOPIA_arrow*/0, set_font_null, - 0, /* pointsize */ - TERM_CAN_MULTIPLOT, - NULL, NULL, NULL, NULL -#ifdef USE_MOUSE - , NULL, NULL, NULL, NULL, NULL -#endif -#ifdef PM3D - , NULL, NULL, NULL, NULL -#endif -TERM_TABLE_END(qtopia_driver) - -#undef LAST_TERM -#define LAST_TERM qtopia_driver - -#endif /* TERM_TABLE */ - -#ifdef TERM_HELP -START_HELP(qtopia) -"1 qtopia", -"?commands set terminal qtopia", -"?set terminal qtopia", -"?set term qtopia", -"?terminal qtopia", -"?term qtopia", -"?qtopia", -" The `qtopia` terminal driver has no additional options.", -"", -" Syntax:", -" set terminal qtopia", -"" -END_HELP(qtopia) -#endif /* TERM_HELP */ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch deleted file mode 100644 index 8c7d1f0d35..0000000000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb deleted file mode 100644 index 42308ba0be..0000000000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" -SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053" -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb new file mode 100644 index 0000000000..4cc289d3ab --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb @@ -0,0 +1,69 @@ +SUMMARY = "Gnuplot is a portable command-line driven graphing utility" +DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ +(text or binary) and function plotting utility." +HOMEPAGE = "http://www.gnuplot.info/" +SECTION = "console/scientific" +LICENSE = "gnuplot" +LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" +DEPENDS = "${BPN}-native virtual/libx11 gd readline" + +inherit autotools distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" +SRC_URI_append_class-target = " \ + file://0002-do-not-build-demos.patch \ + file://0003-Use-native-tools-to-build-docs.patch \ + file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ +" + +SRC_URI[archive.md5sum] = "60aedd08998160593199459dea8467fe" +SRC_URI[archive.sha256sum] = "a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1" +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" + +# for building docs (they deserve it) we need *doc2* tools native +BBCLASSEXTEND = "native" +DEPENDS_class-native = "readline-native" +PACKAGECONFIG_class-native = "" + +SRC_URI_append_class-native = "file://0001-reduce-build-to-conversion-tools-for-native-build.patch" + +do_install_class-native() { + install -d ${D}${bindir} + install ${B}/docs/*doc* ${D}${bindir} + rm ${D}${bindir}/*.o +} + +PACKAGECONFIG ??= "cairo" +PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" +PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" +PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native" + +EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ + --without-tutorial \ + --disable-wxwidgets" + +do_compile_prepend() { + install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ +} + +do_install_append_class-target() { + install -d ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ +} + +PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" +DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." +SECTION_${PN}-x11 = "x11/scientific" +FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " + +FILES_${PN} += "${datadir}/texmf" +FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" diff --git a/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch new file mode 100644 index 0000000000..36fd57c9bc --- /dev/null +++ b/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch @@ -0,0 +1,32 @@ +From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Tue, 27 Mar 2018 10:21:09 +0800 +Subject: [PATCH] init.d/Makefile.am: add missing dependency + +install-data-hook should epend on install-exec-hook, or the +haveged.service might be installed incorrectly when build +with -j option. + +Upstream-Status: Inappropriate [no upstream mailing list] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + init.d/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init.d/Makefile.am b/init.d/Makefile.am +index 5940f78..07bcdf7 100644 +--- a/init.d/Makefile.am ++++ b/init.d/Makefile.am +@@ -33,7 +33,7 @@ if ENABLE_SYSTEMD + install-exec-hook: + $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; + +-install-data-hook: ++install-data-hook: install-exec-hook + if ENABLE_SYSTEMD_LOOKUP + install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; + else +-- +2.11.0 + diff --git a/meta-oe/recipes-extended/haveged/haveged/haveged.sysvinit b/meta-oe/recipes-extended/haveged/haveged/haveged.sysvinit deleted file mode 100755 index 98b8857e77..0000000000 --- a/meta-oe/recipes-extended/haveged/haveged/haveged.sysvinit +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -pidfile=/var/run/haveged.pid - -# source function library -. /etc/init.d/functions - -case "$1" in - start) - echo -n "Starting havege entropy daemon... " - start-stop-daemon --start --quiet --pidfile $pidfile --name haveged --startas haveged -- -w 1024 -v 0 && success || failure - echo - ;; - stop) - echo -n "Stopping havege entropy daemon... " - start-stop-daemon --stop --quiet --pidfile $pidfile --name haveged - success - echo - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - status haveged - ;; - *) - echo "Usage: /etc/init.d/haveged {start|stop|restart|status}" - exit 1 -esac - -exit 0 diff --git a/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch b/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch deleted file mode 100644 index df27bcb091..0000000000 --- a/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/init.d/Makefile.am 2014-01-02 18:55:53.000000000 +0100 -+++ b/init.d/Makefile.am 2014-08-11 10:59:40.000000000 +0200 -@@ -34,11 +34,11 @@ - $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; - - install-data-hook: --if ENABLE_SYSTEMD_LOOKUP -- install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; --else -- install -p -m644 haveged.service ($unit_dir)/haveged.service; --endif -- systemctl enable haveged.service; -+#if ENABLE_SYSTEMD_LOOKUP -+# install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; -+#else -+# install -p -m644 haveged.service ($unit_dir)/haveged.service; -+#endif -+# systemctl enable haveged.service; - - endif diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb index 419c85f510..05ee842f63 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb @@ -6,22 +6,23 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.issihosts.com/haveged/haveged-${PV}.tar.gz \ - file://remove-systemd-unit-503.patch \ - file://haveged.sysvinit \ + file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ " -SRC_URI[md5sum] = "015ff58cd10607db0e0de60aeca2f5f8" -SRC_URI[sha256sum] = "9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715" +SRC_URI[md5sum] = "fb1d8b3dcbb9d06b30eccd8aa500fd31" +SRC_URI[sha256sum] = "f77d9adbdf421b61601fa29faa9ce3b479d910f73c66b9e364ba8642ccbfbe70" inherit autotools update-rc.d systemd EXTRA_OECONF = "\ - --enable-init=service.redhat \ --enable-nistest=yes \ --enable-olt=yes \ --enable-threads=no \ " +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--enable-init=service.redhat --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" + INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "haveged" INITSCRIPT_PARAMS_${PN} = "defaults 9" @@ -30,10 +31,10 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "haveged.service" do_install_append() { - install -D -m 755 ${WORKDIR}/haveged.sysvinit ${D}${sysconfdir}/init.d/haveged - - mkdir -p ${D}${systemd_unitdir}/system - install -p -m644 ${B}/init.d/haveged.service ${D}${systemd_unitdir}/system + # The exit status is 143 when the service is stopped + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service + fi } MIPS_INSTRUCTION_SET = "mips" diff --git a/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch b/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch deleted file mode 100644 index a384b05cef..0000000000 --- a/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cc67246ca6839e5b3f6a286f10ed24c225b77a5e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> -Date: Thu, 4 Jul 2013 12:34:32 +0200 -Subject: [PATCH] don't strip when installing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Eric Bénard <eric@eukrea.com> - -Upstream-Status: Inappropriate [configuration] ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 159463e..735cc72 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -42,6 +42,6 @@ distclean: clean - - install: $(PRODUCT) - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) -- $(INSTALL) -s -m 755 $(PRODUCT) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(PRODUCT) $(DESTDIR)$(bindir) - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 $(PRODUCT).1 $(DESTDIR)$(mandir)/man1 --- -1.7.10.4 - diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb index 39df5b2b36..050b7da3d7 100644 --- a/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb +++ b/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb @@ -6,12 +6,11 @@ DEPENDS = "ncurses" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://rigaux.org/${BP}.src.tgz \ - file://0001-don-t-strip-when-installing.patch " +SRC_URI = "git://github.com/pixel/hexedit.git \ + " -SRC_URI[md5sum] = "a5af1378d028512a9cad27a5ba3e15f9" -SRC_URI[sha256sum] = "6a126da30a77f5c0b08038aa7a881d910e3b65d13767fb54c58c983963b88dd7" +SRCREV = "800e4b2e6280531a84fd23ee0b48e16baeb90878" -inherit autotools-brokensep +S = "${WORKDIR}/git" -S = "${WORKDIR}/${BPN}" +inherit autotools-brokensep diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index cbf04734e1..0f798d2334 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -20,8 +20,8 @@ S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ + ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ + ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch b/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch index 914ee99db2..745883ebe8 100644 --- a/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch +++ b/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch @@ -33,7 +33,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 0270c99..b7c7368 100644 +index d41a307..b036e04 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,8 @@ AC_DISABLE_STATIC @@ -45,7 +45,7 @@ index 0270c99..b7c7368 100644 AM_PATH_PYTHON AM_PROG_AR -@@ -129,7 +131,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([UDEV], [libudev >= 216]) +@@ -154,7 +156,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19]) AS_IF([test "x$with_crypto" != "xno"], [LIBBLOCKDEV_PKG_CHECK_MODULES([CRYPTSETUP], [libcryptsetup >= 1.6.7]) LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0]) @@ -53,7 +53,7 @@ index 0270c99..b7c7368 100644 ], []) -@@ -137,10 +138,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" ! +@@ -162,10 +163,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" ! [LIBBLOCKDEV_PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.93])], []) @@ -61,10 +61,10 @@ index 0270c99..b7c7368 100644 - [LIBBLOCKDEV_CHECK_HEADER([dmraid/dmraid.h], [], [dmraid.h not available])], - []) - - AS_IF([test "x$with_kbd" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19])], + AS_IF([test "x$with_part" != "xno" -o "x$with_fs" != "xno"], + [LIBBLOCKDEV_PKG_CHECK_MODULES([PARTED], [libparted >= 3.1])] []) -@@ -154,7 +151,8 @@ AS_IF([test "x$with_fs" != "xno"], +@@ -174,7 +171,8 @@ AS_IF([test "x$with_fs" != "xno"], [LIBBLOCKDEV_PKG_CHECK_MODULES([MOUNT], [mount >= 2.23.0]) # new versions of libmount has some new functions we can use AS_IF([$PKG_CONFIG --atleast-version=2.30.0 mount], @@ -75,5 +75,5 @@ index 0270c99..b7c7368 100644 LIBBLOCKDEV_PKG_CHECK_MODULES([BLKID], [blkid >= 2.23.0]) # older versions of libblkid don't support BLKID_SUBLKS_BADCSUM so let's just -- -1.8.3.1 +2.14.3 diff --git a/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch b/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch index 3d9cb6d018..ac5b5e2beb 100644 --- a/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch +++ b/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch @@ -22,21 +22,22 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - src/lib/plugin_apis/dm.api | 41 ----- + src/lib/plugin_apis/dm.api | 50 ------ src/plugins/Makefile.am | 2 +- - src/plugins/dm.c | 318 ------------------------------------ + src/plugins/dm.c | 330 ------------------------------------ src/plugins/dm.h | 5 - src/python/gi/overrides/BlockDev.py | 6 - - 5 files changed, 1 insertion(+), 371 deletions(-) + 5 files changed, 1 insertion(+), 392 deletions(-) diff --git a/src/lib/plugin_apis/dm.api b/src/lib/plugin_apis/dm.api -index a885bba..ec86b80 100644 +index 04fd8d8..5d30b6a 100644 --- a/src/lib/plugin_apis/dm.api +++ b/src/lib/plugin_apis/dm.api -@@ -68,44 +68,3 @@ gchar* bd_dm_node_from_name (const gchar *map_name, GError **error); +@@ -111,53 +111,3 @@ gchar* bd_dm_get_subsystem_from_name (const gchar *device_name, GError **error); + * Tech category: %BD_DM_TECH_MAP-%BD_DM_TECH_MODE_QUERY */ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean active_only, GError **error); - +- -/** - * bd_dm_get_member_raid_sets: - * @name: (allow-none): name of the member @@ -49,6 +50,8 @@ index a885bba..ec86b80 100644 - * the member or %NULL in case of error - * - * One of @name, @uuid or @major:@minor has to be given. +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_MODE_QUERY - */ -gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); - @@ -58,6 +61,8 @@ index a885bba..ec86b80 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully activate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_CREATE_ACTIVATE - */ -gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); - @@ -67,6 +72,8 @@ index a885bba..ec86b80 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully deactivate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_REMOVE_DEACTIVATE - */ -gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); - @@ -76,13 +83,15 @@ index a885bba..ec86b80 100644 - * @error: (out): variable to store error (if any) - * - * Returns: string representation of the @name RAID set's type +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_QUERY - */ -gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error); diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am -index 6c4038f..59dc5e3 100644 +index b69c8f7..7575f4a 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am -@@ -76,7 +76,7 @@ endif +@@ -75,7 +75,7 @@ endif if WITH_DM libbd_dm_la_CFLAGS = $(GLIB_CFLAGS) $(DEVMAPPER_CFLAGS) $(UDEV_CFLAGS) -Wall -Wextra -Werror @@ -92,10 +101,10 @@ index 6c4038f..59dc5e3 100644 # Dear author of libdmdraid, VERSION really is not a good name for an enum member! libbd_dm_la_CPPFLAGS = -I${builddir}/../../include/ -UVERSION diff --git a/src/plugins/dm.c b/src/plugins/dm.c -index 9cee742..fd7c7ba 100644 +index 0e5466c..31ebe96 100644 --- a/src/plugins/dm.c +++ b/src/plugins/dm.c -@@ -21,16 +21,10 @@ +@@ -21,17 +21,11 @@ #include <unistd.h> #include <blockdev/utils.h> #include <libdevmapper.h> @@ -103,6 +112,7 @@ index 9cee742..fd7c7ba 100644 #include <libudev.h> #include "dm.h" + #include "check_deps.h" -/* macros taken from the pyblock/dmraid.h file plus one more*/ -#define for_each_raidset(_c, _n) list_for_each_entry(_n, LC_RS(_c), list) @@ -112,10 +122,11 @@ index 9cee742..fd7c7ba 100644 /** * SECTION: dm * @short_description: plugin for basic operations with device mapper -@@ -286,315 +280,3 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a +@@ -380,327 +374,3 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a + return ret; } - +- -/** - * init_dmraid_stack: (skip) - * @@ -191,6 +202,9 @@ index 9cee742..fd7c7ba 100644 - /* if we don't have the name, we cannot check any match */ - g_return_val_if_fail (dev_name, FALSE); - +- /* g_return_val_if_fail above checks value of dev_name and returns FALSE if +- * it is NULL so we don't need to check it here */ +- /* coverity[var_deref_model] */ - if (name && strcmp (dev_name, name) != 0) { - return FALSE; - } @@ -220,8 +234,8 @@ index 9cee742..fd7c7ba 100644 - * find_raid_sets_for_dev: (skip) - */ -static void find_raid_sets_for_dev (const gchar *name, const gchar *uuid, gint major, gint minor, struct lib_context *lc, struct raid_set *rs, GPtrArray *ret_sets) { -- struct raid_set *subset; -- struct raid_dev *dev; +- struct raid_set *subset = NULL; +- struct raid_dev *dev = NULL; - - if (T_GROUP(rs) || !list_empty(&(rs->sets))) { - for_each_subset (rs, subset) @@ -246,6 +260,8 @@ index 9cee742..fd7c7ba 100644 - * the member or %NULL in case of error - * - * One of @name, @uuid or @major:@minor has to be given. +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_MODE_QUERY - */ -gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error) { - guint64 i = 0; @@ -312,8 +328,8 @@ index 9cee742..fd7c7ba 100644 - -static gboolean change_set_by_name (const gchar *name, enum activate_type action, GError **error) { - gint rc = 0; -- struct lib_context *lc; -- struct raid_set *iter_rs; +- struct lib_context *lc = NULL; +- struct raid_set *iter_rs = NULL; - struct raid_set *match_rs = NULL; - - lc = init_dmraid_stack (error); @@ -352,6 +368,8 @@ index 9cee742..fd7c7ba 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully activate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_CREATE_ACTIVATE - */ -gboolean bd_dm_activate_raid_set (const gchar *name, GError **error) { - guint64 progress_id = 0; @@ -372,6 +390,8 @@ index 9cee742..fd7c7ba 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully deactivate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_REMOVE_DEACTIVATE - */ -gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error) { - guint64 progress_id = 0; @@ -392,10 +412,12 @@ index 9cee742..fd7c7ba 100644 - * @error: (out): variable to store error (if any) - * - * Returns: string representation of the @name RAID set's type +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_QUERY - */ -gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error) { -- struct lib_context *lc; -- struct raid_set *iter_rs; +- struct lib_context *lc = NULL; +- struct raid_set *iter_rs = NULL; - struct raid_set *match_rs = NULL; - const gchar *type = NULL; - @@ -429,7 +451,7 @@ index 9cee742..fd7c7ba 100644 - return g_strdup (type); -} diff --git a/src/plugins/dm.h b/src/plugins/dm.h -index 859fb80..80acd49 100644 +index 0dce6ac..1ee3788 100644 --- a/src/plugins/dm.h +++ b/src/plugins/dm.h @@ -1,5 +1,4 @@ @@ -438,10 +460,10 @@ index 859fb80..80acd49 100644 #ifndef BD_DM #define BD_DM -@@ -35,9 +34,5 @@ gboolean bd_dm_remove (const gchar *map_name, GError **error); +@@ -48,9 +47,5 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a gchar* bd_dm_name_from_node (const gchar *dm_node, GError **error); gchar* bd_dm_node_from_name (const gchar *map_name, GError **error); - gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean active_only, GError **error); + gchar* bd_dm_get_subsystem_from_name (const gchar *device_name, GError **error); -gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); -gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); -gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); @@ -466,5 +488,5 @@ index fb3ffb4..eed0a38 100644 _loop_setup = BlockDev.loop_setup @override(BlockDev.loop_setup) -- -1.8.3.1 +2.14.3 diff --git a/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch index f18b569285..0b5b809122 100644 --- a/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch +++ b/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index 8fbce4f..66e11e5 100644 +index b961471..2d3d251 100644 --- a/src/plugins/crypto.c +++ b/src/plugins/crypto.c @@ -22,7 +22,7 @@ @@ -25,7 +25,7 @@ index 8fbce4f..66e11e5 100644 #include <linux/random.h> #include <locale.h> diff --git a/src/plugins/part.c b/src/plugins/part.c -index 12d2ef7..3afe297 100644 +index 6b2a690..ab490d9 100644 --- a/src/plugins/part.c +++ b/src/plugins/part.c @@ -25,6 +25,7 @@ @@ -33,10 +33,10 @@ index 12d2ef7..3afe297 100644 #include <unistd.h> #include <sys/file.h> +#include <fcntl.h> + #include <sys/ioctl.h> + #include <linux/fs.h> #include <blockdev/utils.h> - #include <part_err.h> - -@@ -1224,7 +1225,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, +@@ -1354,7 +1355,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, real_flags |= 0x4000000000000000; /* 1 << 62 */ if (flags & BD_PART_FLAG_GPT_NO_AUTOMOUNT) real_flags |= 0x8000000000000000; /* 1 << 63 */ @@ -46,5 +46,5 @@ index 12d2ef7..3afe297 100644 args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); g_free (mask_str); -- -1.8.3.1 +2.14.3 diff --git a/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch b/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch index 3818936087..b214f0b05d 100644 --- a/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch +++ b/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch @@ -19,17 +19,17 @@ Upstream-Status: Submitted [https://github.com/storaged-project/libblockdev/pull Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - src/plugins/crypto.c | 6 +++--- - src/plugins/fs.c | 4 ++-- - src/plugins/part.c | 4 ++-- - src/utils/exec.c | 2 +- + src/plugins/crypto.c | 6 +++--- + src/plugins/fs/vfat.c | 4 ++-- + src/plugins/part.c | 4 ++-- + src/utils/exec.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index 8fbce4f..7ee7cdc 100644 +index 563093e..b961471 100644 --- a/src/plugins/crypto.c +++ b/src/plugins/crypto.c -@@ -881,7 +881,7 @@ gboolean bd_crypto_tc_open (const gchar *device, const gchar *name, const guint8 +@@ -970,7 +970,7 @@ gboolean bd_crypto_tc_open (const gchar *device, const gchar *name, const guint8 gint ret = 0; guint64 progress_id = 0; gchar *msg = NULL; @@ -38,7 +38,7 @@ index 8fbce4f..7ee7cdc 100644 msg = g_strdup_printf ("Started opening '%s' TrueCrypt/VeraCrypt device", device); progress_id = bd_utils_report_started (msg); -@@ -999,7 +999,7 @@ static gchar *replace_char (gchar *str, gchar orig, gchar new) { +@@ -1090,7 +1090,7 @@ static gchar *replace_char (gchar *str, gchar orig, gchar new) { return str; } @@ -47,7 +47,7 @@ index 8fbce4f..7ee7cdc 100644 CERTCertificate *cert, GError **error) { gpointer packet_data = NULL; gsize packet_data_size = 0; -@@ -1008,7 +1008,7 @@ static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libv +@@ -1099,7 +1099,7 @@ static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libv gsize bytes_written = 0; GError *tmp_error = NULL; @@ -56,11 +56,11 @@ index 8fbce4f..7ee7cdc 100644 ui, LIBVK_PACKET_FORMAT_ASYMMETRIC_WRAP_SECRET_ONLY, error); if (!packet_data) { -diff --git a/src/plugins/fs.c b/src/plugins/fs.c -index c4b6ac8..647096d 100644 ---- a/src/plugins/fs.c -+++ b/src/plugins/fs.c -@@ -2614,8 +2614,8 @@ BDFSVfatInfo* bd_fs_vfat_get_info (const gchar *device, GError **error) { +diff --git a/src/plugins/fs/vfat.c b/src/plugins/fs/vfat.c +index 3ed7d4a..5ff7795 100644 +--- a/src/plugins/fs/vfat.c ++++ b/src/plugins/fs/vfat.c +@@ -376,8 +376,8 @@ BDFSVfatInfo* bd_fs_vfat_get_info (const gchar *device, GError **error) { */ gboolean bd_fs_vfat_resize (const gchar *device, guint64 new_size, GError **error) { PedDevice *ped_dev = NULL; @@ -72,10 +72,10 @@ index c4b6ac8..647096d 100644 PedSector start = 0; PedSector length = 0; diff --git a/src/plugins/part.c b/src/plugins/part.c -index 12d2ef7..d277688 100644 +index fed8300..6b2a690 100644 --- a/src/plugins/part.c +++ b/src/plugins/part.c -@@ -849,7 +849,7 @@ static PedPartition* add_part_to_disk (PedDevice *dev, PedDisk *disk, BDPartType +@@ -926,7 +926,7 @@ static PedPartition* add_part_to_disk (PedDevice *dev, PedDisk *disk, BDPartType return NULL; } @@ -84,7 +84,7 @@ index 12d2ef7..d277688 100644 if (!part) { set_parted_error (error, BD_PART_ERROR_FAIL); g_prefix_error (error, "Failed to create new partition on device '%s'", dev->path); -@@ -1427,7 +1427,7 @@ gboolean bd_part_set_part_flags (const gchar *disk, const gchar *part, guint64 f +@@ -1564,7 +1564,7 @@ gboolean bd_part_set_part_flags (const gchar *disk, const gchar *part, guint64 f PedPartition *ped_part = NULL; const gchar *part_num_str = NULL; gint part_num = 0; @@ -94,7 +94,7 @@ index 12d2ef7..d277688 100644 gboolean ret = FALSE; guint64 progress_id = 0; diff --git a/src/utils/exec.c b/src/utils/exec.c -index 7ac44fd..0a3094c 100644 +index 11c1489..dcf87e5 100644 --- a/src/utils/exec.c +++ b/src/utils/exec.c @@ -354,7 +354,7 @@ gboolean bd_utils_exec_and_report_progress (const gchar **argv, const BDExtraArg @@ -107,5 +107,5 @@ index 7ac44fd..0a3094c 100644 gboolean err_done = FALSE; GString *stdout_data = g_string_new (NULL); -- -1.8.3.1 +2.14.3 diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.10.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb index 2a923548ad..0c954aa39b 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.10.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb @@ -8,20 +8,6 @@ SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "c1dda45001542edd7d7f1ffc6451c5a74623f805" -SRC_URI = "git://github.com/rhinstaller/libblockdev;branch=master \ - file://0001-fix-configure-and-compile-failures.patch \ - file://0002-remove-python2-support.patch \ - file://0003-remove-dmraid-while-compiling-with-with-dm.patch \ - file://0005-fix-a-clang-compiling-issue.patch \ -" -SRC_URI_append_libc-musl = " \ - file://0004-fix-compile-failure-against-musl-C-library.patch \ -" - inherit autotools python3native gobject-introspection DEPENDS += " \ @@ -31,6 +17,21 @@ DEPENDS += " \ libbytesize \ btrfs-tools \ " + +SRCREV = "e2e0899efe8dd3f111ff955fb6c1dc10b0bd2075" +SRC_URI = " \ + git://github.com/rhinstaller/libblockdev;branch=master \ + file://0001-fix-configure-and-compile-failures.patch \ + file://0002-remove-python2-support.patch \ + file://0003-remove-dmraid-while-compiling-with-with-dm.patch \ + file://0005-fix-a-clang-compiling-issue.patch \ +" +SRC_URI_append_libc-musl = " \ + file://0004-fix-compile-failure-against-musl-C-library.patch \ +" + +S = "${WORKDIR}/git" + RDEPENDS_${PN} += " \ lvm2 \ " @@ -46,6 +47,5 @@ PACKAGECONFIG[parted] = "--with-part, --without-part, parted" PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" -export STAGING_INCDIR export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" diff --git a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch index cc3f5d4786..f65d26aaea 100644 --- a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch +++ b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch @@ -2,11 +2,11 @@ configure.ac | 1 + 1 file changed, 1 insertion(+) +Index: git/configure.ac +=================================================================== --- git.orig/configure.ac +++ git/configure.ac -@@ -24,10 +24,11 @@ LT_INIT([win32-dll]) - LT_PROG_RC - +@@ -56,6 +56,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 @@ -14,5 +14,3 @@ # Enable automake silent build rules. m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - - # Checks for native Windows. diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 5bf7c6e334..7e4c330a19 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -26,4 +26,6 @@ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = " --disable-static --disable-rebuilds --enable-compile-warnings=minimum" DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native" -inherit autotools pkgconfig gettext +inherit distro_features_check autotools pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted file mode 100644 index 28bc5c07df..0000000000 --- a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 29 Mar 2017 16:31:38 -0700 -Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC - -Does not work during cross compile - -use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa13ae6..f4f0f46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - ) - - AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) --AC_RUN_IFELSE([AC_LANG_PROGRAM( -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <time.h>]], --[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], -+[[ -+#include <unistd.h> -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) -+ #error No monotonic clock -+#endif -+ return 0; -+ -+]])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) --- -2.12.1 - diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch b/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file mode 100644 index 0000000000..c82f3bf017 --- /dev/null +++ b/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch @@ -0,0 +1,56 @@ +From 73d2aea33e32272bac693550e8a3b0e3ad89707f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com> +Date: Tue, 26 Dec 2017 00:02:26 +0100 +Subject: [PATCH] build: fix configure script neglecting, re-enable out-of-tree + builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For the former, a prototype and the final code got (hm, mysteriously) +intertwisted. For the latter, I am clearly guilty of (rare, anyway) +testing of the out-of-tree builds only with libqb-already-system-wide +scenario, which is rather shortsighted. + +Thanks Fabio and his ci.kronosnet.org project for spotting that. + +X-mas-present-for: Fabio M. Di Nitto <fdinitto@redhat.com> +Signed-off-by: Jan Pokorný <jpokorny@redhat.com> +--- +Upstream-Status: Backport + + configure.ac | 2 +- + lib/Makefile.am | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9900310..f9761cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -710,7 +710,7 @@ if test "x${GCC}" = xyes; then + | grep __stop___verbose | cut -d" " -f 3) + test "${verbose_start_addr}" = "${verbose_stop_addr}" \ + && gcc_has_attribute_section_visible=no \ +- || { verbose_start_type=$(${READELF} -s backup \ ++ || { verbose_start_type=$(${READELF} -s "conftest${shrext_cmds}" \ + | sed -n '/__start___verbose/{s/^\s*//p;q}' \ + | tr -s ' ' \ + | cut -d" " -f6) +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6ca6b15..b035f0b 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -101,7 +101,9 @@ endif + endif + + qblog_script.ld: %.ld: %.ld.in +- $(AM_V_GEN)$(CPP) -xc -I$(top_srcdir)/include -D_GNU_SOURCE -C -P $< \ ++ $(AM_V_GEN)$(CPP) -C -D_GNU_SOURCE -P \ ++ -I$(top_srcdir)/include -I$(top_builddir)/include \ ++ -xc $< \ + | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ + > $@ + +-- +2.16.2 + diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb index 574f6601ca..73cea5e398 100644 --- a/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb @@ -11,12 +11,14 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" +# v1.0.3 +SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ - file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" +CFLAGS += "-pthread -D_REENTRANT" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) diff --git a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb index 525437bdb6..f2c661c8f7 100644 --- a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb +++ b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://abrt.readthedocs.org/" LICENSE = "GPLv2+" DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ json-c libtar libnewt libproxy rpm \ - augeas satyr systemd gtk+3 \ + augeas satyr systemd \ " LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -26,6 +26,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" inherit gettext autotools python3native pkgconfig +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}" +PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3," + RDEPENDS_python3-libreport += "${PN}" do_patch[prefuncs] += "do_gen_version" diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 8ad5457565..2c31a21c0e 100644 --- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -12,7 +12,9 @@ DEPENDS = "freetype libpng jpeg expat gtk+" BBCLASSEXTEND = "native" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \ file://libwmf-0.2.8.4-intoverflow.patch \ diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb index 15935c8709..df82bef634 100644 --- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb @@ -17,7 +17,9 @@ SRC_URI = "git://github.com/GNOME/gtkmathview.git \ S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_append() { # avoid host polution inf pkg-config files diff --git a/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch index 15ad03f712..83f4543193 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch @@ -1,4 +1,4 @@ -From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 +From 1d1fa95c8ff7697e46343385a79a8f7e5c514a87 Mon Sep 17 00:00:00 2001 From: Zheng Xu <zheng.xu@linaro.org> Date: Fri, 2 Sep 2016 17:40:05 +0800 Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits @@ -16,11 +16,11 @@ Upstream-status: Backport 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..38101cf 100644 +index e5ad018..4149adf 100644 --- a/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp -@@ -306,6 +306,75 @@ InitMemorySubsystem() - MOZ_CRASH(); +@@ -309,6 +309,75 @@ InitMemorySubsystem() + #endif } +static inline void * @@ -95,7 +95,7 @@ index 5b386a2..38101cf 100644 void * MapAlignedPages(size_t size, size_t alignment) { -@@ -319,12 +388,12 @@ MapAlignedPages(size_t size, size_t alignment) +@@ -322,12 +391,12 @@ MapAlignedPages(size_t size, size_t alignment) /* Special case: If we want page alignment, no further work is needed. */ if (alignment == PageSize) { @@ -110,6 +110,3 @@ index 5b386a2..38101cf 100644 if (region == MAP_FAILED) return NULL; --- -1.9.1 - diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index c4b9c6f90e..930c041233 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -3,12 +3,13 @@ HOMEPAGE = "https://github.com/intel-iot-devkit/mraa" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" -SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480" -PV = "1.7.0-git${SRCPV}" +SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb" +PV = "1.9.0-git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.4.bb index c4778ca38a..f46a3bd25c 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.4.bb @@ -12,8 +12,11 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" -SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" -PV = "2.6.3" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +SRCREV = "4aff7eaf5df948b6ed74cf4f8dd721a397bfb759" +PV = "2.6.4" SRC_URI = "git://github.com/Openwsman/openwsman.git \ file://libssl-is-required-if-eventint-supported.patch \ diff --git a/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch b/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch new file mode 100644 index 0000000000..ae27517458 --- /dev/null +++ b/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch @@ -0,0 +1,48 @@ +From b6b1782af4aa7f9084d32e4144738dc2535c8d6f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Apr 2018 23:07:21 -0700 +Subject: [PATCH] Fix narrowing errors -Wc++11-narrowing + +Clang 6.x finds these errors + + ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka 'unsigned int') [-Wc++11-narrowing] + case E_INVALIDARG : txt = "E_INVALIDARG"; break ; + ^ + +HRESULT causes the macro to be parsed as a signed long, so we need to force it +to be checked as an unsigned long instead. + +also reported here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224930 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CPP/Windows/ErrorMsg.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp +index 99684ae..78a64ba 100644 +--- a/CPP/Windows/ErrorMsg.cpp ++++ b/CPP/Windows/ErrorMsg.cpp +@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode) + + switch(errorCode) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; +- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; +- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +- case E_ABORT : txt = "E_ABORT"; break ; +- case E_FAIL : txt = "E_FAIL"; break ; +- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; +- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; +- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; ++ case (DWORD) E_NOTIMPL : txt = "E_NOTIMPL"; break ; ++ case (DWORD) E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; ++ case (DWORD) E_ABORT : txt = "E_ABORT"; break ; ++ case (DWORD) E_FAIL : txt = "E_FAIL"; break ; ++ case (DWORD) STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; ++ case (DWORD) E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; ++ case (DWORD) E_INVALIDARG : txt = "E_INVALIDARG"; break ; + case ERROR_DIRECTORY : txt = "Error Directory"; break ; + default: + txt = strerror(errorCode); diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch new file mode 100644 index 0000000000..177d1455f8 --- /dev/null +++ b/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch @@ -0,0 +1,31 @@ +p7zip: Fix CVE-2017-17969 + +[No upstream tracking] -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888297 + +Heap-based buffer overflow in 7zip + +Compress/ShrinkDecoder.cpp: Heap-based buffer overflow +in the NCompress::NShrink::CDecoder::CodeReal method +in 7-Zip before 18.00 and p7zip allows remote attackers +to cause a denial of service (out-of-bounds write) +or potentially execute arbitrary code via a crafted ZIP archive. + +Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/8316/attachment/CVE-2017-17969.patch] +CVE: CVE-2017-17969 +Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com> + +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index 67ffbc67ce..d986da9043 100644 --- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c file://DOC/License.txt;md5=879598edf1f54dddb6930d7581357f8b" SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_all.tar.bz2 \ - file://do_not_override_compiler_and_do_not_strip.patch" + file://do_not_override_compiler_and_do_not_strip.patch \ + file://CVE-2017-17969.patch \ + file://0001-Fix-narrowing-errors-Wc-11-narrowing.patch \ + " SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f" diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index ff88533ff0..1638c41c88 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + # This gets us ssh-agent, which we are almost certain to want. # RDEPENDS_${PN} += "openssh-misc" diff --git a/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch b/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch deleted file mode 100644 index 4b6ad75ccc..0000000000 --- a/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- polkit-gnome-0.105/configure.ac.org 2015-05-04 22:33:03.925977953 -0700 -+++ polkit-gnome-0.105/configure.ac 2015-05-04 22:33:16.862288030 -0700 -@@ -120,6 +120,9 @@ - # Check for required packages - # *************************** - -+# check for gtk-doc -+GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) -+ - POLKIT_AGENT_REQUIRED=0.97 - POLKIT_GOBJECT_REQUIRED=0.97 - GTK_REQUIRED=3.0.0 diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb deleted file mode 100644 index 8e99731bd0..0000000000 --- a/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "GNOME Authentication Agent for PolicyKit" -DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment" -HOMEPAGE = "http://www.packagekit.org/" -BUGTRACKER = "http://bugzilla.gnome.org/" -DEPENDS = "polkit dbus-glib gconf gtk+ intltool-native gnome-common" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \ - file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795" - -SRC_URI = "https://download.gnome.org/sources/polkit-gnome/${PV}/polkit-gnome-${PV}.tar.xz \ - file://gtk-doc-check.patch \ -" -SRC_URI[md5sum] = "50ecad37c8342fb4a52f590db7530621" -SRC_URI[sha256sum] = "1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369" - -EXTRA_OECONF = "\ - --disable-static \ -" - -DEPENDS += "gtk+3" - -inherit autotools gtk-doc pkgconfig - -FILES_${PN} += " ${datadir}/dbus-1 \ - ${datadir}/PolicyKit \ -" diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb index 4025b8087e..7c9f2df9db 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb @@ -38,13 +38,11 @@ do_install() { install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ - fi + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ } -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} +inherit systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "rarpd.service" diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch index 23c0f258f8..ca88dd3f7e 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch @@ -1,4 +1,4 @@ -From 3c3c21f4735eb215206273bc714c57c969926d3d Mon Sep 17 00:00:00 2001 +From 9739095de6ae5f844354756ae968f5f8864eb3e3 Mon Sep 17 00:00:00 2001 From: Ming Liu <peter.x.liu@external.atlascopco.com> Date: Sun, 26 Feb 2017 14:10:21 +0100 Subject: [PATCH] Include sys/time.h @@ -8,6 +8,7 @@ struct timeval is defined in sys/time.h with a musl libc. Upstream-Status: Inappropriate [musl libc specific] Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> + --- tests/msleep.c | 4 ---- 1 file changed, 4 deletions(-) @@ -28,6 +29,3 @@ index 26a8206..ca818be 100644 int main(int argc, char *argv[]) { --- -1.9.1 - diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch deleted file mode 100644 index 7903bb1ccf..0000000000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6746e3a9615d1566bf228e9012d0841b15178810 Mon Sep 17 00:00:00 2001 -From: Ming Liu <liu.ming50@gmail.com> -Date: Sun, 26 Feb 2017 13:50:33 +0100 -Subject: [PATCH] Undefine GLOB_BRACE - -GLOB_BRACE is not defined in posix and thus not implemented in musl libc. - -Fixed by defining it to 0 if it is undefined. - -Upstream-Status: Inappropriate [musl libc specific] - -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - plugins/imfile/imfile.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c -index d20471f..f9aff81 100644 ---- a/plugins/imfile/imfile.c -+++ b/plugins/imfile/imfile.c -@@ -85,6 +85,11 @@ static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config para - - #define ADD_METADATA_UNSPECIFIED -1 - -+/* fixes build with musl libc */ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - /* this structure is used in pure polling mode as well one of the support - * structures for inotify. - */ --- -1.9.1 - diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch index bdcb6e22a3..a248f75e5b 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch @@ -1,3 +1,8 @@ +From 07ad2a1905089b9124623324a9969e4522317110 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Fri, 12 Sep 2014 03:41:11 -0400 +Subject: [PATCH] rsyslog: update configure to fix ptest + $MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then test cases fall into infinite loop with error message: @@ -6,13 +11,24 @@ test cases fall into infinite loop with error message: Update configure to fix it. -Upstream-Status: pending +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> -Kai Kang <kai.kang@windriver.com> --- -diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/testsuites/complex1.conf ---- rsyslog-7.4.4/tests/testsuites/complex1.conf 2013-08-31 00:30:41.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/complex1.conf 2013-12-18 14:28:10.644004184 +0800 + tests/testsuites/complex1.conf | 2 +- + tests/testsuites/gzipwr_large.conf | 2 +- + tests/testsuites/gzipwr_large_dynfile.conf | 2 +- + tests/testsuites/imptcp_conndrop.conf | 2 +- + tests/testsuites/imptcp_large.conf | 2 +- + tests/testsuites/imtcp_conndrop.conf | 2 +- + tests/testsuites/wr_large.conf | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/testsuites/complex1.conf b/tests/testsuites/complex1.conf +index 9b6a9f3..e00caa4 100644 +--- a/tests/testsuites/complex1.conf ++++ b/tests/testsuites/complex1.conf @@ -1,7 +1,7 @@ # complex test case with multiple actions in gzip mode # rgerhards, 2009-05-22 @@ -22,9 +38,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/t $MainMsgQueueTimeoutEnqueue 5000 -diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf ---- rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf 2012-04-04 14:29:55.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 2013-12-18 14:28:10.645004186 +0800 +diff --git a/tests/testsuites/gzipwr_large.conf b/tests/testsuites/gzipwr_large.conf +index 54ad3bb..e8247a9 100644 +--- a/tests/testsuites/gzipwr_large.conf ++++ b/tests/testsuites/gzipwr_large.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -34,9 +51,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tes $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf ---- rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf 2012-04-04 14:29:55.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 2013-12-18 14:28:10.645004186 +0800 +diff --git a/tests/testsuites/gzipwr_large_dynfile.conf b/tests/testsuites/gzipwr_large_dynfile.conf +index 3a1b255..297cb70 100644 +--- a/tests/testsuites/gzipwr_large_dynfile.conf ++++ b/tests/testsuites/gzipwr_large_dynfile.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -46,9 +64,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4 $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf ---- rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf 2013-08-31 00:30:41.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 +diff --git a/tests/testsuites/imptcp_conndrop.conf b/tests/testsuites/imptcp_conndrop.conf +index 77a5d79..d9a14a8 100644 +--- a/tests/testsuites/imptcp_conndrop.conf ++++ b/tests/testsuites/imptcp_conndrop.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -58,9 +77,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/ $ModLoad ../plugins/imptcp/.libs/imptcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf ---- rsyslog-7.4.4/tests/testsuites/imptcp_large.conf 2013-08-31 00:30:41.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 2013-12-18 14:28:10.646004189 +0800 +diff --git a/tests/testsuites/imptcp_large.conf b/tests/testsuites/imptcp_large.conf +index 77a5d79..d9a14a8 100644 +--- a/tests/testsuites/imptcp_large.conf ++++ b/tests/testsuites/imptcp_large.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -70,9 +90,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tes $ModLoad ../plugins/imptcp/.libs/imptcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf ---- rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf 2013-07-19 20:59:03.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 +diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf +index de41bc4..7844dc7 100644 +--- a/tests/testsuites/imtcp_conndrop.conf ++++ b/tests/testsuites/imtcp_conndrop.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -82,9 +103,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/t $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/wr_large.conf rsyslog-7.4.4.new/tests/testsuites/wr_large.conf ---- rsyslog-7.4.4/tests/testsuites/wr_large.conf 2012-04-04 14:29:55.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 2013-12-18 14:28:10.647004190 +0800 +diff --git a/tests/testsuites/wr_large.conf b/tests/testsuites/wr_large.conf +index b64f132..b0ae264 100644 +--- a/tests/testsuites/wr_large.conf ++++ b/tests/testsuites/wr_large.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 46eddd604b..162d239a13 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch @@ -1,5 +1,5 @@ -From 5c3ba79177f7d1763db33c4358af2af60ff214b7 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> +From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt @@ -10,15 +10,16 @@ libgcrypt does no longer provide libgcrypt-config, and provide Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + --- configure.ac | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac -index 0f31869..d35db42 100644 +index 62178c3..b56c9c7 100644 --- a/configure.ac +++ b/configure.ac -@@ -777,20 +777,7 @@ AC_ARG_ENABLE(libgcrypt, +@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then @@ -40,6 +41,3 @@ index 0f31869..d35db42 100644 fi AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) AC_SUBST(LIBGCRYPT_CFLAGS) --- -2.8.1 - diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb index 7056e1c6ad..476540d0a7 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb @@ -27,7 +27,6 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t " SRC_URI_append_libc-musl = " \ - file://0001-Undefine-GLOB_BRACE.patch \ file://0001-Include-sys-time-h.patch \ " diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index c6b9f1019b..10ffaaa31b 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -11,6 +11,9 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://sfcb.service \ file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \ @@ -28,7 +31,7 @@ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" inherit autotools -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} +inherit systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" @@ -53,10 +56,8 @@ do_install() { oe_runmake DESTDIR=${D} install - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service - fi + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service install -d ${D}${sysconfdir}/init.d mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb index 0970d2a307..1a1767e11f 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb @@ -22,8 +22,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d) PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" -SRC_URI[md5sum] = "093aeec3f8f39fa9a37593c4012d3156" -SRC_URI[sha256sum] = "89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc" +SRC_URI[md5sum] = "9ae2c6e7131cd2813edcc65cbe5f223f" +SRC_URI[sha256sum] = "51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054" inherit autotools update-rc.d systemd diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index bc6fec0f1d..4f58281f9f 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit cmake pkgconfig +OECMAKE_GENERATOR = "Unix Makefiles" + DEPENDS = "luajit zlib ncurses" RDEPENDS_${PN} = "bash" @@ -33,3 +35,7 @@ FILES_${PN} += " \ ${datadir}/zsh/* \ ${prefix}/src/* \ " + +# luajit not supported on Aarch64 +COMPATIBLE_HOST = "^(?!aarch64).*" + diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch index 8b98707cd7..976e0380e4 100644 --- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch @@ -1,11 +1,21 @@ +From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 21 Nov 2011 12:00:54 +0100 +Subject: [PATCH] t1lib: add 5.1.2 # # Patch managed by http://www.holgerschurig.de/patcher.html # ---- t1lib-5.0.2/configure.in~configure.patch -+++ t1lib-5.0.2/configure.in -@@ -75,9 +75,9 @@ +--- + configure.in | 95 ++++++++++++++++++++++++------------------------------------ + 1 file changed, 38 insertions(+), 57 deletions(-) + +diff --git a/configure.in b/configure.in +index eade4c0..e649ea9 100644 +--- a/configure.in ++++ b/configure.in +@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION) T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\" @@ -18,7 +28,7 @@ dnl We want these before the checks, so the checks can modify their values. test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS) -@@ -161,6 +161,7 @@ +@@ -162,6 +162,7 @@ fi dnl **** Check for underscore on external symbols **** @@ -26,21 +36,12 @@ AC_CACHE_CHECK("whether external symbols need an underscore prefix", ac_cv_c_extern_prefix, [saved_libs=$LIBS -@@ -178,68 +179,48 @@ +@@ -179,68 +180,48 @@ then AC_DEFINE(NEED_UNDERSCORE_PREFIX) fi -dnl **** Check which ANSI integer type is 16 bit -+dnl **** Check which ANSI integer type is 16 bit -+T1_AA_TYPE16="" -+for type in short int; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then -+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" -+ T1_INT16="$type" -+ break -+ fi -+done - +- -AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type, - AC_TRY_RUN([ -int main(void) { @@ -58,21 +59,23 @@ -else - T1_AA_TYPE16="-DT1_AA_TYPE16=int" - T1_INT16="int" ++dnl **** Check which ANSI integer type is 16 bit ++T1_AA_TYPE16="" ++for type in short int; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then ++ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" ++ T1_INT16="$type" ++ break ++ fi ++done ++ +if test x"$T1_AA_TYPE16" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") fi - dnl **** Check which ANSI integer type is 32 bit -+T1_AA_TYPE32="" -+for type in int long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then -+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" -+ T1_INT32="$type" -+ break -+ fi -+done - +- -AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type, - AC_TRY_RUN([ -int main(void) { @@ -90,21 +93,22 @@ -else - T1_AA_TYPE32="-DT1_AA_TYPE32=long" - T1_INT32="long" ++T1_AA_TYPE32="" ++for type in int long; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then ++ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" ++ T1_INT32="$type" ++ break ++ fi ++done ++ +if test x"$T1_AA_TYPE32" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") fi - dnl **** Check which ANSI integer type is 64 bit -+T1_AA_TYPE64="" -+for type in long long_long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then -+ AC_MSG_WARN("$type is 64 bit") -+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" -+ break -+ fi -+done - +- -AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type, - AC_TRY_RUN([ -int main(void) { @@ -118,6 +122,15 @@ - T1_AA_TYPE64="-DT1_AA_TYPE64=long" -else - T1_AA_TYPE64= ++T1_AA_TYPE64="" ++for type in long long_long; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then ++ AC_MSG_WARN("$type is 64 bit") ++ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" ++ break ++ fi ++done ++ +if test x"$T1_AA_TYPE64" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 64 bit.") fi diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch index 8b4ce400f3..bc2476bfc1 100644 --- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch @@ -1,3 +1,8 @@ +From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Mar 2017 23:13:36 -0800 +Subject: [PATCH] t1lib: Fix printf format string errors + Fix printf formats to use format qualifiers fixes @@ -6,20 +11,17 @@ error: format string is not a string literal (potentially insecure) [-Werror,-Wf Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending ---- a/lib/type1/objects.c -+++ b/lib/type1/objects.c -@@ -957,7 +957,7 @@ - - sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", - name, TypeFmt(expect), TypeFmt(obj->type)); -- IfTrace0(TRUE,typemsg); -+ IfTrace1(TRUE, "%s", typemsg); - - ObjectPostMortem(obj); - +--- + lib/t1lib/t1subset.c | 2 +- + lib/type1/objects.c | 2 +- + lib/type1/objects.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c +index da427b2..e76974f 100644 --- a/lib/t1lib/t1subset.c +++ b/lib/t1lib/t1subset.c -@@ -759,7 +759,7 @@ +@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID, tr_len); T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, T1LOG_DEBUG); @@ -28,9 +30,24 @@ Upstream-Status: Pending } /* compute size of output file */ +diff --git a/lib/type1/objects.c b/lib/type1/objects.c +index c413a0f..f828e6a 100644 +--- a/lib/type1/objects.c ++++ b/lib/type1/objects.c +@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict + + sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", + name, TypeFmt(expect), TypeFmt(obj->type)); +- IfTrace0(TRUE,typemsg); ++ IfTrace1(TRUE, "%s", typemsg); + + ObjectPostMortem(obj); + +diff --git a/lib/type1/objects.h b/lib/type1/objects.h +index 13cbae7..3a1d337 100644 --- a/lib/type1/objects.h +++ b/lib/type1/objects.h -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ struct xobject { /*SHARED*/ /* NDW: personally, I want to see status and error messages! */ #define IfTrace0(condition,model) \ diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch index e050025739..da54f87abb 100644 --- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch @@ -1,12 +1,28 @@ +From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 21 Nov 2011 12:00:54 +0100 +Subject: [PATCH] t1lib: add 5.1.2 # # Patch managed by http://www.holgerschurig.de/patcher.html # ---- t1lib-5.0.2/Makefile.in~libtool -+++ t1lib-5.0.2/Makefile.in +--- + Makefile.in | 5 +++-- + examples/Makefile.in | 5 +++-- + lib/Makefile.in | 6 ++++-- + lib/t1lib/Makefile.in | 6 ++++-- + lib/type1/Makefile.in | 6 ++++-- + type1afm/Makefile.in | 6 ++++-- + xglyph/Makefile.in | 6 ++++-- + 7 files changed, 26 insertions(+), 14 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 29c3468..396c020 100644 +--- a/Makefile.in ++++ b/Makefile.in @@ -18,7 +18,8 @@ - # Last modified: 2001-04-01 + # Last modified: 2005-05-01 # -SHELL = /bin/sh @@ -15,7 +31,7 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ -@@ -150,7 +151,7 @@ +@@ -149,7 +150,7 @@ distclean: clean $(RM) examples/Makefile $(RM) xglyph/Makefile $(RM) doc/Makefile @@ -24,8 +40,10 @@ # The following two targets are for building and cleaning the python- ---- t1lib-5.0.2/examples/Makefile.in~libtool -+++ t1lib-5.0.2/examples/Makefile.in +diff --git a/examples/Makefile.in b/examples/Makefile.in +index b301db5..7a6a514 100644 +--- a/examples/Makefile.in ++++ b/examples/Makefile.in @@ -14,9 +14,10 @@ # Last modified: 2001-04-01 # @@ -39,8 +57,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/lib/Makefile.in~libtool -+++ t1lib-5.0.2/lib/Makefile.in +diff --git a/lib/Makefile.in b/lib/Makefile.in +index 89e5e86..6e0f960 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in @@ -15,8 +15,10 @@ # # Contributions by H.Kakugawa to use libtool! @@ -54,8 +74,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/lib/t1lib/Makefile.in~libtool -+++ t1lib-5.0.2/lib/t1lib/Makefile.in +diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in +index a6c2478..32434b3 100644 +--- a/lib/t1lib/Makefile.in ++++ b/lib/t1lib/Makefile.in @@ -14,8 +14,10 @@ # # Modified by H.Kakugawa to use libtool @@ -69,8 +91,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/lib/type1/Makefile.in~libtool -+++ t1lib-5.0.2/lib/type1/Makefile.in +diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in +index 241f124..42efa94 100644 +--- a/lib/type1/Makefile.in ++++ b/lib/type1/Makefile.in @@ -14,8 +14,10 @@ # # Modified by H.Kakugawa to use libtool @@ -84,8 +108,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/type1afm/Makefile.in~libtool -+++ t1lib-5.0.2/type1afm/Makefile.in +diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in +index 61611e1..9b51406 100644 +--- a/type1afm/Makefile.in ++++ b/type1afm/Makefile.in @@ -15,8 +15,10 @@ # # Modified by H.Kakugawa to use libtool @@ -99,8 +125,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/xglyph/Makefile.in~libtool -+++ t1lib-5.0.2/xglyph/Makefile.in +diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in +index 8da9b63..741334c 100644 +--- a/xglyph/Makefile.in ++++ b/xglyph/Makefile.in @@ -15,8 +15,10 @@ # # Modified by H.Kakugawa to use libtool diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch b/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch new file mode 100644 index 0000000000..e495285051 --- /dev/null +++ b/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch @@ -0,0 +1,33 @@ +From 1ce892749e4f53bd0aeaa4c3ce45f80178799411 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Mar 2018 17:52:51 -0800 +Subject: [PATCH] multicast_blast/tipcc: Fix struct type for TIPC_GROUP_JOIN + +Kernel defines it as tipc_group_req and not tipc_mreq +this code was not excercised with older kernels so we +never ran into the compiler failures since TIPC_GROUP_JOIN +is only defined in kernel starting 4.15 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + multicast_blast/tipcc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/multicast_blast/tipcc.c b/multicast_blast/tipcc.c +index 90644d3..911c759 100755 +--- a/multicast_blast/tipcc.c ++++ b/multicast_blast/tipcc.c +@@ -213,7 +213,7 @@ int tipc_accept(int sd, struct tipc_addr *src) + int tipc_join(int sd, struct tipc_addr *member) + { + #ifdef TIPC_GROUP_JOIN +- struct tipc_mreq mreq = { ++ struct tipc_group_req mreq = { + .type = member->type, + .instance = member->instance, + .scope = domain2scope(member->domain) +-- +2.16.2 + diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 720aa3c2b0..54ed043f4e 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1 SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ + file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" diff --git a/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb b/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb index d729de9bb8..0a00a366e1 100644 --- a/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb +++ b/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses libxml2" SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "f1fba1e90465b0e5a3865b19133fa19d" -SRC_URI[sha256sum] = "3f07e958b40acaeab98e9eb1326c9f91b0be0a782c1cc2bd7a9e18d31fab18ca" +SRC_URI[md5sum] = "46ca0fdf0236f02dd2b96d347626d2a2" +SRC_URI[sha256sum] = "51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182" inherit autotools-brokensep EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" diff --git a/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch b/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch deleted file mode 100644 index c617d14a1b..0000000000 --- a/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c64d04d084f47b4cb3e1cdee6e96348fcc6a756e Mon Sep 17 00:00:00 2001 -From: Mihai Tudor Panu <mihai.tudor.panu@intel.com> -Date: Tue, 30 May 2017 15:14:09 -0700 -Subject: [PATCH 1/1] ads1x15: fixed case logic in getThresh() function - -Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com> - -Upstream-Status: Backported [c64d04d084f47b4cb3e1cdee6e96348fcc6a756e] - -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> - ---- - src/ads1x15/ads1x15.cxx | 4 ++-- - src/ads1x15/ads1x15.hpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ads1x15/ads1x15.cxx b/src/ads1x15/ads1x15.cxx -index 35782709..47701b2a 100644 ---- a/src/ads1x15/ads1x15.cxx -+++ b/src/ads1x15/ads1x15.cxx -@@ -116,7 +116,7 @@ ADS1X15::setContinuous(bool mode){ - - float - ADS1X15::getThresh(ADSTHRESH reg){ -- if( THRESH_HIGH && THRESH_LOW) return getLastSample(reg); -+ if(reg == THRESH_HIGH || reg == THRESH_LOW) return getLastSample(reg); - else return 0.0; - } - -@@ -137,7 +137,7 @@ ADS1X15::setThresh(ADSTHRESH reg, float value){ - case 2: - case 3: - set_value = value / getMultiplier(); -- set_value = set_value << m_bitShift; -+ set_value = set_value << m_bitShift; - if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){ - throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.write() failed"); - return; -diff --git a/src/ads1x15/ads1x15.hpp b/src/ads1x15/ads1x15.hpp -index 7524572d..efd8c8ec 100644 ---- a/src/ads1x15/ads1x15.hpp -+++ b/src/ads1x15/ads1x15.hpp -@@ -390,7 +390,7 @@ namespace upm { - * @param reg ADSTHRES enum value. - * Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested. - */ -- float getThresh(ADSTHRESH reg = THRESH_LOW); -+ float getThresh(ADSTHRESH reg = THRESH_DEFAULT); - - /** - * Sets threshold levels or configures for conversion ready --- -2.11.0 - diff --git a/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch b/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch new file mode 100644 index 0000000000..4b17087ef8 --- /dev/null +++ b/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch @@ -0,0 +1,49 @@ +From d314f26e024aaf15bf4ab22ceb98501148d0eac8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 May 2018 19:53:33 -0700 +Subject: [PATCH] Replace strncpy with memcpy + +gcc8 detects that strncpy is overwiritng the null terminating character +the source strings are already initialized to 0 so memcpy would do the same +job + +Fixes +rn2903.c:153:5: error: 'strncpy' output may be truncated copying 16 bytes from a string of length 511 [-Werror=stringop-truncation] + strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ecezo/ecezo.c | 2 +- + src/rn2903/rn2903.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ecezo/ecezo.c b/src/ecezo/ecezo.c +index 6a195fc1..56c6dab3 100644 +--- a/src/ecezo/ecezo.c ++++ b/src/ecezo/ecezo.c +@@ -488,7 +488,7 @@ int ecezo_send_command(const ecezo_context dev, char *cmd, char *buffer, + // our write buffer + char writeBuffer[ECEZO_MAX_BUFFER_LEN]; + +- strncpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN); ++ memcpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN-1); + writeBuffer[ECEZO_MAX_BUFFER_LEN - 1] = 0; + + int writelen = strlen(writeBuffer); +diff --git a/src/rn2903/rn2903.c b/src/rn2903/rn2903.c +index f30a33ae..01a011da 100644 +--- a/src/rn2903/rn2903.c ++++ b/src/rn2903/rn2903.c +@@ -150,7 +150,7 @@ static rn2903_context _rn2903_postinit(rn2903_context dev, + rn2903_close(dev); + return NULL; + } +- strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); ++ memcpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); + + return dev; + } +-- +2.17.0 + diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index a5c2bb3211..478aa0db1d 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "106b6c706268522ab0168a4ddb19e89ce832e084" -PV = "1.3.0-git${SRCPV}" +SRCREV = "37642f3b0194f6ddd63f1e6b5d49b8cb689d5c81" +PV = "1.6.0-git${SRCPV}" SRC_URI = " \ git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ - file://ads1x15-fixed-case-logic-in-getThresh-function.patch \ + file://0001-Replace-strncpy-with-memcpy.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch b/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch index ee0d074de8..2412bb8deb 100644 --- a/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch +++ b/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch @@ -1,13 +1,23 @@ +From f71cc920528c3496b0118964ebbcf5440cda4ed1 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 16 Aug 2017 13:37:40 +0800 +Subject: [PATCH] vlock: add new recipe + Upstream-Status: Inappropriate [configuration] written by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Index: vlock-2.2.2/man/vlock.1 -=================================================================== ---- vlock-2.2.2.orig/man/vlock.1 2010-07-26 14:12:42.000000000 -0400 -+++ vlock-2.2.2/man/vlock.1 2010-07-26 14:13:06.000000000 -0400 -@@ -111,11 +111,6 @@ +--- + man/vlock.1 | 5 ----- + src/vlock.sh | 5 ----- + 2 files changed, 10 deletions(-) + +diff --git a/man/vlock.1 b/man/vlock.1 +index 0d29b49..01cb944 100644 +--- a/man/vlock.1 ++++ b/man/vlock.1 +@@ -111,11 +111,6 @@ enter your password at the password prompt. If this variable is unset or set to an invalid value or 0 no timeout is used. \fBWarning\fR: If this value is too low, you may not be able to unlock your session. .PP @@ -19,11 +29,11 @@ Index: vlock-2.2.2/man/vlock.1 .SH SECURITY See the SECURITY file in the \fBvlock\fR distribution for more information. .PP -Index: vlock-2.2.2/src/vlock.sh -=================================================================== ---- vlock-2.2.2.orig/src/vlock.sh 2010-07-26 14:12:32.000000000 -0400 -+++ vlock-2.2.2/src/vlock.sh 2010-07-26 14:13:33.000000000 -0400 -@@ -35,11 +35,6 @@ +diff --git a/src/vlock.sh b/src/vlock.sh +index 75f1369..f572776 100644 +--- a/src/vlock.sh ++++ b/src/vlock.sh +@@ -35,11 +35,6 @@ This TTY is now locked. ${VLOCK_ENTER_PROMPT}" diff --git a/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch b/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch index 6e8a6a9fdc..3a344b2362 100644 --- a/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch +++ b/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch @@ -1,8 +1,21 @@ +From 17e5c8d32abc214aea408f0837be41e88bce7eb2 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 16 Aug 2017 13:37:40 +0800 +Subject: [PATCH] vlock: add new recipe + Upstream-Status: Pending written by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + Makefile | 4 ++++ + configure | 9 +++++++++ + src/vlock-main.c | 8 ++++++++ + 3 files changed, 21 insertions(+) + +diff --git a/Makefile b/Makefile +index 4eeb42a..834cd2c 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,10 @@ ifeq ($(AUTH_METHOD),shadow) @@ -16,6 +29,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ifeq ($(ENABLE_PLUGINS),yes) vlock-main: plugins.o plugin.o module.o process.o script.o tsort.o list.o # -rdynamic is needed so that the all plugin can access the symbols from console_switch.o +diff --git a/configure b/configure +index d5d84d6..1303598 100755 --- a/configure +++ b/configure @@ -44,6 +44,7 @@ Optional Features: @@ -36,7 +51,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> pam|shadow) if [ "$2" = "yes" ] ; then if [ -n "$auth_method" ] && [ "$auth_method" != "$1" ] ; then -@@ -232,6 +232,7 @@ set_defaults() { +@@ -228,6 +232,7 @@ set_defaults() { AUTH_METHOD="pam" ENABLE_ROOT_PASSWORD="yes" ENABLE_PLUGINS="yes" @@ -44,9 +59,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> SCRIPTS="" VLOCK_GROUP="vlock" -@@ -356,10 +356,14 @@ ENABLE_PLUGINS = ${ENABLE_PLUGINS} - # which plugins should be build - MODULES = ${MODULES} +@@ -353,6 +358,10 @@ MODULES = ${MODULES} # which scripts should be installed SCRIPTS = ${SCRIPTS} @@ -57,12 +70,12 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> # root's group ROOT_GROUP = ${ROOT_GROUP} - # group for privileged plugins - VLOCK_GROUP = ${VLOCK_GROUP} +diff --git a/src/vlock-main.c b/src/vlock-main.c +index 008f6f0..108ce8b 100644 --- a/src/vlock-main.c +++ b/src/vlock-main.c -@@ -111,7 +111,9 @@ static void restore_terminal(void) - (void) tcsetattr(STDIN_FILENO, TCSANOW, &term); +@@ -112,7 +112,9 @@ static void restore_terminal(void) + (void) tcsetattr(STDIN_FILENO, TCSANOW, &old_term); } +#ifdef ENABLE_FAIL_COUNT @@ -71,7 +84,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> static void auth_loop(const char *username) { -@@ -181,7 +183,9 @@ static void auth_loop(const char *userna +@@ -182,7 +184,9 @@ static void auth_loop(const char *username) } #endif @@ -81,7 +94,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> } /* Free timeouts memory. */ -@@ -189,11 +193,13 @@ static void auth_loop(const char *userna +@@ -190,11 +194,13 @@ static void auth_loop(const char *username) free(prompt_timeout); } @@ -95,7 +108,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> #ifdef USE_PLUGINS static void call_end_hook(void) -@@ -216,7 +222,9 @@ int main(int argc, char *const argv[]) +@@ -217,7 +223,9 @@ int main(int argc, char *const argv[]) if (username == NULL) fatal_perror("vlock: could not get username"); diff --git a/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch b/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch index 4ce0abc71b..460b292498 100644 --- a/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch +++ b/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch @@ -1,13 +1,22 @@ +From fcec4e7fe899f8c0077b3004eeccb7292a945a67 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 16 Aug 2017 13:37:40 +0800 +Subject: [PATCH] vlock: add new recipe + Upstream-Status: Pending written by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Index: vlock-2.2.2/src/auth-pam.c -=================================================================== ---- vlock-2.2.2.orig/src/auth-pam.c 2010-06-14 14:38:51.000000000 -0400 -+++ vlock-2.2.2/src/auth-pam.c 2010-06-14 14:39:12.000000000 -0400 -@@ -148,6 +148,9 @@ +--- + src/auth-pam.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/auth-pam.c b/src/auth-pam.c +index 5cf93f6..c5cc67a 100644 +--- a/src/auth-pam.c ++++ b/src/auth-pam.c +@@ -148,6 +148,9 @@ bool auth(const char *user, struct timespec *timeout) if (pam_status != PAM_SUCCESS) { fprintf(stderr, "vlock: %s\n", pam_strerror(pamh, pam_status)); diff --git a/meta-oe/recipes-extended/zram/zram/init b/meta-oe/recipes-extended/zram/zram/init index 7b6cbf414c..a2c9c21239 100644 --- a/meta-oe/recipes-extended/zram/zram/init +++ b/meta-oe/recipes-extended/zram/zram/init @@ -34,7 +34,7 @@ start() { mem_by_cpu=$(($memtotal/$num_cpus*$factor/100*1024)) # load dependency modules - modprobe zram zram_num_devices=$num_cpus + modprobe zram num_devices=$num_cpus echo "zram devices probed successfully" # initialize the devices diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb b/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb index 30ac90a70b..307774b37e 100644 --- a/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb +++ b/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ DEPENDS = "atk glibmm" -inherit gnome autotools pkgconfig +inherit distro_features_check gnome autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "d53b60b0f1be597e86070954a49cf0c3" SRC_URI[archive.sha256sum] = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd" diff --git a/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch new file mode 100644 index 0000000000..176e979982 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch @@ -0,0 +1,51 @@ +From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 31 Mar 2018 22:29:16 +0200 +Subject: [PATCH] do not build demos +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +They are not installed anyway and add libepoxy dependency + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 3 ++- + configure.ac | 3 --- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 984b6a7..6c754a6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -28,7 +28,8 @@ doc_subdirs = docs + else + doc_subdirs = + endif +-SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs) ++ ++SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs) + + gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME) + gdkmm_include_HEADERS = gdk/gdkmm.h +diff --git a/configure.ac b/configure.ac +index e5e82dc..c1c7658 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno], + [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"]) + AC_SUBST([GTKMM_MODULES]) + +-AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2']) +- + PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES]) + PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES]) +-PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES]) + + MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0]) + MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0]) +-- +2.14.3 + diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb new file mode 100644 index 0000000000..96b54dd2c7 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "C++ bindings for the GTK+ toolkit V3" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" + +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" + +BPN = "gtkmm" + +inherit gnomebase distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "883e9046768b3a5afc8e365988823e77" +SRC_URI[archive.sha256sum] = "91afd98a31519536f5f397c2d79696e3d53143b80b75778521ca7b48cb280090" +SRC_URI += "file://0001-do-not-build-demos.patch" + +EXTRA_OECONF = " --disable-documentation " + +FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb index 195bb21836..b780d09bc3 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb @@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "atkmm pangomm glibmm gtk+ cairomm" -inherit gnome autotools pkgconfig distro_features_check +inherit gnomebase distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -GNOME_COMPRESS_TYPE = "xz" - SRC_URI[archive.md5sum] = "6c59ae8bbff48fad9132f23af347acf1" SRC_URI[archive.sha256sum] = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72" diff --git a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch b/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch deleted file mode 100644 index 473827448e..0000000000 --- a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ceefcb19cebf8bc3d45ee502f8eabd3bc5bd0aac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sat, 11 Feb 2017 16:42:12 +0100 -Subject: [PATCH] configure.in: remove deprecated GNOME_COMMON_INIT -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 8905f1c..3901398 100644 ---- a/configure.in -+++ b/configure.in -@@ -15,7 +15,6 @@ AC_CONFIG_HEADERS([config.h]) - - AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) - --GNOME_COMMON_INIT - - if test "$enable_debug" != "no"; then - AC_DEFINE([DEBUG],[1],[enable use of LIBGLADE_DEBUG environment variable]) --- -2.9.3 - diff --git a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch b/meta-oe/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch deleted file mode 100644 index c5d586465c..0000000000 --- a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch +++ /dev/null @@ -1,102 +0,0 @@ -Upstream-Status: Pending - -diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in ---- libglade-2.4.0~/configure.in 2004-05-17 12:38:31.000000000 +0100 -+++ libglade-2.4.0/configure.in 2004-07-28 16:53:09.000000000 +0100 -@@ -147,6 +147,18 @@ - AM_CONDITIONAL(HAVE_PYTHON, $have_python) - AC_SUBST(PYTHON) - -+AC_MSG_CHECKING([for cruft in libgtk]) -+AC_TRY_LINK([ -+#include <gtk/gtk.h> -+#include <stdio.h> -+], [ gtk_tree_get_type (); return 0; ], -+ [ AC_MSG_RESULT(yes) -+ have_cruft=yes ], -+ [ AC_MSG_RESULT(no) -+ AC_DEFINE(DISABLE_CRUFT,,[leave out support for old, broken widgets]) -+ have_cruft=no ]) -+AC_SUBST(DISABLE_CRUFT) -+ - dnl add debugging options ... - changequote(,)dnl - if test "x$GCC" = xyes; then -Only in libglade-2.4.0: configure.in.orig -diff -ur libglade-2.4.0~/glade/glade-gtk.c libglade-2.4.0/glade/glade-gtk.c ---- libglade-2.4.0~/glade/glade-gtk.c 2004-03-13 13:47:35.000000000 +0000 -+++ libglade-2.4.0/glade/glade-gtk.c 2004-07-28 16:53:52.000000000 +0100 -@@ -213,6 +213,8 @@ - gtk_clist_column_titles_hide (GTK_CLIST (w)); - } - -+#ifndef DISABLE_CRUFT -+ - static void - tree_set_selection_mode (GladeXML *xml, GtkWidget *w, - const char *name, const char *value) -@@ -238,6 +240,8 @@ - gtk_tree_set_view_lines (GTK_TREE (w), BOOL (value)); - } - -+#endif -+ - static void - list_set_selection_mode (GladeXML *xml, GtkWidget *w, - const char *name, const char *value) -@@ -254,6 +258,7 @@ - gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (w), BOOL (value)); - } - -+#ifndef DISABLE_CRUFT - static void - text_set_text (GladeXML *xml, GtkWidget *w, - const char *name, const char *value) -@@ -262,6 +267,7 @@ - - gtk_editable_insert_text (GTK_EDITABLE (w), value, -1, &pos); - } -+#endif - - static void - radio_menu_item_set_group (GladeXML *xml, GtkWidget *w, -@@ -1125,13 +1131,17 @@ - glade_register_custom_prop (GTK_TYPE_CLIST, "selection_mode", clist_set_selection_mode); - glade_register_custom_prop (GTK_TYPE_CLIST, "shadow_type", clist_set_shadow_type); - glade_register_custom_prop (GTK_TYPE_CLIST, "show_titles", clist_set_show_titles); -+#ifndef DISABLE_CRUFT - glade_register_custom_prop (GTK_TYPE_TREE, "selection_mode", tree_set_selection_mode); - glade_register_custom_prop (GTK_TYPE_TREE, "view_mode", tree_set_view_mode); - glade_register_custom_prop (GTK_TYPE_TREE, "view_line", tree_set_view_line); -+#endif - glade_register_custom_prop (GTK_TYPE_LIST, "selection_mode", list_set_selection_mode); - glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle", - check_menu_item_set_always_show_toggle); -+#ifndef DISABLE_CRUFT - glade_register_custom_prop (GTK_TYPE_TEXT, "text", text_set_text); -+#endif - glade_register_custom_prop (GTK_TYPE_RADIO_MENU_ITEM, "group", - radio_menu_item_set_group); - glade_register_custom_prop (GTK_TYPE_TOOLBAR, "tooltips", toolbar_set_tooltips); -@@ -1288,8 +1298,10 @@ - glade_standard_build_children, NULL); - glade_register_widget (GTK_TYPE_TEAROFF_MENU_ITEM, glade_standard_build_widget, - NULL, NULL); -+#ifndef DISABLE_CRUFT - glade_register_widget (GTK_TYPE_TEXT, glade_standard_build_widget, - NULL, NULL); -+#endif - glade_register_widget (GTK_TYPE_TEXT_VIEW, glade_standard_build_widget, - NULL, NULL); - glade_register_widget (GTK_TYPE_TIPS_QUERY, glade_standard_build_widget, -@@ -1304,8 +1316,10 @@ - glade_standard_build_children, NULL); - glade_register_widget (GTK_TYPE_TOOL_BUTTON, glade_standard_build_widget, - NULL, NULL); -+#ifndef DISABLE_CRUFT - glade_register_widget (GTK_TYPE_TREE, glade_standard_build_widget, - NULL, NULL); -+#endif - glade_register_widget (GTK_TYPE_TREE_VIEW, glade_standard_build_widget, - NULL, NULL); - glade_register_widget (GTK_TYPE_VBUTTON_BOX, glade_standard_build_widget, diff --git a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch b/meta-oe/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch deleted file mode 100644 index dc4c092fd3..0000000000 --- a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch +++ /dev/null @@ -1,501 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -urN libglade-2.4.2.orig/configure.in libglade-2.4.2/configure.in ---- libglade-2.4.2.orig/configure.in 2005-02-11 12:42:58.000000000 +0100 -+++ libglade-2.4.2/configure.in 2005-03-22 01:22:00.000000000 +0100 -@@ -52,11 +52,33 @@ - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - PKG_CHECK_MODULES(LIBGLADE, [dnl -- libxml-2.0 >= required_libxml_version dnl - atk >= required_atk_version dnl - gtk+-2.0 >= required_gtk_version dnl - glib-2.0 >= required_glib_version]) - -+disable_xml2=no -+AC_ARG_WITH([libxml2], -+ AC_HELP_STRING([--without-libxml2], [Don't use libxml2, use Glib's GMarkupParser instead]), -+ [disable_xml2=yes], -+ [disable_xml2=no]) -+ -+AC_MSG_CHECKING([if we are using libxml2]) -+if test "x$disable_xml2" == "xno"; then -+ AC_MSG_RESULT(yes) -+ PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.4.10) -+ PKGCFG_REQUIRE_LIBXML2="libxml-2.0" -+ LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS $XML2_CFLAGS" -+ LIBGLADE_LIBS="$LIBGLADE_LIBS $XML2_LIBS" -+else -+ LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS -DUSE_GMARKUP_PARSER" -+ PKGCFG_REQUIRE_LIBXML2="" -+ AC_MSG_RESULT(no) -+fi -+ -+AC_SUBST(XML2_LIBS) -+AC_SUBST(XML2_CFLAGS) -+AC_SUBST(PKGCFG_REQUIRE_LIBXML2) -+ - AC_MSG_CHECKING([for native Win32]) - case "$host" in - *-*-mingw*) -@@ -116,6 +138,21 @@ - fi - fi - -+if test "x$disable_xml2" == "xyes"; then -+ echo "*****************************************************" -+ echo " You chose to disable libxml2 and use Glib's" -+ echo " GMarkupParser instead." -+ echo -+ echo " Please bear in mind that using libglade with" -+ echo " GMarkupParser is an experimental feature only." -+ echo -+ echo " Please post problems or success stories to" -+ echo " the glade-devel mailing list. Thank you." -+ echo "*****************************************************" -+fi -+ -+ -+ - GTK_DOC_CHECK(1.0) - - dnl gettext stuff ... there is no message catalog for libglade -- libglade -diff -urN libglade-2.4.2.orig/glade/glade-parser.c libglade-2.4.2/glade/glade-parser.c ---- libglade-2.4.2.orig/glade/glade-parser.c 2004-11-11 11:56:13.000000000 +0100 -+++ libglade-2.4.2/glade/glade-parser.c 2005-03-22 01:20:00.000000000 +0100 -@@ -34,7 +34,15 @@ - # define dgettext(Domain, String) (String) - #endif - --#include <libxml/parser.h> -+#ifdef USE_GMARKUP_PARSER -+# include <zlib.h> -+#else -+# include <libxml/parser.h> -+#endif -+ -+#ifdef USE_GMARKUP_PARSER -+# define xmlChar gchar -+#endif - - #include "glade-parser.h" - #include "glade-private.h" -@@ -508,7 +516,9 @@ - case PARSER_START: - if (!strcmp(name, "glade-interface")) { - state->state = PARSER_GLADE_INTERFACE; --#if 0 -+ -+#ifndef USE_GMARKUP_PARSER -+ #if 0 - /* check for correct XML namespace */ - for (i = 0; attrs && attrs[i] != NULL; i += 2) { - if (!strcmp(attrs[i], "xmlns") && -@@ -518,7 +528,9 @@ - g_warning("unknown attribute `%s' for <glade-interface>", - attrs[i]); - } -+ #endif - #endif -+ - } else { - g_warning("Expected <glade-interface>. Got <%s>.", name); - state->prev_state = state->state; -@@ -1063,12 +1075,18 @@ - } - } - -+#ifndef USE_GMARKUP_PARSER -+ - static xmlEntityPtr - glade_parser_get_entity(GladeParseState *state, const xmlChar *name) - { - return xmlGetPredefinedEntity(name); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - glade_parser_warning(GladeParseState *state, const char *msg, ...) - { -@@ -1079,6 +1097,10 @@ - va_end(args); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - glade_parser_error(GladeParseState *state, const char *msg, ...) - { -@@ -1089,6 +1111,10 @@ - va_end(args); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - glade_parser_fatal_error(GladeParseState *state, const char *msg, ...) - { -@@ -1099,6 +1125,10 @@ - va_end(args); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static xmlSAXHandler glade_parser = { - (internalSubsetSAXFunc)NULL, /* internalSubset */ - (isStandaloneSAXFunc)NULL, /* isStandalone */ -@@ -1126,6 +1156,82 @@ - (fatalErrorSAXFunc)glade_parser_fatal_error, /* fatalError */ - }; - -+#else /* USE_GMARKUP_PARSER */ -+ -+static void -+glade_parser_start_element_wrapper(GMarkupParseContext *context, -+ const gchar *name, -+ const gchar **attr_names, -+ const gchar **attr_values, -+ gpointer state, -+ GError **error) -+{ -+ guint i = 0; -+ -+ /* Pack attribute names/values from two separate -+ * arrays (GMarkupParser style) into one single -+ * array (libxml SAXParser style). This is not -+ * very efficient, but we do it to make the -+ * GMarkupParser code as little invasive as -+ * possible. */ -+ -+ while (attr_names[i] != NULL) { -+ ++i; -+ } -+ -+ if (1) -+ { -+ const gchar *attr[(i*2)+1]; -+ guint j, k; -+ -+ for (j=0, k=0; k < i; j += 2) -+ { -+ attr[j] = attr_names[k]; -+ attr[j+1] = attr_values[k]; -+ ++k; -+ } -+ attr[i*2] = NULL; -+ -+ glade_parser_start_element((GladeParseState*)state, name, attr); -+ } -+} -+ -+static void -+glade_parser_end_element_wrapper(GMarkupParseContext *context, -+ const gchar *name, -+ gpointer state, -+ GError **err) -+{ -+ glade_parser_end_element((GladeParseState*)state, name); -+} -+ -+static void -+glade_parser_characters_wrapper(GMarkupParseContext *context, -+ const gchar *chars, -+ gsize len, -+ gpointer state, -+ GError **err) -+{ -+ glade_parser_characters((GladeParseState*)state, chars, (int) len); -+} -+ -+static void -+glade_parser_error(GMarkupParseContext *context, GError *err, gpointer data) -+{ -+ g_log("Glade-Parser", G_LOG_LEVEL_CRITICAL, "%s", err->message); -+} -+ -+static const GMarkupParser glade_parser = { -+ glade_parser_start_element_wrapper, /* element open */ -+ glade_parser_end_element_wrapper, /* element close */ -+ glade_parser_characters_wrapper, /* text content */ -+ NULL, /* passthrough */ -+ glade_parser_error, /* parse error */ -+}; -+ -+#endif /* USE_GMARKUP_PARSER */ -+ -+ - static void - widget_info_free(GladeWidgetInfo *info) - { -@@ -1191,6 +1297,9 @@ - * - * Returns: the GladeInterface structure for the XML file. - */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - GladeInterface * - glade_parser_parse_file(const gchar *file, const gchar *domain) - { -@@ -1222,6 +1331,31 @@ - return state.interface; - } - -+#else /* defined(USE_GMARKUP_PARSER) */ -+ -+GladeInterface * -+glade_parser_parse_file(const gchar *file, const gchar *domain) -+{ -+ GladeInterface *interface; -+ GError *err = NULL; -+ gchar *content = NULL; -+ gsize clen; -+ -+ if (!g_file_get_contents(file, &content, &clen, &err)) { -+ g_warning("could not load glade file: %s", err->message); -+ g_error_free(err); -+ return NULL; -+ } -+ -+ interface = glade_parser_parse_buffer(content, (gint) clen, domain); -+ -+ g_free(content); -+ -+ return interface; -+} -+ -+#endif /* USE_GMARKUP_PARSER */ -+ - /** - * glade_parser_parse_buffer - * @buffer: a buffer in memory containing XML data. -@@ -1237,6 +1371,9 @@ - * - * Returns: the GladeInterface structure for the XML buffer. - */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - GladeInterface * - glade_parser_parse_buffer(const gchar *buffer, gint len, const gchar *domain) - { -@@ -1263,6 +1400,161 @@ - return state.interface; - } - -+#else /* defined(USE_GMARKUP_PARSER) */ -+ -+ -+static GladeInterface * -+glade_parser_parse_buffer_internal(const gchar *buffer, gint len, const gchar *domain) -+{ -+ GMarkupParseContext *context; -+ GladeParseState state = { 0 }; -+ GError *err = NULL; -+ -+ state.interface = NULL; -+ if (domain) -+ state.domain = domain; -+ else -+ state.domain = textdomain(NULL); -+ -+ /* FIXME: This strstr() is not safe, as it ignores the len -+ * argument and assumes the buffer is NUL-terminated */ -+ if (strstr(buffer, "<?xml") == NULL) { -+ g_warning("No XML header found in document!"); -+ return NULL; -+ } -+ -+ context = g_markup_parse_context_new(&glade_parser, (GMarkupParseFlags) 0, &state, NULL); -+ -+ glade_parser_start_document(&state); -+ -+ if (!g_markup_parse_context_parse(context, buffer, (gssize) len, &err)) { -+ g_warning("document not well formed: %s", err->message); -+ g_error_free(err); -+ if (state.interface) -+ glade_interface_destroy (state.interface); -+ return NULL; -+ } -+ -+ glade_parser_end_document(&state); -+ -+ if (state.state != PARSER_FINISH) { -+ g_warning("did not finish in PARSER_FINISH state!"); -+ -+ if (state.interface) -+ glade_interface_destroy(state.interface); -+ -+ return NULL; -+ } -+ -+ return state.interface; -+} -+ -+struct _gzip_rfc1952_hdr -+{ -+ guint8 id1, id2, cm, flags; -+ guint32 mtime; -+ guint8 xflags; -+ guint8 os; -+}; -+ -+static GladeInterface * -+glade_parser_parse_gzipped_buffer(const gchar *buffer, gint len, const gchar *domain) -+{ -+ struct _gzip_rfc1952_hdr *hdr = (struct _gzip_rfc1952_hdr*)buffer; -+ struct z_stream_s zstream; -+ GladeInterface *interface; -+ const guint8 *cbuf; /* start of compressed data */ -+ guint8 *decompress_buf; -+ gulong decompress_len = 0; -+ gint ret; -+ -+ g_assert(hdr != NULL && hdr->id1 == 0x1f && hdr->id2 == 0x8b); -+ -+ if (hdr->cm != Z_DEFLATED) { -+ g_warning("Unknown decompression method %u", (guint) hdr->cm); -+ return NULL; -+ } -+ -+ /* Uncompressed size (modulo 2^32) is last -+ * 4 bytes of gzipped file, and little endian. -+ * See RFC 1952 */ -+ decompress_len = GUINT32_FROM_LE(*((guint32*)(((guint8*)buffer) + len - 4))); -+ -+ /* paranoid mode: glade files > 5MB are unlikely */ -+ g_return_val_if_fail(decompress_len < 5*1024*1024, NULL); -+ -+ decompress_buf = g_malloc0(decompress_len + 1); /* +1 for NUL-terminator */ -+ -+ /* find start of compressed data, skipping header stuff */ -+ cbuf = (guint8*)buffer + 10; -+ if (hdr->flags & 0x04) { -+ guint16 xlen = GUINT16_FROM_LE(*((guint16*)cbuf)); -+ cbuf += xlen + 2; -+ } -+ if (hdr->flags & 0x08) { -+ guint16 onamelen = strlen(cbuf); -+ cbuf += onamelen + 1; -+ } -+ if (hdr->flags & 0x10) { -+ guint16 commentlen = strlen(cbuf); -+ cbuf += commentlen + 1; -+ } -+ if (hdr->flags & 0x02) -+ { -+ cbuf += 2; /* skip header CRC16 */ -+ } -+ -+ zstream.next_in = (void*)cbuf; -+ zstream.avail_in = (uLongf) len - ((void*)cbuf-(void*)buffer) - 4 - 4 +1; -+ zstream.next_out = decompress_buf; -+ zstream.avail_out= decompress_len; -+ zstream.zalloc = Z_NULL; -+ zstream.zfree = Z_NULL; -+ zstream.opaque = Z_NULL; -+ -+ ret = inflateInit2(&zstream, -MAX_WBITS); -+ -+ if (ret != Z_OK) { -+ g_warning("inflateInit2() failed. zlib error code: %d", ret); -+ g_free(decompress_buf); -+ return NULL; -+ } -+ -+ ret = inflate(&zstream, Z_FINISH); -+ -+ if (ret != Z_STREAM_END) { -+ g_warning("zlib decompression failed. zlib error code: %d", ret); -+ g_free(decompress_buf); -+ return NULL; -+ } -+ -+ interface = glade_parser_parse_buffer_internal(decompress_buf, decompress_len, domain); -+ -+ g_free(decompress_buf); -+ -+ return interface; -+} -+ -+GladeInterface * -+glade_parser_parse_buffer(const gchar *buffer, gint len, const gchar *domain) -+{ -+ g_return_val_if_fail(buffer != NULL, NULL); -+ g_return_val_if_fail(len > 0, NULL); -+ -+ /* Check if buffer is gzipped */ -+ if (buffer[0] == 0x1f && buffer[1] == (gchar)0x8b) { -+ return glade_parser_parse_gzipped_buffer(buffer, len, domain); -+ } -+ -+ /* Buffer is cleartext. */ -+ return glade_parser_parse_buffer_internal(buffer, len, domain); -+} -+ -+#endif /* USE_GMARKUP_PARSER */ -+ -+ -+#ifndef USE_GMARKUP_PARSER -+ - static void - dump_widget(xmlNode *parent, GladeWidgetInfo *info, gint indent) - { -@@ -1382,6 +1674,8 @@ - xmlNodeAddContent(widget, " "); - } - -+#endif /* !defined(USE_GMARKUP_PARSER) */ -+ - /** - * glade_interface_dump - * @interface: the GladeInterface -@@ -1390,6 +1684,9 @@ - * This function dumps the contents of a GladeInterface into a file as - * XML. It is intended mainly as a debugging tool. - */ -+ -+#ifndef USE_GMARKUP_PARSER -+ - void - glade_interface_dump(GladeInterface *interface, const gchar *filename) - { -@@ -1428,6 +1725,17 @@ - xmlFreeDoc(doc); - } - -+#else /* defined(USE_GMARKUP_PARSER) */ -+ -+void -+glade_interface_dump(GladeInterface *interface, const gchar *filename) -+{ -+ g_warning("glade_interface_dump() is only available with libxml2."); -+} -+ -+#endif /* USE_GMARKUP_PARSER */ -+ -+ - #if 0 - int - main(int argc, char **argv) { -diff -urN libglade-2.4.2.orig/libglade-2.0.pc.in libglade-2.4.2/libglade-2.0.pc.in ---- libglade-2.4.2.orig/libglade-2.0.pc.in 2001-12-12 15:28:23.000000000 +0100 -+++ libglade-2.4.2/libglade-2.0.pc.in 2005-03-22 01:20:00.000000000 +0100 -@@ -11,7 +11,7 @@ - Name: Libglade - Description: a library for dynamically loading GLADE interface files - Version: @VERSION@ --Requires: gtk+-2.0 libxml-2.0 -+Requires: gtk+-2.0 @PKGCFG_REQUIRE_LIBXML2@ - Libs: -L${libdir} -lglade-2.0 - Cflags: -I${includedir}/libglade-2.0 - diff --git a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch b/meta-oe/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch deleted file mode 100644 index b5b2ec4534..0000000000 --- a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch +++ /dev/null @@ -1,14 +0,0 @@ -Using @PYTHON@ for this path would result in the build system python being -referred to. Instead we want to locate python from the environment. - -Upstream-Status: Inappropriate [configuration] - -diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in ---- libglade-2.6.4-orig//libglade-convert.in 2011-09-22 10:18:28.991164003 +0800 -+++ libglade-2.6.4/libglade-convert.in 2011-09-22 10:18:55.431164003 +0800 -@@ -1,4 +1,4 @@ --#!@PYTHON@ -+#!/usr/bin/env python - # -*- mode: python -*- - - # yes, this requires python 2.x and an XML parser module (eg. PyExpat) diff --git a/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb b/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb deleted file mode 100644 index fdb9f8a3e3..0000000000 --- a/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Runtime support for the GTK+ interface builder" -HOMEPAGE = "http://library.gnome.org/devel/libglade/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ - file://glade/glade.h;endline=22;md5=a04f461c964ba4b57a172d1fbcd8f8fc \ - file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff" - -SECTION = "libs" -PR = "r5" -DEPENDS = "zlib gdk-pixbuf gtk+" - -inherit autotools pkgconfig gnomebase gtk-doc distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -GNOME_COMPRESS_TYPE="bz2" - -SRC_URI += " \ - file://glade-cruft.patch \ - file://no-xml2.patch \ - file://python_environment.patch \ - file://0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch \ -" - -SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" -SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" - -EXTRA_OECONF += "--without-libxml2 --disable-gtk-doc" - -CFLAGS += "-lz -lgmodule-2.0" - -PACKAGES += " ${PN}-data" -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd" -FILES_${PN}-dev += "${bindir}/libglade-convert" diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index bfbd9c29e5..bd66a28207 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc @@ -41,16 +41,16 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," +PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg," EXTRA_OECONF = "\ --with-gfxdrivers=none \ --enable-freetype=yes \ --enable-zlib \ --disable-imlib2 \ - --disable-mesa \ --disable-sdl \ --disable-vnc \ - --disable-x11 \ --disable-x11vdpau \ --disable-xine-vdpau \ " diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb index 5678f73525..9cd1efb8e8 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git \ file://0001-Run-python-scripts-using-env.patch \ " -PV = "1.0.1+git" +PV = "1.0.1+git${SRCPV}" SRCREV = "4fef4ce889b8e4fa03191d414f63bfd50796152a" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb index d9f086749f..481fedf983 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \ " -DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib" +DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib gettext-native" DEPENDS_append_class-target = " libxi" inherit autotools pkgconfig pythonnative distro_features_check gettext diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch new file mode 100644 index 0000000000..5a76474558 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch @@ -0,0 +1,69 @@ +From 60c17eb49121bf2aa485acd30750b2fc6c8eb61f Mon Sep 17 00:00:00 2001 +From: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> +Date: Mon, 19 Jun 2017 16:41:36 +0300 +Subject: [PATCH] Fix compilation for Helix. + +Gnome support, including GNOME_INIT_HOOK, has been removed, but it was +still being called. + +COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system +most definitely is not. It is accomplished by trying to execute +a program, which does not work when cross compiling. + +The fvwm(1) man page is created from Docbook XML which is set for +a Windows code page that is not available when compiling. Easiest is +to just not create the man page as those are not needed on the monitor. + +Upstream-Status: inappropriate [OE specific] +Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> +Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> +Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> +--- + configure.ac | 20 ++++---------------- + doc/fvwm/Makefile.am | 2 +- + 3 files changed, 7 insertions(+), 17 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 48ce264..fab7b44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1413,23 +1413,7 @@ else + problem_gdkimlib=": Failed on gdk-imlib, see config.log" + fi + +-GNOME_INIT_HOOK +- +-# Unfortunately we have 2 gnome supports: WM hints and gnome libs. +-# The $with_gnomehints below refers to the first, not GNOME_INIT_HOOK. +-if test ! x"$enable_gnome_hints" = xno; then +- with_gnomehints=yes +- problem_gnomehints="" +-else +- with_gnomehints=no +- problem_gnomehints=": Explicitly disabled" +-fi +- + # Define some compatibility macros needed for config.h. +-mg_DEFINE_IF_NOT([#include <X11/keysym.h>], +- [defined XK_Page_Up && defined XK_Page_Down], +- [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], +- [Old AIX systems (3.2.5) don't define some common keysyms.]) + AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], + [#ifdef COMPAT_OLD_KEYSYMDEF + # define XK_Page_Up XK_Prior +diff --git a/doc/fvwm/Makefile.am b/doc/fvwm/Makefile.am +index cddb102..ff00149 100755 +--- a/doc/fvwm/Makefile.am ++++ b/doc/fvwm/Makefile.am +@@ -10,7 +10,7 @@ XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl + HTML_FILES = fvwm.man.html + XML_FILES = @DOC_SECTIONS_XML_PATH@ + EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections +-man_MANS = fvwm.1 ++man_MANS = + + if FVWM_BUILD_HTMLDOC + doc_DATA = $(HTML_FILES) +-- +1.9.1 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch new file mode 100644 index 0000000000..756cc86e87 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch @@ -0,0 +1,27 @@ +From: Sebastian Reichel <sebastian.reichel@collabora.co.uk> +Date: Tue, 29 Auf 2017 16:08:42 +0200 +Subject: [PATCH] Avoid absolute symlinks + +Avoid usage of absolute symlinks, which breaks yocto builds +since pyro. + +Upstream-Status: Pending +Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> + +diff --git a/default-config/Makefile.am b/default-config/Makefile.am +index 5e16d095a137..5404145a742c 100644 +--- a/default-config/Makefile.am ++++ b/default-config/Makefile.am +@@ -17,9 +17,9 @@ EXTRA_DIST = images \ + + install-data-hook: + cp -r $(srcdir)/images $(inst_location) +- ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/.. +- ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/.. +- ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/.. ++ ln -sf default-config/FvwmScript-DateTime $(inst_location)/.. ++ ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/.. ++ ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/.. + + uninstall-hook: + rm -fr $(DESTDIR)/$(configdir) diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb new file mode 100644 index 0000000000..cb851bfd96 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb @@ -0,0 +1,114 @@ +SUMMARY = "F Virtual Window Manager " +HOMEPAGE = "http://www.fvwm.org/" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=363fbcfb59124689af72c914560eaf6e" + +DEPENDS = " \ + bison-native \ + flex-native \ + freetype-native \ + gettext-native \ + libxslt-native \ + fontconfig \ + libice \ + libpng \ + librsvg \ + libsm \ + libxau \ + libxcb \ + libxcursor \ + libxdmcp \ + libxext \ + libxfixes \ + libxft \ + libxinerama \ + libxml2 \ + libxrender \ + libxt \ + virtual/libx11 \ + xrandr \ + zlib \ +" + +PV = "2.6.7+git${SRCPV}" + +SRC_URI = " \ + git://github.com/fvwmorg/fvwm.git;protocol=https \ + file://0001-Fix-compilation-for-disabled-gnome.patch \ + file://0002-Avoid-absolute-symlinks.patch \ +" + +SRCREV = "597a4e296da4f21e71a17facab297e016a3a80a8" + +S = "${WORKDIR}/git" + +inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/fvwm" +ALTERNATIVE_PRIORITY[x-window-manager] = "20" + +EXTRA_OECONF = " \ + --disable-bidi \ + --disable-fontconfigtest \ + --disable-freetypetest \ + --disable-htmldoc \ + --disable-imlibtest \ + --disable-mandoc \ + --disable-nls \ + --disable-perllib \ + --disable-rsvg \ + --disable-shape \ + --disable-sm \ + --disable-xfttest \ + --with-imlib-exec-prefix=/nonexistent \ + --with-imlib-prefix=/nonexistent \ + --without-ncurses-library \ + --without-readline-library \ + --without-rplay-library \ + --without-stroke-library \ + --without-termcap-library \ + --without-xpm-library \ + ac_cv_func_mkstemp=no \ + has_safety_mkstemp=yes \ +" + +# show the exact commands in the log file +EXTRA_OEMAKE = " \ + V=1 \ +" + +do_install_append() { + install -d -m 0755 ${D}/${sysconfdir}/xdg/fvwm + # You can install the config file here + + install -d -m 0755 ${D}/${datadir}/fvwm + touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults +} + +# the only needed packages (note: locale packages are automatically generated +# as well) +PACKAGES = " \ + ${PN} \ + ${PN}-dbg \ +" + +# minimal set of binaries +FILES_${PN} = " \ + ${bindir}/fvwm \ + ${bindir}/fvwm-root \ + ${datadir}/fvwm/ConfigFvwmDefaults \ +" + +RDEPENDS_${PN} = " \ + xuser-account \ +" + +# by default a lot of stuff is installed and it's not easy to control what to +# install, so install everything, but skip the check +INSANE_SKIP_${PN} = " \ + installed-vs-shipped \ +" diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb index 6cc20f5c69..0053c0c689 100644 --- a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ b/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb @@ -5,7 +5,9 @@ DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual EXTRA_OECONF = "--disable-docs" -inherit gnomebase vala gobject-introspection +inherit distro_features_check gnomebase vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "" PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb index cd7e27a19d..943986e77e 100644 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb @@ -24,7 +24,9 @@ DEPENDS = " \ " DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" -inherit gnome gtk-doc +inherit distro_features_check gnome gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ file://0001-configure-ac-do-not-check-for-freetype-config.patch \ diff --git a/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch b/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch new file mode 100644 index 0000000000..d69c5af3af --- /dev/null +++ b/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch @@ -0,0 +1,860 @@ +From 99a9676a0193f6291d7202d7af72e24580abe565 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 16 Mar 2018 13:55:29 +0100 +Subject: [PATCH 1/2] Make GLM_ENABLE_EXPERIMENTAL a configurable option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It seems that erroring out if GLM_ENABLE_EXPERIMENTAL is not set turns into +packagers nightmare: There are packages around expecting glx headers. E.g +libgltf [1] fails during configure checking for usable headers AND during +compile. Paticularly fixing configure for those packages is time-consuming: +The only way (correct me if I am wrong) is creating a patch adding + +AC_DEFINE([GLM_ENABLE_EXPERIMENTAL], [1], [glm needs this for gtx headers]) + +By adding a configure option 'GLM_ENABLE_EXPERIMENTAL', the decision to use +glm/glx is done at one (and the right) place. + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +[1] https://gerrit.libreoffice.org/gitweb?p=libgltf.git + +Uptream-Status: Submitted [2] + +[2] https://github.com/g-truc/glm/pull/741 +--- + CMakeLists.txt | 6 ++++++ + glm/CMakeLists.txt | 2 ++ + glm/experimental.hpp.in | 1 + + glm/ext.hpp | 1 + + glm/gtx/associated_min_max.hpp | 1 + + glm/gtx/bit.hpp | 1 + + glm/gtx/closest_point.hpp | 1 + + glm/gtx/color_space.hpp | 1 + + glm/gtx/color_space_YCoCg.hpp | 1 + + glm/gtx/common.hpp | 1 + + glm/gtx/compatibility.hpp | 1 + + glm/gtx/component_wise.hpp | 1 + + glm/gtx/dual_quaternion.hpp | 1 + + glm/gtx/euler_angles.hpp | 1 + + glm/gtx/extend.hpp | 1 + + glm/gtx/extended_min_max.hpp | 1 + + glm/gtx/fast_exponential.hpp | 1 + + glm/gtx/fast_square_root.hpp | 1 + + glm/gtx/fast_trigonometry.hpp | 1 + + glm/gtx/gradient_paint.hpp | 1 + + glm/gtx/handed_coordinate_space.hpp | 1 + + glm/gtx/hash.hpp | 1 + + glm/gtx/integer.hpp | 1 + + glm/gtx/intersect.hpp | 1 + + glm/gtx/io.hpp | 1 + + glm/gtx/log_base.hpp | 1 + + glm/gtx/matrix_cross_product.hpp | 1 + + glm/gtx/matrix_decompose.hpp | 1 + + glm/gtx/matrix_factorisation.hpp | 1 + + glm/gtx/matrix_interpolation.hpp | 1 + + glm/gtx/matrix_major_storage.hpp | 1 + + glm/gtx/matrix_operation.hpp | 1 + + glm/gtx/matrix_query.hpp | 1 + + glm/gtx/matrix_transform_2d.hpp | 1 + + glm/gtx/mixed_product.hpp | 1 + + glm/gtx/norm.hpp | 1 + + glm/gtx/normal.hpp | 1 + + glm/gtx/normalize_dot.hpp | 1 + + glm/gtx/number_precision.hpp | 1 + + glm/gtx/optimum_pow.hpp | 1 + + glm/gtx/orthonormalize.hpp | 1 + + glm/gtx/perpendicular.hpp | 1 + + glm/gtx/polar_coordinates.hpp | 1 + + glm/gtx/projection.hpp | 1 + + glm/gtx/quaternion.hpp | 1 + + glm/gtx/range.hpp | 1 + + glm/gtx/raw_data.hpp | 1 + + glm/gtx/rotate_normalized_axis.hpp | 1 + + glm/gtx/rotate_vector.hpp | 1 + + glm/gtx/scalar_multiplication.hpp | 1 + + glm/gtx/scalar_relational.hpp | 1 + + glm/gtx/spline.hpp | 1 + + glm/gtx/std_based_type.hpp | 1 + + glm/gtx/string_cast.hpp | 1 + + glm/gtx/texture.hpp | 1 + + glm/gtx/transform.hpp | 1 + + glm/gtx/transform2.hpp | 1 + + glm/gtx/type_aligned.hpp | 1 + + glm/gtx/type_trait.hpp | 1 + + glm/gtx/vec_swizzle.hpp | 1 + + glm/gtx/vector_angle.hpp | 1 + + glm/gtx/vector_query.hpp | 1 + + glm/gtx/wrap.hpp | 1 + + 63 files changed, 69 insertions(+) + create mode 100644 glm/experimental.hpp.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5159b0f..bd4dd654 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,11 @@ option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) + option(GLM_TEST_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF) + option(GLM_TEST_FORCE_PURE "Force 'pure' instructions" OFF) + ++option(GLM_ENABLE_EXPERIMENTAL "Enable experimental GLM_GTX" OFF) ++configure_file(glm/experimental.hpp.in experimental.hpp @ONLY) ++include_directories(${CMAKE_BINARY_DIR}/glm) ++include_directories(${CMAKE_BINARY_DIR}) ++ + if(GLM_TEST_FORCE_PURE) + add_definitions(-DGLM_FORCE_PURE) + +@@ -167,6 +172,7 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) + set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") + if (GLM_INSTALL_ENABLE) + install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) + endif() + + write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion) +diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt +index df9c9ee5..dc5db4bc 100644 +--- a/glm/CMakeLists.txt ++++ b/glm/CMakeLists.txt +@@ -43,6 +43,8 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) + source_group("SIMD Files" FILES ${SIMD_HEADER}) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) ++# make out-of tree builds find experimental.hpp ++include_directories(${CMAKE_BINARY_DIR}/glm) + + if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE) + if(GLM_STATIC_LIBRARY_ENABLE) +diff --git a/glm/experimental.hpp.in b/glm/experimental.hpp.in +new file mode 100644 +index 00000000..bfab5138 +--- /dev/null ++++ b/glm/experimental.hpp.in +@@ -0,0 +1 @@ ++#cmakedefine GLM_ENABLE_EXPERIMENTAL +diff --git a/glm/ext.hpp b/glm/ext.hpp +index d085bfd5..a2948447 100644 +--- a/glm/ext.hpp ++++ b/glm/ext.hpp +@@ -39,6 +39,7 @@ + # include "./gtc/type_aligned.hpp" + #endif + ++#include "experimental.hpp" + #ifdef GLM_ENABLE_EXPERIMENTAL + #include "./gtx/associated_min_max.hpp" + #include "./gtx/bit.hpp" +diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp +index 0c9935f3..d00c2bc4 100644 +--- a/glm/gtx/associated_min_max.hpp ++++ b/glm/gtx/associated_min_max.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp +index 1447fa00..31957083 100644 +--- a/glm/gtx/bit.hpp ++++ b/glm/gtx/bit.hpp +@@ -15,6 +15,7 @@ + // Dependencies + #include "../gtc/bitfield.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp +index 6859bb96..ebd9fe5a 100644 +--- a/glm/gtx/closest_point.hpp ++++ b/glm/gtx/closest_point.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp +index d1e655c3..51416819 100644 +--- a/glm/gtx/color_space.hpp ++++ b/glm/gtx/color_space.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp +index e82cbd8b..7ae71041 100644 +--- a/glm/gtx/color_space_YCoCg.hpp ++++ b/glm/gtx/color_space_YCoCg.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp +index 8081bff7..57a68a8d 100644 +--- a/glm/gtx/common.hpp ++++ b/glm/gtx/common.hpp +@@ -18,6 +18,7 @@ + #include "../vec4.hpp" + #include "../gtc/vec1.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp +index e5b60399..9876669c 100644 +--- a/glm/gtx/compatibility.hpp ++++ b/glm/gtx/compatibility.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtc/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp +index 39bab5d5..4fe0e4e2 100644 +--- a/glm/gtx/component_wise.hpp ++++ b/glm/gtx/component_wise.hpp +@@ -18,6 +18,7 @@ + #include "../detail/setup.hpp" + #include "../detail/qualifier.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp +index c4343e9d..d59fb459 100644 +--- a/glm/gtx/dual_quaternion.hpp ++++ b/glm/gtx/dual_quaternion.hpp +@@ -20,6 +20,7 @@ + #include "../gtc/constants.hpp" + #include "../gtc/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp +index e66e9281..ad5988c1 100644 +--- a/glm/gtx/euler_angles.hpp ++++ b/glm/gtx/euler_angles.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp +index eda4e470..cde6db63 100644 +--- a/glm/gtx/extend.hpp ++++ b/glm/gtx/extend.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp +index 3e767b0c..0bcffcc6 100644 +--- a/glm/gtx/extended_min_max.hpp ++++ b/glm/gtx/extended_min_max.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp +index 2d4918e7..e6d11f0a 100644 +--- a/glm/gtx/fast_exponential.hpp ++++ b/glm/gtx/fast_exponential.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp +index 1e1ec3cf..f758aeef 100644 +--- a/glm/gtx/fast_square_root.hpp ++++ b/glm/gtx/fast_square_root.hpp +@@ -19,6 +19,7 @@ + #include "../exponential.hpp" + #include "../geometric.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp +index 739065fb..f1332958 100644 +--- a/glm/gtx/fast_trigonometry.hpp ++++ b/glm/gtx/fast_trigonometry.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../gtc/constants.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp +index 2713cec0..d4703991 100644 +--- a/glm/gtx/gradient_paint.hpp ++++ b/glm/gtx/gradient_paint.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/optimum_pow.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp +index 1d0d4104..3a52ddcf 100644 +--- a/glm/gtx/handed_coordinate_space.hpp ++++ b/glm/gtx/handed_coordinate_space.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp +index fe8a3efd..92bfc9b2 100644 +--- a/glm/gtx/hash.hpp ++++ b/glm/gtx/hash.hpp +@@ -12,6 +12,7 @@ + + #pragma once + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp +index 96637a13..5d1a16c6 100644 +--- a/glm/gtx/integer.hpp ++++ b/glm/gtx/integer.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtc/integer.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp +index 61e2226a..4895ba93 100644 +--- a/glm/gtx/intersect.hpp ++++ b/glm/gtx/intersect.hpp +@@ -21,6 +21,7 @@ + #include "../gtx/closest_point.hpp" + #include "../gtx/vector_query.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp +index 49a1ec11..ae39cd60 100644 +--- a/glm/gtx/io.hpp ++++ b/glm/gtx/io.hpp +@@ -23,6 +23,7 @@ + #include "../glm.hpp" + #include "../gtx/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp +index e873e356..45b8d53c 100644 +--- a/glm/gtx/log_base.hpp ++++ b/glm/gtx/log_base.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp +index 967743b8..52d6c173 100644 +--- a/glm/gtx/matrix_cross_product.hpp ++++ b/glm/gtx/matrix_cross_product.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp +index b7ec0e83..6793fee2 100644 +--- a/glm/gtx/matrix_decompose.hpp ++++ b/glm/gtx/matrix_decompose.hpp +@@ -20,6 +20,7 @@ + #include "../gtc/quaternion.hpp" + #include "../gtc/matrix_transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp +index e30a7746..79c293be 100644 +--- a/glm/gtx/matrix_factorisation.hpp ++++ b/glm/gtx/matrix_factorisation.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp +index 89c4596c..799983bb 100644 +--- a/glm/gtx/matrix_interpolation.hpp ++++ b/glm/gtx/matrix_interpolation.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp +index 7f264a59..e68467cd 100644 +--- a/glm/gtx/matrix_major_storage.hpp ++++ b/glm/gtx/matrix_major_storage.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp +index bce938bb..1e85bb5e 100644 +--- a/glm/gtx/matrix_operation.hpp ++++ b/glm/gtx/matrix_operation.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp +index 5df5f52f..eec1eec0 100644 +--- a/glm/gtx/matrix_query.hpp ++++ b/glm/gtx/matrix_query.hpp +@@ -18,6 +18,7 @@ + #include "../gtx/vector_query.hpp" + #include <limits> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp +index 239ab9f4..3ca8d2f2 100644 +--- a/glm/gtx/matrix_transform_2d.hpp ++++ b/glm/gtx/matrix_transform_2d.hpp +@@ -17,6 +17,7 @@ + #include "../mat3x3.hpp" + #include "../vec2.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp +index 58562aab..5c7460d5 100644 +--- a/glm/gtx/mixed_product.hpp ++++ b/glm/gtx/mixed_product.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp +index 46474e07..3cf2c3ea 100644 +--- a/glm/gtx/norm.hpp ++++ b/glm/gtx/norm.hpp +@@ -17,6 +17,7 @@ + #include "../geometric.hpp" + #include "../gtx/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp +index 15cec9c2..7bb4c096 100644 +--- a/glm/gtx/normal.hpp ++++ b/glm/gtx/normal.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp +index 86048e70..c6604da4 100644 +--- a/glm/gtx/normalize_dot.hpp ++++ b/glm/gtx/normalize_dot.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../gtx/fast_square_root.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp +index 3732a56c..b48845f7 100644 +--- a/glm/gtx/number_precision.hpp ++++ b/glm/gtx/number_precision.hpp +@@ -18,6 +18,7 @@ + #include "../glm.hpp" + #include "../gtc/type_precision.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp +index eb09f1c3..94a6bbb2 100644 +--- a/glm/gtx/optimum_pow.hpp ++++ b/glm/gtx/optimum_pow.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp +index 2a684ee4..4ff47e53 100644 +--- a/glm/gtx/orthonormalize.hpp ++++ b/glm/gtx/orthonormalize.hpp +@@ -18,6 +18,7 @@ + #include "../mat3x3.hpp" + #include "../geometric.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp +index 35601ac7..17251ebe 100644 +--- a/glm/gtx/perpendicular.hpp ++++ b/glm/gtx/perpendicular.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/projection.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp +index b8421db4..5125215d 100644 +--- a/glm/gtx/polar_coordinates.hpp ++++ b/glm/gtx/polar_coordinates.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp +index 9a24abf9..4d5bf76f 100644 +--- a/glm/gtx/projection.hpp ++++ b/glm/gtx/projection.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../geometric.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp +index c3d99a5c..808ba0fd 100644 +--- a/glm/gtx/quaternion.hpp ++++ b/glm/gtx/quaternion.hpp +@@ -19,6 +19,7 @@ + #include "../gtc/quaternion.hpp" + #include "../gtx/norm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp +index e0ef46af..03c797c3 100644 +--- a/glm/gtx/range.hpp ++++ b/glm/gtx/range.hpp +@@ -15,6 +15,7 @@ + // Dependencies + #include "../detail/setup.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp +index fb34c8cb..0084fec6 100644 +--- a/glm/gtx/raw_data.hpp ++++ b/glm/gtx/raw_data.hpp +@@ -16,6 +16,7 @@ + #include "../detail/setup.hpp" + #include "../detail/type_int.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp +index eee90d6e..82612928 100644 +--- a/glm/gtx/rotate_normalized_axis.hpp ++++ b/glm/gtx/rotate_normalized_axis.hpp +@@ -19,6 +19,7 @@ + #include "../gtc/epsilon.hpp" + #include "../gtc/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp +index c8ace89e..e954b041 100644 +--- a/glm/gtx/rotate_vector.hpp ++++ b/glm/gtx/rotate_vector.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp +index b73edf67..22baa52a 100644 +--- a/glm/gtx/scalar_multiplication.hpp ++++ b/glm/gtx/scalar_multiplication.hpp +@@ -16,6 +16,7 @@ + + #include "../detail/setup.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp +index 7fc8c1cc..f21f3b2b 100644 +--- a/glm/gtx/scalar_relational.hpp ++++ b/glm/gtx/scalar_relational.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp +index f96d7e07..76359cfd 100644 +--- a/glm/gtx/spline.hpp ++++ b/glm/gtx/spline.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtx/optimum_pow.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp +index 55a2f074..92532b9e 100644 +--- a/glm/gtx/std_based_type.hpp ++++ b/glm/gtx/std_based_type.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include <cstdlib> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp +index 4b4e280f..dfcd5085 100644 +--- a/glm/gtx/string_cast.hpp ++++ b/glm/gtx/string_cast.hpp +@@ -24,6 +24,7 @@ + #include <string> + #include <cmath> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp +index 312bf398..7af185f6 100644 +--- a/glm/gtx/texture.hpp ++++ b/glm/gtx/texture.hpp +@@ -17,6 +17,7 @@ + #include "../gtc/integer.hpp" + #include "../gtx/component_wise.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp +index d23b99ce..5a5d9619 100644 +--- a/glm/gtx/transform.hpp ++++ b/glm/gtx/transform.hpp +@@ -19,6 +19,7 @@ + #include "../glm.hpp" + #include "../gtc/matrix_transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp +index 85f5bea4..5d7c83fc 100644 +--- a/glm/gtx/transform2.hpp ++++ b/glm/gtx/transform2.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp +index 6ff9f276..6ad92fad 100644 +--- a/glm/gtx/type_aligned.hpp ++++ b/glm/gtx/type_aligned.hpp +@@ -18,6 +18,7 @@ + // Dependency: + #include "../gtc/type_precision.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp +index 637bbd19..65519cab 100644 +--- a/glm/gtx/type_trait.hpp ++++ b/glm/gtx/type_trait.hpp +@@ -12,6 +12,7 @@ + + #pragma once + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp +index daebac38..13d523dc 100644 +--- a/glm/gtx/vec_swizzle.hpp ++++ b/glm/gtx/vec_swizzle.hpp +@@ -14,6 +14,7 @@ + + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp +index 401a47eb..98c9d110 100644 +--- a/glm/gtx/vector_angle.hpp ++++ b/glm/gtx/vector_angle.hpp +@@ -20,6 +20,7 @@ + #include "../gtx/quaternion.hpp" + #include "../gtx/rotate_vector.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp +index 6560eaa5..5ab1ffda 100644 +--- a/glm/gtx/vector_query.hpp ++++ b/glm/gtx/vector_query.hpp +@@ -17,6 +17,7 @@ + #include <cfloat> + #include <limits> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp +index 2c4b55df..5bf26a33 100644 +--- a/glm/gtx/wrap.hpp ++++ b/glm/gtx/wrap.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtc/vec1.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +-- +2.14.3 + diff --git a/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch b/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch new file mode 100644 index 0000000000..1be3318cc1 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch @@ -0,0 +1,46 @@ +From 7fdd36d7496238e03e43fcc32839f75588116c5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 16 Mar 2018 15:44:48 +0100 +Subject: [PATCH 2/2] glm: install headers only +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Plausibility check in root source path + +$ find glm -type f ! -name '*.hpp' ! -name '*.h' ! -name '*.inl' +glm/detail/glm.cpp +glm/detail/dummy.cpp +glm/experimental.hpp.in +glm/CMakeLists.txt + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +Uptream-Status: Submitted [1] + +[1] https://github.com/g-truc/glm/pull/741 +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd4dd654..113dd735 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -171,7 +171,12 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) + + set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") + if (GLM_INSTALL_ENABLE) +- install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ install(DIRECTORY glm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES_MATCHING ++ PATTERN "*.h" ++ PATTERN "*.hpp" ++ PATTERN "*.inl") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) + endif() + +-- +2.14.3 + diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.8.5.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb index a174f2af09..4e2ee23787 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.8.5.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb @@ -8,14 +8,20 @@ BUGTRACKER = "https://github.com/g-truc/glm/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://copying.txt;md5=4431606d144252143c9c3df384a74cad" +LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790" -SRC_URI = "git://github.com/g-truc/glm;branch=0.9.8" -SRCREV = "6fa203eeb7fbcbb6f620501fad40359c8a456049" +SRC_URI = " \ + git://github.com/g-truc/glm;branch=master \ + file://0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch \ + file://0002-glm-install-headers-only.patch \ +" +SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7" S = "${WORKDIR}/git" inherit cmake +EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON" + FILES_${PN}-dev += "${libdir}/cmake" RDEPENDS_${PN}-dev = "" diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.14.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb index d7290fa6f5..7a691c611d 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.14.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb @@ -16,8 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ " -SRC_URI[libgphoto2.md5sum] = "65acb6cbd2b4f3f46829599f5dabd89c" -SRC_URI[libgphoto2.sha256sum] = "d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274" +SRC_URI[libgphoto2.md5sum] = "084d220d078d28c0c7a3ba13f4476128" +SRC_URI[libgphoto2.sha256sum] = "e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906" inherit autotools pkgconfig gettext lib_package diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 2db91904f8..4094513b29 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -16,7 +16,9 @@ DEPENDS = "gtk+" S = "${WORKDIR}/${BPN}" -inherit autotools binconfig pkgconfig gettext +inherit distro_features_check autotools binconfig pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend () { rm -f ${S}/m4/init.m4 diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb index 457d721699..38dac06e64 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb @@ -12,7 +12,9 @@ PACKAGECONFIG[systemd] = ",,systemd" RDEPENDS_${PN} += "libpng gtk+ libgcrypt" -inherit autotools binconfig pkgconfig +inherit distro_features_check autotools binconfig pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz" SRC_URI[md5sum] = "7f06104d5c009813e95142932c4ddb06" diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch new file mode 100644 index 0000000000..8e3774c1ae --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch @@ -0,0 +1,40 @@ +From 4b84f243a70a8c07f6a38dad3c9411fa707f25c9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Mar 2018 17:08:43 -0800 +Subject: [PATCH] use _nl_msg_cat_cntr only with glibc + +The musl libc provides libintl (similar to glibc) +but does not use the same internals, +so even though we are using the GNU gettext +the libintl included with the libc does not define +_nl_msg_cat_cntr and it does not need to. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/NCi18n.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/NCi18n.h b/src/NCi18n.h +index 165b0e7..bfc4ed7 100644 +--- a/src/NCi18n.h ++++ b/src/NCi18n.h +@@ -59,12 +59,13 @@ inline void setTextdomain( const char * domain ) + bindtextdomain( domain, YSettings::localeDir().c_str() ); + bind_textdomain_codeset( domain, "UTF-8" ); + textdomain( domain ); +- ++#if defined(__GLIBC__) + // Make change known + { + extern int _nl_msg_cat_cntr; + ++_nl_msg_cat_cntr; + } ++#endif + } + + +-- +2.16.2 + diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index e445ee0ccd..578c713012 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -4,12 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui-ncurses.git" +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0001-use-_nl_msg_cat_cntr-only-with-glibc.patch \ + " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" PV = "2.48.3+git${SRCPV}" -SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd" +SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch b/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch new file mode 100644 index 0000000000..c1ba42eeed --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch @@ -0,0 +1,48 @@ +From 1e6d40fec16a94d1a4bd40634405267200b7e969 Mon Sep 17 00:00:00 2001 +From: marxin <mliska@suse.cz> +Date: Tue, 10 Apr 2018 15:21:40 +0200 +Subject: [PATCH] Fix GCC 8 warning: +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static void YDialog::showText(const string&, bool)’: +/home/marxin/Programming/libyui/src/YDialog.cc:690:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=] + catch ( YUIException exception ) + ^~~~~~~~~ +/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static bool YDialog::showRelNotesText()’: +/home/marxin/Programming/libyui/src/YDialog.cc:814:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=] + catch ( YUIException exception ) + ^~~~~~~~~ +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/122] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + src/YDialog.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/YDialog.cc b/src/YDialog.cc +index 92e5031..8ecff90 100644 +--- a/src/YDialog.cc ++++ b/src/YDialog.cc +@@ -687,7 +687,7 @@ YDialog::showText( const std::string & text, bool useRichText ) + dialog->waitForEvent(); + dialog->destroy(); + } +- catch ( YUIException exception ) ++ catch ( YUIException &exception ) + { + // Don't let the application die just because help couldn't be displayed. + +@@ -811,7 +811,7 @@ YDialog::showRelNotesText() + } + dialog->destroy(); + } +- catch ( YUIException exception ) ++ catch ( YUIException &exception ) + { + // Don't let the application die just because RN couldn't be displayed. + +-- +2.17.0 + diff --git a/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch b/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch new file mode 100644 index 0000000000..4269018192 --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch @@ -0,0 +1,687 @@ +From 18562671982ad97549bccb444fdbb5905b6e9335 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Apr 2018 15:06:14 -0700 +Subject: [PATCH] Fix build with clang + +Fix warnings found with clang + +error: class 'YButtonBoxPrivate' was previously declared as a struct [-Werror,-Wmismatched-tags] +| friend class YButtonBoxPrivate; + +YTimezoneSelector.cc:35:9: error: private field 'dummy' is not used [-Werror,-Wunused-private-field] + bool dummy; + ^ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] + + src/YAlignment.h | 2 +- + src/YBarGraph.h | 2 +- + src/YBusyIndicator.h | 2 +- + src/YButtonBox.h | 4 ++-- + src/YCheckBox.h | 2 +- + src/YCheckBoxFrame.h | 2 +- + src/YComboBox.h | 2 +- + src/YCommandLine.h | 2 +- + src/YContextMenu.h | 2 +- + src/YDateField.h | 2 +- + src/YDialog.h | 2 +- + src/YDownloadProgress.h | 2 +- + src/YDumbTab.h | 2 +- + src/YEmpty.h | 2 +- + src/YEventFilter.h | 2 +- + src/YFrame.h | 2 +- + src/YGraph.h | 2 +- + src/YImage.h | 2 +- + src/YInputField.h | 2 +- + src/YIntField.h | 2 +- + src/YLabel.h | 2 +- + src/YLayoutBox.h | 2 +- + src/YLogView.h | 2 +- + src/YMenuButton.h | 2 +- + src/YMultiLineEdit.h | 2 +- + src/YMultiProgressMeter.h | 2 +- + src/YMultiSelectionBox.h | 2 +- + src/YPartitionSplitter.h | 2 +- + src/YProgressBar.h | 2 +- + src/YPushButton.h | 2 +- + src/YRadioButton.h | 2 +- + src/YRadioButtonGroup.h | 2 +- + src/YRichText.h | 2 +- + src/YSelectionBox.h | 2 +- + src/YSelectionWidget.h | 2 +- + src/YSimpleInputField.h | 2 +- + src/YSlider.h | 2 +- + src/YSpacing.h | 2 +- + src/YSquash.h | 2 +- + src/YTable.h | 2 +- + src/YTableHeader.h | 2 +- + src/YTimeField.h | 2 +- + src/YTimezoneSelector.cc | 2 +- + src/YTree.h | 2 +- + src/YUILog.h | 2 +- + src/YWidget.h | 2 +- + src/YWizard.h | 2 +- + 47 files changed, 48 insertions(+), 48 deletions(-) + +diff --git a/src/YAlignment.h b/src/YAlignment.h +index d716c77..7276944 100644 +--- a/src/YAlignment.h ++++ b/src/YAlignment.h +@@ -28,7 +28,7 @@ + #include "YSingleChildContainerWidget.h" + + +-class YAlignmentPrivate; ++struct YAlignmentPrivate; + + /** + * Implementation of all the alignment widgets: +diff --git a/src/YBarGraph.h b/src/YBarGraph.h +index 29f7f26..d7eaad2 100644 +--- a/src/YBarGraph.h ++++ b/src/YBarGraph.h +@@ -29,7 +29,7 @@ + #include "YColor.h" + + +-class YBarGraphPrivate; ++struct YBarGraphPrivate; + class YBarGraphSegment; + + /** +diff --git a/src/YBusyIndicator.h b/src/YBusyIndicator.h +index 9530fa5..75297d8 100644 +--- a/src/YBusyIndicator.h ++++ b/src/YBusyIndicator.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YBusyIndicatorPrivate; ++struct YBusyIndicatorPrivate; + + + /** +diff --git a/src/YButtonBox.h b/src/YButtonBox.h +index 84f8dbb..ca51f57 100644 +--- a/src/YButtonBox.h ++++ b/src/YButtonBox.h +@@ -30,7 +30,7 @@ + #include "YWidget.h" + #include "YPushButton.h" + +-class YButtonBoxPrivate; ++struct YButtonBoxPrivate; + class YPushButton; + + +@@ -147,7 +147,7 @@ struct YButtonBoxMargins + **/ + class YButtonBox : public YWidget + { +- friend class YButtonBoxPrivate; ++ friend struct YButtonBoxPrivate; + + protected: + /** +diff --git a/src/YCheckBox.h b/src/YCheckBox.h +index 793cc77..03f3faa 100644 +--- a/src/YCheckBox.h ++++ b/src/YCheckBox.h +@@ -30,7 +30,7 @@ + #include "YWidget.h" + #include "ImplPtr.h" + +-class YCheckBoxPrivate; ++struct YCheckBoxPrivate; + + enum YCheckBoxState + { +diff --git a/src/YCheckBoxFrame.h b/src/YCheckBoxFrame.h +index 243f1a0..7017110 100644 +--- a/src/YCheckBoxFrame.h ++++ b/src/YCheckBoxFrame.h +@@ -29,7 +29,7 @@ + #include "YSingleChildContainerWidget.h" + #include "ImplPtr.h" + +-class YCheckBoxFramePrivate; ++struct YCheckBoxFramePrivate; + + + /** +diff --git a/src/YComboBox.h b/src/YComboBox.h +index 416359a..ad0e550 100644 +--- a/src/YComboBox.h ++++ b/src/YComboBox.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YComboBoxPrivate; ++struct YComboBoxPrivate; + + + /** +diff --git a/src/YCommandLine.h b/src/YCommandLine.h +index 70cb4fe..f344a3b 100644 +--- a/src/YCommandLine.h ++++ b/src/YCommandLine.h +@@ -28,7 +28,7 @@ + #include <string> + #include "ImplPtr.h" + +-class YCommandLinePrivate; ++struct YCommandLinePrivate; + + + /** +diff --git a/src/YContextMenu.h b/src/YContextMenu.h +index a4acb1c..1253002 100644 +--- a/src/YContextMenu.h ++++ b/src/YContextMenu.h +@@ -29,7 +29,7 @@ + #include "YMenuItem.h" + + class YMenuItem; +-class YContextMenuPrivate; ++struct YContextMenuPrivate; + + + /** +diff --git a/src/YDateField.h b/src/YDateField.h +index e5a468d..6164fba 100644 +--- a/src/YDateField.h ++++ b/src/YDateField.h +@@ -27,7 +27,7 @@ + + #include "YSimpleInputField.h" + +-class YDateFieldPrivate; ++struct YDateFieldPrivate; + + /** + * Input field for entering a date. +diff --git a/src/YDialog.h b/src/YDialog.h +index 66c25c0..371209b 100644 +--- a/src/YDialog.h ++++ b/src/YDialog.h +@@ -32,7 +32,7 @@ + + class YShortcutManager; + class YPushButton; +-class YDialogPrivate; ++struct YDialogPrivate; + class YEvent; + class YEventFilter; + +diff --git a/src/YDownloadProgress.h b/src/YDownloadProgress.h +index c47ec4f..fe09a9d 100644 +--- a/src/YDownloadProgress.h ++++ b/src/YDownloadProgress.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + +-class YDownloadProgressPrivate; ++struct YDownloadProgressPrivate; + + /** + * DownloadProgress: A progress bar that monitors downloading a file by +diff --git a/src/YDumbTab.h b/src/YDumbTab.h +index aec17a3..f8fb250 100644 +--- a/src/YDumbTab.h ++++ b/src/YDumbTab.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YDumbTabPrivate; ++struct YDumbTabPrivate; + + /** + * DumbTab: A very simple tab widget that can display and switch between a +diff --git a/src/YEmpty.h b/src/YEmpty.h +index 9a3cb36..9b88fbc 100644 +--- a/src/YEmpty.h ++++ b/src/YEmpty.h +@@ -29,7 +29,7 @@ + #include "ImplPtr.h" + + +-class YEmptyPrivate; ++struct YEmptyPrivate; + + /** + * A widget with zero size, useful as a placeholder. +diff --git a/src/YEventFilter.h b/src/YEventFilter.h +index 3dc1803..74aa62d 100644 +--- a/src/YEventFilter.h ++++ b/src/YEventFilter.h +@@ -32,7 +32,7 @@ + class YEvent; + class YDialog; + +-class YEventFilterPrivate; ++struct YEventFilterPrivate; + + + /** +diff --git a/src/YFrame.h b/src/YFrame.h +index 111e8ec..4f8c61e 100644 +--- a/src/YFrame.h ++++ b/src/YFrame.h +@@ -29,7 +29,7 @@ + #include "YSingleChildContainerWidget.h" + #include "ImplPtr.h" + +-class YFramePrivate; ++struct YFramePrivate; + + + /** +diff --git a/src/YGraph.h b/src/YGraph.h +index d90d1ae..287d800 100644 +--- a/src/YGraph.h ++++ b/src/YGraph.h +@@ -37,7 +37,7 @@ + * For that reason a lot of functions simply take a void* instead of graph_t*. + */ + +-class YGraphPrivate; ++struct YGraphPrivate; + + /** + * A graph with nodes and edges, rendered with Graphviz. +diff --git a/src/YImage.h b/src/YImage.h +index 17bea21..84eb674 100644 +--- a/src/YImage.h ++++ b/src/YImage.h +@@ -29,7 +29,7 @@ + #include <string> + + +-class YImagePrivate; ++struct YImagePrivate; + + /** + * A picture, possibly animated, loaded from a file. +diff --git a/src/YInputField.h b/src/YInputField.h +index 70641ce..fa29b42 100644 +--- a/src/YInputField.h ++++ b/src/YInputField.h +@@ -28,7 +28,7 @@ + #include <string> + #include "YWidget.h" + +-class YInputFieldPrivate; ++struct YInputFieldPrivate; + + + +diff --git a/src/YIntField.h b/src/YIntField.h +index 9da0537..8ad2949 100644 +--- a/src/YIntField.h ++++ b/src/YIntField.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YIntFieldPrivate; ++struct YIntFieldPrivate; + + + +diff --git a/src/YLabel.h b/src/YLabel.h +index d2fff61..bf06d8b 100644 +--- a/src/YLabel.h ++++ b/src/YLabel.h +@@ -30,7 +30,7 @@ + #include "ImplPtr.h" + + +-class YLabelPrivate; ++struct YLabelPrivate; + + /** + * Implementation of the Label, Heading and OutputField widgets +diff --git a/src/YLayoutBox.h b/src/YLayoutBox.h +index e652a45..070eaff 100644 +--- a/src/YLayoutBox.h ++++ b/src/YLayoutBox.h +@@ -29,7 +29,7 @@ + #include "YWidget.h" + + +-class YLayoutBoxPrivate; ++struct YLayoutBoxPrivate; + + /** + * A vertical or horizontal stacking of widgets, implementing HBox and VBox. +diff --git a/src/YLogView.h b/src/YLogView.h +index 53fb9ee..5b44229 100644 +--- a/src/YLogView.h ++++ b/src/YLogView.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YLogViewPrivate; ++struct YLogViewPrivate; + + + /** +diff --git a/src/YMenuButton.h b/src/YMenuButton.h +index 205e730..5df7efb 100644 +--- a/src/YMenuButton.h ++++ b/src/YMenuButton.h +@@ -29,7 +29,7 @@ + #include "YMenuItem.h" + + class YMenuItem; +-class YMenuButtonPrivate; ++struct YMenuButtonPrivate; + + + /** +diff --git a/src/YMultiLineEdit.h b/src/YMultiLineEdit.h +index c52a6ae..1f792f8 100644 +--- a/src/YMultiLineEdit.h ++++ b/src/YMultiLineEdit.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YMultiLineEditPrivate; ++struct YMultiLineEditPrivate; + + /** + * A multi-line plain-text area +diff --git a/src/YMultiProgressMeter.h b/src/YMultiProgressMeter.h +index 57c758d..f6bec91 100644 +--- a/src/YMultiProgressMeter.h ++++ b/src/YMultiProgressMeter.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + #include <vector> + +-class YMultiProgressMeterPrivate; ++struct YMultiProgressMeterPrivate; + + + /** +diff --git a/src/YMultiSelectionBox.h b/src/YMultiSelectionBox.h +index bbe5a20..f3a2947 100644 +--- a/src/YMultiSelectionBox.h ++++ b/src/YMultiSelectionBox.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YMultiSelectionBoxPrivate; ++struct YMultiSelectionBoxPrivate; + + + /** +diff --git a/src/YPartitionSplitter.h b/src/YPartitionSplitter.h +index 2839bbc..9de1174 100644 +--- a/src/YPartitionSplitter.h ++++ b/src/YPartitionSplitter.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + +-class YPartitionSplitterPrivate; ++struct YPartitionSplitterPrivate; + + + /** +diff --git a/src/YProgressBar.h b/src/YProgressBar.h +index 718352f..baab662 100644 +--- a/src/YProgressBar.h ++++ b/src/YProgressBar.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YProgressBarPrivate; ++struct YProgressBarPrivate; + + + /** +diff --git a/src/YPushButton.h b/src/YPushButton.h +index 5b65c98..e288252 100644 +--- a/src/YPushButton.h ++++ b/src/YPushButton.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YPushButtonPrivate; ++struct YPushButtonPrivate; + + + +diff --git a/src/YRadioButton.h b/src/YRadioButton.h +index 9dc62de..5a7c0dd 100644 +--- a/src/YRadioButton.h ++++ b/src/YRadioButton.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + class YRadioButtonGroup; +-class YRadioButtonPrivate; ++struct YRadioButtonPrivate; + + + /** +diff --git a/src/YRadioButtonGroup.h b/src/YRadioButtonGroup.h +index 063a52e..671a257 100644 +--- a/src/YRadioButtonGroup.h ++++ b/src/YRadioButtonGroup.h +@@ -28,7 +28,7 @@ + #include "YSingleChildContainerWidget.h" + + class YRadioButton; +-class YRadioButtonGroupPrivate; ++struct YRadioButtonGroupPrivate; + + typedef std::list<YRadioButton *> YRadioButtonList; + typedef YRadioButtonList::iterator YRadioButtonListIterator; +diff --git a/src/YRichText.h b/src/YRichText.h +index 149bfb3..86b3f80 100644 +--- a/src/YRichText.h ++++ b/src/YRichText.h +@@ -30,7 +30,7 @@ + #include "ImplPtr.h" + + +-class YRichTextPrivate; ++struct YRichTextPrivate; + + + /** +diff --git a/src/YSelectionBox.h b/src/YSelectionBox.h +index 7fc4fb8..9bbf9f3 100644 +--- a/src/YSelectionBox.h ++++ b/src/YSelectionBox.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YSelectionBoxPrivate; ++struct YSelectionBoxPrivate; + + + /** +diff --git a/src/YSelectionWidget.h b/src/YSelectionWidget.h +index abbdfb4..cf05afd 100644 +--- a/src/YSelectionWidget.h ++++ b/src/YSelectionWidget.h +@@ -29,7 +29,7 @@ + #include "YItem.h" + #include "ImplPtr.h" + +-class YSelectionWidgetPrivate; ++struct YSelectionWidgetPrivate; + + /** + * Base class for various kinds of multi-value widgets. +diff --git a/src/YSimpleInputField.h b/src/YSimpleInputField.h +index 6d926d4..b93fe6b 100644 +--- a/src/YSimpleInputField.h ++++ b/src/YSimpleInputField.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YSimpleInputFieldPrivate; ++struct YSimpleInputFieldPrivate; + + + /** +diff --git a/src/YSlider.h b/src/YSlider.h +index d29f6b8..4bcd7d3 100644 +--- a/src/YSlider.h ++++ b/src/YSlider.h +@@ -27,7 +27,7 @@ + + #include "YIntField.h" + +-class YSliderPrivate; ++struct YSliderPrivate; + + + /** +diff --git a/src/YSpacing.h b/src/YSpacing.h +index e8aafd3..066cd68 100644 +--- a/src/YSpacing.h ++++ b/src/YSpacing.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + #include "ImplPtr.h" + +-class YSpacingPrivate; ++struct YSpacingPrivate; + + + /** +diff --git a/src/YSquash.h b/src/YSquash.h +index 4bd0fb6..3804cc4 100644 +--- a/src/YSquash.h ++++ b/src/YSquash.h +@@ -29,7 +29,7 @@ + #include "ImplPtr.h" + + +-class YSquashPrivate; ++struct YSquashPrivate; + + /** + * HSquash, VSquash HVSquash: reduce child to its preferred size. +diff --git a/src/YTable.h b/src/YTable.h +index 6694f10..469b8ca 100644 +--- a/src/YTable.h ++++ b/src/YTable.h +@@ -30,7 +30,7 @@ + #include "YTableItem.h" + #include "YTableHeader.h" + +-class YTablePrivate; ++struct YTablePrivate; + + + +diff --git a/src/YTableHeader.h b/src/YTableHeader.h +index 70166c2..4ae99b4 100644 +--- a/src/YTableHeader.h ++++ b/src/YTableHeader.h +@@ -31,7 +31,7 @@ + + + +-class YTableHeaderPrivate; ++struct YTableHeaderPrivate; + + /** + * Helper class for YTable for table column properties: +diff --git a/src/YTimeField.h b/src/YTimeField.h +index ab2f9a3..f3a7b94 100644 +--- a/src/YTimeField.h ++++ b/src/YTimeField.h +@@ -27,7 +27,7 @@ + + #include "YSimpleInputField.h" + +-class YTimeFieldPrivate; ++struct YTimeFieldPrivate; + + + /** +diff --git a/src/YTimezoneSelector.cc b/src/YTimezoneSelector.cc +index 9259b64..e2f9b6f 100644 +--- a/src/YTimezoneSelector.cc ++++ b/src/YTimezoneSelector.cc +@@ -32,7 +32,7 @@ + + class YTimezoneSelectorPrivate + { +- bool dummy; ++// bool dummy; + }; + + +diff --git a/src/YTree.h b/src/YTree.h +index 14fa279..70e1364 100644 +--- a/src/YTree.h ++++ b/src/YTree.h +@@ -28,7 +28,7 @@ + #include "YSelectionWidget.h" + + class YTreeItem; +-class YTreePrivate; ++struct YTreePrivate; + + + /** +diff --git a/src/YUILog.h b/src/YUILog.h +index 0890bc5..4a927a7 100644 +--- a/src/YUILog.h ++++ b/src/YUILog.h +@@ -64,7 +64,7 @@ + + + +-class YUILogPrivate; ++struct YUILogPrivate; + + enum YUILogLevel_t + { +diff --git a/src/YWidget.h b/src/YWidget.h +index 5b285d0..636a41b 100644 +--- a/src/YWidget.h ++++ b/src/YWidget.h +@@ -45,7 +45,7 @@ typedef YChildrenManager<YWidget> YWidgetChildrenManager; + typedef YSingleChildManager<YWidget> YSingleWidgetChildManager; + typedef YChildrenRejector<YWidget> YWidgetChildrenRejector; + +-class YWidgetPrivate; ++struct YWidgetPrivate; + + + /** +diff --git a/src/YWizard.h b/src/YWizard.h +index 7671cbf..975b597 100644 +--- a/src/YWizard.h ++++ b/src/YWizard.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + class YMacroRecorder; +-class YWizardPrivate; ++struct YWizardPrivate; + class YPushButton; + class YReplacePoint; + diff --git a/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-oe/recipes-graphics/libyui/libyui_git.bb index 9b1d1d8184..42945288c4 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_git.bb @@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ " SRC_URI = "git://github.com/libyui/libyui.git \ + file://0001-Fix-GCC-8-warning.patch \ + file://0001-Fix-build-with-clang.patch \ " PV = "3.3.3+git" -SRCREV = "f4ccea39f6b6f37eabd0a4df49db5f9bcb3c013a" +SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index b354ae7a1b..c35a0c7238 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -16,9 +16,11 @@ inherit autotools gettext update-alternatives pkgconfig distro_features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -ALTERNATIVE_${PN}-core = "x-window-manager" +ALTERNATIVE_${PN}-core = "x-window-manager x-session-manager" ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" ALTERNATIVE_PRIORITY[x-window-manager] = "10" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session" +ALTERNATIVE_PRIORITY[x-session-manager] = "100" PACKAGECONFIG ??= "" PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" @@ -38,7 +40,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" -FILES_${PN}-core = "${bindir}/openbox ${libdir}/*${SOLIBS}" +FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" FILES_${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/lxpanel \ @@ -46,6 +48,7 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/icons" FILES_${PN}-gnome += " \ + ${bindir}/openbox-gnome-session \ ${datadir}/gnome \ ${datadir}/gnome-session \ " diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb b/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb index 02bb1cc93d..e0f72cd58a 100644 --- a/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb +++ b/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb @@ -12,7 +12,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${ SRC_URI[md5sum] = "874eadd9434613dbacf0272c82c3ac23" SRC_URI[sha256sum] = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = " --disable-documentation " diff --git a/meta-oe/recipes-graphics/qrencode/qrencode_git.bb b/meta-oe/recipes-graphics/qrencode/qrencode_git.bb index 6a159a73a8..f5397750f5 100644 --- a/meta-oe/recipes-graphics/qrencode/qrencode_git.bb +++ b/meta-oe/recipes-graphics/qrencode/qrencode_git.bb @@ -4,9 +4,9 @@ HOMEPAGE = "http://fukuchi.org/works/qrencode/" SECTION = "libs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -PV = "3.4.4+git${SRCPV}" +PV = "4.0.0+git${SRCPV}" -SRCREV = "1b565c7b599029818fc596e7da4371a3083da36c" +SRCREV = "07f3c5d4bf9136711422cc7dbf28aff469da220a" SRC_URI = "git://github.com/fukuchi/libqrencode.git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/slim/slim/Makefile.oe b/meta-oe/recipes-graphics/slim/slim/Makefile.oe deleted file mode 100644 index 2ee69346a9..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/Makefile.oe +++ /dev/null @@ -1,64 +0,0 @@ -# Makefile for slim - OpenEmbedded -####################################################### - - -SLIMLDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -lpthread -CUSTOM=-DHAVE_SHADOW - -USE_PAM=1 -ifdef USE_PAM -SLIMLDFLAGS+= -lpam -CUSTOM+= -DUSE_PAM -endif - -####################################################### - -NAME=slim -VERSION=1.3.2 - -DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \ - -DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\" - -OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \ - panel.o util.o -ifdef USE_PAM -OBJECTS+=PAM.o -endif - -all: slim - -slim: $(OBJECTS) - $(CXX) $(OBJECTS) $(LDFLAGS) $(SLIMLDFLAGS) -o $(NAME) - -.cpp.o: - $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ - -.c.o: - $(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ - -install: slim install-theme - install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim - install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1 - test -e $(DESTDIR)$(CFGDIR)/slim.conf || \ - install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf - -clean: - @rm -f slim *.o - -dist: - @rm -rf $(NAME)-$(VERSION) - @mkdir $(NAME)-$(VERSION) - @cp -r *.cpp *.h *.c Makefile Makefile.* COPYING ChangeLog INSTALL README TODO \ - xinitrc.sample slim.1 THEMES themes slim.conf $(NAME)-$(VERSION) - @rm -rf $(NAME)-$(VERSION)/themes/.svn $(NAME)-$(VERSION)/themes/default/.svn - @tar cvzf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) - @rm -rf $(NAME)-$(VERSION) - - -install-theme: - install -D -m 644 themes/default/slim.theme \ - $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme - install -D -m 644 themes/default/panel.png \ - $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png - install -D -m 644 themes/default/background.jpg \ - $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg diff --git a/meta-oe/recipes-graphics/slim/slim/slim-dynwm b/meta-oe/recipes-graphics/slim/slim/slim-dynwm deleted file mode 100644 index 49c9d47eca..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/slim-dynwm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -update_slim_wmlist -if [ "x$1" = "x-nodaemon" ]; then - shift - exec slim "$@" -else - slim -d "$@" -fi diff --git a/meta-oe/recipes-graphics/slim/slim/slim.pamd b/meta-oe/recipes-graphics/slim/slim/slim.pamd deleted file mode 100644 index 80c34b1dba..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/slim.pamd +++ /dev/null @@ -1,19 +0,0 @@ -# Begin /etc/pam.d/slim - -auth required pam_shells.so -auth include common-auth -auth optional pam_securetty.so -auth optional pam_gnome_keyring.so - -account required pam_nologin.so -account include common-account - -password include common-password - -session include common-session -session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 -session optional pam_lastlog.so nowtmp -session optional pam_mail.so dir=/var/mail standard -session optional pam_gnome_keyring.so auto_start - -# End /etc/pam.d/slim diff --git a/meta-oe/recipes-graphics/slim/slim/slim.service b/meta-oe/recipes-graphics/slim/slim/slim.service deleted file mode 100644 index 341351aad8..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/slim.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon -StandardOutput=syslog - -[Install] -WantedBy=graphical.target diff --git a/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist b/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist deleted file mode 100644 index 0f116537fd..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/perl -w -# -# update_slim_wmlist, based on: -# update_wdm_wmlist, (c) 1998 Marcelo Magalln <mmagallo@debian.org> -# rewriten to use the x-window-manager alternative -# modified to also use the x-session-manager alternative by Arthur Korn -# Copyright 2000 Wichert Akkerman <wakkerma@debian.org> -# Modified to use the freedesktop.org .desktop like kdm and gdm -# -# This script will read the list of installed window managers from -# the freedesktop .desktop files in <etc>/X11/sessions/:<etc>/dm/Sessions/: -# <share>/xsessions/ -# and update the sessions line in /etc/slim.conf. -# BEWARE: It doesn't ask any questions about this. It just does it. It -# takes an optional list of window managers. - -use strict; -use File::DesktopEntry; - -my $wm_list=''; -my %desktop_files; - -unless (@ARGV) { - #my @wm_list = ('default'); - my @wm_list; - foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') { - next unless (opendir DIR, $dir); - my @files; - @files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR); - foreach my $file (@files) { - push @{$desktop_files{$file}}, "$dir/$file"; - } - } - DESKTOP: foreach my $desktop_file (keys(%desktop_files)) { - foreach my $file (@{$desktop_files{$desktop_file}}) { - my $entry = File::DesktopEntry->new_from_file($file); - next DESKTOP if (defined($entry->get_value('Hidden')) - and $entry->get_value('Hidden') eq 'true'); - if ($entry->get_value('Name') =~ /^gnome$/i) { - push (@wm_list, 'gnome'); - } - elsif ($entry->get_value('Name') =~ /^kde$/i) { - push (@wm_list, 'kde'); - } - elsif (defined($entry->get_value('Exec'))) { - push (@wm_list, $entry->get_value('Exec')); - } - else { # not found, go to next file - next; - } - # found, proceed to next destop file - next DESKTOP; - } - } - $wm_list = join (',', sort @wm_list) . ',custom'; -} else { - $wm_list = join (',', sort @ARGV); -} - -open (SLIM_CONFIG_FILE, '</etc/slim.conf') - or die "Can't open /etc/slim.conf for reading: $!"; -open (NEW_SLIM_CONFIG_FILE, '>/etc/slim.conf.new') - or die "Can't open /etc/slim.conf.new for writing: $!"; - -while (<SLIM_CONFIG_FILE>) { - s|^(sessions\s*).*|$1$wm_list|; - print NEW_SLIM_CONFIG_FILE; -} - -close(SLIM_CONFIG_FILE); -close(NEW_SLIM_CONFIG_FILE); - -rename '/etc/slim.conf.new', '/etc/slim.conf' - or die "Can't rename /etc/slim.conf.new: $!"; - -exit 0; diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.1.bb b/meta-oe/recipes-graphics/tslib/tslib_1.1.bb deleted file mode 100644 index e7c48ff6ce..0000000000 --- a/meta-oe/recipes-graphics/tslib/tslib_1.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "An abstraction layer for touchscreen panel events" -DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ -events, as well as a filter stack for the manipulation of those events. \ -Tslib is generally used on embedded devices to provide a common user \ -space interface to touchscreen functionality." -HOMEPAGE = "http://tslib.org/" - -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." -SECTION = "base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" - -SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ - file://ts.conf \ - file://tslib.sh \ -" - -SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" -SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" - -UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -# People should consider using udev's /dev/input/touchscreen0 symlink -# instead of detect-stylus -#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" -RPROVIDES_tslib-conf = "libts-0.0-conf" - -PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" -DEBIAN_NOAUTONAME_tslib-conf = "1" -DEBIAN_NOAUTONAME_tslib-tests = "1" -DEBIAN_NOAUTONAME_tslib-calibrate = "1" - -RDEPENDS_${PN} = "tslib-conf" -RRECOMMENDS_${PN} = "pointercal" - -FILES_${PN}-dev += "${libdir}/ts/*.la" -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.15.bb b/meta-oe/recipes-graphics/tslib/tslib_1.15.bb new file mode 100644 index 0000000000..7ae941a3cf --- /dev/null +++ b/meta-oe/recipes-graphics/tslib/tslib_1.15.bb @@ -0,0 +1,82 @@ +SUMMARY = "An abstraction layer for touchscreen panel events" +DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ +events, as well as a filter stack for the manipulation of those events. \ +Tslib is generally used on embedded devices to provide a common user \ +space interface to touchscreen functionality." +HOMEPAGE = "http://tslib.org/" + +AUTHOR = "Martin Kepplinger <martink@posteo.de>" +SECTION = "base" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ + file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ +" + +SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ + file://ts.conf \ + file://tslib.sh \ +" +SRC_URI[md5sum] = "9ff36788c9ab76a10b58422227b9629e" +SRC_URI[sha256sum] = "7ce48807cab655076d71a1ceef3ed0ab8a25df98074981d4a8fd1477ee5f710c" + +UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" +PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" +PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" +PACKAGECONFIG[median] = "--enable-median,--disable-median" +PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" +PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" +PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" +PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" +PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" +PACKAGECONFIG[input] = "--enable-input,--disable-input" +PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" +PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" +PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" +PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" +PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" +PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" +PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" +PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" +PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" +PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" +PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" +PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" +PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" +PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ +} + +RPROVIDES_tslib-conf = "libts-0.0-conf" + +PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" +DEBIAN_NOAUTONAME_tslib-conf = "1" +DEBIAN_NOAUTONAME_tslib-tests = "1" +DEBIAN_NOAUTONAME_tslib-calibrate = "1" +DEBIAN_NOAUTONAME_tslib-uinput = "1" + +RDEPENDS_${PN} = "tslib-conf" +RRECOMMENDS_${PN} = "pointercal" + +FILES_${PN}-dev += "${libdir}/ts/*.la" +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-uinput += "${bindir}/ts_uinput" + +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ + ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev" diff --git a/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb b/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb index 31f4df4864..b79a562c8e 100644 --- a/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb +++ b/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb @@ -3,7 +3,7 @@ SUMMARY = "Video Decode and Presentation API for UNIX" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" -DEPENDS = "virtual/libx11 libxext dri2proto" +DEPENDS = "virtual/libx11 libxext xorgproto" PV = "1.1.1+git${SRCPV}" @@ -12,7 +12,9 @@ SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" do_install_append() { rm -f ${D}${libdir}/*/*.la diff --git a/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb b/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb index 27a38c1aab..a21dc42a9b 100644 --- a/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb +++ b/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb @@ -7,6 +7,8 @@ SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.b SRC_URI[md5sum] = "09f56978a62854534deacc8aa8ff3031" SRC_URI[sha256sum] = "bc7171a0fa212da866fca2301241630e2009aea8c4ddb75f21b51a31c2e4c581" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb index 3885d613dd..d2afa78f97 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb +++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb @@ -4,8 +4,8 @@ SUMMARY = "a simple program for managing utmp/wtmp entries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" -SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9" -SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c" +SRC_URI[md5sum] = "e475167a892b589da23edf8edf8c942d" +SRC_URI[sha256sum] = "78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1" CFLAGS_append_libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " diff --git a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb index 583a531baf..42bda7ea35 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=350e1b718a56df39cfe8ca9345ea4575" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "9fbf6b174a5138a61738a42e707ad8f5" -SRC_URI[sha256sum] = "5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d" +SRC_URI[md5sum] = "4fa92377e0ddc137cd226a7a87b6b29a" +SRC_URI[sha256sum] = "773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb index 9feed754de..76b76e4b37 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb @@ -6,5 +6,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" -SRC_URI[md5sum] = "6f5711bef8c765857a0887a91476283b" -SRC_URI[sha256sum] = "40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa" +SRC_URI[md5sum] = "5774fd4f518b3f338f2b28f270e04bfc" +SRC_URI[sha256sum] = "89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_330.bb b/meta-oe/recipes-graphics/xorg-app/xterm_330.bb index e3bb0fb6eb..c2feb81070 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_330.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_330.bb @@ -1,6 +1,6 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xproto xextproto libxext libxau libxinerama libxpm ncurses" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=f02ab9ebda87b770ecf711dbb3784a33" @@ -27,3 +27,8 @@ do_configure() { } FILES_${PN} += "/usr/lib/X11" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE_${PN} = "resize" diff --git a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb index 33bd7f03f6..7cb550d276 100644 --- a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb @@ -8,5 +8,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794" -SRC_URI[md5sum] = "3025b152b4f13fdffd0c46d0be587be6" -SRC_URI[sha256sum] = "d6b3a09ccfe750868e26bd2384900ab5ff0d434f7f40cd272a50eda8aaa1f8bd" +SRC_URI[md5sum] = "79972093bb0766fcd0223b2bd6d11932" +SRC_URI[sha256sum] = "99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9" diff --git a/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc index b23096225b..cb6b5ac773 100644 --- a/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc +++ b/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc @@ -7,4 +7,6 @@ XORG_PN = "${BPN}" SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb index d409a18630..fb81e53965 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb @@ -6,8 +6,8 @@ SUMMARY = "X.Org X server -- ATI Radeon video driver" DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ - virtual/libgl xineramaproto libpciaccess" +DEPENDS += "virtual/libx11 libxvmc drm \ + virtual/libgl xorgproto libpciaccess" inherit distro_features_check REQUIRED_DISTRO_FEATURES += "opengl" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb index cd680597cd..182e18fd95 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb @@ -16,6 +16,6 @@ SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri" RDEPENDS_${PN} = "xserver-xorg-module-exa" diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb index 7d26d141f3..3e5c31a05d 100644 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb @@ -3,7 +3,7 @@ require recipes-graphics/xorg-lib/xorg-lib-common.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907" SUMMARY = "XFIXES Extension" -DEPENDS += " xextproto xproto zlib" +DEPENDS += " xorgproto zlib" PE = "1" PR = "r11" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb index 8ba5ac354d..cb1ffcd8cc 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb @@ -1,6 +1,6 @@ require recipes-graphics/xorg-lib/xorg-lib-common.inc SUMMARY = "X Athena Widget Set" -DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxau xmlto-native" +DEPENDS += "xorgproto virtual/libx11 libxext libxt libxmu libxpm libxau xmlto-native" LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch index 29dd71ab03..2bfe85b285 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch @@ -1,7 +1,7 @@ -From 834fa06920f88ceedf752964c8e296c653d541e4 Mon Sep 17 00:00:00 2001 +From f919725918fad2b32504f89a28310fcae4ab0406 Mon Sep 17 00:00:00 2001 From: Yu Ke <ke.yu@intel.com> Date: Wed, 11 Apr 2012 14:26:16 +0200 -Subject: [PATCH 01/12] COPYING: add GPLv2 license file +Subject: [PATCH] COPYING: add GPLv2 license file this is a local file recipe and the license file is missing.In order to pass the license checksum checking, the license file is needed. So @@ -9,9 +9,10 @@ this patch add the GPLv2 license file. Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - COPYING | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 339 insertions(+), 0 deletions(-) + COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 339 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING @@ -359,6 +360,3 @@ index 0000000..d511905 +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch index 26288d6d10..0ed12d106f 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch @@ -1,4 +1,4 @@ -From c92ce6a4b3622874f820b5ec487a2b63f519826c Mon Sep 17 00:00:00 2001 +From 1002a1137b140dad3319bf3206fec5b6c6b74fea Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Thu, 10 Nov 2016 14:33:05 +0200 Subject: [PATCH] Don't install Xsession or Xserver @@ -8,15 +8,16 @@ Xsession scripts and xserver-common from this recipe will still be used as before. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- - Makefile | 1 - - 1 file changed, 1 deletion(-) + Makefile | 2 -- + 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile -index caa5de1..7e36bbc 100644 +index caa5de1..9428205 100644 --- a/Makefile +++ b/Makefile -@@ -20,7 +20,5 @@ install-program: +@@ -20,8 +20,6 @@ install-program: install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit @@ -25,6 +26,3 @@ index caa5de1..7e36bbc 100644 install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common install -m 755 X11/functions $(DESTDIR)/etc/X11/functions install -d $(DESTDIR)/etc/X11/xmodmap --- -2.1.4 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch index 23b5345a13..0be3fa5b39 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch @@ -1,12 +1,13 @@ -From 3d1a1a8273112668927a6c6bb3e361e896f5b229 Mon Sep 17 00:00:00 2001 +From 3b5f431a370054bfc090796e8d55de8c8cea46f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:28:45 +0200 -Subject: [PATCH 02/12] add setdpi Xinit.d script +Subject: [PATCH] add setdpi Xinit.d script Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 92 insertions(+), 0 deletions(-) + X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) create mode 100644 X11/Xinit.d/50setdpi diff --git a/X11/Xinit.d/50setdpi b/X11/Xinit.d/50setdpi @@ -107,6 +108,3 @@ index 0000000..04a2edd + +set_dpi "$SET_SCREEN_DPI" +set_rxvt_font "$SCREEN_DPI" --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch index 7ee8572b8a..53a283feae 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch @@ -1,15 +1,16 @@ -From 0c42e1fb84cc2bfe768bed17f3b979aca868cf64 Mon Sep 17 00:00:00 2001 +From b60e364c35d56a2a3164254d98c9931bfa3feed4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:34:43 +0200 -Subject: [PATCH 06/12] add support for /etc/X11/xserver-system +Subject: [PATCH] add support for /etc/X11/xserver-system Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + X11/xserver-common | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 4c7ed6e..6d8c9df 100644 +index 52655cb..bb7c2ff 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -204,3 +204,8 @@ fi @@ -21,6 +22,3 @@ index 4c7ed6e..6d8c9df 100644 +if [ -e /etc/X11/xserver-system ] ; then + . /etc/X11/xserver-system +fi --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch index 8791226cdd..94a35407af 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch @@ -1,17 +1,18 @@ -From 63e6b9a54e1f12dbf7ddbfe3376fff4c382421a5 Mon Sep 17 00:00:00 2001 +From 492c65a32a4ae44c34580ed8ac5d3f50a155cfef Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:36:02 +0200 -Subject: [PATCH 07/12] use own functions file instead /etc/init.d/functions +Subject: [PATCH] use own functions file instead /etc/init.d/functions * so we don't have to depend on initscripts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - Makefile | 1 + - X11/Xinit.d/11zaurus | 2 +- - X11/Xinit.d/12keymap | 2 +- - X11/functions | 11 +++++++++++ - X11/xserver-common | 2 +- + Makefile | 1 + + X11/Xinit.d/11zaurus | 2 +- + X11/Xinit.d/12keymap | 2 +- + X11/functions | 11 +++++++++++ + X11/xserver-common | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 X11/functions @@ -70,7 +71,7 @@ index 0000000..a1311ad + { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo +} diff --git a/X11/xserver-common b/X11/xserver-common -index 6d8c9df..de92bb7 100644 +index bb7c2ff..d622f2a 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then @@ -82,6 +83,3 @@ index 6d8c9df..de92bb7 100644 fallback_screen_arg() { geom=`fbset | grep geometry` --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch index e35e4a74ab..90d0f25843 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch @@ -1,16 +1,17 @@ -From 0ee7bf87e0c83abc79de3a99dfa3c87dd5c5b229 Mon Sep 17 00:00:00 2001 +From e2abbe110e71a7b4b56564e6b9d58ffa7f34a9e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:37:29 +0200 -Subject: [PATCH 08/12] xserver-common: add dpi and nocursor params for gta01 - and gta02 +Subject: [PATCH] xserver-common: add dpi and nocursor params for gta01 and + gta02 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + X11/xserver-common | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/X11/xserver-common b/X11/xserver-common -index de92bb7..f76fa5f 100644 +index d622f2a..a2c0591 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -133,15 +133,19 @@ else @@ -35,6 +36,3 @@ index de92bb7..f76fa5f 100644 fi ;; "motorola_ezx_platform") --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch index 1a0bde894c..8fb69b3561 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch @@ -1,16 +1,16 @@ -From 6d6caecb7172b9b33e7364564b0e6eabf67b6e8b Mon Sep 17 00:00:00 2001 +From f2d808cea5b9f69158f82e16c06f882a6db10d63 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:40:14 +0200 -Subject: [PATCH 09/12] xserver-common: add support for n900 alias - nokia_rx-51_board +Subject: [PATCH] xserver-common: add support for n900 alias nokia_rx-51_board Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + X11/xserver-common | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index f76fa5f..86ed17f 100644 +index a2c0591..b8c37e6 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -132,6 +132,13 @@ else @@ -27,6 +27,3 @@ index f76fa5f..86ed17f 100644 "gta01" ) DPI="280" if [ "$XSERVER" != "Xorg" ] ; then --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch index 688be40da5..d30c7bbdcb 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch @@ -1,15 +1,16 @@ -From 52003e6b52b1417c1a0e57243d83349addcdacf6 Mon Sep 17 00:00:00 2001 +From a194ba2013f9e58cf73cd39b57be68386e501eda Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:40:44 +0200 -Subject: [PATCH 10/12] xserver-common: add support for nexus S alias herring +Subject: [PATCH] xserver-common: add support for nexus S alias herring Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + X11/xserver-common | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 86ed17f..5c9a6eb 100644 +index b8c37e6..9aa6b24 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -126,6 +126,9 @@ else @@ -22,6 +23,3 @@ index 86ed17f..5c9a6eb 100644 "generic_omap1510/1610/1710") ARGS="$ARGS -screen ${SCREEN_SIZE}" DPI="225" ;; --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch index f80456dfd2..23e17f0988 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch @@ -1,16 +1,16 @@ -From 0ecc978b7d8cb6867646fb2a29523ebef3afa016 Mon Sep 17 00:00:00 2001 +From dfd832b35b6cb4cf2b6f2b51df7b0999f10c8ca1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:41:06 +0200 -Subject: [PATCH 11/12] xserver-common: add support for nexus one alias - mahimahi +Subject: [PATCH] xserver-common: add support for nexus one alias mahimahi Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + X11/xserver-common | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 5c9a6eb..55594fd 100644 +index 9aa6b24..8da926e 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -129,6 +129,9 @@ else @@ -23,6 +23,3 @@ index 5c9a6eb..55594fd 100644 "generic_omap1510/1610/1710") ARGS="$ARGS -screen ${SCREEN_SIZE}" DPI="225" ;; --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch index 54a032973f..5e794f6b31 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch @@ -1,16 +1,16 @@ -From d194f0302582f1ca599f2ea58c15e15f4fd6bdef Mon Sep 17 00:00:00 2001 +From d9e05e53b30c66705852256ff5c603252aa94b2c Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:41:52 +0200 -Subject: [PATCH 12/12] xserver-common: add support for gta04 alias - OpenPhoenux +Subject: [PATCH] xserver-common: add support for gta04 alias OpenPhoenux Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + X11/xserver-common | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 55594fd..434333e 100644 +index 8da926e..d9325dd 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -161,6 +161,14 @@ else @@ -28,6 +28,3 @@ index 55594fd..434333e 100644 "motorola_ezx_platform") ARGS="$ARGS -screen 240x320" DPI="170" ;; --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch index 49321eb428..78d2e40297 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch @@ -1,13 +1,13 @@ -From 176c3bd3d86c223fd44b0f15b62d38526bb3b0d2 Mon Sep 17 00:00:00 2001 +From 57ab521ffc1024f21105ca14be2d041a477942b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 17 Aug 2012 13:00:56 +0200 -Subject: [PATCH 13/13] xserver-common: add support for tuna alias Galaxy - Nexus +Subject: [PATCH] xserver-common: add support for tuna alias Galaxy Nexus Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + X11/xserver-common | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common index d9325dd..017e5ae 100644 @@ -28,6 +28,3 @@ index d9325dd..017e5ae 100644 "motorola_ezx_platform") ARGS="$ARGS -screen 240x320" DPI="170" ;; --- -1.7.8.6 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch index 06df2618bd..a731917003 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch @@ -1,3 +1,4 @@ +From 5236209e30e0f45113e140f0667c8ffcfe621536 Mon Sep 17 00:00:00 2001 From: Javier Viguera <javier.viguera@digi.com> Date: Wed, 26 Nov 2014 09:24:44 +0100 Subject: [PATCH] xserver-common: disable TCP connections @@ -5,12 +6,13 @@ Subject: [PATCH] xserver-common: disable TCP connections Upstream-Status: Inappropriate [configuration] Signed-off-by: Javier Viguera <javier.viguera@digi.com> + --- X11/xserver-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X11/xserver-common b/X11/xserver-common -index 017e5aee1ab0..4dc48c412741 100644 +index 017e5ae..4dc48c4 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -44,7 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg` diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index cc30541844..a5ed21d458 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PR = "r9" # we are using a gpe-style Makefile -inherit gpe +inherit distro_features_check gpe + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14" SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" diff --git a/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh deleted file mode 100644 index fa43617bd2..0000000000 --- a/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - n=1 - while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le 5 ] - do - /usr/bin/xtscal - sleep 1 - n=$(($n+1)) - done -fi diff --git a/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch b/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch deleted file mode 100644 index 1da7717869..0000000000 --- a/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - ---- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000 -+++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000 -@@ -131,9 +131,10 @@ - { - XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2); - -- XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- WIDTH + 1, WIDTH + 1, 0, 360 * 64); -+ XFillRectangle (dpy, crosshair_w, crosshair_gc, -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ WIDTH, WIDTH); - } - - void diff --git a/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch b/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch deleted file mode 100644 index f7b0854c34..0000000000 --- a/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch +++ /dev/null @@ -1,621 +0,0 @@ ---- - Makefile.am | 9 -- - configure.ac | 3 - gpe-dist.am | 12 --- - h3600_ts.h | 216 ----------------------------------------------------------- - main.c | 210 ++------------------------------------------------------- - xtscal.in | 19 ----- - 6 files changed, 14 insertions(+), 455 deletions(-) - -Upstream-Status: Pending - -Index: xtscal-0.6.3/xtscal.in -=================================================================== ---- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,19 +0,0 @@ --#!/bin/sh -- --module_id() { -- # Get model name -- echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` --} -- --case `module_id` in -- "HP IPAQ H3100" | "HP IPAQ H3800" ) -- ARGS="-rotate 90" ;; -- "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE) -- ARGS="-rotate 270" ;; -- # H2200: works without rotation --esac -- --# the things we do for autoconf --prefix=@prefix@ --exec_prefix=@exec_prefix@ --exec @libexecdir@/xtscal.bin $ARGS $* -Index: xtscal-0.6.3/main.c -=================================================================== ---- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100 -+++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100 -@@ -22,12 +22,10 @@ - #include <X11/Xlib.h> - - #include <X11/extensions/Xrender.h> --#include <X11/extensions/Xrandr.h> - #include <X11/Xft/Xft.h> - #include <X11/extensions/xcalibrate.h> - #include <X11/keysym.h> - --#include "h3600_ts.h" - #include "calibrate.h" - - Display *dpy; -@@ -45,15 +43,11 @@ XftColor xftcol; - XftDraw *xftdraw; - XftFont *xftfont; - int screen_x, screen_y; --int ts_fd; - int samples; - Pixmap bg_pixmap; - int flag_debug; --int rotation = 0; - int error_base, event_base; - --int using_xcalibrate; -- - int moving; - - #define CROSSHAIR_SIZE 25 -@@ -63,7 +57,6 @@ int moving; - #define ENOUGH 5 - #define MAX_SAMPLES 40 - --#define RAW_DEVICE "/dev/h3600_tsraw" - #define FONTNAME "sans-10" - - struct point -@@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b) - void - set_calibration (calibration *cal) - { -- TS_CAL tc; -- int xtrans, ytrans, xscale, yscale, xyscale, yxscale; - calibration ocal = *cal; - -- if (using_xcalibrate) -- { - FILE *fp; - if (flag_debug) - printf ("constants are: %d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); -@@ -304,29 +293,6 @@ set_calibration (calibration *cal) - } - fprintf (fp, "%d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); - fclose (fp); -- return; -- } -- -- xtrans = cal->a[0] / cal->a[6]; -- ytrans = cal->a[3] / cal->a[6]; -- xscale = cal->a[1] * 256 / cal->a[6]; -- yscale = cal->a[5] * 256 / cal->a[6]; -- xyscale = cal->a[2] * 256 / cal->a[6]; -- yxscale = cal->a[4] * 256 / cal->a[6]; -- -- tc.xtrans = xtrans; -- tc.ytrans = ytrans; -- tc.xscale = xscale; -- tc.yscale = yscale; -- tc.xyswap = 0; -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } - } - - void -@@ -398,80 +364,13 @@ handle_ts_event (int x, int y, int press - } - - void --read_ts (void) --{ -- TS_EVENT ts_ev; -- int r; -- -- r = read (ts_fd, &ts_ev, sizeof (ts_ev)); -- if (r == sizeof (ts_ev)) -- handle_ts_event (ts_ev.x, ts_ev.y, ts_ev.pressure); --} -- --void --do_cal (char **args) --{ -- TS_CAL tc; -- -- tc.xscale = atoi (args[0]); -- tc.xtrans = atoi (args[1]); -- tc.yscale = atoi (args[2]); -- tc.ytrans = atoi (args[3]); -- tc.xyswap = atoi (args[4]); -- -- if (flag_debug) -- fprintf (stderr, "setting: %d %d %d %d %d\n", -- tc.xtrans, tc.ytrans, tc.xscale, tc.yscale, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } -- -- exit (0); --} -- --void --show_cal (void) --{ -- TS_CAL tc; -- -- if (ioctl (ts_fd, TS_GET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_GET_CAL"); -- exit (1); -- } -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); --} -- --void - usage (const char *name) - { -- fprintf (stderr, "usage: %s -view\n", name); -- fprintf (stderr, " %s [-rotate <0 | 90 | 180 | 270>]\n", name); -- fprintf (stderr, " %s -cal <xs> <xt> <ys> <yt> <xyswap>\n", name); -- -+ fprintf (stderr, "usage: %s [-debug]\n", name); - exit (1); - } - - int --xrr_supported (void) --{ -- int xrr_event_base, xrr_error_base; -- int xrr_major, xrr_minor; -- -- if (XRRQueryExtension (dpy, &xrr_event_base, &xrr_error_base) == False -- || XRRQueryVersion (dpy, &xrr_major, &xrr_minor) == 0 -- || xrr_major != 1 -- || xrr_minor < 1) -- return 0; -- -- return 1; --} -- --int - main (int argc, char *argv[]) - { - XSetWindowAttributes attributes; -@@ -480,31 +379,11 @@ main (int argc, char *argv[]) - int max_fd; - GC bg_gc; - int i; -- int have_xrandr; - - for (i = 1; i < argc; i++) - { -- if (!strcmp (argv[i], "-view")) -- { -- show_cal (); -- exit (0); -- } -- else if (!strcmp (argv[i], "-debug")) -+ if (!strcmp (argv[i], "-debug")) - flag_debug = 1; -- else if (!strcmp (argv[i], "-cal")) -- { -- if (argc > (i + 5)) -- do_cal (argv + i + 1); -- else -- usage (argv[0]); -- } -- else if (!strcmp (argv[i], "-rotate")) -- { -- if (argc > (i + 1)) -- rotation = atoi (argv[++i]); -- else -- usage (argv[0]); -- } - else - usage (argv[0]); - } -@@ -531,48 +410,11 @@ main (int argc, char *argv[]) - fprintf (stderr, "failed to set raw mode: error %d\n", r); - exit (1); - } -- -- using_xcalibrate = 1; -- } -- -- have_xrandr = xrr_supported (); -- if (have_xrandr) -- { -- XRRScreenConfiguration *rr_screen; -- Rotation current_rotation; -- -- if (flag_debug) -- fprintf (stderr, "XRANDR is supported\n"); -- -- rr_screen = XRRGetScreenInfo (dpy, RootWindow (dpy, screen)); -- -- XRRRotations (dpy, screen, ¤t_rotation); -- -- XRRFreeScreenConfigInfo (rr_screen); -- -- if (flag_debug) -- fprintf (stderr, "Current RANDR rotation is %d\n", current_rotation); -- -- switch (current_rotation) -- { -- case RR_Rotate_270: -- rotation += 90; -- case RR_Rotate_180: -- rotation += 90; -- case RR_Rotate_90: -- rotation += 90; -- rotation %= 360; -- case RR_Rotate_0: -- break; -- default: -- fprintf (stderr, "Unknown RANDR rotation: %d\n", current_rotation); -- break; -- } - } - else - { -- if (flag_debug) -- fprintf (stderr, "XRANDR not supported\n"); -+ perror ("XCALIBRATE extension missing"); -+ exit (1); - } - - attributes.override_redirect = flag_debug ? False : True; -@@ -666,45 +508,17 @@ main (int argc, char *argv[]) - - for (i = 0; i < NR_POINTS; i++) - { -- switch (rotation) -- { -- case 0: -- cal.xfb[i] = cal.xscr[i]; -- cal.yfb[i] = cal.yscr[i]; -- break; -- case 90: -- cal.xfb[i] = cal.yscr[i]; -- cal.yfb[i] = screen_x - cal.xscr[i]; -- break; -- case 180: -- cal.xfb[i] = screen_x - cal.xscr[i]; -- cal.yfb[i] = screen_y - cal.yscr[i]; -- break; -- case 270: -- cal.xfb[i] = screen_y - cal.yscr[i]; -- cal.yfb[i] = cal.xscr[i]; -- break; -- } -+ cal.xfb[i] = cal.xscr[i]; -+ cal.yfb[i] = cal.yscr[i]; -+ XCalibrateScreenToCoord (dpy, &cal.xfb[i], &cal.yfb[i]); - - if (flag_debug) -- printf ("rotation %d: (%d,%d) -> (%d,%d)\n", rotation, -+ printf ("rotation conversion: (%d,%d) -> (%d,%d)\n", - cal.xscr[i], cal.yscr[i], cal.xfb[i], cal.yfb[i]); - } - - next_event (); - -- if (!using_xcalibrate) -- { -- ts_fd = open (RAW_DEVICE, O_RDONLY); -- if (ts_fd < 0) -- { -- perror (RAW_DEVICE); -- exit (1); -- } -- } -- -- max_fd = (xfd > ts_fd) ? xfd : ts_fd; -- - for (;;) - { - fd_set fds; -@@ -713,12 +527,8 @@ main (int argc, char *argv[]) - - FD_ZERO (&fds); - FD_SET (xfd, &fds); -- if (ts_fd != -1) -- FD_SET (ts_fd, &fds); - -- select (max_fd + 1, &fds, NULL, NULL, NULL); -- -- if (ts_fd != -1 && FD_ISSET (ts_fd, &fds)) -- read_ts (); -+ select (xfd + 1, &fds, NULL, NULL, NULL); - } - } -+ -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100 -+++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100 -@@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xrandr xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) - - AC_CONFIG_FILES([Makefile]) --AC_CONFIG_FILES([xtscal]) - AC_OUTPUT -Index: xtscal-0.6.3/gpe-dist.am -=================================================================== ---- xtscal-0.6.3.orig/gpe-dist.am 2004-06-02 23:07:13.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,12 +0,0 @@ --CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) -- --dist-upload: dist -- scp $(PACKAGE)-$(VERSION).tar.bz2 $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ -- --tag: -- cvs tag $(CVSTAG) -- --retag: -- cvs tag -F $(CVSTAG) -- --source: tag dist-upload -Index: xtscal-0.6.3/h3600_ts.h -=================================================================== ---- xtscal-0.6.3.orig/h3600_ts.h 2003-07-05 17:27:10.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,216 +0,0 @@ --/* --* --* Driver for the H3600 Touch Screen and other Atmel controlled devices. --* --* Copyright 2000 Compaq Computer Corporation. --* --* Use consistent with the GNU GPL is permitted, --* provided that this copyright notice is --* preserved in its entirety in all copies and derived works. --* --* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, --* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS --* FITNESS FOR ANY PARTICULAR PURPOSE. --* --* Author: Charles Flynn. --* --*/ -- -- --#ifndef __H3600_TS_H__ --#define __H3600_TS_H__ -- --#include <linux/ioctl.h> -- --enum h3600_ts_minor_devices { -- TS_MINOR = 0, -- TSRAW_MINOR = 1, -- KEY_MINOR = 2 --}; -- --typedef struct h3600_ts_calibration { -- int xscale; -- int xtrans; -- int yscale; -- int ytrans; -- int xyswap; --} TS_CAL; -- --typedef struct h3600_ts_event { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_EVENT; -- --/* Deprecated - do not use */ --typedef struct h3600_ts_return { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_RET; -- --enum power_button_mode { -- PBM_SUSPEND = 0, -- PBM_GENERATE_KEYPRESS = 1 --}; -- -- --/* ++++++++++++++ +++++++++++++++++++++++++++++++++++++ */ -- --typedef struct therm_dev { -- short data; --} THERM_DEV; -- --#define H3600_BATT_CHEM_ALKALINE 0x01 --#define H3600_BATT_CHEM_NICD 0x02 --#define H3600_BATT_CHEM_NIMH 0x03 --#define H3600_BATT_CHEM_LION 0x04 --#define H3600_BATT_CHEM_LIPOLY 0x05 --#define H3600_BATT_CHEM_NOT_INSTALLED 0x06 --#define H3600_BATT_CHEM_UNKNOWN 0xff -- --/* These should match the apm_bios.h definitions */ --#define H3600_AC_STATUS_AC_OFFLINE 0x00 --#define H3600_AC_STATUS_AC_ONLINE 0x01 --#define H3600_AC_STATUS_AC_BACKUP 0x02 /* What does this mean? */ --#define H3600_AC_STATUS_AC_UNKNOWN 0xff -- --/* These bitfields are rarely "or'd" together */ --#define H3600_BATT_STATUS_HIGH 0x01 --#define H3600_BATT_STATUS_LOW 0x02 --#define H3600_BATT_STATUS_CRITICAL 0x04 --#define H3600_BATT_STATUS_CHARGING 0x08 --#define H3600_BATT_STATUS_CHARGE_MAIN 0x10 --#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */ --#define H3600_BATT_NOT_INSTALLED 0x20 /* For expansion pack batteries */ --#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged (and connected to AC) */ --#define H3600_BATT_STATUS_NOBATT 0x80 --#define H3600_BATT_STATUS_UNKNOWN 0xff -- --struct battery_data { -- unsigned char chemistry; -- unsigned char status; -- unsigned short voltage; /* Voltage for battery #0; unknown for battery #1 */ -- unsigned short percentage; /* Percentage of full charge */ -- unsigned short life; /* Life remaining in minutes */ --}; -- --struct h3600_battery { -- unsigned char ac_status; -- unsigned char battery_count; /* How many batteries we have */ -- struct battery_data battery[2]; --}; -- --/* -------- EEPROM and SPI Interfaces ---------------*/ -- --#define EEPROM_RD_BUFSIZ 6 /* EEPROM reads are 16 bits */ --#define EEPROM_WR_BUFSIZ 5 /* Allow room for 8bit 'addr' field in buffer*/ --#define SPI_RD_BUFSIZ 16 /* SPI reads are 8 bits */ --#define SPI_WR_BUFSIZ 7 -- --/* The EEPROM is where internal programs are stored on the Amtel. -- You probably don't want to read or write these values */ -- --typedef struct h3600_eeprom_read_request { -- unsigned char addr; /* 8bit Address Offset 0-255 */ -- unsigned char len; /* Number of 16bit words to read 0-128 */ -- unsigned short buff[EEPROM_RD_BUFSIZ]; --} EEPROM_READ; -- --typedef struct h3600_eeprom_write_request { -- unsigned char len; /* used only to compute the number of bytes to send */ -- unsigned char addr; /* 0-128 */ -- unsigned short buff[EEPROM_WR_BUFSIZ]; --} EEPROM_WRITE; -- --/* The SPI bus connects to EEPROMs located on sleeves plugged into -- the iPAQ. You may want to read these values */ -- --typedef struct h3600_spi_read_request { -- unsigned short addr; /* 16bit Address Offset 0-128 */ -- unsigned char len; /* Number of bytes to read */ -- unsigned char buff[SPI_RD_BUFSIZ]; --} SPI_READ; -- --#define SPI_READ_STATUS_BYTE 0xffff /* Use this address to read the status byte */ -- --typedef struct h3600_spi_write_request { -- unsigned short len; /* used only to compute the number of bytes to send */ -- unsigned short addr; /* this 16bit address accesses a single byte */ -- unsigned char buff[SPI_WR_BUFSIZ]; --} SPI_WRITE; -- -- --/* -------- end of EEPROM and SPI Interfaces ---------------*/ -- --/* User space structures for IOCTL calls */ -- --typedef struct h3600_ts_version { -- unsigned char host_version[8]; /* ascii "x.yy" */ -- unsigned char pack_version[8]; /* ascii "x.yy" */ -- unsigned char boot_type; /* TODO ?? */ --} VER_RET; -- --typedef struct h3600_ts_led { -- unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ -- unsigned char TotalTime; /* Units of 5 seconds */ -- unsigned char OnTime; /* units of 100m/s */ -- unsigned char OffTime; /* units of 100m/s */ --} LED_IN; -- --enum flite_mode { -- FLITE_MODE1 = 1, -- FLITE_AUTO_MODE = 1, /* for reference only */ -- FLITE_MANUAL_MODE = 2, /* Use this normally? */ -- FLITE_GET_LIGHT_SENSOR = 3 /* Returns light reading in "brightness" field */ --}; --enum flite_pwr { -- FLITE_PWR_OFF = 0, -- FLITE_PWR_ON = 1 --}; -- --typedef struct h3600_ts_flite { -- unsigned char mode; -- unsigned char pwr; -- unsigned char brightness; --} FLITE_IN; -- --/*************************** Updated "universal" structures *******************/ -- --/* Sets backlight for both H3100 and H3600 models - technically "frontlight" for H3600 */ --struct h3600_ts_backlight { -- enum flite_pwr power; /* 0 = off, 1 = on */ -- unsigned char brightness; /* 0 - 255 */ --}; -- --struct h3600_ts_contrast { /* Only useful on H3100 model */ -- unsigned char contrast; /* 0 - 255 */ --}; -- --/* IOCTL cmds user or kernel space */ -- --/* Use 'f' as magic number */ --#define IOC_H3600_TS_MAGIC 'f' -- --/* TODO: Some of these IOWR values are just plain wrong */ --#define GET_VERSION _IOR(IOC_H3600_TS_MAGIC, 1, struct h3600_ts_version ) --#define READ_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 2, struct h3600_eeprom_read_request) --#define WRITE_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 3, struct h3600_eeprom_write_request) --#define GET_THERMAL _IOR(IOC_H3600_TS_MAGIC, 4, struct therm_dev) --#define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) --#define GET_BATTERY_STATUS _IOR(IOC_H3600_TS_MAGIC, 6, struct h3600_battery) --#define FLITE_ON _IOW(IOC_H3600_TS_MAGIC, 7, struct h3600_ts_flite) --#define READ_SPI _IOWR(IOC_H3600_TS_MAGIC, 8, struct h3600_spi_read_request) --#define WRITE_SPI _IOWR(IOC_H3600_TS_MAGIC, 9, struct h3600_spi_write_request) --#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct h3600_ts_calibration) --#define TS_SET_CAL _IOW(IOC_H3600_TS_MAGIC, 11, struct h3600_ts_calibration) -- --/* New IOCTL interfaces - defined to be more user friendly */ --#define TS_GET_BACKLIGHT _IOR(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_SET_BACKLIGHT _IOW(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_GET_CONTRAST _IOR(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) --#define TS_SET_CONTRAST _IOW(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) -- --#endif -Index: xtscal-0.6.3/Makefile.am -=================================================================== ---- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100 -+++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100 -@@ -1,11 +1,8 @@ --libexec_PROGRAMS = xtscal.bin --bin_SCRIPTS = xtscal -+bin_PROGRAMS = xtscal - --xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h -+xtscal_SOURCES = main.c calibrate.c calibrate.h - --xtscal_bin_LDADD = @XTSCAL_LIBS@ -+xtscal_LDADD = @XTSCAL_LIBS@ - - INCLUDES = @XTSCAL_CFLAGS@ -DNR_POINTS=5 - --include gpe-dist.am -- diff --git a/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch deleted file mode 100644 index 3e4533f785..0000000000 --- a/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified -This patch avoids this linking error: - -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xtscal main.o calibrate.o -lX11 -lXft -lXext -lXcalibrate^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^?: invalid DSO for symbol `XRenderChangePicture' definition^M -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make: *** [xtscal] Error 1 - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Upstream-Status: Pending - -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac -+++ xtscal-0.6.3/configure.ac -@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT diff --git a/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb deleted file mode 100644 index 4bfddf06b5..0000000000 --- a/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Touchscreen calibration utility" - -DESCRIPTION = "Basic touchscreen calibration utility" - -HOMEPAGE = "http://gpe.linuxtogo.org" -BUGTRACKER = "http://bugs.linuxtogo.org" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=10;md5=8721bcb08ae9f24e5fe4c82941873c87" - -SECTION = "x11/base" - -DEPENDS = "virtual/libx11 libxft libxcalibrate" - -PR = "r13" - -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://change-cross.patch \ - file://cleanup.patch \ - file://dso_linking_change_build_fix.patch \ - file://30xTs_Calibrate.sh" - -SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" -SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d/ - install -m 0755 ${WORKDIR}/30xTs_Calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ -} diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb index c963c8ef91..4abd273fae 100644 --- a/meta-oe/recipes-kernel/cpupower/cpupower.bb +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb @@ -3,7 +3,7 @@ DESCRIPTION = "cpupower is a collection of tools to examine and tune power \ saving related features of your processor." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -DEPENDS = "pciutils" +DEPENDS = "pciutils gettext-native" PROVIDES = "virtual/cpupower" inherit kernelsrc kernel-arch diff --git a/meta-oe/recipes-support/ipmitool/ipmitool_1.8.18.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb index 9f73d2799b..9f73d2799b 100644 --- a/meta-oe/recipes-support/ipmitool/ipmitool_1.8.18.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch index 33116b3c06..33116b3c06 100644 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb index 338cafd536..338cafd536 100644 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb +++ b/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-oe/recipes-kernel/kpatch/kpatch.inc new file mode 100644 index 0000000000..b1e73e9542 --- /dev/null +++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc @@ -0,0 +1,49 @@ +SUMMARY = "Linux dynamic kernel patching infrastructure" +DESCRIPTION = "kpatch is a Linux dynamic kernel patching infrastructure which allows you to patch a running kernel without rebooting or restarting any processes." +LICENSE = "GPLv2 & LGPLv2" +DEPENDS = "elfutils bash" + +SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https \ + file://0001-kpatch-build-add-cross-compilation-support.patch \ + file://0002-kpatch-build-allow-overriding-of-distro-name.patch \ + " + +EXTRA_OEMAKE = " \ + PREFIX=${prefix} \ + BINDIR=${D}${bindir} \ + SBINDIR=${D}${sbindir} \ + LIBDIR=${D}${libdir} \ + MANDIR=${D}${mandir}/man1 \ + SYSTEMDDIR=${D}${systemd_system_unitdir} \ + DESTDIR=${D} \ + BUILDMOD=no \ + CC='${CC}' \ + " + +S = "${WORKDIR}/git" + +do_install () { + oe_runmake install +} + +PACKAGES =+ "kpatch-build" +PROVIDES += "kpatch-build" + +COMPATIBLE_HOST = "(x86_64).*-linux" + +RDEPENDS_${PN} = "bash binutils" +RDEPENDS_kpatch-build = "bash glibc-utils" + +FILES_${PN} = " \ + ${sbindir}/kpatch \ + ${systemd_system_unitdir}/kpatch.service \ + ${mandir}/man1/kpatch.1.gz \ + " +FILES_kpatch-build = " \ + ${bindir}/kpatch-build \ + ${libexecdir}/* \ + ${datadir}/kpatch \ + ${mandir}/man1/kpatch-build.1.gz \ + " + +SYSTEMD_SERVICE_${PN} = "kpatch.service" diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch new file mode 100644 index 0000000000..459fb21977 --- /dev/null +++ b/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch @@ -0,0 +1,103 @@ +From a9a80a1f4df65892a0269295ce8a64b06f2ff61d Mon Sep 17 00:00:00 2001 +From: Ruslan Bilovol <rbilovol@cisco.com> +Date: Tue, 19 Dec 2017 15:59:04 +0200 +Subject: [PATCH] kpatch-build: add cross-compilation support + +This patch introduces new option for kpatch-build +script "--cross-compile" which can be used for +specifying cross-complier prefix. +It allows to build live patches not only on +target system, but also on hosts for a target other +than the one on which the compiler is running + +Also removed quotes in exec lines, so it is +possible to pass multy-component strings like +"ccache x86_64-xelinux-linux-" as cross-compiler + +Upstream-Status: Pending + +Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> +--- + kpatch-build/kpatch-build | 13 +++++++++++-- + kpatch-build/kpatch-gcc | 4 ++-- + 2 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build +index 166ecbd..af24cc4 100755 +--- a/kpatch-build/kpatch-build ++++ b/kpatch-build/kpatch-build +@@ -195,7 +195,7 @@ gcc_version_check() { + # gcc --version varies between distributions therefore extract version + # by compiling a test file and compare it to vmlinux's version. + echo 'void main(void) {}' > "$c" +- out="$(gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" ++ out="$(${KPATCH_CROSS_COMPILE}gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" + gccver="$(gcc_version_from_file "$o")" + kgccver="$(gcc_version_from_file "$VMLINUX")" + rm -f "$c" "$o" +@@ -381,12 +381,14 @@ usage() { + echo " -d, --debug Enable 'xtrace' and keep scratch files" >&2 + echo " in <CACHEDIR>/tmp" >&2 + echo " (can be specified multiple times)" >&2 ++ echo " --cross-compile Specify the prefix used for all executables" >&2 ++ echo " used during compilation" >&2 + echo " --skip-cleanup Skip post-build cleanup" >&2 + echo " --skip-gcc-check Skip gcc version matching check" >&2 + echo " (not recommended)" >&2 + } + +-options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" ++options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" + + eval set -- "$options" + +@@ -444,6 +446,10 @@ while [[ $# -gt 0 ]]; do + echo "DEBUG mode enabled" + fi + ;; ++ --cross-compile) ++ KPATCH_CROSS_COMPILE="$2" ++ shift ++ ;; + --skip-cleanup) + echo "Skipping cleanup" + SKIPCLEANUP=1 +@@ -691,6 +697,8 @@ if [[ $DEBUG -ge 4 ]]; then + export KPATCH_GCC_DEBUG=1 + fi + ++export KPATCH_CROSS_COMPILE ++ + echo "Building original kernel" + ./scripts/setlocalversion --save-scmversion || die + make mrproper 2>&1 | logger || die +@@ -840,6 +848,7 @@ cd "$TEMPDIR/patch" || die + KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$MODNAME" \ + KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \ + KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \ ++CROSS_COMPILE="$KPATCH_CROSS_COMPILE" \ + make 2>&1 | logger || die + + if ! "$KPATCH_MODULE"; then +diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc +index 6ba133c..3937948 100755 +--- a/kpatch-build/kpatch-gcc ++++ b/kpatch-build/kpatch-gcc +@@ -8,7 +8,7 @@ TOOLCHAINCMD="$1" + shift + + if [[ -z "$KPATCH_GCC_TEMPDIR" ]]; then +- exec "$TOOLCHAINCMD" "$@" ++ exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "$@" + fi + + declare -a args=("$@") +@@ -80,4 +80,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then + done + fi + +-exec "$TOOLCHAINCMD" "${args[@]}" ++exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "${args[@]}" +-- +1.9.1 + diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch new file mode 100644 index 0000000000..a9d8a7f2c5 --- /dev/null +++ b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch @@ -0,0 +1,62 @@ +From d418d716dae1e2a05131dfb42a19a4da2fc8a85d Mon Sep 17 00:00:00 2001 +From: Ruslan Bilovol <rbilovol@cisco.com> +Date: Tue, 2 Jan 2018 14:50:03 +0200 +Subject: [PATCH] kpatch-build: allow overriding of distro name + +It is sometimes useful to have ability to override +distro name, for example during cross-compilation +build when livepatch modules will be ran on the +target which differs from host. + +This patch adds a new --distro option which +implements all needed functionality + +Upstream-Status: Pending + +Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> +--- + kpatch-build/kpatch-build | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build +index af24cc4..4f9f78d 100755 +--- a/kpatch-build/kpatch-build ++++ b/kpatch-build/kpatch-build +@@ -383,12 +383,13 @@ usage() { + echo " (can be specified multiple times)" >&2 + echo " --cross-compile Specify the prefix used for all executables" >&2 + echo " used during compilation" >&2 ++ echo " --distro Override distro name" >&2 + echo " --skip-cleanup Skip post-build cleanup" >&2 + echo " --skip-gcc-check Skip gcc version matching check" >&2 + echo " (not recommended)" >&2 + } + +-options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" ++options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,distro:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" + + eval set -- "$options" + +@@ -450,6 +451,10 @@ while [[ $# -gt 0 ]]; do + KPATCH_CROSS_COMPILE="$2" + shift + ;; ++ --distro) ++ DISTRO="$2" ++ shift ++ ;; + --skip-cleanup) + echo "Skipping cleanup" + SKIPCLEANUP=1 +@@ -526,7 +531,7 @@ fi + # Don't check external file. + # shellcheck disable=SC1091 + source /etc/os-release +-DISTRO="$ID" ++DISTRO="${DISTRO:-${ID}}" + if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then + [[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux" + [[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed" +-- +1.9.1 + diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb new file mode 100644 index 0000000000..e495e2882c --- /dev/null +++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb @@ -0,0 +1,11 @@ +require kpatch.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "db6efbb8c7e90d2b761272cf563047119072768f" + +PV = "0.5.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc index e200127718..9f14370cd8 100644 --- a/meta-oe/recipes-kernel/linux/linux.inc +++ b/meta-oe/recipes-kernel/linux/linux.inc @@ -16,7 +16,7 @@ CMDLINE_DEBUG ?= "loglevel=3" # Kernel bootlogo is distro-specific (default is OE logo). # Logo resolution (qvga, vga, ...) is machine-specific. -LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}' +LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}' # To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar # to your kernel recipe, and then structure your logos for each resolution # accordingly. diff --git a/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init b/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init index 90ef7fa373..9c96e3156a 100644 --- a/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init +++ b/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init @@ -22,7 +22,7 @@ case "$1" in start) - echo "|/usr/bin/minicoredumper %p %u %g %s %t %h %e" > /proc/sys/kernel/core_pattern + echo "|/usr/sbin/minicoredumper %p %u %g %s %t %h %e" > /proc/sys/kernel/core_pattern ;; stop) echo "core" > /proc/sys/kernel/core_pattern diff --git a/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service b/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service index 851b54ccc1..45d098f293 100644 --- a/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service +++ b/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service @@ -4,7 +4,7 @@ Description=Enable minicoredumper. [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/bin/sh -c '/bin/echo "|/usr/bin/minicoredumper %%p %%u %%g %%s %%t %%h %%e" > /proc/sys/kernel/core_pattern' +ExecStart=/bin/sh -c '/bin/echo "|/usr/sbin/minicoredumper %%p %%u %%g %%s %%t %%h %%e" > /proc/sys/kernel/core_pattern' ExecStop=/bin/sh -c '/bin/echo "core" > /proc/sys/kernel/core_pattern' [Install] diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index 1858e102d8..0d3c66b07a 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -38,4 +38,8 @@ do_install_append() { install -m 0644 ${WORKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper + + # correct path of minicoredumper + sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper + sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${systemd_system_unitdir}/minicoredumper.service } diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch index a053e4c604..5299945e19 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch @@ -1,7 +1,7 @@ -Index: alsa-oss-1.0.15/alsa/stdioemu.c +Index: alsa-oss-1.0.28/alsa/stdioemu.c =================================================================== ---- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200 +--- alsa-oss-1.0.28.orig/alsa/stdioemu.c ++++ alsa-oss-1.0.28/alsa/stdioemu.c @@ -37,7 +37,9 @@ #endif @@ -12,7 +12,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c struct fd_cookie { int fd; -@@ -99,7 +101,11 @@ +@@ -99,7 +101,11 @@ static FILE *fake_fopen(const char *path if (open_mode && fdc->fd > 0) { result = fopencookie (fdc,"w", fns); @@ -24,11 +24,11 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c } return result; } -Index: alsa-oss-1.0.15/configure.in +Index: alsa-oss-1.0.28/configure.ac =================================================================== ---- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200 -@@ -33,6 +33,12 @@ +--- alsa-oss-1.0.28.orig/configure.ac ++++ alsa-oss-1.0.28/configure.ac +@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then LIBS="$OLD_LIBS" fi diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb index 8966dbbc1a..0c4a9f5456 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb @@ -3,11 +3,12 @@ SECTION = "libs/multimedia" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "alsa-lib" -PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ file://libio.patch \ " +SRC_URI[md5sum] = "91f57e8cee1ad4cc956caa8b62ac5d43" +SRC_URI[sha256sum] = "3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5" inherit autotools @@ -17,6 +18,3 @@ do_configure_prepend () { touch NEWS README AUTHORS ChangeLog sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in } - -SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" -SRC_URI[sha256sum] = "8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca" diff --git a/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch b/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch index 6c7f3bd30d..130f3c2290 100644 --- a/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch +++ b/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch @@ -1,9 +1,10 @@ -From a860fe0796c43e35eac9783140fcb563cab9f55a Mon Sep 17 00:00:00 2001 +From 945df2da87a412758ceab4ac5711abbb269a47c1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 8 Jun 2017 23:09:51 -0700 -Subject: [PATCH 1/3] audio_alsa09.c: alsa drain fix +Subject: [PATCH] audio_alsa09.c: alsa drain fix Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- audio_alsa09.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,6 +22,3 @@ index 534e3db..d9450e6 100644 if (alsadbg) print_state(); --- -2.13.1 - diff --git a/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch b/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch index 337546abe9..10a6ba03ae 100644 --- a/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch +++ b/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch @@ -1,11 +1,12 @@ -From 1fbee6e96384f340b816e221fe1c2f3ff0b487bf Mon Sep 17 00:00:00 2001 +From e218d5a0a545ebb9623d62da5cfca478f9c90fce Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 8 Jun 2017 23:11:31 -0700 -Subject: [PATCH 2/3] Undefine open64 and fopen64 +Subject: [PATCH] Undefine open64 and fopen64 Since the signatures do not match with libc Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- esddsp.c | 2 ++ 1 file changed, 2 insertions(+) @@ -30,6 +31,3 @@ index d3c6ea9..17b5949 100644 FILE * fopen64 (const char *path, const char *mode) { --- -2.13.1 - diff --git a/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch b/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch index 62c880d9d0..83365b4e6f 100644 --- a/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch +++ b/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch @@ -1,12 +1,13 @@ -From 979a02d9ec9c28686021cd2b49ca55d2195c9dce Mon Sep 17 00:00:00 2001 +From 89c62db54716d514e639f9e1bfd3c1f7d82641dd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 8 Jun 2017 23:12:36 -0700 -Subject: [PATCH 3/3] Use -I=<path> in configure +Subject: [PATCH] Use -I=<path> in configure This helps to use proper sysroot in cross build environment Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -33,6 +34,3 @@ index 5645dce..d374cda 100644 SOUND_LIBS=-lmme esac fi --- -2.13.1 - diff --git a/meta-oe/recipes-multimedia/esound/esound/no-docs.patch b/meta-oe/recipes-multimedia/esound/esound/no-docs.patch index fc69f1a038..8a546e6db1 100644 --- a/meta-oe/recipes-multimedia/esound/esound/no-docs.patch +++ b/meta-oe/recipes-multimedia/esound/esound/no-docs.patch @@ -1,11 +1,19 @@ -Index: esound-0.2.36/Makefile.am -=================================================================== ---- esound-0.2.36.orig/Makefile.am -+++ esound-0.2.36/Makefile.am +From bfcaa9bdc70440db96f10afc0c2a792870f75acb Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Fri, 3 Jun 2011 19:39:02 +0200 + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 08c4c94..ede9d26 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = docs +SUBDIRS = - ACLOCAL_FLAGS = -I m4 + ACLOCAL_AMFLAGS = -I m4 diff --git a/meta-oe/recipes-multimedia/libass/libass_0.13.6.bb b/meta-oe/recipes-multimedia/libass/libass_0.13.6.bb deleted file mode 100644 index 40ac0f8119..0000000000 --- a/meta-oe/recipes-multimedia/libass/libass_0.13.6.bb +++ /dev/null @@ -1,4 +0,0 @@ -require recipes-multimedia/${BPN}/${BPN}.inc - -SRC_URI[md5sum] = "daa6cfca437c0776af5f79750cdd9b4e" -SRC_URI[sha256sum] = "f8a874d104e3e72e2cc057e5a1710c650b10367486845a26e5ff28ed7a912c2d" diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb index 4bc3db062a..3454a5c270 100644 --- a/meta-oe/recipes-multimedia/libass/libass.inc +++ b/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" DEPENDS = "enca fontconfig freetype libpng fribidi" -SRC_URI = "https://github.com/libass/libass/releases/download/${PV}/libass-${PV}.tar.xz" +SRC_URI = "git://github.com/libass/libass.git" +SRCREV = "73284b676b12b47e17af2ef1b430527299e10c17" +S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_0.93.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb index 99e6a84bca..6bf64d6636 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_0.93.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb @@ -5,8 +5,9 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "d154476feaac5a7b5f180e83eaf3d689" -SRC_URI[sha256sum] = "4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975" + +SRC_URI[md5sum] = "0cb25905113b930e4539d2f4eb6574b0" +SRC_URI[sha256sum] = "1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958" inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb index a24f5e30b6..dd6789dc01 100644 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb @@ -50,3 +50,5 @@ python () { #| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' #| make[2]: *** [celt/celt.lo] Error 1 ARM_INSTRUCTION_SET = "arm" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb index 8276b446dc..718f3f5fde 100644 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb +++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb @@ -2,12 +2,12 @@ SUMMARY = "Simple DirectMedia Layer mixer library V2" SECTION = "libs" DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=29d8bc7c38aa44b1cf3a633a46589917" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=95e0c3cf63f71b950911e698a54b7fc5" SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" -SRC_URI[md5sum] = "c6c4f556d4415871f526248f5c9a627d" -SRC_URI[sha256sum] = "5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f" +SRC_URI[md5sum] = "aaa0551393993c14a13f72b339c0ed6c" +SRC_URI[sha256sum] = "4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb" S = "${WORKDIR}/SDL2_mixer-${PV}" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index 44d92a0988..de78de27f0 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -16,7 +16,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ - http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=${BPN}-${PV} \ " SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab" SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46" @@ -64,9 +64,10 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -do_configure_prepend () { - ln -sf waf-1.8.12 ${S}/waf +adjust_waf_perms() { chmod +x ${S}/waf } +do_patch[postfuncs] += "adjust_waf_perms" + FILES_${PN} += "${datadir}/icons" diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch index 74130949f6..eb294b3fb4 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch @@ -1,4 +1,4 @@ -From 2d6bfa75b2e16b4d764f1bf00bb902fb4b5e507b Mon Sep 17 00:00:00 2001 +From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 27 Feb 2015 21:55:36 +0000 Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and @@ -10,6 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Conflicts: utils/media-ctl/Makefile.am + --- utils/media-ctl/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) @@ -40,6 +41,3 @@ index ee7dcc9..d11fa2e 100644 mediactl_includedir=$(includedir)/mediactl noinst_HEADERS = mediactl.h v4l2subdev.h --- -2.9.3 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch index 54161f90fc..12609d30e2 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch @@ -1,7 +1,7 @@ -From 806822f5acb756d5acda0f9063c84b28b38b3ffb Mon Sep 17 00:00:00 2001 +From 75372b8088c20474497b79ec6cf1e99f2d17f56d Mon Sep 17 00:00:00 2001 From: Ismo Puustinen <ismo.puustinen@intel.com> Date: Mon, 3 Apr 2017 13:23:38 +0300 -Subject: [PATCH v4l-utils] buildsystem: do not assume building in source tree. +Subject: [PATCH] buildsystem: do not assume building in source tree. Use $(top_srcdir) as reference for include paths and buildtime scripts. Otherwise compilation outside of project root directory will fail @@ -12,6 +12,7 @@ To reproduce: mkdir b; cd b; ../configure; make Upstream-status: Accepted [https://git.linuxtv.org//v4l-utils.git/commit/?id=bd98c9a99bffc8d44c54859345e4dfee0ada4275] Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> + --- utils/cec-compliance/Makefile.am | 2 +- utils/cec-ctl/Makefile.am | 2 +- @@ -22,7 +23,7 @@ Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am -index ec5de51..8331aa0 100644 +index f05fe6c..f7d1535 100644 --- a/utils/cec-compliance/Makefile.am +++ b/utils/cec-compliance/Makefile.am @@ -7,7 +7,7 @@ cec_compliance_LDFLAGS = -lrt @@ -35,10 +36,10 @@ index ec5de51..8331aa0 100644 cec-compliance.cpp: version.h diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am -index 0a7ef22..6afb6c9 100644 +index 4a6eae5..570a070 100644 --- a/utils/cec-ctl/Makefile.am +++ b/utils/cec-ctl/Makefile.am -@@ -7,7 +7,7 @@ cec_ctl_LDFLAGS = -lrt +@@ -6,7 +6,7 @@ cec_ctl_SOURCES = cec-ctl.cpp cec-ctl.cpp: cec-ctl-gen.h cec-ctl-gen.h: msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h @@ -48,7 +49,7 @@ index 0a7ef22..6afb6c9 100644 clean-local: -rm -vf cec-ctl-gen.h diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am -index 538edb2..fdbf3d9 100644 +index d8ad292..e3553eb 100644 --- a/utils/cec-follower/Makefile.am +++ b/utils/cec-follower/Makefile.am @@ -7,12 +7,12 @@ cec_follower_LDFLAGS = -lrt @@ -65,7 +66,7 @@ index 538edb2..fdbf3d9 100644 + $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ version.h: - @if git rev-parse HEAD >/dev/null 2>&1; then \ + @if git show-ref -s HEAD >/dev/null 2>&1; then \ diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am index fd58486..ccd1a2a 100644 --- a/utils/qv4l2/Makefile.am @@ -80,7 +81,7 @@ index fd58486..ccd1a2a 100644 if WITH_QTGL qv4l2_CPPFLAGS += $(QTGL_CFLAGS) diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am -index 03db8df..18b9892 100644 +index c2b5919..fb8d12e 100644 --- a/utils/v4l2-compliance/Makefile.am +++ b/utils/v4l2-compliance/Makefile.am @@ -5,7 +5,7 @@ DEFS := @@ -105,6 +106,3 @@ index 955647d..825e53f 100644 if WITH_V4L2_CTL_LIBV4L v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread --- -2.9.3 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch index f1e11da3fd..82fc3e120f 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch @@ -1,7 +1,7 @@ -From e60aea50e41ae8a17672beb5859beecb66e7a305 Mon Sep 17 00:00:00 2001 +From b2efcc20617d6317f74c4acb2a6af5b765f20b34 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 14 Jul 2017 13:11:25 -0700 -Subject: [PATCH 1/3] ir-ctl: Define TEMP_FAILURE_RETRY if undefined +Subject: [PATCH] ir-ctl: Define TEMP_FAILURE_RETRY if undefined use strndup() instead of strndupa() which is not universally available in C libraries @@ -9,6 +9,7 @@ universally available in C libraries Taken from AlpineLinux Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- utils/ir-ctl/ir-ctl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) @@ -50,6 +51,3 @@ index bc58cee..1a44011 100644 if (!strtoscancode(p + 1, &scancode)) { fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1); --- -2.13.3 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch index 2fb4057ec0..a779a307d7 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch @@ -1,11 +1,12 @@ -From b3acc4c6407f9553f32582a9aee6a11b5fcd1d8a Mon Sep 17 00:00:00 2001 +From 49f865a17d62db7bbd333a9b83fadeea55686e35 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 14 Jul 2017 13:17:19 -0700 -Subject: [PATCH 2/3] contrib/test: Link mc_nextgen_test with libargp if needed +Subject: [PATCH] contrib/test: Link mc_nextgen_test with libargp if needed musl depends on external argp implementation e.g. Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- contrib/test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -23,6 +24,3 @@ index 4641e21..e47b948 100644 ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h --- -2.13.3 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch index 0a986ae5d8..5b84af2c32 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch @@ -1,7 +1,7 @@ -From d04aa6866cbea57c4a81b033cd60586a9436ac6b Mon Sep 17 00:00:00 2001 +From f7a4b79b3323534460a63b3e6c58ebaf06adf207 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 14 Jul 2017 13:20:05 -0700 -Subject: [PATCH 3/3] v4l2-ctl: Do not use getsubopt +Subject: [PATCH] v4l2-ctl: Do not use getsubopt POSIX says that behavior when subopts list is empty is undefined. musl libs will set value to NULL which leads to crash. @@ -9,6 +9,7 @@ musl libs will set value to NULL which leads to crash. Taken from AlpineLinux Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- utils/v4l2-ctl/v4l2-ctl-common.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) @@ -44,6 +45,3 @@ index 3ea6cd3..291fb3e 100644 } void common_cmd(int ch, char *optarg) --- -2.13.3 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch index c610e7e488..55a5cdc8a1 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch @@ -1,9 +1,17 @@ -Index: v4l-utils-1.6.2/utils/media-ctl/Makefile.am -=================================================================== ---- v4l-utils-1.6.2.orig/utils/media-ctl/Makefile.am -+++ v4l-utils-1.6.2/utils/media-ctl/Makefile.am -@@ -4,8 +4,8 @@ libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS - libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) +From b82e509c10659a4647961a6da3adf4d285dea2dd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Mar 2015 22:25:07 +0000 + +--- + utils/media-ctl/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am +index 7c520a2..748353d 100644 +--- a/utils/media-ctl/Makefile.am ++++ b/utils/media-ctl/Makefile.am +@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) + nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) libv4l2subdev_la_SOURCES = libv4l2subdev.c libv4l2subdev_la_LIBADD = libmediactl.la -mediactl_includedir=$(includedir)/mediactl diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch index 34fb3cf238..9fcf61165b 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch @@ -1,8 +1,16 @@ -Index: v4l-utils-1.6.2/utils/media-ctl/Makefile.am -=================================================================== ---- v4l-utils-1.6.2.orig/utils/media-ctl/Makefile.am -+++ v4l-utils-1.6.2/utils/media-ctl/Makefile.am -@@ -7,6 +7,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la +From 480c04ac6a9d11bfef9d4aca073052fdcee4fdea Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Mar 2015 22:25:07 +0000 + +--- + utils/media-ctl/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am +index d11fa2e..7c520a2 100644 +--- a/utils/media-ctl/Makefile.am ++++ b/utils/media-ctl/Makefile.am +@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la mediactl_includedir=$(includedir)/mediactl noinst_HEADERS = mediactl.h v4l2subdev.h diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index c7a6e51e76..6ad7f2b478 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -1,19 +1,28 @@ -Upstream: not yet +From dc0a5c3d2dd4e79d12a150a246a95c4dc88326f1 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 16 Aug 2011 16:04:35 +0200 +Subject: [PATCH] Upstream: not yet Fix configure to accept "--prefix=" (a blank prefix). ---- libvpx-0.9.1/build/make/configure.sh.orig 2010-06-17 09:08:56.000000000 -0400 -+++ libvpx-0.9.1/build/make/configure.sh 2010-09-23 14:27:48.000000000 -0400 -@@ -444,6 +444,8 @@ +--- + build/make/configure.sh | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 007e020..04d5cbf 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -581,6 +581,8 @@ process_common_cmdline() { ;; - --prefix=*) + --prefix=*) prefix="${optval}" + # Distinguish between "prefix not set" and "prefix set to ''" + prefixset=1 ;; - --libdir=*) + --libdir=*) libdir="${optval}" -@@ -587,13 +587,23 @@ process_cmdline() { +@@ -614,13 +616,23 @@ process_cmdline() { } post_process_common_cmdline() { diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb index 1d531aec70..b31d8eb4ef 100644 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb @@ -8,9 +8,9 @@ SECTION = "console/network" LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd" -DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native gobject-introspection-native" +DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc gobject-introspection SRC_URI = " \ http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-${PV}.tar.xz \ diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch index 2ea3226a48..1fa27c210d 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch @@ -39,36 +39,42 @@ Signed-off-by: Peter A. Bigot <pab@pabigot.com> 1 file changed, 9 insertions(+) diff --git a/SConstruct b/SConstruct -index 6c93311..cde8b3d 100644 +index 3318bb48..e1c4f963 100644 --- a/SConstruct +++ b/SConstruct -@@ -1148,6 +1148,12 @@ else: - basecflags += ' -coverage' - ldflags += ' -coverage' - ldshared += ' -coverage' -+ -+ if env['sysroot']: -+ print "Prefixing includepy '%s' with sysroot prefix" % includepy -+ includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy)) -+ print "'%s'" % includepy -+ - # in case CC/CXX was set to the scan-build wrapper, - # ensure that we build the python modules with scan-build, too - if env['CC'] is None or env['CC'].find('scan-build') < 0: -@@ -1408,11 +1414,14 @@ if not env['python']: +@@ -934,7 +934,7 @@ else: + + # Set up configuration for target Python + +-PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()' ++PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib(plat_specific=1)' + + PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', + 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] +@@ -1364,7 +1364,7 @@ else: + LINK=ldshared, + SHLIBPREFIX="", + SHLIBSUFFIX=python_config['SO'], +- CPPPATH=[python_config['INCLUDEPY']], ++ CPPPATH=[os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], python_config['INCLUDEPY']))] if env['sysroot'] else [python_config['INCLUDEPY']], + CPPFLAGS=python_config['OPT'], + CFLAGS=python_config['BASECFLAGS'], + CXXFLAGS=python_config['BASECFLAGS']) +@@ -1662,12 +1662,15 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] + if not env['python']: python_install = [] else: - python_lib_dir = env['python_libdir'] -+ python_lib_dir = python_lib_dir.replace(env['sysroot'], '') - python_module_dir = python_lib_dir + os.sep + 'gps' - python_extensions_install = python_env.Install( DESTDIR + python_module_dir, - python_built_extensions) - if not env['debug'] and not env['profiling'] and not env['nostrip'] and not sys.platform.startswith('darwin'): ++ python_libdir = python_libdir.replace(env['sysroot'], '') + python_module_dir = python_libdir + os.sep + 'gps' + python_extensions_install = python_env.Install(DESTDIR + python_module_dir, + python_built_extensions) + if ((not env['debug'] and not env['profiling'] + and not env['nostrip'] and not sys.platform.startswith('darwin'))): python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') + env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (python_lib_dir, )) ++ % (python_libdir, )) - python_modules_install = python_env.Install( DESTDIR + python_module_dir, + python_modules_install = python_env.Install(DESTDIR + python_module_dir, python_modules) -- 2.1.0 diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch index f496b5e7d1..e91e4e9fbd 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch @@ -19,10 +19,10 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> 1 file changed, 1 insertion(+) diff --git a/gpsmon.c b/gpsmon.c -index ead84d0..f205cb1 100644 +index 89c43ee2..5cc0dabd 100644 --- a/gpsmon.c +++ b/gpsmon.c -@@ -20,6 +20,7 @@ +@@ -24,6 +24,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/select.h> diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch index 8527f0db39..ba3d205d10 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch @@ -29,23 +29,22 @@ Signed-off-by: Peter A. Bigot <pab@pabigot.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct -index 0e518e7..c01a71b 100644 +index 3318bb48..a5bb756d 100644 --- a/SConstruct +++ b/SConstruct -@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); +@@ -889,11 +889,11 @@ else: - manbuilder = mangenerator = htmlbuilder = None + manbuilder = htmlbuilder = None if env['manbuild']: - if config.CheckXsltproc(): + if False and config.CheckXsltproc(): - mangenerator = 'xsltproc' build = "xsltproc --nonet %s $SOURCE >$TARGET" htmlbuilder = build % docbook_html_uri manbuilder = build % docbook_man_uri - elif WhereIs("xmlto"): + elif False and WhereIs("xmlto"): - mangenerator = 'xmlto' - xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`" + xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \ + "`dirname $TARGET`" htmlbuilder = xmlto % "html-nochunks" -- 1.8.5.5 diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb index 41f01bb898..d526db2bee 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb @@ -12,8 +12,8 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://0001-include-sys-ttydefaults.h.patch \ " -SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63" -SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" +SRC_URI[md5sum] = "e0cfadcf4a65dfbdd2afb11c58f4e4a1" +SRC_URI[sha256sum] = "68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a" inherit scons update-rc.d python-dir pythonnative systemd bluetooth update-alternatives diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 1a00b08084..010f65fb9b 100644 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -5,7 +5,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" DEPENDS = "gtk+" -inherit autotools-brokensep pkgconfig +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ file://orrery.png \ diff --git a/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index e9023492e0..e9023492e0 100644 --- a/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch diff --git a/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb index 198db3ce72..8fc0b35912 100644 --- a/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb @@ -21,6 +21,9 @@ SECTION = "System Environment/Base" DEPENDS += "libpam" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" diff --git a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb index 4a1b4ce670..f362775999 100644 --- a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb +++ b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb @@ -5,9 +5,9 @@ being useful purely as a system analysis tool." HOMEPAGE = "http://tomoyo.sourceforge.jp/" SECTION = "System Environment/Kernel" -SRC_URI = "http://jaist.dl.sourceforge.jp/tomoyo/53357/${BP}-20140601.tar.gz" -SRC_URI[md5sum] = "888869b793127f00d6439a3246598b83" -SRC_URI[sha256sum] = "118ef6ba1fbf7c0b83018c3a0d4d5485dfb9b5b7f647f37ce9f63841a3133c2a" +SRC_URI = "http://jaist.dl.sourceforge.jp/tomoyo/53357/${BP}-20170102.tar.gz" +SRC_URI[md5sum] = "888804d58742452fe213a68f7eadd0ad" +SRC_URI[sha256sum] = "00fedfac5e514321250bbe69eaccc732c8a8158596f77a785c2e3ae9f9968283" S = "${WORKDIR}/${BPN}" diff --git a/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch index b3991faa88..b3991faa88 100644 --- a/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch +++ b/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch diff --git a/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb b/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb index 6dee66f691..6dee66f691 100644 --- a/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb +++ b/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch index ff2f6a3b68..ff2f6a3b68 100644 --- a/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch +++ b/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch index e4de6f7fe5..e4de6f7fe5 100644 --- a/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch +++ b/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb index b59d88f5de..b59d88f5de 100644 --- a/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb diff --git a/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb b/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb index 1f5e390000..100c449f2b 100644 --- a/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb +++ b/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb @@ -6,13 +6,13 @@ HOMEPAGE = "http://www.zsh.org" SECTION = "base/shell" LICENSE = "zsh" -LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e" +LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec" DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "d583fbca0c2410bf9542ce8a651c26ca" -SRC_URI[sha256sum] = "3d94a590ff3c562ecf387da78ac356d6bea79b050a9ef81e3ecb9f8ee513040e" +SRC_URI[md5sum] = "dfe156fd69b0d8d1745ecf6d6e02e047" +SRC_URI[sha256sum] = "957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9" inherit autotools gettext update-alternatives @@ -30,6 +30,9 @@ EXTRA_OECONF = " \ zsh_cv_shared_environ=yes \ " +# Configure respects --bindir from EXTRA_OECONF, but then Src/Makefile will read bindir from environment +export bindir="${base_bindir}" + EXTRA_OEMAKE = "-e MAKEFLAGS=" ALTERNATIVE_${PN} = "sh" diff --git a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch index 291b66b37b..47ce007b7f 100644 --- a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch @@ -3,20 +3,24 @@ author: pH5 comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, comment: calctrans and proccorpus. ---- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900 -+++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900 -@@ -3,7 +3,7 @@ +Index: anthy-9100h/mkanthydic/Makefile.am +=================================================================== +--- anthy-9100h.orig/mkanthydic/Makefile.am ++++ anthy-9100h/mkanthydic/Makefile.am +@@ -3,7 +3,7 @@ noinst_SCRIPTS = CLEANFILES = anthy.dic - INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\" + INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\" -noinst_PROGRAMS = mkfiledic +bin_PROGRAMS = mkfiledic mkfiledic_SOURCES = mkfiledic.c mkfiledic_LDADD = ../src-diclib/libdiclib.la ---- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900 -+++ anthy-7811/depgraph/Makefile.am 2006-06-18 10:57:19.420000000 +0900 -@@ -9,7 +9,7 @@ +Index: anthy-9100h/depgraph/Makefile.am +=================================================================== +--- anthy-9100h.orig/depgraph/Makefile.am ++++ anthy-9100h/depgraph/Makefile.am +@@ -9,7 +9,7 @@ CLEANFILES = anthy.dep EXTRA_DIST = indepword.txt $(DEPWORDS) # Generate the dictionary @@ -25,10 +29,12 @@ comment: calctrans and proccorpus. mkdepgraph_SOURCES = mkdepgraph.c mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la ---- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900 -+++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:21:56.300000000 +0900 -@@ -16,7 +16,8 @@ - udict dict.args.in +Index: anthy-9100h/mkworddic/Makefile.am +=================================================================== +--- anthy-9100h.orig/mkworddic/Makefile.am ++++ anthy-9100h/mkworddic/Makefile.am +@@ -26,7 +26,8 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gc + @top_srcdir@/mkworddic/udict # Generate the dictionary -noinst_PROGRAMS = mkworddic @@ -36,10 +42,12 @@ comment: calctrans and proccorpus. +bin_PROGRAMS = mkworddic mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h mkworddic_LDADD = ../src-worddic/libanthydic.la - ---- anthy-9100e.orig/calctrans/Makefile.am 2008-05-08 15:04:13.000000000 +0200 -+++ anthy-9100e/calctrans/Makefile.am 2008-05-08 15:04:24.000000000 +0200 -@@ -3,7 +3,7 @@ + +Index: anthy-9100h/calctrans/Makefile.am +=================================================================== +--- anthy-9100h.orig/calctrans/Makefile.am ++++ anthy-9100h/calctrans/Makefile.am +@@ -3,7 +3,7 @@ EXTRA_DIST =\ corpus.3.txt corpus.4.txt corpus.5.txt\ corpus_info weak_words diff --git a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch index bf748f3c60..1c5c494003 100644 --- a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch +++ b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch @@ -1,12 +1,13 @@ upstream: not applicable source: stolen from debian -diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am ---- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900 -+++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900 -@@ -6,7 +6,8 @@ +Index: anthy-9100h/src-util/Makefile.am +=================================================================== +--- anthy-9100h.orig/src-util/Makefile.am ++++ anthy-9100h/src-util/Makefile.am +@@ -8,7 +8,8 @@ ELISP_FILES = anthy.el anthy-dic.el anth anthy-isearch.el anthy-azik.el anthy-kyuri.el - EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb + EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt anthy.i bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer -ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc +#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc diff --git a/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch index 9a19876aa6..0ba7c76a36 100644 --- a/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ b/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -1,4 +1,4 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From 32b15332e2130a54b25f4fbf6f58b407b851dd8f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 13 Apr 2015 17:02:13 -0700 Subject: [PATCH] Unset need_charset_alias when building for musl @@ -11,14 +11,15 @@ coreutils Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - lib/gnulib.mk | 2 +- + gnulib/lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: augeas-1.2.0/gnulib/lib/Makefile.am -=================================================================== ---- augeas-1.2.0.orig/gnulib/lib/Makefile.am -+++ augeas-1.2.0/gnulib/lib/Makefile.am +diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am +index 963b22d..75788d2 100644 +--- a/gnulib/lib/Makefile.am ++++ b/gnulib/lib/Makefile.am @@ -463,7 +463,7 @@ install-exec-localcharset: all-local case '$(host_os)' in \ darwin[56]*) \ diff --git a/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch b/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch index abbdbaa63b..368bb41764 100644 --- a/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch +++ b/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch @@ -1,14 +1,21 @@ -Add missing GL_GENERATE_ARGZ_H conditional +From 9a6e6374da7d7056db0950f0f7d6b8b905009775 Mon Sep 17 00:00:00 2001 +From: Constantin Musca <constantinx.musca@intel.com> +Date: Fri, 15 Jul 2016 10:04:48 +0300 +Subject: [PATCH] Add missing GL_GENERATE_ARGZ_H conditional - GL_GENERATE_ARGZ_H is used in gnulib/lib/Makefile.am Upstream-Status: Pending Signed-off-by: Constantin Musca <constantinx.musca@intel.com> -Index: augeas-1.0.0/configure.ac -=================================================================== ---- augeas-1.0.0.orig/configure.ac -+++ augeas-1.0.0/configure.ac +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 72b6984..fb9653e 100644 +--- a/configure.ac ++++ b/configure.ac @@ -55,6 +55,8 @@ AC_ARG_WITH([failmalloc], AM_CONDITIONAL([WITH_FAILMALLOC], [test x$with_failmalloc != xno]) diff --git a/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch b/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch index b82a3ee2cb..2b18618fbc 100644 --- a/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch +++ b/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch @@ -1,15 +1,24 @@ -Ensure that builds in separate builddirs (${B} != ${S}) correctly install the +From 8a277957a2579e7149c1850675441b288192077c Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Fri, 15 Jul 2016 10:04:48 +0300 +Subject: [PATCH] augeas: fix separate builddirs + +Ensure that builds in separate builddirs (${B} != ${S}) correctly install the lenses files. Upstream-Status: Pending RP 2013/4/17 -Index: augeas-1.0.0/Makefile.am -=================================================================== ---- augeas-1.0.0.orig/Makefile.am 2012-11-02 15:20:11.000000000 +0000 -+++ augeas-1.0.0/Makefile.am 2013-04-17 10:36:24.033400125 +0000 -@@ -5,8 +5,8 @@ +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 87d511a..7710b3b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I gnulib/m4 lensdir=$(datadir)/augeas/lenses/dist lenstestdir=$(datadir)/augeas/lenses/dist/tests @@ -18,5 +27,5 @@ Index: augeas-1.0.0/Makefile.am +dist_lens_DATA=$(wildcard $(top_srcdir)/lenses/*.aug) +dist_lenstest_DATA=$(wildcard $(top_srcdir)lenses/tests/*.aug) - EXTRA_DIST=augeas.spec build/aux/move-if-change Makefile.am HACKING + EXTRA_DIST=augeas.spec build/ac-aux/move-if-change Makefile.am HACKING.md diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index 976aafb4fc..30d41a16e6 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -30,7 +30,6 @@ EXTRA_OECONF = "--disable-integration-tests" FILES_${PN}-bin = "${bindir}" RDEPENDS_${PN}-bin = " \ - python3-argparse \ python3-compression \ python3-core \ python3-crypt \ @@ -40,8 +39,6 @@ RDEPENDS_${PN}-bin = " \ python3-pickle \ python3-shell \ python3-stringold \ - python3-subprocess \ - python3-textutils \ python3-threading \ " diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.13.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index e883c70d1d..29917c8a14 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.13.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "19333b0f55c8462381038e70d42af43b52941128" +SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch new file mode 100644 index 0000000000..0feafef5bf --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch @@ -0,0 +1,17 @@ +Description: install cmake files into /usr/lib/cmake/cpprestsdk +Author: Gianfranco Costamagna <locutusofborg@debian.org> +Upstream-Status: https://github.com/Microsoft/cpprestsdk/pull/737 +Forwarded: https://github.com/Microsoft/cpprestsdk/pull/737 +Last-Update: 2018-04-19 + +--- cpprest-2.10.2.orig/CMakeLists.txt ++++ cpprest-2.10.2/CMakeLists.txt +@@ -18,7 +18,7 @@ enable_testing() + set(WERROR ON CACHE BOOL "Treat Warnings as Errors.") + set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.") + set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.") +-set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.") ++set(CPPREST_EXPORT_DIR lib/cmake/cpprestsdk CACHE STRING "Directory to install CMake config files.") + set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.") + set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.") + diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb new file mode 100644 index 0000000000..2ba6fc66cc --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/../license.txt;md5=a2e15b954769218ff912468eecd6a02f" +DEPENDS = "openssl websocketpp zlib boost" + +SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master" + +SRC_URI += "file://fix-cmake-install.patch" + +# tag 2.10.2 +SRCREV= "fea848e2a77563cf2a6f28f8eab396fd6e787fbf" + +S = "${WORKDIR}/git/Release" + +inherit cmake diff --git a/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb b/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb index 59b01b69b6..13eb7943f7 100644 --- a/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb +++ b/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb @@ -13,7 +13,7 @@ DESCRIPTION = "The EventLog library aims to be a replacement of the \ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=b8ba8e77bcda9a53fac0fe39fe957767" -SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/${BPN}_${PV}.tar.gz" +SRC_URI = "https://www.balabit.com/downloads/syslog-ng/open-source-edition/3.4.2/source/${BPN}_${PV}.tar.gz" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff deleted file mode 100644 index b3e4b7aae4..0000000000 --- a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff +++ /dev/null @@ -1,6615 +0,0 @@ -Index: lang/usenglish/Makefile -=================================================================== ---- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7) -@@ -38,6 +38,7 @@ - DIRNAME=lang/usenglish - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \ - us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h - SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \ -@@ -45,7 +46,11 @@ - us_phoneset.c us_ffeatures.c us_phrasing_cart.c \ - us_gpos.c us_text.c us_expand.c us_postlex.c \ - us_nums_cart.c us_aswd.c usenglish.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_usenglish -Index: lang/cmu_us_kal/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7) -@@ -43,7 +43,12 @@ - cmu_us_kal_lpc.c \ - cmu_us_kal_res.c \ - cmu_us_kal_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal -Index: lang/cmu_us_kal16/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7) -@@ -44,7 +44,12 @@ - cmu_us_kal16_lpc.c \ - cmu_us_kal16_res.c \ - cmu_us_kal16_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal16 -Index: lang/cmu_time_awb/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7) -@@ -45,7 +45,12 @@ - cmu_time_awb_mcep.c \ - cmu_time_awb_lpc.c \ - cmu_time_awb_lex_entry.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_time_awb -Index: lang/cmulex/Makefile -=================================================================== ---- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7) -@@ -38,13 +38,20 @@ - DIRNAME=lang/cmulex - BUILD_DIRS = - ALL_DIRS= -+ - H = cmu_lts_model.h cmulex.h - SRCS = cmu_lts_rules.c cmu_lts_model.c \ - cmu_lex.c cmu_lex_entries.c cmu_lex_data.c - LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \ - cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c - --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif -+ - SCRIPTS=make_cmulex - - SCM= -Index: configure -=================================================================== ---- flite-1.3-release/configure (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/configure (.../release-1.2) (revision 7) -@@ -1,324 +1,38 @@ - #! /bin/sh -+ - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.57. -+# Generated automatically using autoconf version 2.13 -+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -- --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -- -- --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- as_mkdir_p=false --fi -- --as_executable_p="test -f" -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -- --# Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --# so uname gets run too. --ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -- --exec 6>&1 -- --# --# Initializations. --# -+# Defaults: -+ac_help= - ac_default_prefix=/usr/local --ac_config_libobj_dir=. --cross_compiling=no --subdirs= --MFLAGS= --MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -+# Any additions from configure.in: -+ac_help="$ac_help -+ --disable-shared without shared library support" -+ac_help="$ac_help -+ --disable-sockets without socket support" -+ac_help="$ac_help -+ --with-audio with specific audio support (none linux freebsd etc) " -+ac_help="$ac_help -+ --with-lang with language " -+ac_help="$ac_help -+ --with-vox with vox " -+ac_help="$ac_help -+ --with-lex with lexicon " - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -- --ac_unique_file="include/flite.h" --# Factoring default headers for most tests. --ac_includes_default="\ --#include <stdio.h> --#if HAVE_SYS_TYPES_H --# include <sys/types.h> --#endif --#if HAVE_SYS_STAT_H --# include <sys/stat.h> --#endif --#if STDC_HEADERS --# include <stdlib.h> --# include <stddef.h> --#else --# if HAVE_STDLIB_H --# include <stdlib.h> --# endif --#endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H --# include <memory.h> --# endif --# include <string.h> --#endif --#if HAVE_STRINGS_H --# include <strings.h> --#endif --#if HAVE_INTTYPES_H --# include <inttypes.h> --#else --# if HAVE_STDINT_H --# include <stdint.h> --# endif --#endif --#if HAVE_UNISTD_H --# include <unistd.h> --#endif" -- --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR ac_ct_AR TARGET_OS TARGET_CPU M68KCC LEXDEFS VOXDEFS HOST_OS HOST_CPU OTHERLIBS SHFLAGS MMAPTYPE STDIOTYPE CPP EGREP AUDIODRIVER AUDIODEFS AUDIOLIBS FL_LANG FL_VOX FL_LEX LIBOBJS LTLIBOBJS' --ac_subst_files='' -- - # Initialize some variables set by options. --ac_init_help= --ac_init_version=false - # The variables have the same names as the options, with - # dashes changed to underlines. --cache_file=/dev/null -+build=NONE -+cache_file=./config.cache - exec_prefix=NONE -+host=NONE - no_create= -+nonopt=NONE - no_recursion= - prefix=NONE - program_prefix=NONE -@@ -327,15 +41,10 @@ - silent= - site= - srcdir= -+target=NONE - verbose= - x_includes=NONE - x_libraries=NONE -- --# Installation directory options. --# These are left unexpanded so users can "make install exec_prefix=/foo" --# and all the variables that are supposed to be based on exec_prefix --# by default will actually change. --# Use braces instead of parens because sh, perl, etc. also accept them. - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' -@@ -349,9 +58,17 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - -+# Initialize some other variables. -+subdirs= -+MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 -+ - ac_prev= - for ac_option - do -+ - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" -@@ -359,59 +76,59 @@ - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case "$ac_option" in -+ -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) ac_optarg= ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -- bindir=$ac_optarg ;; -+ bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) -- ac_prev=build_alias ;; -+ ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) -- build_alias=$ac_optarg ;; -+ build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -- cache_file=$ac_optarg ;; -+ cache_file="$ac_optarg" ;; - -- --config-cache | -C) -- cache_file=config.cache ;; -- - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) -- datadir=$ac_optarg ;; -+ datadir="$ac_optarg" ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; - *) ac_optarg=yes ;; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -420,47 +137,95 @@ - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) -- exec_prefix=$ac_optarg ;; -+ exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - -- -help | --help | --hel | --he | -h) -- ac_init_help=long ;; -- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -- ac_init_help=recursive ;; -- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -- ac_init_help=short ;; -+ -help | --help | --hel | --he) -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat << EOF -+Usage: configure [options] [host] -+Options: [defaults in brackets after descriptions] -+Configuration: -+ --cache-file=FILE cache test results in FILE -+ --help print this message -+ --no-create do not create output files -+ --quiet, --silent do not print \`checking...' messages -+ --version print the version of autoconf that created configure -+Directory and file names: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [same as prefix] -+ --bindir=DIR user executables in DIR [EPREFIX/bin] -+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data in DIR -+ [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data in DIR -+ [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] -+ --includedir=DIR C header files in DIR [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -+ --infodir=DIR info documentation in DIR [PREFIX/info] -+ --mandir=DIR man documentation in DIR [PREFIX/man] -+ --srcdir=DIR find the sources in DIR [configure dir or ..] -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM -+ run sed PROGRAM on installed program names -+EOF -+ cat << EOF -+Host type: -+ --build=BUILD configure for building on BUILD [BUILD=HOST] -+ --host=HOST configure for HOST [guessed] -+ --target=TARGET configure for TARGET [TARGET=HOST] -+Features and packages: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+EOF -+ if test -n "$ac_help"; then -+ echo "--enable and --with options recognized:$ac_help" -+ fi -+ exit 0 ;; - - -host | --host | --hos | --ho) -- ac_prev=host_alias ;; -+ ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) -- host_alias=$ac_optarg ;; -+ host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) -- includedir=$ac_optarg ;; -+ includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -- infodir=$ac_optarg ;; -+ infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) -- libdir=$ac_optarg ;; -+ libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) -- libexecdir=$ac_optarg ;; -+ libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ -@@ -469,19 +234,19 @@ - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -- localstatedir=$ac_optarg ;; -+ localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -- mandir=$ac_optarg ;; -+ mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c | -n) -+ | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -495,26 +260,26 @@ - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -- oldincludedir=$ac_optarg ;; -+ oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- prefix=$ac_optarg ;; -+ prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -- program_prefix=$ac_optarg ;; -+ program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -- program_suffix=$ac_optarg ;; -+ program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ -@@ -531,7 +296,7 @@ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) -- program_transform_name=$ac_optarg ;; -+ program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) -@@ -541,7 +306,7 @@ - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) -- sbindir=$ac_optarg ;; -+ sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -@@ -552,57 +317,58 @@ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) -- sharedstatedir=$ac_optarg ;; -+ sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) -- site=$ac_optarg ;; -+ site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- srcdir=$ac_optarg ;; -+ srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -- sysconfdir=$ac_optarg ;; -+ sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) -- ac_prev=target_alias ;; -+ ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -- target_alias=$ac_optarg ;; -+ target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - -- -version | --version | --versio | --versi | --vers | -V) -- ac_init_version=: ;; -+ -version | --version | --versio | --versi | --vers) -+ echo "configure generated by autoconf version 2.13" -+ exit 0 ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -+ fi - ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ case "$ac_option" in -+ *=*) ;; - *) ac_optarg=yes ;; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. -@@ -613,110 +379,99 @@ - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -- x_includes=$ac_optarg ;; -+ x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -- x_libraries=$ac_optarg ;; -+ x_libraries="$ac_optarg" ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - -- *=*) -- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -- # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -- export $ac_envvar ;; -- - *) -- # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then -+ echo "configure: warning: $ac_option: invalid host type" 1>&2 -+ fi -+ if test "x$nonopt" != xNONE; then -+ { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } -+ fi -+ nonopt="$ac_option" - ;; - - esac - done - - if test -n "$ac_prev"; then -- ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# File descriptor usage: -+# 0 standard input -+# 1 file creation -+# 2 errors and warnings -+# 3 some systems may open it to /dev/tty -+# 4 used on the Kubota Titan -+# 6 checking for... messages and results -+# 5 compiler messages saved in config.log -+if test "$silent" = yes; then -+ exec 6>/dev/null -+else -+ exec 6>&1 -+fi -+exec 5>./config.log -+ -+echo "\ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+" 1>&5 -+ -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Also quote any args containing shell metacharacters. -+ac_configure_args= -+for ac_arg - do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ case "$ac_arg" in -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) ;; -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -+ ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac - done - --# There might be people who depend on the old broken behavior: `$host' --# used to hold the argument of --host etc. --# FIXME: To remove some day. --build=$build_alias --host=$host_alias --target=$target_alias -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - --# FIXME: To remove some day. --if test "x$host_alias" != x; then -- if test "x$build_alias" = x; then -- cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 -- elif test "x$build_alias" != "x$host_alias"; then -- cross_compiling=yes -- fi --fi -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -rf conftest* confdefs.h -+# AIX cpp loses on an empty file, so make sure it contains at least a newline. -+echo > confdefs.h - --ac_tool_prefix= --test -n "$host_alias" && ac_tool_prefix=$host_alias- -+# A filename unique to this package, relative to the directory that -+# configure is in, which we can look for to find out if srcdir is correct. -+ac_unique_file=include/flite.h - --test "$silent" = yes && exec 6>/dev/null -- -- - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ ac_prog=$0 -+ ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -+ test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. -@@ -726,441 +481,13 @@ - fi - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - --# --# Report the --help message. --# --if test "$ac_init_help" = "long"; then -- # Omit some internal or obsolete options to make the list less imposing. -- # This message is too long to be a string in the A/UX 3.1 sh. -- cat <<_ACEOF --\`configure' configures this package to adapt to many kinds of systems. -- --Usage: $0 [OPTION]... [VAR=VALUE]... -- --To assign environment variables (e.g., CC, CFLAGS...), specify them as --VAR=VALUE. See below for descriptions of some of the useful variables. -- --Defaults for the options are specified in brackets. -- --Configuration: -- -h, --help display this help and exit -- --help=short display options specific to this package -- --help=recursive display the short help of all the included packages -- -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -- --cache-file=FILE cache test results in FILE [disabled] -- -C, --config-cache alias for \`--cache-file=config.cache' -- -n, --no-create do not create output files -- --srcdir=DIR find the sources in DIR [configure dir or \`..'] -- --_ACEOF -- -- cat <<_ACEOF --Installation directories: -- --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -- --By default, \`make install' will install all the files in --\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify --an installation prefix other than \`$ac_default_prefix' using \`--prefix', --for instance \`--prefix=\$HOME'. -- --For better control, use the options below. -- --Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] --_ACEOF -- -- cat <<\_ACEOF -- --System types: -- --build=BUILD configure for building on BUILD [guessed] -- --host=HOST cross-compile to build programs to run on HOST [BUILD] -- --target=TARGET configure for building compilers for TARGET [HOST] --_ACEOF --fi -- --if test -n "$ac_init_help"; then -- -- cat <<\_ACEOF -- --Optional Features: -- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-shared without shared library support -- --disable-sockets without socket support -- --Optional Packages: -- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-audio with specific audio support (none linux freebsd etc) -- --with-lang with language -- --with-vox with vox -- --with-lex with lexicon -- --Some influential environment variables: -- CC C compiler command -- CFLAGS C compiler flags -- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -- nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -- CPP C preprocessor -- --Use these variables to override the choices made by `configure' or to help --it to find libraries and programs with nonstandard names/locations. -- --_ACEOF --fi -- --if test "$ac_init_help" = "recursive"; then -- # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` -- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -- else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -- done --fi -- --test -n "$ac_init_help" && exit 0 --if $ac_init_version; then -- cat <<\_ACEOF -- --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --Free Software Foundation, Inc. --This configure script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it. --_ACEOF -- exit 0 --fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- $ $0 $@ -- --_ACEOF --{ --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -- --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -- --_ASUNAME -- --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -- --} >&5 -- --cat >&5 <<_ACEOF -- -- --## ----------- ## --## Core tests. ## --## ----------- ## -- --_ACEOF -- -- --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. --# Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. --ac_configure_args= --ac_configure_args0= --ac_configure_args1= --ac_sep= --ac_must_keep_next=false --for ac_pass in 1 2 --do -- for ac_arg -- do -- case $ac_arg in -- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -- 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -- if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -- else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -- fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -- ;; -- esac -- done --done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -- --# When interrupted or exit'd, cleanup temporary files, and complete --# config.log. We remove comments because anyway the quotes in there --# would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. --trap 'exit_status=$? -- # Save into config.log some information that might help in debugging. -- { -- echo -- -- cat <<\_ASBOX --## ---------------- ## --## Cache variables. ## --## ---------------- ## --_ASBOX -- echo -- # The following way of writing the cache mishandles newlines in values, --{ -- (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -- *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -- ;; -- esac; --} -- echo -- -- cat <<\_ASBOX --## ----------------- ## --## Output variables. ## --## ----------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_vars -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- -- if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_files -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- fi -- -- if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## --## confdefs.h. ## --## ----------- ## --_ASBOX -- echo -- sed "/^$/d" confdefs.h | sort -- echo -- fi -- test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -- } >&5 -- rm -f core core.* *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -- exit $exit_status -- ' 0 --for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal --done --ac_signal=0 -- --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -- --# Predefined preprocessor variables. -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_NAME "$PACKAGE_NAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_TARNAME "$PACKAGE_TARNAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION "$PACKAGE_VERSION" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_STRING "$PACKAGE_STRING" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" --_ACEOF -- -- --# Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then -@@ -1171,106 +498,42 @@ - fi - for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -- sed 's/^/| /' "$ac_site_file" >&5 -+ echo "loading site script $ac_site_file" - . "$ac_site_file" - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -- case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -- esac -- fi -+ echo "loading cache $cache_file" -+ . $cache_file - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -- >$cache_file -+ echo "creating cache $cache_file" -+ > $cache_file - fi - --# Check that the precious variables saved in the cache have kept the same --# value. --ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -- eval ac_old_set=\$ac_cv_env_${ac_var}_set -- eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -- case $ac_old_set,$ac_new_set in -- set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,);; -- *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -- fi;; -- esac -- # Pass precious variables to config.status. -- if test "$ac_new_set" = set; then -- case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -- *) ac_arg=$ac_var=$ac_new_val ;; -- esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -- esac -- fi --done --if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -- - ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - -+ac_exeext= -+ac_objext=o -+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -+ ac_n= ac_c=' -+' ac_t=' ' -+ else -+ ac_n=-n ac_c= ac_t= -+ fi -+else -+ ac_n= ac_c='\c' ac_t= -+fi - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then -@@ -1281,740 +544,312 @@ - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ac_config_guess=$ac_aux_dir/config.guess -+ac_config_sub=$ac_aux_dir/config.sub -+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - --# Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+# Do some error checking and defaulting for the host and target type. -+# The inputs are: -+# configure --host=HOST --target=TARGET --build=BUILD NONOPT -+# -+# The rules are: -+# 1. You are not allowed to specify --host, --target, and nonopt at the -+# same time. -+# 2. Host defaults to nonopt. -+# 3. If nonopt is not specified, then host defaults to the current host, -+# as determined by config.guess. -+# 4. Target and build default to nonopt. -+# 5. If nonopt is not specified, then target and build default to host. - -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+case $host---$target---$nonopt in -+NONE---*---* | *---NONE---* | *---*---NONE) ;; -+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -+esac -+ -+ -+# Make sure we can run config.sub. -+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 --build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -+echo $ac_n "checking host system type""... $ac_c" 1>&6 -+echo "configure:585: checking host system type" >&5 - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+host_alias=$host -+case "$host_alias" in -+NONE) -+ case $nonopt in -+ NONE) -+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : -+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } -+ fi ;; -+ *) host_alias=$nonopt ;; -+ esac ;; -+esac - --fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 --host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$host" 1>&6 - -+echo $ac_n "checking target system type""... $ac_c" 1>&6 -+echo "configure:606: checking target system type" >&5 - --echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6 --if test "${ac_cv_target+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_target_alias=$target_alias --test "x$ac_cv_target_alias" = "x" && -- ac_cv_target_alias=$ac_cv_host_alias --ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+target_alias=$target -+case "$target_alias" in -+NONE) -+ case $nonopt in -+ NONE) target_alias=$host_alias ;; -+ *) target_alias=$nonopt ;; -+ esac ;; -+esac - --fi --echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6 --target=$ac_cv_target --target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$target" 1>&6 - -+echo $ac_n "checking build system type""... $ac_c" 1>&6 -+echo "configure:624: checking build system type" >&5 - --# The aliases save the names the user supplied, while $host etc. --# will get canonicalized. --test -n "$target_alias" && -+build_alias=$build -+case "$build_alias" in -+NONE) -+ case $nonopt in -+ NONE) build_alias=$host_alias ;; -+ *) build_alias=$nonopt ;; -+ esac ;; -+esac -+ -+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$build" 1>&6 -+ -+test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. --set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done - --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "gcc", so it can be a program name with args. -+# Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:649: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. --set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:679: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift -- if test $# != 0; then -+ if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" - fi - fi - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -- do -- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. --set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:730: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi -- -- test -n "$CC" && break -- done --fi --if test -z "$CC"; then -- ac_ct_CC=$CC -- for ac_prog in cl --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+ ;; -+ esac - fi --done --done -- -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi - -- test -n "$ac_ct_CC" && break --done -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -- CC=$ac_ct_CC --fi -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - --fi -+cat > conftest.$ac_ext << EOF - -+#line 773 "configure" -+#include "confdefs.h" - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- --# Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" --# Try to create an executable without -o first, disregard a.out. --# It will help us diagnose broken compilers, and finding out an intuition --# of exeext. --echo "$as_me:$LINENO: checking for C compiler default output" >&5 --echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out --do -- test -f "$ac_file" || continue -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -- ;; -- [ab].out ) -- # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -- *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -- break;; -- * ) -- break;; -- esac --done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } --fi -- --ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -+main(){return(0);} -+EOF -+if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no - else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -+ ac_cv_prog_cc_cross=yes - fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - --rm -f a.out a.exe conftest$ac_cv_exeext b.out --ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # If both `conftest.exe' and `conftest' are `present' (well, observable) --# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will --# work properly (i.e., refer to `conftest.exe'), while it won't with --# `rm'. --for ac_file in conftest.exe conftest conftest.*; do -- test -f "$ac_file" || continue -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext -- break;; -- * ) break;; -- esac --done --else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross - --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -- --rm -f conftest.$ac_ext --EXEEXT=$ac_cv_exeext --ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:809: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -- break;; -- esac --done -+ cat > conftest.c <<EOF -+#ifdef __GNUC__ -+ yes; -+#endif -+EOF -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gcc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ ac_cv_prog_gcc=no - fi -- --rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 --OBJEXT=$ac_cv_objext --ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ --#ifndef __GNUC__ -- choke me --#endif -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_compiler_gnu=yes -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ GCC= - fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_cv_c_compiler_gnu=$ac_compiler_gnu - --fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` --ac_test_CFLAGS=${CFLAGS+set} --ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* - --ac_cv_prog_cc_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS -+ CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" -@@ -2028,304 +863,37 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_prog_cc_stdc=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdarg.h> --#include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --int --main () --{ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- ; -- return 0; --} --_ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.$ac_objext --done --rm -f conftest.$ac_ext conftest.$ac_objext --CC=$ac_save_CC -- --fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -- *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; --esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+# Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:871: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" - fi - fi --RANLIB=$ac_cv_prog_RANLIB -+RANLIB="$ac_cv_prog_RANLIB" - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ echo "$ac_t""$RANLIB" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" --fi --fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- RANLIB=$ac_ct_RANLIB --else -- RANLIB="$ac_cv_prog_RANLIB" --fi -- - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -2333,306 +901,158 @@ - # SunOS /usr/etc/install - # IRIX /sbin/install - # AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -+echo "configure:910: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" -+ for ac_dir in $PATH; do -+ # Account for people who put trailing slashes in PATH elements. -+ case "$ac_dir/" in -+ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ if test -f $ac_dir/$ac_prog; then -+ if test $ac_prog = install && -+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ else -+ ac_cv_path_install="$ac_dir/$ac_prog -c" -+ break 2 -+ fi -+ fi - done -- done -- ;; --esac --done -+ ;; -+ esac -+ done -+ IFS="$ac_save_IFS" - -- - fi - if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -+ INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. -- INSTALL=$ac_install_sh -+ INSTALL="$ac_install_sh" - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+echo "$ac_t""$INSTALL" 1>&6 - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+if test $host != $build; then -+ ac_tool_prefix=${host_alias}- -+else -+ ac_tool_prefix= -+fi -+ -+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:971: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" - fi - fi --AR=$ac_cv_prog_AR -+AR="$ac_cv_prog_AR" - if test -n "$AR"; then -- echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6 -+ echo "$ac_t""$AR" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_AR"; then -- ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_AR"; then -- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done - --fi --fi --ac_ct_AR=$ac_cv_prog_ac_ct_AR --if test -n "$ac_ct_AR"; then -- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --echo "${ECHO_T}$ac_ct_AR" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi - -- AR=$ac_ct_AR -+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -+echo "configure:1001: checking whether byte ordering is bigendian" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- AR="$ac_cv_prog_AR" --fi -- -- --echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 --echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 --if test "${ac_cv_c_bigendian+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # See if sys/param.h defines the BYTE_ORDER macro. --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ ac_cv_c_bigendian=unknown -+# See if sys/param.h defines the BYTE_ORDER macro. -+cat > conftest.$ac_ext <<EOF -+#line 1008 "configure" -+#include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -+int main() { - --int --main () --{ - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+; return 0; } -+EOF -+if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+cat > conftest.$ac_ext <<EOF -+#line 1023 "configure" -+#include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -+int main() { - --int --main () --{ - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+; return 0; } -+EOF -+if { (eval echo configure:1034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - ac_cv_c_bigendian=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_c_bigendian=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_bigendian=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest* - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --# It does not; compile a test program. --if test "$cross_compiling" = yes; then -- # try to guess the endianness by grepping values into an object file -- ac_cv_c_bigendian=unknown -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; --short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; --void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } --short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; --short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; --void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } --int --main () --{ -- _ascii (); _ebcdic (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -- ac_cv_c_bigendian=yes -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - fi --if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi --fi -+rm -f conftest* -+if test $ac_cv_c_bigendian = unknown; then -+if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --int --main () --{ -+ cat > conftest.$ac_ext <<EOF -+#line 1054 "configure" -+#include "confdefs.h" -+main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { -@@ -2642,52 +1062,31 @@ - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); - } --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+EOF -+if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - ac_cv_c_bigendian=no - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_c_bigendian=yes -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_c_bigendian=yes - fi --rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -fr conftest* - fi -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 --echo "${ECHO_T}$ac_cv_c_bigendian" >&6 --case $ac_cv_c_bigendian in -- yes) - --cat >>confdefs.h <<\_ACEOF -+echo "$ac_t""$ac_cv_c_bigendian" 1>&6 -+if test $ac_cv_c_bigendian = yes; then -+ cat >> confdefs.h <<\EOF - #define WORDS_BIGENDIAN 1 --_ACEOF -- ;; -- no) -- ;; -- *) -- { { echo "$as_me:$LINENO: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&5 --echo "$as_me: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -- { (exit 1); exit 1; }; } ;; --esac -+EOF - -+fi - -+ - if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall" - fi -@@ -2697,14 +1096,13 @@ - case "${enableval}" in - yes) shared=true ;; - no) shared=false ;; -- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for shared options" >&5 --echo "$as_me: error: bad value ${enableval} for shared options" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) { echo "configure: error: bad value ${enableval} for shared options" 1>&2; exit 1; } ;; - esac - else - shared=false --fi; -+fi - -+ - case "$target_cpu" in - i386|i486|i586|i686) - TARGET_CPU=i386 -@@ -2712,7 +1110,7 @@ - *) - TARGET_CPU=$target_cpu - ;; --esac -+esac - TARGET_OS=$target_os - - M68KCC= -@@ -2726,7 +1124,7 @@ - M68KCC=/usr/m68k-palmos/bin/gcc - # Generic build is ARM or M68K (probably ARM though) - CC="/usr/$TARGET_CPU-palmos/bin/gcc" -- if test "$target_cpu" = "arm" -+ if test "$target_cpu" = "arm" - then - CC="$CC -fPIC -march=armv4t" - fi -@@ -2762,7 +1160,7 @@ - *) - HOST_CPU=$host_cpu - ;; --esac -+esac - HOST_OS=$host_os - - -@@ -2800,138 +1198,91 @@ - case "${enableval}" in - yes) sockets=true ;; - no) sockets=false ;; -- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for sockets options" >&5 --echo "$as_me: error: bad value ${enableval} for sockets options" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) { echo "configure: error: bad value ${enableval} for sockets options" 1>&2; exit 1; } ;; - esac - else - sockets=true --fi; -+fi -+ - if test "$sockets" = false; then -- cat >>confdefs.h <<\_ACEOF -+ cat >> confdefs.h <<\EOF - #define CST_NO_SOCKETS 1 --_ACEOF -+EOF - - fi - --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+cat > conftest.$ac_ext <<EOF -+#line 1216 "configure" -+#include "confdefs.h" - #include <stdio.h> --int --main () --{ -+int main() { - struct a { union { float b; int c; } d; }; -- const struct a e = { .d={ .b=3.14 } }; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ const struct a e = { .d={ .b=3.14 } }; -+; return 0; } -+EOF -+if { (eval echo configure:1224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - unioninit=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --unioninit=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ unioninit=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest* - if test "$unioninit" = no; then -- cat >>confdefs.h <<\_ACEOF -+ cat >> confdefs.h <<\EOF - #define NO_UNION_INITIALIZATION 1 --_ACEOF -+EOF - - fi - --echo "$as_me:$LINENO: checking for mmap" >&5 --echo $ECHO_N "checking for mmap... $ECHO_C" >&6 --if test "${ac_cv_func_mmap+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for mmap""... $ac_c" 1>&6 -+echo "configure:1242: checking for mmap" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ cat > conftest.$ac_ext <<EOF -+#line 1247 "configure" -+#include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mmap (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+ which can conflict with char mmap(); below. */ -+#include <assert.h> - /* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif - /* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char mmap (); -+ builtin and then its argument prototype would still apply. */ -+char mmap(); -+ -+int main() { -+ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_mmap) || defined (__stub___mmap) - choke me - #else --char (*f) () = mmap; -+mmap(); - #endif --#ifdef __cplusplus --} --#endif - --int --main () --{ --return f != mmap; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_mmap=yes -+; return 0; } -+EOF -+if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_mmap=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_mmap=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_mmap=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest* - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 --echo "${ECHO_T}$ac_cv_func_mmap" >&6 --if test $ac_cv_func_mmap = yes; then -+ -+if eval "test \"`echo '$ac_cv_func_'mmap`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - MMAPTYPE=posix -+else -+ echo "$ac_t""no" 1>&6 - fi - - -@@ -2956,1028 +1307,266 @@ - - - AUDIODRIVER=none --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:1312: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ # not just through cpp. -+ cat > conftest.$ac_ext <<EOF -+#line 1327 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CPP=$CPP -- --fi -- CPP=$ac_cv_prog_CPP --else -- ac_cv_prog_CPP=$CPP --fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 --ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext <<EOF -+#line 1344 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#line 1361 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp - fi -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi -+rm -f conftest* - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -- -- --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --#include <stdarg.h> --#include <string.h> --#include <float.h> -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_header_stdc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <string.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi - rm -f conftest* -- - fi -- --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi - rm -f conftest* -- -+ ac_cv_prog_CPP="$CPP" - fi -- --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : -+ CPP="$ac_cv_prog_CPP" - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ctype.h> --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif -- --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_header_stdc=no -+ ac_cv_prog_CPP="$CPP" - fi --rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 --if test $ac_cv_header_stdc = yes; then -+echo "$ac_t""$CPP" 1>&6 - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -- --fi -- --# On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_safe=`echo "sys/soundcard.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/soundcard.h""... $ac_c" 1>&6 -+echo "configure:1393: checking for sys/soundcard.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 --echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 --echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1398 "configure" -+#include "confdefs.h" - #include <sys/soundcard.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 --echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/soundcard.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 --echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_soundcard_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 -- --fi --if test $ac_cv_header_sys_soundcard_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="oss" - AUDIODEFS=-DCST_AUDIO_LINUX -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 --echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 -+ac_safe=`echo "machine/soundcard.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for machine/soundcard.h""... $ac_c" 1>&6 -+echo "configure:1427: checking for machine/soundcard.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking machine/soundcard.h usability" >&5 --echo $ECHO_N "checking machine/soundcard.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1432 "configure" -+#include "confdefs.h" - #include <machine/soundcard.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking machine/soundcard.h presence" >&5 --echo $ECHO_N "checking machine/soundcard.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <machine/soundcard.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: machine/soundcard.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 --echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_machine_soundcard_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 -- --fi --if test $ac_cv_header_machine_soundcard_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="oss" - AUDIODEFS=-DCST_AUDIO_FREEBSD -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 --echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 -+ac_safe=`echo "sys/audioio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/audioio.h""... $ac_c" 1>&6 -+echo "configure:1461: checking for sys/audioio.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/audioio.h usability" >&5 --echo $ECHO_N "checking sys/audioio.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1466 "configure" -+#include "confdefs.h" - #include <sys/audioio.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/audioio.h presence" >&5 --echo $ECHO_N "checking sys/audioio.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/audioio.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/audioio.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 --echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_audioio_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 -- --fi --if test $ac_cv_header_sys_audioio_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo "$as_me:$LINENO: checking for mmsystem.h" >&5 --echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 --echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 -+ ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -+echo "configure:1495: checking for alsa/asoundlib.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking mmsystem.h usability" >&5 --echo $ECHO_N "checking mmsystem.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <mmsystem.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+ cat > conftest.$ac_ext <<EOF -+#line 1500 "configure" -+#include "confdefs.h" -+#include <alsa/asoundlib.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking mmsystem.h presence" >&5 --echo $ECHO_N "checking mmsystem.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <mmsystem.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -+ echo "$ac_t""no" 1>&6 - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: mmsystem.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: mmsystem.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for mmsystem.h" >&5 --echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6 -+echo "configure:1530: checking for mmsystem.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_cv_header_mmsystem_h=$ac_header_preproc -+ cat > conftest.$ac_ext <<EOF -+#line 1535 "configure" -+#include "confdefs.h" -+#include <mmsystem.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 --echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 -- -+rm -f conftest* - fi --if test $ac_cv_header_mmsystem_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE - AUDIOLIBS=-lwinmm -+else -+ echo "$ac_t""no" 1>&6 - fi - - -- -- - # Check whether --with-audio or --without-audio was given. - if test "${with_audio+set}" = set; then - withval="$with_audio" -- AUDIODRIVER=$with_audio --fi; -+ AUDIODRIVER=$with_audio -+fi - -+ - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in - linux|oss) -@@ -4006,34 +1595,34 @@ - - - -- - # Check whether --with-lang or --without-lang was given. - if test "${with_lang+set}" = set; then - withval="$with_lang" -- FL_LANG=$with_lang --fi; -+ FL_LANG=$with_lang -+fi -+ - if test "x$with_lang" = "x"; then - FL_LANG="usenglish" - fi - - -- - # Check whether --with-vox or --without-vox was given. - if test "${with_vox+set}" = set; then - withval="$with_vox" -- FL_VOX=$with_vox --fi; -+ FL_VOX=$with_vox -+fi -+ - if test "x$with_vox" = "x"; then - FL_VOX="cmu_us_kal" - fi - - -- - # Check whether --with-lex or --without-lex was given. - if test "${with_lex+set}" = set; then - withval="$with_lex" -- FL_LEX=$with_lex --fi; -+ FL_LEX=$with_lex -+fi -+ - if test "x$with_lex" = "x"; then - FL_LEX="cmulex" - fi -@@ -4041,921 +1630,300 @@ - - - -- ac_config_files="$ac_config_files config/config config/system.mak" --cat >confcache <<\_ACEOF -+trap '' 1 2 15 -+cat > confcache <<\EOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure --# scripts and configure runs, see configure's option --config-cache. --# It is not useful on other systems. If it contains results you don't --# want to keep, you may remove or edit it. -+# scripts and configure runs. It is not useful on other systems. -+# If it contains results you don't want to keep, you may remove or edit it. - # --# config.status only pays attention to the cache file if you give it --# the --recheck option to rerun configure. -+# By default, configure uses ./config.cache as the cache file, -+# creating it if it does not exist already. You can give configure -+# the --cache-file=FILE option to use a different cache file; that is -+# what configure does when it calls configure scripts in -+# subdirectories, so they share the cache. -+# Giving --cache-file=/dev/null disables caching, for debugging configure. -+# config.status only pays attention to the cache file if you give it the -+# --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the --# following values. -- --_ACEOF -- -+EOF - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. - # So, don't put newlines in cache variables' values. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -- (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -- sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -- *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -- ;; -- esac; --} | -- sed ' -- t clear -- : clear -- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -- t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -+(set) 2>&1 | -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache -+if cmp -s $cache_file confcache; then -+ : -+else - if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ echo "updating cache $cache_file" -+ cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi - fi - rm -f confcache - -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -+ - test "x$prefix" = xNONE && prefix=$ac_default_prefix - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). -+# Any assignment to VPATH causes Sun make to only execute -+# the first set of double-colon rules, so remove it if not needed. -+# If there is a colon in the path, we need to keep it. - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' -+ ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' - fi - -+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -+ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - --ac_libobjs= --ac_ltlibobjs= --for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -- # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' --done --LIBOBJS=$ac_libobjs -- --LTLIBOBJS=$ac_ltlibobjs -- -- -- -+# Without the "./", some shells look in PATH for config.status. - : ${CONFIG_STATUS=./config.status} --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF --#! $SHELL --# Generated by $as_me. -+ -+echo creating $CONFIG_STATUS -+rm -f $CONFIG_STATUS -+cat > $CONFIG_STATUS <<EOF -+#! /bin/sh -+# Generated automatically by configure. - # Run this file to recreate the current configuration. -+# This directory was configured as follows, -+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# -+# $0 $ac_configure_args -+# - # Compiler output produced by configure, useful for debugging --# configure, is in config.log if it exists. -+# configure, is in ./config.log if it exists. - --debug=false --ac_cs_recheck=false --ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -- --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -+for ac_option - do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi -+ case "\$ac_option" in -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" -+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -+ echo "$CONFIG_STATUS generated by autoconf version 2.13" -+ exit 0 ;; -+ -help | --help | --hel | --he | --h) -+ echo "\$ac_cs_usage"; exit 0 ;; -+ *) echo "\$ac_cs_usage"; exit 1 ;; -+ esac - done - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -+ac_given_srcdir=$srcdir -+ac_given_INSTALL="$INSTALL" - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -+trap 'rm -fr `echo "config/config config/system.mak" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+EOF -+cat >> $CONFIG_STATUS <<EOF - -+# Protect against being on the right side of a sed subst in config.status. -+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; -+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -+$ac_vpsub -+$extrasub -+s%@SHELL@%$SHELL%g -+s%@CFLAGS@%$CFLAGS%g -+s%@CPPFLAGS@%$CPPFLAGS%g -+s%@CXXFLAGS@%$CXXFLAGS%g -+s%@FFLAGS@%$FFLAGS%g -+s%@DEFS@%$DEFS%g -+s%@LDFLAGS@%$LDFLAGS%g -+s%@LIBS@%$LIBS%g -+s%@exec_prefix@%$exec_prefix%g -+s%@prefix@%$prefix%g -+s%@program_transform_name@%$program_transform_name%g -+s%@bindir@%$bindir%g -+s%@sbindir@%$sbindir%g -+s%@libexecdir@%$libexecdir%g -+s%@datadir@%$datadir%g -+s%@sysconfdir@%$sysconfdir%g -+s%@sharedstatedir@%$sharedstatedir%g -+s%@localstatedir@%$localstatedir%g -+s%@libdir@%$libdir%g -+s%@includedir@%$includedir%g -+s%@oldincludedir@%$oldincludedir%g -+s%@infodir@%$infodir%g -+s%@mandir@%$mandir%g -+s%@host@%$host%g -+s%@host_alias@%$host_alias%g -+s%@host_cpu@%$host_cpu%g -+s%@host_vendor@%$host_vendor%g -+s%@host_os@%$host_os%g -+s%@target@%$target%g -+s%@target_alias@%$target_alias%g -+s%@target_cpu@%$target_cpu%g -+s%@target_vendor@%$target_vendor%g -+s%@target_os@%$target_os%g -+s%@build@%$build%g -+s%@build_alias@%$build_alias%g -+s%@build_cpu@%$build_cpu%g -+s%@build_vendor@%$build_vendor%g -+s%@build_os@%$build_os%g -+s%@CC@%$CC%g -+s%@RANLIB@%$RANLIB%g -+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -+s%@INSTALL_DATA@%$INSTALL_DATA%g -+s%@AR@%$AR%g -+s%@TARGET_OS@%$TARGET_OS%g -+s%@TARGET_CPU@%$TARGET_CPU%g -+s%@M68KCC@%$M68KCC%g -+s%@LEXDEFS@%$LEXDEFS%g -+s%@VOXDEFS@%$VOXDEFS%g -+s%@HOST_OS@%$HOST_OS%g -+s%@HOST_CPU@%$HOST_CPU%g -+s%@OTHERLIBS@%$OTHERLIBS%g -+s%@SHFLAGS@%$SHFLAGS%g -+s%@MMAPTYPE@%$MMAPTYPE%g -+s%@STDIOTYPE@%$STDIOTYPE%g -+s%@CPP@%$CPP%g -+s%@AUDIODRIVER@%$AUDIODRIVER%g -+s%@AUDIODEFS@%$AUDIODEFS%g -+s%@AUDIOLIBS@%$AUDIOLIBS%g -+s%@FL_LANG@%$FL_LANG%g -+s%@FL_VOX@%$FL_VOX%g -+s%@FL_LEX@%$FL_LEX%g -+s%@EXEEXT@%$EXEEXT%g - --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+CEOF -+EOF - -+cat >> $CONFIG_STATUS <<\EOF - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+# Split the substitutions into bite-sized pieces for seds with -+# small command number limits, like on Digital OSF/1 and HP-UX. -+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -+ac_file=1 # Number of current file. -+ac_beg=1 # First line for current file. -+ac_end=$ac_max_sed_cmds # Line after last line for current file. -+ac_more_lines=: -+ac_sed_cmds="" -+while $ac_more_lines; do -+ if test $ac_beg -gt 1; then -+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else -- PATH_SEPARATOR=: -+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -+ if test ! -s conftest.s$ac_file; then -+ ac_more_lines=false -+ rm -f conftest.s$ac_file - else -- as_ln_s='ln -s' -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds="sed -f conftest.s$ac_file" -+ else -+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" -+ fi -+ ac_file=`expr $ac_file + 1` -+ ac_beg=$ac_end -+ ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- as_mkdir_p=false --fi -- --as_executable_p="test -f" -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- --exec 6>&1 -- --# Open the log real soon, to keep \$[0] and so on meaningful, and to --# report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- --This file was extended by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- CONFIG_FILES = $CONFIG_FILES -- CONFIG_HEADERS = $CONFIG_HEADERS -- CONFIG_LINKS = $CONFIG_LINKS -- CONFIG_COMMANDS = $CONFIG_COMMANDS -- $ $0 $@ -- --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 --_ACEOF -- --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -- --cat >>$CONFIG_STATUS <<\_ACEOF -- --ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -- --Usage: $0 [OPTIONS] [FILE]... -- -- -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -- -d, --debug don't remove temporary files -- --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --Configuration files: --$config_files -- --Report bugs to <bug-autoconf@gnu.org>." --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF --ac_cs_version="\\ --config.status --configured by $0, generated by GNU Autoconf 2.57, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -- --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. --This config.status script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. --ac_need_defaults=: --while test $# != 0 --do -- case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -- ac_shift=: -- ;; -- -*) -- ac_option=$1 -- ac_optarg=$2 -- ac_shift=shift -- ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; -- esac -- -- case $ac_option in -- # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -- debug=: ;; -- --file | --fil | --fi | --f ) -- $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -- ac_need_defaults=false;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil | --si | --s) -- ac_cs_silent=: ;; -- -- # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -- -- *) ac_config_targets="$ac_config_targets $1" ;; -- -- esac -- shift - done -- --ac_configure_extra_args= -- --if $ac_cs_silent; then -- exec 6>/dev/null -- ac_configure_extra_args="$ac_configure_extra_args --silent" -+if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds=cat - fi -+EOF - --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF --if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion --fi -+cat >> $CONFIG_STATUS <<EOF - --_ACEOF -- -- -- -- -- --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_config_target in $ac_config_targets --do -- case "$ac_config_target" in -- # Handling of arguments. -- "config/config" ) CONFIG_FILES="$CONFIG_FILES config/config" ;; -- "config/system.mak" ) CONFIG_FILES="$CONFIG_FILES config/system.mak" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+CONFIG_FILES=\${CONFIG_FILES-"config/config config/system.mak"} -+EOF -+cat >> $CONFIG_STATUS <<\EOF -+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ case "$ac_file" in -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` -+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -+ *) ac_file_in="${ac_file}.in" ;; - esac --done - --# If the user did not use the arguments to specify the items to instantiate, --# then the envvar interface is used. Set only those that are not. --# We use the long form for the default assignment because of an extremely --# bizarre bug on SunOS 4.1.3. --if $ac_need_defaults; then -- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files --fi -+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - --# Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, --# creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. --$debug || --{ -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 --} -- --# Create a (secure) tmp directory for tmp files. -- --{ -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" --} || --{ -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -- --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- --# --# CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@target@,$target,;t t --s,@target_cpu@,$target_cpu,;t t --s,@target_vendor@,$target_vendor,;t t --s,@target_os@,$target_os,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@AR@,$AR,;t t --s,@ac_ct_AR@,$ac_ct_AR,;t t --s,@TARGET_OS@,$TARGET_OS,;t t --s,@TARGET_CPU@,$TARGET_CPU,;t t --s,@M68KCC@,$M68KCC,;t t --s,@LEXDEFS@,$LEXDEFS,;t t --s,@VOXDEFS@,$VOXDEFS,;t t --s,@HOST_OS@,$HOST_OS,;t t --s,@HOST_CPU@,$HOST_CPU,;t t --s,@OTHERLIBS@,$OTHERLIBS,;t t --s,@SHFLAGS@,$SHFLAGS,;t t --s,@MMAPTYPE@,$MMAPTYPE,;t t --s,@STDIOTYPE@,$STDIOTYPE,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@AUDIODRIVER@,$AUDIODRIVER,;t t --s,@AUDIODEFS@,$AUDIODEFS,;t t --s,@AUDIOLIBS@,$AUDIOLIBS,;t t --s,@FL_LANG@,$FL_LANG,;t t --s,@FL_VOX@,$FL_VOX,;t t --s,@FL_LEX@,$FL_LEX,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+ # Remove last slash and all that follows it. Not all systems have dirname. -+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -+ # The file is in a subdirectory. -+ test ! -d "$ac_dir" && mkdir "$ac_dir" -+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` -+ else -+ ac_dir_suffix= ac_dots= - fi --fi # test -n "$CONFIG_FILES" - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case "$ac_given_srcdir" in -+ .) srcdir=. -+ if test -z "$ac_dots"; then top_srcdir=. -+ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; -+ /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; -+ *) # Relative path. -+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" -+ top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ case "$ac_given_INSTALL" in -+ [/$]*) INSTALL="$ac_given_INSTALL" ;; -+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -+ esac - -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ echo creating "$ac_file" -+ rm -f "$ac_file" -+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." -+ case "$ac_file" in -+ *Makefile*) ac_comsub="1i\\ -+# $configure_input" ;; -+ *) ac_comsub= ;; - esac - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -+ sed -e "$ac_comsub -+s%@configure_input@%$configure_input%g -+s%@srcdir@%$srcdir%g -+s%@top_srcdir@%$top_srcdir%g -+s%@INSTALL@%$INSTALL%g -+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -+fi; done -+rm -f conftest.s* - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo $f;; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+EOF -+cat >> $CONFIG_STATUS <<EOF - --done --_ACEOF -+EOF -+cat >> $CONFIG_STATUS <<\EOF - --cat >>$CONFIG_STATUS <<\_ACEOF -- --{ (exit 0); exit 0; } --_ACEOF -+exit 0 -+EOF - chmod +x $CONFIG_STATUS --ac_clean_files=$ac_clean_files_save -+rm -fr confdefs* $ac_clean_files -+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - -- --# configure is writing to config.log, and then calls config.status. --# config.status does its own redirection, appending to config.log. --# Unfortunately, on DOS this fails, as config.log is still kept open --# by configure, so config.status won't be able to write to it; its --# output is simply discarded. So we exec the FD to /dev/null, --# effectively closing config.log, so it can be properly (re)opened and --# appended to by config.status. When coming back to configure, we --# need to make the FD available again. --if test "$no_create" != yes; then -- ac_cs_success=: -- ac_config_status_args= -- test "$silent" = yes && -- ac_config_status_args="$ac_config_status_args --quiet" -- exec 5>/dev/null -- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -- exec 5>>config.log -- # Use ||, not &&, to avoid exiting from the if with $? = 1, which -- # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } --fi -- -Index: configure.in -=================================================================== ---- flite-1.3-release/configure.in (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/configure.in (.../release-1.2) (revision 7) -@@ -206,10 +206,10 @@ - AC_CHECK_HEADER(sys/audioio.h, - [AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS]) --dnl AC_CHECK_HEADER(sys/asoundlib.h, --dnl [AUDIODRIVER="alsa" --dnl AUDIODEFS=-DCST_AUDIO_ALSA --dnl AUDIOLIBS=-lasound]) -+ AC_CHECK_HEADER(alsa/asoundlib.h, -+ [AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound]) - AC_CHECK_HEADER(mmsystem.h, - [AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE -Index: src/hrg/Makefile -=================================================================== ---- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \ - cst_rel_io.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/utils/Makefile -=================================================================== ---- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7) -@@ -44,8 +44,13 @@ - cst_tokenstream.c cst_val.c cst_features.c \ - cst_endian.c cst_socket.c cst_val_const.c \ - cst_val_user.c cst_args.c -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \ -+ $(STDIOTYPE:%=cst_file_%.os) -+else - OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \ - $(STDIOTYPE:%=cst_file_%.o) -+endif - FILES = Makefile $(H) $(SRCS) \ - cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \ - cst_file_stdio.c cst_file_wince.c cst_file_palmos.c -Index: src/audio/au_alsa.c -=================================================================== ---- flite-1.3-release/src/audio/au_alsa.c (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/src/audio/au_alsa.c (.../release-1.2) (revision 7) -@@ -0,0 +1,311 @@ -+/*************************************************************************/ -+/* */ -+/* Language Technologies Institute */ -+/* Carnegie Mellon University */ -+/* Copyright (c) 2000 */ -+/* All Rights Reserved. */ -+/* */ -+/* Permission is hereby granted, free of charge, to use and distribute */ -+/* this software and its documentation without restriction, including */ -+/* without limitation the rights to use, copy, modify, merge, publish, */ -+/* distribute, sublicense, and/or sell copies of this work, and to */ -+/* permit persons to whom this work is furnished to do so, subject to */ -+/* the following conditions: */ -+/* 1. The code must retain the above copyright notice, this list of */ -+/* conditions and the following disclaimer. */ -+/* 2. Any modifications must be clearly marked as such. */ -+/* 3. Original authors' names are not deleted. */ -+/* 4. The authors' names are not used to endorse or promote products */ -+/* derived from this software without specific prior written */ -+/* permission. */ -+/* */ -+/* CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK */ -+/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */ -+/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */ -+/* SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE */ -+/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ -+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */ -+/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */ -+/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ -+/* THIS SOFTWARE. */ -+/* */ -+/*********************************************************************** */ -+/* Author: Lukas Loehrer ( */ -+/* Date: January 2005 */ -+/*************************************************************************/ -+/* */ -+/* Native access to alsa audio devices on Linux */ -+/* Tested with libasound version 1.0.10 */ -+/*************************************************************************/ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <assert.h> -+#include <errno.h> -+ -+#include "cst_string.h" -+#include "cst_wave.h" -+#include "cst_audio.h" -+ -+#include <alsa/asoundlib.h> -+ -+ -+/*static char *pcm_dev_name = "hw:0,0"; */ -+static char *pcm_dev_name ="default"; -+ -+static inline void print_pcm_state(snd_pcm_t *handle, char *msg) -+{ -+ fprintf(stderr, "PCM state at %s = %s\n", msg, -+ snd_pcm_state_name(snd_pcm_state(handle))); -+} -+ -+cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt) -+{ -+ cst_audiodev *ad; -+ unsigned int real_rate; -+ int err; -+ -+ /* alsa specific stuff */ -+ snd_pcm_t *pcm_handle; -+ snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; -+ snd_pcm_hw_params_t *hwparams; -+ snd_pcm_format_t format; -+ snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; -+ -+ /* Allocate the snd_pcm_hw_params_t structure on the stack. */ -+ snd_pcm_hw_params_alloca(&hwparams); -+ -+ /* Open pcm device */ -+ err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0); -+ if (err < 0) -+ { -+ cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n", -+ pcm_dev_name, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Init hwparams with full configuration space */ -+ err = snd_pcm_hw_params_any(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set access mode */ -+ err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Determine matching alsa sample format */ -+ /* This could be implemented in a more */ -+ /* flexible way (byte order conversion). */ -+ switch (fmt) -+ { -+ case CST_AUDIO_LINEAR16: -+ if (CST_LITTLE_ENDIAN) -+ format = SND_PCM_FORMAT_S16_LE; -+ else -+ format = SND_PCM_FORMAT_S16_BE; -+ break; -+ case CST_AUDIO_LINEAR8: -+ format = SND_PCM_FORMAT_U8; -+ break; -+ case CST_AUDIO_MULAW: -+ format = SND_PCM_FORMAT_MU_LAW; -+ break; -+ default: -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to find suitable format.\n"); -+ return NULL; -+ break; -+ } -+ -+ /* Set samble format */ -+ err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format); -+ if (err <0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set sample rate near the disired rate */ -+ real_rate = sps; -+ err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err)); -+ return NULL; -+ } -+ /*FIXME: This is probably too strict */ -+ assert(sps == real_rate); -+ -+ /* Set number of channels */ -+ assert(channels >0); -+ err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Commit hardware parameters */ -+ err = snd_pcm_hw_params(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Make sure the device is ready to accept data */ -+ assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED); -+ -+ /* Write hardware parameters to flite audio device data structure */ -+ ad = cst_alloc(cst_audiodev, 1); -+ assert(ad != NULL); -+ ad->real_sps = ad->sps = sps; -+ ad->real_channels = ad->channels = channels; -+ ad->real_fmt = ad->fmt = fmt; -+ ad->platform_data = (void *) pcm_handle; -+ -+ return ad; -+} -+ -+int audio_close_alsa(cst_audiodev *ad) -+{ -+ int result; -+ snd_pcm_t *pcm_handle; -+ -+ if (ad == NULL) -+ return 0; -+ -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ result = snd_pcm_close(pcm_handle); -+ if (result < 0) -+ { -+ cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ cst_free(ad); -+ return result; -+} -+ -+/* Returns zero if recovery was successful. */ -+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res) -+{ -+ if (res == -EPIPE) /* xrun */ -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res < 0) -+ { -+ /* Failed to recover from xrun */ -+ cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ else if (res == -ESTRPIPE) /* Suspend */ -+ { -+ while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) -+ { -+ snd_pcm_wait(pcm_handle, 1000); -+ } -+ if (res < 0) -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res <0) -+ { -+ /* Resume failed */ -+ cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ } -+ else if (res < 0) -+ { -+ /* Unknown failure */ -+ cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res)); -+ return res; -+ } -+ return 0; -+} -+ -+int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes) -+{ -+ size_t frame_size; -+ ssize_t num_frames, res; -+ snd_pcm_t *pcm_handle; -+ char *buf = (char *) samples; -+ -+ /* Determine frame size in bytes */ -+ frame_size = audio_bps(ad->real_fmt) * ad->real_channels; -+ /* Require that only complete frames are handed in */ -+ assert((num_bytes % frame_size) == 0); -+ num_frames = num_bytes / frame_size; -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ -+ while (num_frames > 0) -+ { -+ res = snd_pcm_writei(pcm_handle, buf, num_frames); -+ if (res != num_frames) -+ { -+ if (res == -EAGAIN || (res > 0 && res < num_frames)) -+ { -+ snd_pcm_wait(pcm_handle, 100); -+ } -+ else if (recover_from_error(pcm_handle, res) < 0) -+ { -+ return -1; -+ } -+ } -+ -+ if (res >0) -+ { -+ num_frames -= res; -+ buf += res * frame_size; -+ } -+ } -+ return num_bytes; -+} -+ -+int audio_flush_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drain((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ /* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -+ -+int audio_drain_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drop((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+/* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -Index: src/audio/Makefile -=================================================================== ---- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7) -@@ -43,9 +43,13 @@ - - BASESRCS = auclient.c auserver.c audio.c - SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c) --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \ -- au_oss.c au_sun.c au_wince.c au_palmos.c -+ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c - LIBNAME = flite - - LOCAL_INCLUDES = -I. $(AUDIODEFS) -Index: src/lexicon/Makefile -=================================================================== ---- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7) -@@ -38,8 +38,13 @@ - DIRNAME=src/lexicon - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/synth/Makefile -=================================================================== ---- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/synth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \ - flite.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/speech/Makefile -=================================================================== ---- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \ - cst_wave_utils.c cst_lpcres.c rateconv.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/wavesynth/Makefile -=================================================================== ---- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/wavesynth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \ - cst_sigprFP.c cst_sts.c cst_reflpc.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - LIBNAME = flite - FILES = Makefile $(SRCS) - -Index: src/regex/Makefile -=================================================================== ---- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7) -@@ -42,8 +42,13 @@ - DIRNAME=src/regex - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_regex.c regexp.c regsub.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/stats/Makefile -=================================================================== ---- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7) -@@ -39,8 +39,13 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_cart.c cst_viterbi.c cst_ss.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: config/common_make_rules -=================================================================== ---- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7) -@@ -73,12 +73,13 @@ - ifdef SHFLAGS - SOOBJS = $(OBJS:.o=.os) - FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) --ifdef LIBNAME --ALL += $(OBJDIR)/.build_so -+#ifdef LIBNAME -+#ALL += $(OBJDIR)/.build_so -+#endif - endif --endif - ifdef LIBNAME - ALL += $(OBJDIR)/.build_lib -+ALL += $(OBJDIR)/.build_so - endif - # Only do some directories when you are not cross compiling - ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) -@@ -117,14 +118,17 @@ - @ touch $(OBJDIR)/.build_so - - # Used in the lib/ directory and in building new voices --$(OBJDIR)/%.so: %.shared.a -+#$(OBJDIR)/%.so: %.shared.a -+%.so: %.shared.a - @ echo making $@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} -+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ - @ rm -rf shared_os - - $(OBJDIR)/.make_build_dirs: -Index: lib/Makefile -=================================================================== ---- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7) -@@ -0,0 +1,70 @@ -+########################################################################### -+## ## -+## Language Technologies Institute ## -+## Carnegie Mellon University ## -+## Copyright (c) 1999 ## -+## All Rights Reserved. ## -+## ## -+## Permission is hereby granted, free of charge, to use and distribute ## -+## this software and its documentation without restriction, including ## -+## without limitation the rights to use, copy, modify, merge, publish, ## -+## distribute, sublicense, and/or sell copies of this work, and to ## -+## permit persons to whom this work is furnished to do so, subject to ## -+## the following conditions: ## -+## 1. The code must retain the above copyright notice, this list of ## -+## conditions and the following disclaimer. ## -+## 2. Any modifications must be clearly marked as such. ## -+## 3. Original authors' names are not deleted. ## -+## 4. The authors' names are not used to endorse or promote products ## -+## derived from this software without specific prior written ## -+## permission. ## -+## ## -+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## -+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## -+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## -+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## -+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## -+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## -+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## -+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## -+## THIS SOFTWARE. ## -+## ## -+########################################################################### -+## ## -+## FLITE libraries ## -+## ## -+########################################################################### -+TOP=.. -+DIRNAME=lib -+BUILD_DIRS = -+ALL_DIRS= -+FILES = Makefile -+LIBNAMES = flite flite_cmulex flite_usenglish \ -+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb -+ -+STATICLIBS= $(LIBNAMES:%=lib%.a) -+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) -+#SHAREDLIBS = $(LIBNAMES:%=lib%.so) -+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) -+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ -+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) -+ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS) -+ -+ALL = shared_libs -+ -+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} -+ -+include $(TOP)/config/common_make_rules -+ -+ifdef SHFLAGS -+shared_libs: $(SHAREDLIBS) -+else -+shared_libs: nothing -+endif -+ -+install: -+ @ cp -vf $(LIBDIR)/* . -+ @ $(MAKE) shared_libs -+ @ echo ARLIBS: $(SHAREDARLIBS) -+ @ echo SHARLIBS: $(SHAREDLIBS) -+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 6a3d1c9f93..ec9e04bed6 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb @@ -2,7 +2,8 @@ require ${BPN}.inc DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -inherit binconfig lib_package gtk-icon-cache mime +inherit distro_features_check binconfig lib_package gtk-icon-cache mime +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch" @@ -34,4 +35,12 @@ python populate_packages_prepend () { LEAD_SONAME = "libfltk.so" -FILES_${PN} += "${datadir}/mime" +# .desktop / icons / mime only necessary for fluid app +FILES_${PN}-bin += " \ + ${datadir}/applications \ + ${datadir}/icons \ + ${datadir}/mime \ +" + +# cmake files +FILES_${PN}-dev += "${datadir}/fltk" diff --git a/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb b/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb index b505ac18dd..b72ffa9a19 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb @@ -29,8 +29,8 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_package[noexec] = "1" do_packagedata[noexec] = "1" -do_package_write_ipk[noexec] = "1" -do_package_write_deb[noexec] = "1" -do_package_write_rpm[noexec] = "1" +deltask package_write_ipk +deltask package_write_deb +deltask package_write_rpm BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch index e582c0da6e..2fd21c2783 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch @@ -1,4 +1,4 @@ -From ea9f64eb2cdf3be6c4dc65fa1472d854616e43ca Mon Sep 17 00:00:00 2001 +From aa0a63209af6813d87255ec3ab339f2dbbf27d6d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 6 Mar 2017 13:38:46 -0800 Subject: [PATCH] Support Atomic ops on clang @@ -9,25 +9,23 @@ gcc 4.2, here it depends on gcc 4.7 to enable the atomics and fails for clang Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- + Upstream-Status: Pending +--- src/base/atomicops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/atomicops.h b/src/base/atomicops.h -index be038f3..f1a21ff 100644 +index dac95be..390733c 100644 --- a/src/base/atomicops.h +++ b/src/base/atomicops.h -@@ -118,7 +118,7 @@ +@@ -124,7 +124,7 @@ #include "base/atomicops-internals-linuxppc.h" #elif defined(__GNUC__) && defined(__mips__) #include "base/atomicops-internals-mips.h" -#elif defined(__GNUC__) && GCC_VERSION >= 40700 +#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__) #include "base/atomicops-internals-gcc.h" - #else - #error You need to implement atomic operations for this architecture --- -2.12.0 - + #elif defined(__clang__) && CLANG_VERSION >= 30400 + #include "base/atomicops-internals-gcc.h" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch index 5bd0b6fa4f..b3033621b5 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch @@ -1,4 +1,4 @@ -From 12ac0dc6742e1bcdfaf1842186c9002f0820a5e8 Mon Sep 17 00:00:00 2001 +From 230cd84486145c5bb1d69d4c9a544e00adbcc9b5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 1 Jul 2017 13:21:21 -0700 Subject: [PATCH] Use ucontext_t instead of struct ucontext @@ -6,12 +6,13 @@ Subject: [PATCH] Use ucontext_t instead of struct ucontext Newer glibc has dropped the ucontext tag from exposing Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/stacktrace_powerpc-linux-inl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h -index a9bf775..47ff2d7 100644 +index 3b3843b..a301a46 100644 --- a/src/stacktrace_powerpc-linux-inl.h +++ b/src/stacktrace_powerpc-linux-inl.h @@ -53,7 +53,6 @@ @@ -31,6 +32,3 @@ index a9bf775..47ff2d7 100644 // We don't care about the rest, since IP value is at 'uc' field.A } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current); result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; --- -2.13.2 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch index 99127e11a6..ab3ceb964f 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch @@ -1,19 +1,20 @@ -From b5961f17e9d7f2bc44da611b3e4b27c8a641fc72 Mon Sep 17 00:00:00 2001 +From 06605158852f9364519391fa11070ba5ec4303e9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 2 Sep 2017 08:07:17 -0700 Subject: [PATCH] disbale heap checkers and debug allocator on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- + Upstream-Status: Pending +--- configure.ac | 2 ++ 1 file changed, 2 insertions(+) -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac +diff --git a/configure.ac b/configure.ac +index 70b49a3..8154c5c 100644 +--- a/configure.ac ++++ b/configure.ac @@ -51,6 +51,8 @@ case "$host" in *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; *-freebsd*) default_enable_heap_checker=no;; diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch index 78621c7fe0..0a72ff27c8 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch @@ -1,4 +1,4 @@ -From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From 034e7da08c3fbffcba8cf8d4e24a71a16558db5a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 16 Jul 2017 15:51:28 -0700 Subject: [PATCH] fix build with musl libc @@ -6,6 +6,7 @@ Subject: [PATCH] fix build with musl libc Patch from https://github.com/gperftools/gperftools/pull/765/ Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- configure.ac | 1 + src/malloc_hook_mmap_linux.h | 8 ++++++-- @@ -56,6 +57,3 @@ index 79ac4e3..d444635 100755 // libc's version: extern "C" void* __sbrk(ptrdiff_t increment); --- -2.13.3 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch index 667008a5b1..4c63e73b3c 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch @@ -1,4 +1,4 @@ -From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From a16a73f0819d26219ee83cd98eea82786d7c1755 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 16 Jul 2017 19:28:17 -0700 Subject: [PATCH] include fcntl.h for loff_t definition @@ -7,6 +7,7 @@ Fixes linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/base/linux_syscall_support.h | 1 + 1 file changed, 1 insertion(+) @@ -23,6 +24,3 @@ index 85347a2..70431ca 100644 #ifdef __mips__ /* Include definitions of the ABI currently in use. */ --- -2.13.3 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch index f2647404bf..c3c5784186 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch @@ -1,15 +1,22 @@ -Disable libunwind on aarch64 +From 564f800e3e24647c095f7a321bf3ebdccfbf762d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 2 Sep 2017 12:02:04 -0700 +Subject: [PATCH] Disable libunwind on aarch64 Fixes hangs when using libtcmalloc.so Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 8154c5c..063b260 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __PPC64__])], [default_enable_libunwind=yes default_tcmalloc_pagesize=8]) diff --git a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch index 7e1a23bf68..10274a6dec 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch @@ -1,11 +1,19 @@ -sgidef.h does not exist on musl and its not needed to compile +From 259b420444c52463795b4b582a2ab7511149eea7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Oct 2017 21:26:40 -0700 +Subject: [PATCH] sgidef.h does not exist on musl and its not needed to compile Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: git/src/base/linux_syscall_support.h -=================================================================== ---- git.orig/src/base/linux_syscall_support.h -+++ git/src/base/linux_syscall_support.h + +--- + src/base/linux_syscall_support.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h +index 70431ca..b23ca59 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h @@ -164,7 +164,7 @@ extern "C" { #include <endian.h> #include <fcntl.h> diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch index 19f8380b47..1ec6a61b31 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch @@ -3,9 +3,10 @@ Auto-detect disks if none specified Refer to: https://bugzilla.redhat.com/show_bug.cgi?id=717479 -diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8 ---- hddtemp-0.3-beta15/doc/hddtemp.8~ 2011-08-18 00:36:05.689001470 +0300 -+++ hddtemp-0.3-beta15/doc/hddtemp.8 2011-08-18 00:44:46.753006253 +0300 +Index: hddtemp-0.3-beta15/doc/hddtemp.8 +=================================================================== +--- hddtemp-0.3-beta15.orig/doc/hddtemp.8 ++++ hddtemp-0.3-beta15/doc/hddtemp.8 @@ -19,7 +19,7 @@ hddtemp \- Utility to monitor hard drive temperature .SH SYNOPSIS @@ -25,9 +26,10 @@ diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8 .SH "OPTIONS" -diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c ---- hddtemp-0.3-beta15/src/hddtemp.c~ 2011-08-18 00:36:05.638996861 +0300 -+++ hddtemp-0.3-beta15/src/hddtemp.c 2011-08-18 00:35:55.485060798 +0300 +Index: hddtemp-0.3-beta15/src/hddtemp.c +=================================================================== +--- hddtemp-0.3-beta15.orig/src/hddtemp.c ++++ hddtemp-0.3-beta15/src/hddtemp.c @@ -54,6 +54,7 @@ #include <linux/hdreg.h> #include <ctype.h> @@ -44,7 +46,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c backtrace_sigsegv(); backtrace_sigill(); -@@ -419,11 +421,6 @@ int main(int argc, char* argv[]) { +@@ -423,11 +425,6 @@ int main(int argc, char* argv[]) { exit(0); } @@ -56,7 +58,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c if(debug) { /* argc = optind + 1;*/ quiet = 1; -@@ -434,6 +431,23 @@ int main(int argc, char* argv[]) { +@@ -438,6 +435,23 @@ int main(int argc, char* argv[]) { exit(1); } @@ -80,7 +82,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c init_bus_types(); /* collect disks informations */ -@@ -527,6 +541,7 @@ int main(int argc, char* argv[]) { +@@ -531,6 +545,7 @@ int main(int argc, char* argv[]) { else { do_direct_mode(ldisks); } diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff index f61c1649a4..057b1fd1d3 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff @@ -8,9 +8,11 @@ Filtered with: Upstream-Status: unmaintained +Index: hddtemp-0.3-beta15/doc/hddtemp.8 +=================================================================== --- hddtemp-0.3-beta15.orig/doc/hddtemp.8 +++ hddtemp-0.3-beta15/doc/hddtemp.8 -@@ -58,6 +58,10 @@ +@@ -58,6 +58,10 @@ Execute hddtemp in TCP/IP daemon mode (p .B \-f, \-\-file=\fIfile\fI Specify the database file to use. .TP @@ -21,7 +23,7 @@ Upstream-Status: unmaintained .B \-l, \-\-listen=\fIaddr\fR Listen on a specific address. \fIaddr\fR is a string containing a host name or a numeric host address string. The numeric host address -@@ -80,6 +84,9 @@ +@@ -80,6 +84,9 @@ seconds. .B \-q, \-\-quiet Don't check if the drive is supported. .TP @@ -31,7 +33,7 @@ Upstream-Status: unmaintained .B \-v, \-\-version Display hddtemp version number. .TP -@@ -96,7 +103,7 @@ +@@ -96,7 +103,7 @@ Listen on IPv6 sockets only. .SH "DRIVE DATABASE" If you know your drive has a temperature sensor but it is being reported unsupported, tell me which model and which manufacturer it @@ -40,7 +42,7 @@ Upstream-Status: unmaintained line of hddtemp.db is either a comment, a blank line or a line containing: .TP -@@ -112,7 +119,7 @@ +@@ -112,7 +119,7 @@ set of drives from its model name or fro Feedback is welcome (see the REPORT section below). .SH "TCP/IP DAEMON MODE" @@ -49,7 +51,7 @@ Upstream-Status: unmaintained .PP # hddtemp SATA:/dev/sda PATA:/dev/hda .PP -@@ -120,7 +127,7 @@ +@@ -120,7 +127,7 @@ To test .B hddtemp in daemon mode, start it like this: .PP @@ -58,7 +60,7 @@ Upstream-Status: unmaintained .PP .PP and use -@@ -165,8 +172,8 @@ +@@ -165,8 +172,8 @@ and 12 are often reported to match a tem investigation they do not. But fields 194 (which is the standard field for temperature) and 231 are good candidates. .PP @@ -69,13 +71,15 @@ Upstream-Status: unmaintained yourself. .SH "BUGS" -@@ -183,5 +190,5 @@ +@@ -183,5 +190,5 @@ supported on i386 architectures only. .PP Emmanuel Varagnat (hddtemp@guzu.net). .PP -This manual page was originaly written by Aurelien Jarno <aurel32@debian.org>, +This manual page was originally written by Aurelien Jarno <aurel32@debian.org>, for the Debian GNU/Linux system (but may be used by others). +Index: hddtemp-0.3-beta15/po/fr.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/fr.po +++ hddtemp-0.3-beta15/po/fr.po @@ -7,9 +7,9 @@ @@ -91,7 +95,7 @@ Upstream-Status: unmaintained "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" "Language-Team: FRANCAIS <fr@li.org>\n" "MIME-Version: 1.0\n" -@@ -17,23 +17,7 @@ +@@ -17,23 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.1\n" @@ -116,7 +120,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -46,7 +30,7 @@ +@@ -46,7 +30,7 @@ msgstr "" "Modle: %s\n" "\n" @@ -125,7 +129,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -60,75 +44,60 @@ +@@ -60,75 +44,60 @@ msgstr "" "net).\n" "ATTENTION : Voir les options --help, --debug et --drivebase.\n" @@ -216,7 +220,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -138,6 +107,7 @@ +@@ -138,6 +107,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -224,7 +228,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -145,6 +115,8 @@ +@@ -145,6 +115,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -233,7 +237,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -153,11 +125,14 @@ +@@ -153,11 +125,14 @@ msgid "" "\n" "Report bugs or new drives to <hddtemp@guzu.net>.\n" msgstr "" @@ -249,7 +253,7 @@ Upstream-Status: unmaintained " -b --drivebase : affiche le contenu du fichier de base de donne " "qui \n" " permet hddtemp de reconnatre les lecteurs " -@@ -172,6 +147,7 @@ +@@ -172,6 +147,7 @@ msgstr "" "dfaut).\n" " -f --file=FILE : specifie le fichier utiliser comme base de " "donnes.\n" @@ -257,7 +261,7 @@ Upstream-Status: unmaintained " -l --listen=addr : coute sur une interface spcifique (en mode dmon " "TCP/IP).\n" " -n --numeric : affiche seulement la temprature.\n" -@@ -180,6 +156,8 @@ +@@ -180,6 +156,8 @@ msgstr "" "dmon TCP/IP).\n" " -S --syslog=s : enregistre la temprature dans syslog tous les s " "secondes.\n" @@ -266,7 +270,7 @@ Upstream-Status: unmaintained " -q --quiet : ne vrifie pas si le lecteur est support.\n" " -v --version : affiche la version de hddtemp.\n" " -w --wake-up : rveiller le lecteur si ncessaire.\n" -@@ -188,62 +166,95 @@ +@@ -188,62 +166,95 @@ msgstr "" "\n" "Report bugs or new drives to <hddtemp@guzu.net>.\n" @@ -377,6 +381,8 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "champ(%d)\t = %d\n" +Index: hddtemp-0.3-beta15/po/ru.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/ru.po +++ hddtemp-0.3-beta15/po/ru.po @@ -6,8 +6,8 @@ @@ -390,7 +396,7 @@ Upstream-Status: unmaintained "PO-Revision-Date: 2003-03-08 16:42+0300\n" "Last-Translator: Michael Shigorin <mike@altlinux.ru>\n" "Language-Team: Russian <ru@li.org>\n" -@@ -15,23 +15,7 @@ +@@ -15,23 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -415,7 +421,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -40,7 +24,7 @@ +@@ -40,7 +24,7 @@ msgid "" "\n" msgstr "" @@ -424,7 +430,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -53,72 +37,59 @@ +@@ -53,72 +37,59 @@ msgstr "" ": , , hddtemp@guzu.net\n" ": (. --help, --debug --drivebase).\n" @@ -512,7 +518,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -128,6 +99,7 @@ +@@ -128,6 +99,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -520,7 +526,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -135,6 +107,8 @@ +@@ -135,6 +107,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -529,7 +535,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -168,59 +142,90 @@ +@@ -168,59 +142,90 @@ msgstr "" "\n" " <hddtemp@guzu.net>.\n" @@ -636,6 +642,8 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "(%d)\t = %d\n" +Index: hddtemp-0.3-beta15/po/sv.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/sv.po +++ hddtemp-0.3-beta15/po/sv.po @@ -6,8 +6,8 @@ @@ -649,7 +657,7 @@ Upstream-Status: unmaintained "PO-Revision-Date: 2005-11-02 19:03+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <sv@li.org>\n" -@@ -17,23 +17,7 @@ +@@ -17,23 +17,7 @@ msgstr "" "X-Poedit-Language: swe\n" "X-Poedit-Country: swe\n" @@ -674,7 +682,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -46,7 +30,7 @@ +@@ -46,7 +30,7 @@ msgstr "" "Modell: %s\n" "\n" @@ -683,7 +691,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -60,76 +44,63 @@ +@@ -60,76 +44,63 @@ msgstr "" "net).\n" "VARNING: Se --help, --debug och --drivebase flaggorna.\n" @@ -777,7 +785,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -139,6 +110,7 @@ +@@ -139,6 +110,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -785,7 +793,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -146,6 +118,8 @@ +@@ -146,6 +118,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -794,7 +802,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -184,61 +158,91 @@ +@@ -184,61 +158,91 @@ msgstr "" "\n" "Rapportera buggar eller nya hrddiskar till <hddtemp@guzu.net>.\n" @@ -901,9 +909,11 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "flt(%d)\t = %d\n" +Index: hddtemp-0.3-beta15/po/pt.po +=================================================================== --- hddtemp-0.3-beta15.orig/po/pt.po +++ hddtemp-0.3-beta15/po/pt.po -@@ -7,7 +7,7 @@ +@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hddtemp 0.3-beta14\n" "Report-Msgid-Bugs-To: \n" @@ -912,7 +922,7 @@ Upstream-Status: unmaintained "PO-Revision-Date: 2006-03-29 23:22+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianp.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" -@@ -15,23 +15,7 @@ +@@ -15,23 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -937,7 +947,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -44,7 +28,7 @@ +@@ -44,7 +28,7 @@ msgstr "" "Modelo: %s\n" "\n" @@ -946,7 +956,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -54,79 +38,68 @@ +@@ -54,79 +38,68 @@ msgid "" msgstr "" "AVISO: O disco %s não parece ter um sensor de temperatura.\n" "AVISO: Isto não significa que não tem nenhum.\n" @@ -1047,7 +1057,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -136,6 +109,7 @@ +@@ -136,6 +109,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -1055,7 +1065,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -143,6 +117,8 @@ +@@ -143,6 +117,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -1064,7 +1074,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -156,19 +132,23 @@ +@@ -156,19 +132,23 @@ msgstr "" " hddtemp mostra a temperatura dos discos indicados no argumento.\n" " Os discos têm de suportar S.M.A.R.T.\n" "\n" @@ -1096,7 +1106,7 @@ Upstream-Status: unmaintained " -q --quiet : não verificar se o disco é suportado.\n" " -v --version : mostrar o número da versão do hddtemp.\n" " -w --wake-up : acordar o disco se necessário.\n" -@@ -177,58 +157,93 @@ +@@ -177,58 +157,93 @@ msgstr "" "\n" "Relatar bugs ou novos discos para <hddtemp@guzu.net>.\n" @@ -1208,7 +1218,9 @@ Upstream-Status: unmaintained + +#~ msgid "field(%d)\t = %d\n" +#~ msgstr "campo(%d)\t = %d\n" ---- hddtemp-0.3-beta15.orig/po/de.po +Index: hddtemp-0.3-beta15/po/de.po +=================================================================== +--- /dev/null +++ hddtemp-0.3-beta15/po/de.po @@ -0,0 +1,250 @@ +# German translation of hddtemp. @@ -1461,12 +1473,16 @@ Upstream-Status: unmaintained +#, c-format +msgid "log sense failed : %s" +msgstr "Protokoll-Erkennung fehlgeschlagen : %s" +Index: hddtemp-0.3-beta15/po/LINGUAS +=================================================================== --- hddtemp-0.3-beta15.orig/po/LINGUAS +++ hddtemp-0.3-beta15/po/LINGUAS @@ -1,2 +1,2 @@ # Set of available languages. -fr pt ru sv +de fr pt ru sv +Index: hddtemp-0.3-beta15/po/hddtemp.pot +=================================================================== --- hddtemp-0.3-beta15.orig/po/hddtemp.pot +++ hddtemp-0.3-beta15/po/hddtemp.pot @@ -1,35 +1,22 @@ @@ -1513,7 +1529,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "\n" -@@ -38,7 +25,7 @@ +@@ -38,7 +25,7 @@ msgid "" "\n" msgstr "" @@ -1522,7 +1538,7 @@ Upstream-Status: unmaintained #, c-format msgid "" "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -47,67 +34,59 @@ +@@ -47,67 +34,59 @@ msgid "" "WARNING: See --help, --debug and --drivebase options.\n" msgstr "" @@ -1604,7 +1620,7 @@ Upstream-Status: unmaintained " -b --drivebase : display database file content that allow hddtemp to\n" " recognize supported drives.\n" " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -117,6 +96,7 @@ +@@ -117,6 +96,7 @@ msgid "" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " "default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -1612,7 +1628,7 @@ Upstream-Status: unmaintained " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " "mode).\n" " -n --numeric : print only the temperature.\n" -@@ -124,6 +104,8 @@ +@@ -124,6 +104,8 @@ msgid "" " -s --separator=C : separator to use between fields (in TCP/IP daemon " "mode).\n" " -S --syslog=s : log temperature to syslog every s seconds.\n" @@ -1621,7 +1637,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -133,58 +115,69 @@ +@@ -133,58 +115,69 @@ msgid "" "Report bugs or new drives to <hddtemp@guzu.net>.\n" msgstr "" @@ -1705,9 +1721,11 @@ Upstream-Status: unmaintained #, c-format msgid "log sense failed : %s" msgstr "" +Index: hddtemp-0.3-beta15/src/sata.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/sata.c +++ hddtemp-0.3-beta15/src/sata.c -@@ -118,11 +118,22 @@ +@@ -118,11 +118,22 @@ static enum e_gettemp sata_get_temperatu int i; u16 * p; @@ -1731,7 +1749,7 @@ Upstream-Status: unmaintained /* get SMART values */ if(sata_enable_smart(dsk->fd) != 0) { -@@ -154,24 +165,15 @@ +@@ -154,24 +165,15 @@ static enum e_gettemp sata_get_temperatu } /* temperature */ @@ -1759,6 +1777,8 @@ Upstream-Status: unmaintained /* never reached */ } +Index: hddtemp-0.3-beta15/src/satacmds.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/satacmds.c +++ hddtemp-0.3-beta15/src/satacmds.c @@ -39,7 +39,7 @@ @@ -1770,7 +1790,7 @@ Upstream-Status: unmaintained // Application specific includes #include "satacmds.h" -@@ -80,8 +80,8 @@ +@@ -80,8 +80,8 @@ int sata_pass_thru(int device, unsigned ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); @@ -1781,7 +1801,7 @@ Upstream-Status: unmaintained return 1; else return ret; -@@ -95,10 +95,10 @@ +@@ -95,10 +95,10 @@ void sata_fixstring(unsigned char *s, in p = s; end = &s[bytecount & ~1]; /* bytecount must be even */ @@ -1794,6 +1814,8 @@ Upstream-Status: unmaintained } /* strip leading blanks */ +Index: hddtemp-0.3-beta15/src/backtrace.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/backtrace.c +++ hddtemp-0.3-beta15/src/backtrace.c @@ -16,9 +16,10 @@ @@ -1822,7 +1844,7 @@ Upstream-Status: unmaintained #define MAX_BTSIZE 64 -@@ -42,7 +47,6 @@ +@@ -42,7 +47,6 @@ void backtrace_handler(int n, siginfo_t static char **messages = NULL; static size_t btsize = 0; static size_t i; @@ -1830,7 +1852,7 @@ Upstream-Status: unmaintained static char *strerr = "???"; static FILE *fstrm; -@@ -61,10 +65,10 @@ +@@ -61,10 +65,10 @@ void backtrace_handler(int n, siginfo_t SIC_CASE(SEGV_MAPERR); SIC_CASE(SEGV_ACCERR); } @@ -1843,7 +1865,7 @@ Upstream-Status: unmaintained break; case SIGILL: switch(ist->si_code) { -@@ -77,10 +81,10 @@ +@@ -77,10 +81,10 @@ void backtrace_handler(int n, siginfo_t SIC_CASE(ILL_COPROC); SIC_CASE(ILL_BADSTK); } @@ -1856,7 +1878,7 @@ Upstream-Status: unmaintained break; case SIGBUS: switch(ist->si_code) { -@@ -88,10 +92,10 @@ +@@ -88,10 +92,10 @@ void backtrace_handler(int n, siginfo_t SIC_CASE(BUS_ADRERR); SIC_CASE(BUS_OBJERR); } @@ -1869,7 +1891,7 @@ Upstream-Status: unmaintained break; } fflush(fstrm); -@@ -101,7 +105,7 @@ +@@ -101,7 +105,7 @@ void backtrace_handler(int n, siginfo_t /* old_eip = *(unsigned int*)((void*)&n-4); old_ebp = *(unsigned int*)((void*)&n-8); @@ -1878,7 +1900,7 @@ Upstream-Status: unmaintained *(unsigned int*)((void*)&n-8) = puc->uc_mcontext.gregs[REG_EBP]; btsize = backtrace(btinfo, MAX_BTSIZE); -@@ -111,14 +115,14 @@ +@@ -111,14 +115,14 @@ void backtrace_handler(int n, siginfo_t */ btsize = backtrace(btinfo, MAX_BTSIZE); @@ -1895,9 +1917,11 @@ Upstream-Status: unmaintained fflush(fstrm); fclose(fstrm); +Index: hddtemp-0.3-beta15/src/daemon.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/daemon.c +++ hddtemp-0.3-beta15/src/daemon.c -@@ -163,19 +163,16 @@ +@@ -163,19 +163,16 @@ void daemon_send_msg(struct disk *ldisks switch(dsk->ret) { case GETTEMP_NOT_APPLICABLE: @@ -1922,7 +1946,7 @@ Upstream-Status: unmaintained break; case GETTEMP_KNOWN: n = snprintf(msg, sizeof(msg), "%s%c%s%c%d%c%c", -@@ -185,26 +182,23 @@ +@@ -185,26 +182,23 @@ void daemon_send_msg(struct disk *ldisks get_unit(dsk)); break; case GETTEMP_NOSENSOR: @@ -1955,7 +1979,7 @@ Upstream-Status: unmaintained break; } write(cfd,&separator, 1); -@@ -222,14 +216,11 @@ +@@ -222,14 +216,11 @@ void daemon_syslog(struct disk *ldisks) for(dsk = ldisks; dsk; dsk = dsk->next) { switch(dsk->ret) { case GETTEMP_KNOWN: @@ -1972,7 +1996,7 @@ Upstream-Status: unmaintained break; case GETTEMP_DRIVE_SLEEP: syslog(LOG_WARNING, _("%s: %s: drive is sleeping"), -@@ -270,28 +261,30 @@ +@@ -270,28 +261,30 @@ void do_daemon_mode(struct disk *ldisks) fd_set deffds; time_t next_time; @@ -2025,9 +2049,11 @@ Upstream-Status: unmaintained } chdir("/"); umask(0); +Index: hddtemp-0.3-beta15/src/hddtemp.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/hddtemp.c +++ hddtemp-0.3-beta15/src/hddtemp.c -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ char * listen_addr; char separator = SEPARATOR; struct bustype * bus[BUS_TYPE_MAX]; @@ -2036,7 +2062,7 @@ Upstream-Status: unmaintained static enum { DEFAULT, CELSIUS, FAHRENHEIT } unit; -@@ -194,23 +194,7 @@ +@@ -194,23 +194,7 @@ static void display_temperature(struct d if (numeric && quiet) printf("0\n"); else @@ -2061,7 +2087,7 @@ Upstream-Status: unmaintained break; case GETTEMP_KNOWN: -@@ -232,14 +216,14 @@ +@@ -232,14 +216,14 @@ static void display_temperature(struct d if (numeric && quiet) printf("0\n"); else @@ -2078,7 +2104,7 @@ Upstream-Status: unmaintained break; default: -@@ -268,8 +252,9 @@ +@@ -268,8 +252,9 @@ void do_direct_mode(struct disk *ldisks) int main(int argc, char* argv[]) { int i, c, lindex = 0, db_loaded = 0; @@ -2089,16 +2115,16 @@ Upstream-Status: unmaintained backtrace_sigsegv(); backtrace_sigill(); -@@ -279,7 +264,7 @@ - bindtextdomain (PACKAGE, LOCALEDIR); +@@ -283,7 +268,7 @@ int main(int argc, char* argv[]) { textdomain (PACKAGE); + #endif - show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0; + show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0; unit = DEFAULT; portnum = PORT_NUMBER; listen_addr = NULL; -@@ -294,6 +279,7 @@ +@@ -298,6 +283,7 @@ int main(int argc, char* argv[]) { {"drivebase", 0, NULL, 'b'}, {"debug", 0, NULL, 'D'}, {"file", 1, NULL, 'f'}, @@ -2106,7 +2132,7 @@ Upstream-Status: unmaintained {"listen", 1, NULL, 'l'}, {"version", 0, NULL, 'v'}, {"port", 1, NULL, 'p'}, -@@ -305,7 +291,7 @@ +@@ -309,7 +295,7 @@ int main(int argc, char* argv[]) { {0, 0, 0, 0} }; @@ -2115,7 +2141,7 @@ Upstream-Status: unmaintained if (c == -1) break; -@@ -382,12 +368,13 @@ +@@ -386,12 +372,13 @@ int main(int argc, char* argv[]) { " (done for every drive supplied).\n" " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by default.)\n" " -f --file=FILE : specify database file to use.\n" @@ -2130,7 +2156,7 @@ Upstream-Status: unmaintained " -q --quiet : do not check if the drive is supported.\n" " -v --version : display hddtemp version number.\n" " -w --wake-up : wake-up the drive if need.\n" -@@ -418,6 +405,9 @@ +@@ -422,6 +409,9 @@ int main(int argc, char* argv[]) { } } break; @@ -2140,7 +2166,7 @@ Upstream-Status: unmaintained default: exit(1); } -@@ -489,6 +479,7 @@ +@@ -493,6 +483,7 @@ int main(int argc, char* argv[]) { if( (dsk->fd = open(dsk->drive, O_RDONLY | O_NONBLOCK)) < 0) { snprintf(dsk->errormsg, MAX_ERRORMSG_SIZE, "open: %s\n", strerror(errno)); dsk->type = ERROR; @@ -2148,7 +2174,7 @@ Upstream-Status: unmaintained continue; } -@@ -501,6 +492,7 @@ +@@ -505,6 +496,7 @@ int main(int argc, char* argv[]) { ldisks = dsk->next; free(dsk); @@ -2156,7 +2182,7 @@ Upstream-Status: unmaintained continue; } -@@ -514,11 +506,17 @@ +@@ -518,11 +510,17 @@ int main(int argc, char* argv[]) { db_loaded = 1; } @@ -2177,16 +2203,18 @@ Upstream-Status: unmaintained } } -@@ -530,5 +528,5 @@ +@@ -534,5 +532,5 @@ int main(int argc, char* argv[]) { do_direct_mode(ldisks); } - return 0; + return ret; } +Index: hddtemp-0.3-beta15/src/ata.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/ata.c +++ hddtemp-0.3-beta15/src/ata.c -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ static enum e_gettemp ata_get_temperatur int i; u16 * p; @@ -2195,7 +2223,7 @@ Upstream-Status: unmaintained close(dsk->fd); dsk->fd = -1; return GETTEMP_NOSENSOR; -@@ -140,24 +140,15 @@ +@@ -140,24 +140,15 @@ static enum e_gettemp ata_get_temperatur */ /* temperature */ @@ -2224,9 +2252,11 @@ Upstream-Status: unmaintained /* never reached */ } +Index: hddtemp-0.3-beta15/src/hddtemp.h +=================================================================== --- hddtemp-0.3-beta15.orig/src/hddtemp.h +++ hddtemp-0.3-beta15/src/hddtemp.h -@@ -39,8 +39,6 @@ +@@ -39,8 +39,6 @@ enum e_gettemp { GETTEMP_ERROR, /* Error */ GETTEMP_NOT_APPLICABLE, /* */ GETTEMP_UNKNOWN, /* Drive is not in database */ @@ -2235,7 +2265,7 @@ Upstream-Status: unmaintained GETTEMP_KNOWN, /* Drive appear in database */ GETTEMP_NOSENSOR, /* Drive appear in database but is known to have no sensor */ GETTEMP_DRIVE_SLEEP /* Drive is sleeping */ -@@ -78,7 +76,7 @@ +@@ -78,7 +76,7 @@ struct bustype { extern struct bustype * bus[BUS_TYPE_MAX]; extern char errormsg[MAX_ERRORMSG_SIZE]; @@ -2244,9 +2274,11 @@ Upstream-Status: unmaintained extern char separator; extern long portnum, syslog_interval; extern char * listen_addr; +Index: hddtemp-0.3-beta15/src/scsicmds.c +=================================================================== --- hddtemp-0.3-beta15.orig/src/scsicmds.c +++ hddtemp-0.3-beta15/src/scsicmds.c -@@ -147,6 +147,7 @@ +@@ -147,6 +147,7 @@ int scsi_inquiry(int device, unsigned ch return 1; else { scsi_fixstring(buffer + 8, 24); diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index ff5cd49237..fc0d86e335 100644 --- a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,36 +1,32 @@ -From 7ebcbf17ad9483c7109e4a83b66966bc02f09bd4 Mon Sep 17 00:00:00 2001 -From: Paul Barker <pbarker@toganlabs.com> -Date: Sun, 5 Nov 2017 20:10:10 +0000 -Subject: [PATCH] Use pkg-config - We need to use pkg-config to find the ncurses library instead of the ncurses*-config applications. Signed-off-by: Paul Barker <pbarker@toganlabs.com> +Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> + Upstream-status: Inappropriate (`ncurses*-config` can be used outside of OpenEmbedded) ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 7e0edd1..c5a8365 100644 +index 559dc4d..77aea22 100644 --- a/configure.ac +++ b/configure.ac -@@ -185,9 +185,9 @@ m4_define([HTOP_CHECK_LIB], +@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") if test "x$enable_unicode" = xyes; then - HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", +- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", +- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", - HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], - HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], - HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -200,8 +200,8 @@ if test "x$enable_unicode" = xyes; then ++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", ++ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", + HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], +@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then [AC_CHECK_HEADERS([ncurses/curses.h],[:], [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) else @@ -41,6 +37,3 @@ index 7e0edd1..c5a8365 100644 HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], missing_libraries="$missing_libraries libncurses" --- -2.7.4 - diff --git a/meta-oe/recipes-support/htop/htop_2.0.2.bb b/meta-oe/recipes-support/htop/htop_2.0.2.bb deleted file mode 100644 index 395b83ff66..0000000000 --- a/meta-oe/recipes-support/htop/htop_2.0.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "htop process monitor" -HOMEPAGE = "http://htop.sf.net" -SECTION = "console/utils" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" - -DEPENDS = "ncurses" -RDEPENDS_${PN} = "ncurses-terminfo" - -SRC_URI = " \ - http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz \ - file://0001-Use-pkg-config.patch \ - " - -SRC_URI[md5sum] = "7d354d904bad591a931ad57e99fea84a" -SRC_URI[sha256sum] = "179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487" - -LDFLAGS_append_libc-uclibc = " -lubacktrace" - -do_configure_prepend () { - rm -rf ${S}/config.h -} - -inherit autotools diff --git a/meta-oe/recipes-support/htop/htop_2.1.0.bb b/meta-oe/recipes-support/htop/htop_2.1.0.bb new file mode 100644 index 0000000000..33508f9843 --- /dev/null +++ b/meta-oe/recipes-support/htop/htop_2.1.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Interactive process viewer" +HOMEPAGE = "http://hisham.hm/htop" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" + +DEPENDS = "ncurses" + +SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ + file://0001-Use-pkg-config.patch" +SRC_URI[md5sum] = "f262b66ad6c194782f4d3a80627e84c8" +SRC_URI[sha256sum] = "3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "proc \ + cgroup \ + taskstats \ + unicode \ + linux-affinity \ + delayacct" +PACKAGECONFIG[proc] = "--enable-proc,--disable-proc" +PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" +PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup" +PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" +PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats" +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" +PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" +PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" + +do_configure_prepend () { + rm -rf ${S}/config.h +} diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.6.1.bb b/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb index 125729f2d1..5feea89874 100644 --- a/meta-oe/recipes-support/hunspell/hunspell_1.6.1.bb +++ b/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ " SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "0df1c18c1284f8625af5ae5a8d5c4cef" -SRC_URI[sha256sum] = "30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49" +SRC_URI[md5sum] = "1a54504cb470aafa6530bb372a10dc04" +SRC_URI[sha256sum] = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4" inherit autotools pkgconfig gettext diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index 50d35c682f..679673ba0b 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.291+git${SRCPV}" -SRCREV = "4bfbdcf5913d6dd53336d31b8035708075e6fdfa" +PV = "0.298+git${SRCPV}" +SRCREV = "9030fbd6ab1538f4d77d3cf1e0b463a7ec25b5c4" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch deleted file mode 100644 index 761dadbc34..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd8bc66efac1059c1068f804746b01b90177c333 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> -Date: Sun, 18 Oct 2015 16:52:25 +0200 -Subject: [PATCH] CMakeLists.txt: install FindEigen3.cmake script - -Upstream-Status: Pending - -Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76a11b9..ec6c6ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -342,6 +342,8 @@ if(EIGEN_BUILD_PKGCONFIG) - ) - endif(EIGEN_BUILD_PKGCONFIG) - -+install(FILES "${PROJECT_SOURCE_DIR}/cmake/FindEigen3.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules") -+ - add_subdirectory(Eigen) - - add_subdirectory(doc EXCLUDE_FROM_ALL) --- -1.9.3 - diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.bb b/meta-oe/recipes-support/libgpiod/libgpiod.inc index 6aa27ad574..cd77506235 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -5,11 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" -SRC_URI[md5sum] = "9c1966bea7dffd59bd099a8b2930e2ea" -SRC_URI[sha256sum] = "50c7862428ca90b58672e2475aea66d33a6fc86c6bab1928c0660f3aedf44a37" - -PV = "0.3.2" - inherit autotools pkgconfig # enable tools @@ -18,6 +13,9 @@ PACKAGECONFIG ?= "tools" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" PACKAGECONFIG[tools] = "--enable-tools,--disable-tools," -PACKAGES += " ${PN}-tools" +PACKAGES =+ " ${PN}-tools" FILES_${PN}-tools = "${bindir}/*" + +RRECOMMENDS_TOOLS = "${@bb.utils.contains('PACKAGECONFIG', 'tools', '${PN}-tools', '',d)}" +RRECOMMENDS_${PN} += "${RRECOMMENDS_TOOLS}" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb new file mode 100644 index 0000000000..09fb65a082 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb @@ -0,0 +1,4 @@ +require libgpiod.inc + +SRC_URI[md5sum] = "2aa1e1a80c3c919ae142ab9a55fb59ca" +SRC_URI[sha256sum] = "b773e557af1a497f786825462a776b7bf90168e67ee0a5bc5d2473a5674dc38c" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb new file mode 100644 index 0000000000..51499fd72a --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb @@ -0,0 +1,4 @@ +require libgpiod.inc + +SRC_URI[md5sum] = "2ca0c3eb17d69e367b6f6a109ca86e41" +SRC_URI[sha256sum] = "972924195367f5fb045c023d65340c4b7dfc8764499516be446553865208dedc" diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index d66ac58d5a..ba380ed306 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,21 +4,41 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "08f947d5e40600259bb698c3b95538e9f2bfecc2" -PV = "0.8+git${SRCPV}" +SRCREV = "fa82974d8bd1fded78e630ab71a7ded1b11d0e33" +PV = "0.14+git${SRCPV}" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git" +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" S = "${WORKDIR}/git" -DEPENDS = "flex-native bison-native avahi libaio libusb1 libxml2" +inherit cmake pythonnative systemd -inherit cmake pythonnative +DEPENDS = " \ + flex-native bison-native libaio \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ +" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ +" + +PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND" + +PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" +PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python" RDEPENDS_${PN}-python = "${PN} python-ctypes python-stringold" -FILES_${PN}-iiod = "${sbindir}/iiod" +FILES_${PN}-iiod = " \ + ${sbindir}/iiod \ + ${systemd_system_unitdir}/iiod.service \ +" FILES_${PN}-tests = "${bindir}" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" + +SYSTEMD_PACKAGES = "${PN}-iiod" +SYSTEMD_SERVICE_${PN}-iiod = "iiod.service" diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb index ee399a7645..adbf831dd4 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb @@ -6,11 +6,13 @@ SECTION = "net" DEPENDS = "libgcrypt gnutls file" SRC_URI = "http://ftp.gnu.org/gnu/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "1c20f84a8b9cf692dd50b558b3571a3a" -SRC_URI[sha256sum] = "0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8" +SRC_URI[md5sum] = "8ab5123535549195aff19e91b4e49f48" +SRC_URI[sha256sum] = "9b9ccd7d0b11b0e179f1f58dc2caa3e0c62c8609e1e1dc7dcaadf941b67d923c" inherit autotools lib_package pkgconfig gettext +CFLAGS += "-pthread -D_REENTRANT" + EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" PACKAGECONFIG ?= "curl" diff --git a/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-oe/recipes-support/libol/libol_0.3.18.bb index 74e1ef2156..d7adb2b941 100644 --- a/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ b/meta-oe/recipes-support/libol/libol_0.3.18.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" -SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${BP}.tar.gz \ +SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${BP}.tar.gz \ file://configure.patch" SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" diff --git a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch b/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch deleted file mode 100644 index 2d5bd6d910..0000000000 --- a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: SDL2_ttf-2.0.14/Makefile.am -=================================================================== ---- SDL2_ttf-2.0.14.orig/Makefile.am -+++ SDL2_ttf-2.0.14/Makefile.am -@@ -1,6 +1,8 @@ - # Makefile.am for the SDL truetype font loading library and viewer - lib_LTLIBRARIES = libSDL2_ttf.la - -+AUTOMAKE_OPTIONS = foreign -+ - libSDL2_ttfincludedir = $(includedir)/SDL2 - libSDL2_ttfinclude_HEADERS = \ - SDL_ttf.h diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch new file mode 100644 index 0000000000..1116c34d07 --- /dev/null +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch @@ -0,0 +1,62 @@ +From 8cf318197eea91bec6057308befbb29426d69014 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 22 May 2014 10:59:33 +0100 +Subject: [PATCH] freetype-config was removed from oe-core in + +commit 5870bd272b0b077d0826fb900b251884c1c05061 + + binconfig-disabled: Add class and use + +--- + configure.in | 38 +++++--------------------------------- + 1 file changed, 5 insertions(+), 33 deletions(-) + +diff --git a/configure.in b/configure.in +index 865075e..d7a5a81 100644 +--- a/configure.in ++++ b/configure.in +@@ -90,39 +90,11 @@ case "$host" in + esac + AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) + +-dnl Check for the FreeType 2 library +-dnl +-dnl Get the cflags and libraries from the freetype-config script +-dnl +-AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is +-installed (optional)], +- freetype_prefix="$withval", freetype_prefix="") +-AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix +-where FREETYPE is installed (optional)], +- freetype_exec_prefix="$withval", freetype_exec_prefix="") +- +-if test x$freetype_exec_prefix != x ; then +- freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" +- if test x${FREETYPE_CONFIG+set} != xset ; then +- FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config +- fi +-fi +-if test x$freetype_prefix != x ; then +- freetype_args="$freetype_args --prefix=$freetype_prefix" +- if test x${FREETYPE_CONFIG+set} != xset ; then +- FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config +- fi +-fi +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-no_freetype="" +-if test "$FREETYPE_CONFIG" = "no" ; then +- AC_MSG_ERROR([ +-*** Unable to find FreeType2 library (http://www.freetype.org/) +-]) +-else +- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" +- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" +-fi ++PKG_CHECK_MODULES(FREETYPE2, freetype2, ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LIBS="$LIBS $FREETYPE2_LIBS", ++ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) ++) + + dnl Check for SDL + SDL_VERSION=1.2.4 diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch new file mode 100644 index 0000000000..871e6e94ef --- /dev/null +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch @@ -0,0 +1,21 @@ +From f9c4ad3a171d676e3818b8f6897f325ccf0b2203 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 9 May 2017 00:57:10 -0700 + +--- + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 8166d91..8e05e49 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ + + lib_LTLIBRARIES = libSDL2_ttf.la + ++AUTOMAKE_OPTIONS = foreign ++ + libSDL2_ttfincludedir = $(includedir)/SDL2 + libSDL2_ttfinclude_HEADERS = \ + SDL_ttf.h diff --git a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch index 8a11f66495..1dfbec6edd 100644 --- a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch @@ -1,13 +1,18 @@ -freetype-config was removed from oe-core in +From e6d2c0e130811c15b5f5cc10221fae182cb8609e Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 22 May 2014 10:59:33 +0100 +Subject: [PATCH] freetype-config was removed from oe-core in commit 5870bd272b0b077d0826fb900b251884c1c05061 -Author: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Thu May 22 10:59:33 2014 +0100 binconfig-disabled: Add class and use +--- + configure.in | 38 +++++--------------------------------- + 1 file changed, 5 insertions(+), 33 deletions(-) + diff --git a/configure.in b/configure.in -index 408e8d6..5f9e730 100644 +index 9b36e15..f300cae 100644 --- a/configure.in +++ b/configure.in @@ -86,39 +86,11 @@ case "$host" in diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch new file mode 100644 index 0000000000..468a55f346 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch @@ -0,0 +1,32 @@ +From 00debe6bd4cf5a3133a8fbaab75f7447a39fa655 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Thu, 12 Apr 2018 01:54:15 +0000 +Subject: [PATCH] team_basic_test.py: disable RedHat specific test + +The test _run_teamd_initscripts() is for RedHat ifcfg scripts which are +incompatible with OE: + /etc/sysconfig/network-scripts/ifcfg-* + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + scripts/team_basic_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index b05be9e..faabd18 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -171,7 +171,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + try: + for mode_name in self._team_modes: + self._run_one_mode(mode_name) +- self._run_teamd_initscripts() ++ #self._run_teamd_initscripts() + finally: + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + +-- +2.13.3 + diff --git a/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-oe/recipes-support/libteam/libteam/run-ptest new file mode 100644 index 0000000000..4ba5acf051 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +python $(dirname $0)/team_basic_test.py diff --git a/meta-oe/recipes-support/libteam/libteam_1.27.bb b/meta-oe/recipes-support/libteam/libteam_1.27.bb index 32227009e3..442592de90 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.27.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.27.bb @@ -10,6 +10,8 @@ DEPENDS = "libnl libdaemon jansson" SRC_URI = "git://github.com/jpirko/libteam \ file://0001-include-sys-select.h-for-fd_set-definition.patch \ file://0002-teamd-Re-adjust-include-header-order.patch \ + file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ + file://run-ptest \ " SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16" @@ -18,7 +20,7 @@ SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest FILES_${PN} = "${libdir}/libteam${SOLIBS} \ " @@ -33,4 +35,8 @@ FILES_${PN}-utils = "${bindir}/bond2team \ " RDEPENDS_${PN}-utils = "bash" +RDEPENDS_${PN}-ptest = "python" +do_install_ptest() { + install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ +} diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.02.177.bb index b6ae90240e..211a4726b8 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper_2.02.177.bb @@ -1,7 +1,7 @@ require lvm2.inc -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" +SRC_URI[md5sum] = "ee6cfbc5a0c5696ffae79dac04ee7a2b" +SRC_URI[sha256sum] = "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2" DEPENDS += "autoconf-archive-native" diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb b/meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb index 84881e7442..390970fcb2 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb +++ b/meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb @@ -1,7 +1,7 @@ require lvm2.inc -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" +SRC_URI[md5sum] = "ee6cfbc5a0c5696ffae79dac04ee7a2b" +SRC_URI[sha256sum] = "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2" SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" diff --git a/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch b/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch deleted file mode 100644 index e517d53d10..0000000000 --- a/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 5fdec9592285f5976345fbccb3d07fae1245ab53 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 2 Aug 2017 15:41:22 -0700 -Subject: [PATCH] mongo: Add using std::string - -This is needed with latest clang -Fixes -src/mongo/db/dbwebserver.cpp:206:23: error: use of undeclared identifier 'string'; did you mean 'String'? - static vector<string> commands; - ^~~~~~ - String - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/db/dbwebserver.cpp | 1 + - src/mongo/db/matcher/expression_leaf.cpp | 2 ++ - src/mongo/db/repl/master_slave.cpp | 1 + - src/mongo/util/net/miniwebserver.cpp | 1 + - 4 files changed, 5 insertions(+) - -diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp -index b202e0500b..0255613524 100644 ---- a/src/mongo/db/dbwebserver.cpp -+++ b/src/mongo/db/dbwebserver.cpp -@@ -67,6 +67,7 @@ namespace mongo { - using std::map; - using std::stringstream; - using std::vector; -+using std::string; - - using namespace html; - -diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp -index d562bff141..4d931985e2 100644 ---- a/src/mongo/db/matcher/expression_leaf.cpp -+++ b/src/mongo/db/matcher/expression_leaf.cpp -@@ -44,6 +44,8 @@ - #include "mongo/stdx/memory.h" - #include "mongo/util/mongoutils/str.h" - -+using std::string; -+ - namespace mongo { - - Status LeafMatchExpression::setPath(StringData path) { -diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp -index 05faad1259..ea25d7151b 100644 ---- a/src/mongo/db/repl/master_slave.cpp -+++ b/src/mongo/db/repl/master_slave.cpp -@@ -78,6 +78,7 @@ using std::endl; - using std::max; - using std::min; - using std::set; -+using std::string; - using std::stringstream; - using std::unique_ptr; - using std::vector; -diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp -index 5f4165d42f..239720c349 100644 ---- a/src/mongo/util/net/miniwebserver.cpp -+++ b/src/mongo/util/net/miniwebserver.cpp -@@ -46,6 +46,7 @@ namespace mongo { - - using std::shared_ptr; - using std::stringstream; -+using std::string; - using std::vector; - - MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx) --- -2.13.3 - diff --git a/meta-oe/recipes-support/nano/nano_2.7.4.bb b/meta-oe/recipes-support/nano/nano_2.7.4.bb deleted file mode 100644 index eaf393e180..0000000000 --- a/meta-oe/recipes-support/nano/nano_2.7.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -include nano.inc - -SRC_URI[md5sum] = "c011c7f9e47cb1da27d4e7cc8b56ec6a" -SRC_URI[sha256sum] = "752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9" diff --git a/meta-oe/recipes-support/nano/nano_2.9.3.bb b/meta-oe/recipes-support/nano/nano_2.9.3.bb new file mode 100644 index 0000000000..afb0cf2e73 --- /dev/null +++ b/meta-oe/recipes-support/nano/nano_2.9.3.bb @@ -0,0 +1,4 @@ +include nano.inc + +SRC_URI[md5sum] = "6dd37f010d6a985bf0e5f8ed091ff919" +SRC_URI[sha256sum] = "7783bcfd4b2d5dc0bf64d4bd07b1a19e7ba3c91da881a4249772a36b972d4012" diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index e5b50ce755..76e0741b1f 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -29,7 +29,7 @@ python () { d.setVar('NE10_TARGET_ARCH', 'aarch64') bb.debug(2, 'Building Ne10 for aarch64') else: - raise bb.parse.SkipPackage("Incompatible with archs other than armv7 and aarch64") + raise bb.parse.SkipRecipe("Incompatible with archs other than armv7 and aarch64") } do_install() { diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index c7d7203eda..913290cd97 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} +inherit systemd SYSTEMD_SERVICE_${PN} += "openct.service " SYSTEMD_AUTO_ENABLE = "enable" @@ -77,10 +77,8 @@ do_install () { install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system - fi + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb index 3663d30e92..ca62de7c8f 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb @@ -82,8 +82,8 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ + ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ + ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch index 72bf4ed41b..312fc8593f 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch @@ -1,9 +1,17 @@ -Use pkg-config instead of ${PYTHON}-config to find python +From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 +Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python -diff -uNr pidgin-2.10.12.orig/configure.ac pidgin-2.10.12/configure.ac ---- pidgin-2.10.12.orig/configure.ac 2016-01-01 00:19:40.000000000 +0100 -+++ pidgin-2.10.12/configure.ac 2016-05-05 16:55:13.258945925 +0200 -@@ -1585,20 +1585,15 @@ +--- + configure.ac | 21 ++++++++------------- + 1 file changed, 8 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d20a18e..c741829 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") dnl Check for Python headers (currently useful only for libgnt) dnl (Thanks to XChat) if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch index 293ef709d1..9a24fbbc5f 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch @@ -1,8 +1,16 @@ -Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h -=================================================================== ---- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h 2008-08-19 01:53:38.000000000 +0000 -+++ pidgin-2.5.0/libpurple/protocols/irc/irc.h 2008-08-27 11:15:58.000000000 +0000 -@@ -36,9 +36,9 @@ +From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- + libpurple/protocols/irc/irc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h +index fde35c4..66e52dd 100644 +--- a/libpurple/protocols/irc/irc.h ++++ b/libpurple/protocols/irc/irc.h +@@ -40,9 +40,9 @@ #define IRC_DEFAULT_CHARSET "UTF-8" #define IRC_DEFAULT_AUTODETECT FALSE diff --git a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch index a77d64f40b..84dbcdc276 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -1,6 +1,16 @@ ---- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 -+++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 -@@ -472,7 +472,7 @@ +From c3058f9eadaf5ff28ba776cfed54b609a93a1249 Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- + configure.ac | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b8acd2a..d20a18e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -642,7 +642,7 @@ if test "x$enable_consoleui" = "xyes"; then if test "x$enable_consoleui" = "xyes"; then dnl # Some distros put the headers in ncursesw/, some don't found_ncurses_h=no @@ -8,8 +18,8 @@ + for location in $ac_ncurses_includes $NCURSES_HEADERS do f="$location/ncurses.h" - AC_CHECK_HEADER($f,[ -@@ -1860,10 +1860,6 @@ + orig_CFLAGS="$CFLAGS" +@@ -2397,10 +2397,6 @@ if test "$kerberos" != "no" ; then KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" fi KRB4_LDFLAGS="-L${kerberos}/lib" @@ -20,7 +30,7 @@ fi AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) -@@ -1896,10 +1892,6 @@ +@@ -2433,10 +2429,6 @@ if test "$zephyr" != "no" ; then ZEPHYR_LDFLAGS="-L${zephyr}/lib" elif test -d /usr/athena/include/zephyr ; then ZEPHYR_CFLAGS="-I/usr/athena/include" diff --git a/meta-oe/recipes-support/poco/poco_1.8.1.bb b/meta-oe/recipes-support/poco/poco_1.9.0.bb index e44ff44700..1016caef7c 100644 --- a/meta-oe/recipes-support/poco/poco_1.8.1.bb +++ b/meta-oe/recipes-support/poco/poco_1.9.0.bb @@ -12,7 +12,7 @@ inherit cmake ptest BBCLASSEXTEND = "native" -SRCREV = "2eca6c1813632fb779e07f1e1968afefa81e1dd0" +SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d" SRC_URI = " \ git://github.com/pocoproject/poco.git \ file://run-ptest \ @@ -33,7 +33,7 @@ EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" # By default the most commonly used poco components are built # Foundation is built anyway and doesn't need to be listed explicitly # these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip" +PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis" PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" @@ -46,6 +46,8 @@ PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DO PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" +PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" +PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" # Additional components not build by default, # they might have dependencies not included in oe-core @@ -58,40 +60,30 @@ PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OF PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" -# Make a package for each library -PACKAGES = "${PN}-dbg ${POCO_PACKAGES}" -python __anonymous () { +python populate_packages_prepend () { + poco_libdir = d.expand('${libdir}') + pn = d.getVar("PN") packages = [] testrunners = [] - components = d.getVar("PACKAGECONFIG").split() - components.append("Foundation") - for lib in components: - pkg = ("poco-%s" % lib.lower()).replace("_","") + + def hook(f, pkg, file_regex, output_pattern, modulename): packages.append(pkg) - if not d.getVar("FILES_%s" % pkg): - d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib) - testrunners.append("%s" % lib) + testrunners.append(modulename) + + do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', + 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - d.setVar("POCO_PACKAGES", " ".join(packages)) + d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) } +PACKAGES_DYNAMIC = "poco-.*" + # "poco" is a metapackage which pulls in all Poco components -PACKAGES += "${PN}" -RRECOMMENDS_${PN} += "${POCO_PACKAGES}" -RRECOMMENDS_${PN}_class-native = "" ALLOW_EMPTY_${PN} = "1" -# -dev last to pick up the remaining stuff -PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libPoco*.so ${libdir}/cmake" -FILES_${PN}-staticdev = "${libdir}/libPoco*.a" - -# ptest support -FILES_${PN}-dbg += "${PTEST_PATH}/bin/.debug" - # cppunit is only built if tests are enabled -PACKAGES += "${PN}-cppunit" +PACKAGES =+ "${PN}-cppunit" FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" ALLOW_EMPTY_${PN}-cppunit = "1" diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb index 343b6db812..b2af097154 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb @@ -17,8 +17,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" -SRC_URI[md5sum] = "00f8989c804de84af0ba2ea629949980" -SRC_URI[sha256sum] = "1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872" +SRC_URI[md5sum] = "35cc7beba00aa174631466f06732be40" +SRC_URI[sha256sum] = "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012" SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch new file mode 100644 index 0000000000..18f508519e --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -0,0 +1,38 @@ +From b6fc6c36d359a50503138cd87d7147faf6dff893 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 17 Mar 2018 20:52:10 +0100 +Subject: [PATCH] Do not overwrite all our build flags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + cmake/modules/PopplerMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake +index ccb2790..0f392cb 100644 +--- a/cmake/modules/PopplerMacros.cmake ++++ b/cmake/modules/PopplerMacros.cmake +@@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") + set(_save_cflags "${CMAKE_C_FLAGS}") +- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") ++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") +-- +2.14.3 diff --git a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch b/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch deleted file mode 100644 index 4e80d240fa..0000000000 --- a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 91b6275f0e91c25beb040b4ef9484053ae305d86 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 26 May 2015 12:45:47 +0200 -Subject: [PATCH] add manadatory options to find qt4/qt5 moc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 55 ++++++++----------------------------------------------- - 1 file changed, 8 insertions(+), 47 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4cfc2c..8e961c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -712,25 +712,10 @@ AC_SUBST(POPPLER_QT4_LIBS) - AC_SUBST(POPPLER_QT4_TEST_LIBS) - - if test x$enable_poppler_qt4 = xyes; then -- AC_CHECK_TOOL(MOCQT4, moc) -- AC_MSG_CHECKING([for Qt4 moc]) -- mocversion=`$MOCQT4 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 4"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- AC_MSG_RESULT([no]) -- # moc was not the qt4 one, try with moc-qt4 -- AC_CHECK_TOOL(MOCQT42, moc-qt4) -- AC_MSG_CHECKING([for Qt4 moc-qt4]) -- mocversion=`$MOCQT42 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 4"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- # no valid moc found -- enable_poppler_qt4=no; -- MOCQT4="not found" -- else -- MOCQT4=$MOCQT42 -- fi -- fi -+ AC_ARG_WITH([moc-qt4], -+ AS_HELP_STRING([--with-moc-qt4], [Set location of qt4 moc]), -+ [MOCQT4=$withval] -+ ) - AC_SUBST(MOCQT4) - AC_MSG_RESULT([$MOCQT4]) - fi -@@ -769,34 +754,10 @@ AC_SUBST(POPPLER_QT5_LIBS) - AC_SUBST(POPPLER_QT5_TEST_LIBS) - - if test x$enable_poppler_qt5 = xyes; then -- AC_CHECK_TOOL(MOCQT5, moc) -- AC_MSG_CHECKING([for Qt5 moc]) -- mocversion=`$MOCQT5 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- AC_MSG_RESULT([no]) -- # moc was not the qt5 one, try with moc-qt5 -- AC_CHECK_TOOL(MOCQT52, moc-qt5) -- AC_MSG_CHECKING([for Qt5 moc-qt5]) -- mocversion=`$MOCQT52 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- AC_CHECK_TOOL(QTCHOOSER, qtchooser) -- AC_MSG_CHECKING([for qtchooser]) -- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` -- mocversion=`$qt5tooldir/moc -v 2>&1` -- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` -- if test x"$mocversiongrep" != x"$mocversion"; then -- # no valid moc found -- enable_poppler_qt5=no; -- MOCQT5="not found" -- else -- MOCQT5=$qt5tooldir/moc -- fi -- else -- MOCQT5=$MOCQT52 -- fi -- fi -+ AC_ARG_WITH([moc-qt5], -+ AS_HELP_STRING([--with-moc-qt5], [Set location of qt5 moc]), -+ [MOCQT5=$withval] -+ ) - AC_SUBST(MOCQT5) - AC_MSG_RESULT([$MOCQT5]) - fi --- -2.5.5 - diff --git a/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch new file mode 100644 index 0000000000..7ed795ef7b --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch @@ -0,0 +1,29 @@ +From d488de23b75b2f3e235f1c184b2253d1402b4c0f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 10 May 2018 23:47:56 -0700 +Subject: [PATCH] glib/CMakeLists.txt: Add libpoppler to link along with + poppler-glib + +This is required since poppler-glib uses symbols from poppler and +we use --as-needed + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 33c6608..87e1b44 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -127,7 +127,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) + get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) + _list_prefix(_includes _tmp_includes "-I") + set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}) +- set(Poppler_0_18_gir_LIBS poppler-glib) ++ set(Poppler_0_18_gir_LIBS poppler-glib poppler) + _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") + list(APPEND _abs_introspection_files + ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c diff --git a/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch b/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch new file mode 100644 index 0000000000..3c231fe938 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch @@ -0,0 +1,100 @@ +From 6287663e7db04df7e6dec58a1fc5bb5d510e8bde Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 9 Apr 2018 19:11:20 +0200 +Subject: [PATCH] CairoOutputDev.cc: fix build error when using fixedpoint +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashRound(SplashCoord)': +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1604:28: error: call of overloaded 'floor(FixedPoint)' is ambiguous +| return (int)floor(x + 0.5); +| ^ +| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double) +| __MATHCALLX (floor,, (_Mdouble_ __x), (__const__)); +| ^ +| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46: +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:260:3: note: candidate: constexpr float std::floor(float) +| floor(float __x) +| ^~~~~ +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:264:3: note: candidate: constexpr long double std::floor(long double) +| floor(long double __x) +| ^~~~~ +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashCeil(SplashCoord)': +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1608:21: error: call of overloaded 'ceil(SplashCoord&)' is ambiguous +| return (int)ceil(x); +| ^ +| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:159:1: note: candidate: double ceil(double) +| __MATHCALLX (ceil,, (_Mdouble_ __x), (__const__)); +| ^ +| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46: +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:165:3: note: candidate: constexpr float std::ceil(float) +| ceil(float __x) +| ^~~~ +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:169:3: note: candidate: constexpr long double std::ceil(long double) +| ceil(long double __x) +| ^~~~ +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashFloor(SplashCoord)': +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1612:22: error: call of overloaded 'floor(SplashCoord&)' is ambiguous +| return (int)floor(x); +| ^ +| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, +| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: +| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double) + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + poppler/CairoOutputDev.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc +index 18124b8f..4c85ad65 100644 +--- a/poppler/CairoOutputDev.cc ++++ b/poppler/CairoOutputDev.cc +@@ -1602,15 +1602,27 @@ void CairoOutputDev::endActualText(GfxState *state) + } + + static inline int splashRound(SplashCoord x) { ++#if defined(USE_FIXEDPOINT) ++ return FixedPoint::floor(x + 0.5); ++#else + return (int)floor(x + 0.5); ++#endif + } + + static inline int splashCeil(SplashCoord x) { ++#if defined(USE_FIXEDPOINT) ++ return FixedPoint::ceil(x); ++#else + return (int)ceil(x); ++#endif + } + + static inline int splashFloor(SplashCoord x) { ++#if defined(USE_FIXEDPOINT) ++ return FixedPoint::floor(x); ++#else + return (int)floor(x); ++#endif + } + + static +-- +2.14.3 + diff --git a/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch b/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch deleted file mode 100644 index 406009f4fa..0000000000 --- a/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- poppler-0.45.0/poppler/CairoOutputDev.cc.orig 2016-06-17 14:23:35.399083929 -0400 -+++ poppler-0.45.0/poppler/CairoOutputDev.cc 2016-06-17 14:36:53.351097825 -0400 -@@ -42,7 +42,7 @@ - #endif - - #include <string.h> --#include <math.h> -+#include <cmath> - #include <assert.h> - #include <cairo.h> - diff --git a/meta-oe/recipes-support/poppler/poppler_0.57.0.bb b/meta-oe/recipes-support/poppler/poppler_0.57.0.bb deleted file mode 100644 index 63b77aafe8..0000000000 --- a/meta-oe/recipes-support/poppler/poppler_0.57.0.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = " \ - http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ - file://0002-fix-gcc-6-math-ambiguous-errors.patch \ -" -SRC_URI[md5sum] = "bc5a191741604552c90d484103229374" -SRC_URI[sha256sum] = "0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8" - -DEPENDS = "fontconfig zlib cairo lcms" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" -PACKAGECONFIG[jpeg] = "--enable-dctdecoder=libjpeg,--enable-dctdecoder=none,jpeg" -PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" -PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff" -PACKAGECONFIG[curl] = "--enable-libcurl,--disable-libcurl,curl" -PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg,openjpeg" -PACKAGECONFIG[qt5] = "--enable-poppler-qt5 --with-moc-qt5=${STAGING_BINDIR_NATIVE}/qt5/moc,--disable-poppler-qt5,qtbase qttools-native" -PACKAGECONFIG[qt4e] = "--enable-poppler-qt4 --with-moc-qt4=${STAGING_BINDIR_NATIVE}/moc4,--disable-poppler-qt4,qt4-embedded" -PACKAGECONFIG[nss] = "--enable-libnss,--disable-libnss,nss" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECONF = "\ - --enable-xpdf-headers \ - --disable-gtk-test \ - --enable-zlib \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/poppler/.libs" -} - -# Adjust library names when building for QT4e -QT4E_PATCHES = "${@bb.utils.contains('PACKAGECONFIG', 'qt4e', 'file://fix-qt4e-library-dependencies.patch', '', d)}" -SRC_URI_append = "${QT4E_PATCHES}" - -# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--enable-fixedpoint" - return "" - -EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-oe/recipes-support/poppler/poppler_0.64.0.bb b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb new file mode 100644 index 0000000000..1e87ae6e6c --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb @@ -0,0 +1,58 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ + file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ + " +SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044" +SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_XPDF_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # git-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +def get_poppler_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft' ]: + return "-DUSE_FIXEDPOINT=ON" + return "" + +EXTRA_OECMAKE += "${@get_poppler_fpu_setting(bb, d)}" + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch deleted file mode 100644 index be23fd419d..0000000000 --- a/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: postgresql-9.2.4/configure.in -=================================================================== ---- postgresql-9.2.4.orig/configure.in -+++ postgresql-9.2.4/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - - AC_INIT([PostgreSQL], [9.4.2], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) - diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb b/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb deleted file mode 100644 index eec099a129..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb +++ /dev/null @@ -1,15 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=81b69ddb31a8be66baafd14a90146ee2" - -SRC_URI += "\ - file://remove.autoconf.version.check.patch \ - file://not-check-libperl.patch \ -" - -do_compile_prepend_libc-musl() { - sed -i -e 's/\-lnsl//g' ${B}/src/Makefile.global -} - -SRC_URI[md5sum] = "0aada0833a9208ae5fab966c73c39379" -SRC_URI[sha256sum] = "12bfb3c7e8e45515ef921ad365e122682a5c4935dcc0032644433af2de31acc4" diff --git a/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb b/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb new file mode 100644 index 0000000000..854df06cb7 --- /dev/null +++ b/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb @@ -0,0 +1,16 @@ +SUMMARY = "Open source flash program for STM32 using the ST serial bootloader" +HOMEPAGE = "https://sourceforge.net/projects/stm32flash/" +BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/" +LICENSE = "GPL-2.0+" +LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/${BPN}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} + +SRC_URI[md5sum] = "40f673502949f3bb655d2bcc539d7b6a" +SRC_URI[sha256sum] = "97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306" diff --git a/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch b/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch index 2ac9c0be0f..5d481f232e 100644 --- a/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch +++ b/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch @@ -4,9 +4,11 @@ Upstream-Status: Pending Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> --- ---- a/lib/gprocess.c -+++ b/lib/gprocess.c -@@ -1421,6 +1421,18 @@ +Index: syslog-ng-3.8.1/lib/gprocess.c +=================================================================== +--- syslog-ng-3.8.1.orig/lib/gprocess.c ++++ syslog-ng-3.8.1/lib/gprocess.c +@@ -1432,6 +1432,18 @@ g_process_startup_ok(void) void g_process_finish(void) { diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch index cc8d11044a..c172e4e747 100644 --- a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch +++ b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch @@ -10,13 +10,13 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> configure.ac | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 474e094..cedca54 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,6 +120,9 @@ AC_ARG_ENABLE(memtrace, - AC_ARG_ENABLE(ssl, - [ --enable-ssl Enable SSL support.],,enable_ssl="auto") +Index: syslog-ng-3.8.1/configure.ac +=================================================================== +--- syslog-ng-3.8.1.orig/configure.ac ++++ syslog-ng-3.8.1/configure.ac +@@ -147,6 +147,9 @@ AC_ARG_ENABLE(gprof, + AC_ARG_ENABLE(memtrace, + [ --enable-memtrace Enable alternative leak debugging code.]) +AC_ARG_ENABLE(thread-tls, + [ --enable-thread-tls Enable Thread Transport Layer Security support.],,enable_thread_tls="no") @@ -24,7 +24,7 @@ index 474e094..cedca54 100644 AC_ARG_ENABLE(dynamic-linking, [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") -@@ -381,12 +384,14 @@ dnl *************************************************************************** +@@ -486,12 +489,14 @@ dnl ************************************ dnl Is the __thread keyword available? dnl *************************************************************************** @@ -45,6 +45,3 @@ index 474e094..cedca54 100644 dnl *************************************************************************** dnl How to do static linking? --- -1.9.1 - diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch index 755803c213..553f4a5171 100644 --- a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch @@ -10,11 +10,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> configure.ac | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index b1e18b4..8e13025 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -73,6 +73,9 @@ AC_CONFIG_HEADERS(config.h) +Index: syslog-ng-3.8.1/configure.ac +=================================================================== +--- syslog-ng-3.8.1.orig/configure.ac ++++ syslog-ng-3.8.1/configure.ac +@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h) dnl *************************************************************************** dnl Arguments @@ -24,7 +24,7 @@ index b1e18b4..8e13025 100644 AC_ARG_WITH(libnet, [ --with-libnet=path use path to libnet-config script], , -@@ -768,22 +771,26 @@ dnl *************************************************************************** +@@ -893,22 +896,26 @@ dnl ************************************ dnl libnet headers/libraries dnl *************************************************************************** AC_MSG_CHECKING(for LIBNET) @@ -61,6 +61,3 @@ index b1e18b4..8e13025 100644 if test "x$enable_spoof_source" = "xauto"; then AC_MSG_CHECKING(whether to enable spoof source support) if test "x$LIBNET_LIBS" != "x"; then --- -1.7.1 - diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch index faf967247f..54ecce57e3 100644 --- a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch +++ b/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch @@ -10,11 +10,11 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com> scl/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/scl/Makefile.am b/scl/Makefile.am -index 57fad5d..2a29ca5 100644 ---- a/scl/Makefile.am -+++ b/scl/Makefile.am -@@ -14,7 +14,7 @@ scl-install-data-local: +Index: syslog-ng-3.8.1/scl/Makefile.am +=================================================================== +--- syslog-ng-3.8.1.orig/scl/Makefile.am ++++ syslog-ng-3.8.1/scl/Makefile.am +@@ -27,7 +27,7 @@ scl-install-data-local: fi; \ done $(mkinstalldirs) $(DESTDIR)/$(scldir) @@ -23,6 +23,3 @@ index 57fad5d..2a29ca5 100644 chmod -R u+rwX $(DESTDIR)/$(scldir) scl-uninstall-local: --- -1.7.1 - diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index f1bf9b06f6..771cdb1969 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -41,7 +41,7 @@ EXTRA_OECONF = " \ " CONFIG_TLS = "--enable-thread-tls" -CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" +CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ @@ -101,7 +101,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" # syslog initscript is handled explicitly because order of # update-rc.d and update-alternatives is important -RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" +RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index aa031fef87..879b67b7f5 100644 --- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -11,7 +11,9 @@ SRC_URI = "git://github.com/OSSystems/toscoterm.git" S = "${WORKDIR}/git" -inherit gitpkgv pkgconfig +inherit distro_features_check gitpkgv pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" do_compile() { oe_runmake \ diff --git a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch b/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch index 3cc040075f..2823c54f15 100644 --- a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch +++ b/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch @@ -1,4 +1,4 @@ -From 32278297170ffb49116b5789e4a0588b99d02bd0 Mon Sep 17 00:00:00 2001 +From a6eab413f274376cf703a608e2866118291a6185 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri <amarnath.valluri@intel.com> Date: Thu, 9 Feb 2017 11:02:53 +0200 Subject: [PATCH] Make udev rules directory configurable. @@ -9,6 +9,7 @@ libdir, sbindir for installing librares and binaries. Upstream-Status: Inappropriate[Embedded specific] Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> + --- configure.ac | 14 +++----------- data/Makefile.am | 1 - @@ -49,11 +50,11 @@ index 8c4e4c2..a143397 100644 compiler: ${CC} diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..4834960 100644 +index 08af5f4..9329186 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -34,7 +34,6 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile - @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ + @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ endif -udevrulesdir = $(slashlibdir)/udev/rules.d @@ -86,6 +87,3 @@ index 18325f7..0aaec11 100644 umount_udisks_SOURCES = umount-udisks.c umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS) --- -2.7.4 - diff --git a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch b/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch index 520655a213..8b4f44124b 100644 --- a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch +++ b/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch @@ -1,4 +1,4 @@ -From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 +From 054ad6a06cfac7c3d172d53cd901204079a53ec3 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetromino@gentoo.org> Date: Fri, 29 May 2015 21:09:39 -0400 Subject: [PATCH] fix build with newer glibc versions @@ -8,6 +8,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=90778 Upstream-Status: Applied [1] [1] http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0 + --- src/helpers/job-drive-detach.c | 1 + 1 file changed, 1 insertion(+) @@ -24,6 +25,3 @@ index eeafcab..d122a1f 100644 #include <stdio.h> #include <string.h> #include <errno.h> --- -2.1.0 - diff --git a/meta-oe/recipes-support/udisks/udisks/optional-depends.patch b/meta-oe/recipes-support/udisks/udisks/optional-depends.patch index 6131701928..a890954fc3 100644 --- a/meta-oe/recipes-support/udisks/udisks/optional-depends.patch +++ b/meta-oe/recipes-support/udisks/udisks/optional-depends.patch @@ -1,12 +1,29 @@ -From 1b70b7a798eeeec554ab5aa9fcfff96a22e91774 Mon Sep 17 00:00:00 2001 +From e8b3fbfa3d6a11eee25db2dc0f31f439aaf0b65a Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi> Date: Thu, 26 May 2011 17:30:04 -0300 Subject: [PATCH] Allow disabling atasmart, lvm2 and devicemapper support. https://bugs.freedesktop.org/show_bug.cgi?id=37647 +--- + configure.ac | 53 +++++++++++++++++++++++++++++++++++++++---------- + src/adapter-private.h | 1 - + src/adapter.c | 1 - + src/daemon.c | 4 ++++ + src/device-private.c | 2 +- + src/device-private.h | 5 ++--- + src/device.c | 23 +++++++++++++++++---- + src/expander-private.h | 1 - + src/expander.c | 1 - + src/helpers/Makefile.am | 20 +++++++++++++------ + src/helpers/partutil.c | 3 ++- + src/port-private.h | 1 - + src/probers/Makefile.am | 8 ++++++-- + tools/udisks.c | 10 ++++++++-- + 14 files changed, 99 insertions(+), 34 deletions(-) + diff --git a/configure.ac b/configure.ac -index 62cc35d..b664135 100644 +index 9454423..8c4e4c2 100644 --- a/configure.ac +++ b/configure.ac @@ -155,13 +155,33 @@ PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.97]) @@ -49,8 +66,8 @@ index 62cc35d..b664135 100644 +AM_CONDITIONAL(HAVE_DEVMAPPER, [test "$have_devmapper" = "yes"]) have_lvm2=no - AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support])) -@@ -185,9 +205,19 @@ if test "x$enable_dmmp" != "xno"; then + AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--enable-lvm2], [enable LVM2 support])) +@@ -185,9 +205,19 @@ if test "x$enable_dmmp" = "xyes"; then fi AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"]) @@ -73,7 +90,7 @@ index 62cc35d..b664135 100644 PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143]) AC_SUBST(LIBUDEV_CFLAGS) -@@ -267,9 +297,12 @@ echo " +@@ -278,9 +308,12 @@ echo " cppflags: ${CPPFLAGS} xsltproc: ${XSLTPROC} @@ -99,7 +116,7 @@ index 3409e21..ef584e3 100644 #include "types.h" diff --git a/src/adapter.c b/src/adapter.c -index b85a0ef..802420b 100644 +index 65e05b0..45db8c8 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -30,7 +30,6 @@ @@ -111,10 +128,10 @@ index b85a0ef..802420b 100644 #include "daemon.h" #include "adapter.h" diff --git a/src/daemon.c b/src/daemon.c -index 6072502..d043cb0 100644 +index fafcf9a..14e952f 100644 --- a/src/daemon.c +++ b/src/daemon.c -@@ -1745,6 +1745,7 @@ mdstat_changed_event (GIOChannel *channel, +@@ -1748,6 +1748,7 @@ mdstat_changed_event (GIOChannel *channel, return TRUE; } @@ -122,7 +139,7 @@ index 6072502..d043cb0 100644 static gboolean refresh_ata_smart_data (Daemon *daemon) { -@@ -1773,6 +1774,7 @@ refresh_ata_smart_data (Daemon *daemon) +@@ -1776,6 +1777,7 @@ refresh_ata_smart_data (Daemon *daemon) return FALSE; } @@ -130,7 +147,7 @@ index 6072502..d043cb0 100644 static gboolean register_disks_daemon (Daemon *daemon) -@@ -1984,12 +1986,14 @@ daemon_new (void) +@@ -1987,12 +1989,14 @@ daemon_new (void) mount_file_clean_stale (l); g_list_free (l); @@ -146,10 +163,10 @@ index 6072502..d043cb0 100644 PROFILE ("daemon_new(): end"); return daemon; diff --git a/src/device-private.c b/src/device-private.c -index 22a0d35..fb96525 100644 +index 45418ce..fb1d959 100644 --- a/src/device-private.c +++ b/src/device-private.c -@@ -1378,7 +1378,7 @@ device_set_drive_ata_smart_time_collected (Device *device, +@@ -1390,7 +1390,7 @@ device_set_drive_ata_smart_time_collected (Device *device, void device_set_drive_ata_smart_status (Device *device, @@ -159,7 +176,7 @@ index 22a0d35..fb96525 100644 if (G_UNLIKELY (device->priv->drive_ata_smart_status != value)) { diff --git a/src/device-private.h b/src/device-private.h -index a6db7f2..71473a6 100644 +index 32a9bd0..8c57c13 100644 --- a/src/device-private.h +++ b/src/device-private.h @@ -23,7 +23,6 @@ @@ -170,7 +187,7 @@ index a6db7f2..71473a6 100644 #include "types.h" -@@ -224,7 +223,7 @@ struct DevicePrivate +@@ -228,7 +227,7 @@ struct DevicePrivate gboolean drive_ata_smart_is_available; guint64 drive_ata_smart_time_collected; @@ -179,7 +196,7 @@ index a6db7f2..71473a6 100644 void *drive_ata_smart_blob; gsize drive_ata_smart_blob_size; -@@ -391,7 +390,7 @@ void device_set_holders_objpath (Device *device, GStrv value); +@@ -396,7 +395,7 @@ void device_set_holders_objpath (Device *device, GStrv value); void device_set_drive_ata_smart_is_available (Device *device, gboolean value); void device_set_drive_ata_smart_time_collected (Device *device, guint64 value); @@ -189,7 +206,7 @@ index a6db7f2..71473a6 100644 G_END_DECLS diff --git a/src/device.c b/src/device.c -index 6a34940..7a5a4a9 100644 +index 2ae7f38..d73f9d6 100644 --- a/src/device.c +++ b/src/device.c @@ -50,7 +50,9 @@ @@ -202,7 +219,7 @@ index 6a34940..7a5a4a9 100644 #include "daemon.h" #include "device.h" -@@ -659,10 +661,14 @@ get_property (GObject *object, +@@ -664,10 +666,14 @@ get_property (GObject *object, case PROP_DRIVE_ATA_SMART_STATUS: { const gchar *status; @@ -218,7 +235,7 @@ index 6a34940..7a5a4a9 100644 g_value_set_string (value, status); } break; -@@ -5114,6 +5120,7 @@ device_new (Daemon *daemon, +@@ -5144,6 +5150,7 @@ device_new (Daemon *daemon, goto out; } @@ -226,7 +243,7 @@ index 6a34940..7a5a4a9 100644 /* if just added, update the smart data if applicable */ if (device->priv->drive_ata_smart_is_available) { -@@ -5121,6 +5128,7 @@ device_new (Daemon *daemon, +@@ -5151,6 +5158,7 @@ device_new (Daemon *daemon, gchar *ata_smart_refresh_data_options[] = { NULL }; device_drive_ata_smart_refresh_data (device, ata_smart_refresh_data_options, NULL); } @@ -234,7 +251,7 @@ index 6a34940..7a5a4a9 100644 PROFILE ("device_new(native_path=%s): end", native_path); out: -@@ -9794,16 +9802,18 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context, +@@ -9840,16 +9848,18 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context, const char *stdout, gpointer user_data) { @@ -256,7 +273,7 @@ index 6a34940..7a5a4a9 100644 blob = NULL; if (job_was_cancelled || stdout == NULL) -@@ -9907,6 +9917,11 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context, +@@ -9953,6 +9963,11 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context, g_free (blob); if (d != NULL) sk_disk_free (d); @@ -430,7 +447,7 @@ index 06bb566..01c693b 100644 udisks_probe_sas_expander_SOURCES = udisks-probe-sas-expander.c udisks_probe_sas_expander_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) diff --git a/tools/udisks.c b/tools/udisks.c -index 6fbd6a6..e0c4fbb 100644 +index 97e80d7..d30159b 100644 --- a/tools/udisks.c +++ b/tools/udisks.c @@ -43,7 +43,9 @@ @@ -443,7 +460,7 @@ index 6fbd6a6..e0c4fbb 100644 #include "udisks-daemon-glue.h" #include "udisks-device-glue.h" -@@ -979,6 +981,7 @@ end_highlight (void) +@@ -983,6 +985,7 @@ end_highlight (void) g_print ("\x1B[0m"); } @@ -451,7 +468,7 @@ index 6fbd6a6..e0c4fbb 100644 static const gchar * ata_smart_status_to_desc (const gchar *status, gboolean *out_highlight) -@@ -1159,6 +1162,7 @@ print_ata_smart_attr (SkDisk *d, +@@ -1163,6 +1166,7 @@ print_ata_smart_attr (SkDisk *d, g_free (threshold_str); g_free (pretty); } @@ -459,7 +476,7 @@ index 6fbd6a6..e0c4fbb 100644 static void do_show_info (const char *object_path) -@@ -1440,7 +1444,7 @@ do_show_info (const char *object_path) +@@ -1445,7 +1449,7 @@ do_show_info (const char *object_path) g_print (" if speed: %" G_GINT64_FORMAT " bits/s\n", props->drive_connection_speed); /* ------------------------------------------------------------------------------------------------- */ @@ -468,7 +485,7 @@ index 6fbd6a6..e0c4fbb 100644 if (!props->drive_ata_smart_is_available) { g_print (" ATA SMART: not available\n"); -@@ -1493,7 +1497,9 @@ do_show_info (const char *object_path) +@@ -1498,7 +1502,9 @@ do_show_info (const char *object_path) } } @@ -479,6 +496,3 @@ index 6fbd6a6..e0c4fbb 100644 /* ------------------------------------------------------------------------------------------------- */ } --- -1.7.5.rc3 - diff --git a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch b/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch index d5e84d34df..d4efa93dd3 100644 --- a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch +++ b/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch @@ -1,4 +1,4 @@ -From 7d61ad048856ee239870b917d6933e3ad63f0789 Mon Sep 17 00:00:00 2001 +From a4f6aa5be37ae6e2194c9ded2ea8c1da330f5694 Mon Sep 17 00:00:00 2001 From: David King <amigadave@amigadave.com> Date: Thu, 2 Jul 2015 13:49:22 +0100 Subject: [PATCH] Fix systemd service file @@ -12,6 +12,7 @@ Taken-From: [1] [1] http://pkgs.fedoraproject.org/cgit/udisks.git/tree/udisks-1.0.5-fix-service-file.patch Upstream-Status: Pending + --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -29,5 +30,3 @@ index 411ea0f..08af5f4 100644 endif udevrulesdir = $(slashlibdir)/udev/rules.d --- -2.4.5 diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch b/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch new file mode 100644 index 0000000000..1cbd877517 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch @@ -0,0 +1,35 @@ +From 7fdd4acdf6daf95c5cc74e968f4710513c8ddaea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 23 Mar 2018 18:33:52 +0100 +Subject: [PATCH] data: fix out of tree build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| sed: can't read udisks2.service.in: No such file or directory + +Upstream-Status: Submitted [1] + +[1] https://github.com/storaged-project/udisks/pull/510 + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + data/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index ddf9e3d6..b38928c8 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -22,7 +22,7 @@ systemdservicedir = $(systemdsystemunitdir) + systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) + + $(systemdservice_DATA): udisks2.service.in Makefile +- @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" udisks2.service.in > udisks2.service ++ @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $(srcdir)/udisks2.service.in > udisks2.service + endif + + udevrulesdir = $(udevdir)/rules.d +-- +2.14.3 + diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb deleted file mode 100644 index a3efc5160d..0000000000 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" - -DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native libxslt-native" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS_${PN} = "acl" - -SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2 \ - file://non-gnu-libc.patch \ -" -SRC_URI[md5sum] = "501d11c243bd8c6c00650474cd2afaab" -SRC_URI[sha256sum] = "da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda" - -CVE_PRODUCT = "udisks" - -inherit autotools systemd gtk-doc gobject-introspection - -S = "${WORKDIR}/udisks-${PV}" - -EXTRA_OECONF = "--disable-man --disable-gtk-doc" - -FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${nonarch_base_libdir}/udev/* \ - ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ -" - -PACKAGES =+ "${PN}-libs" - -FILES_${PN} += "${datadir}/bash-completion" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" - -FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/udisks2/.debug" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb b/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb new file mode 100644 index 0000000000..4d22afd0d5 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb @@ -0,0 +1,49 @@ +SUMMARY = "udisks provides dbus interfaces for disks and storage devices" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" + +DEPENDS = " \ + acl \ + libatasmart \ + polkit \ + libgudev \ + dbus-glib \ + glib-2.0 \ + libblockdev \ + intltool-native \ + gnome-common-native \ + libxslt-native \ +" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +RDEPENDS_${PN} = "acl" + +SRC_URI = " \ + git://github.com/storaged-project/udisks.git \ + file://0001-data-fix-out-of-tree-build.patch \ + file://non-gnu-libc.patch \ +" +SRCREV = "b6471f2e99f6aa1133af0de658f1fa05c748932c" +S = "${WORKDIR}/git" + +CVE_PRODUCT = "udisks" + +inherit autotools systemd gtk-doc gobject-introspection + +EXTRA_OECONF = "--disable-man --disable-gtk-doc" + +FILES_${PN} += " \ + ${datadir}/dbus-1/ \ + ${datadir}/polkit-1 \ + ${datadir}/bash-completion \ + ${libdir}/polkit-1/extensions/*.so \ + ${nonarch_base_libdir}/udev/* \ + ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ + ${systemd_system_unitdir} \ +" + +PACKAGES =+ "${PN}-libs" +FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch b/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch index 4b12494361..391b0e68b0 100644 --- a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch +++ b/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch @@ -1,9 +1,10 @@ -From 24fd52cc45f7b5ff45afe072f5fbe66485df8c8e Mon Sep 17 00:00:00 2001 +From 82f44f53b9a9766c2ec816f237506beb953eb332 Mon Sep 17 00:00:00 2001 From: Andreas Schwab <schwab@suse.de> Date: Wed, 29 Oct 2014 14:18:28 +0100 Subject: [PATCH] Add support for aarch64 * include/private/gcconfig.h: Add support for aarch64. + --- sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) @@ -77,6 +78,3 @@ index 4d42b03..0f13db6 100644 # ifdef ARM32 # define CPP_WORDSZ 32 # define MACH_TYPE "ARM32" --- -2.13.2 - diff --git a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch index df82b07aac..0c8f02d6ce 100644 --- a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch +++ b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch @@ -1,9 +1,10 @@ -From 2918196ba782dfa4401bdca917ad4de1910505e0 Mon Sep 17 00:00:00 2001 +From 08b5e51224ed95b1e76e99873b5f9f59840b0a74 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Fri, 21 Aug 2015 15:58:42 +0900 Subject: [PATCH] fix bug for cross compile Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> + --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -23,6 +24,3 @@ index 9be879c..9249bfd 100644 AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 8569bf39ef..3078af0586 100644 --- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch @@ -1,11 +1,21 @@ ---- uim-1.1.0/scm/Makefile.am~ 2006-06-09 10:46:12.000000000 +0900 -+++ uim-1.1.0/scm/Makefile.am 2006-06-19 23:00:15.620000000 +0900 -@@ -58,7 +58,7 @@ - module_names += "scim" +From d61495d3fb039842b82df44184c67eb3c1256136 Mon Sep 17 00:00:00 2001 +From: Bian Naimeng <biannm@cn.fujitsu.com> +Date: Fri, 26 Jun 2015 12:57:48 +0900 + +--- + scm/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scm/Makefile.am b/scm/Makefile.am +index 14d9393..e8a1083 100644 +--- a/scm/Makefile.am ++++ b/scm/Makefile.am +@@ -119,7 +119,7 @@ if EXPAT + module_names += "yahoo-jp" endif -UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager +UIM_MODULE_MANAGER = uim-module-manager UIM_MODULE_MANAGER_ENV = \ + LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \ LIBUIM_SCM_FILES=$(abs_srcdir) \ - LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.6.bb index 271718e5e4..af28895eef 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.6.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.6.bb @@ -17,11 +17,15 @@ DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" RDEPENDS_uim = "libuim0 libedit" -RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0 glibc-utils glibc-gconv-euc-jp" +RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0" +RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" LEAD_SONAME = "libuim.so.1" -inherit autotools pkgconfig gettext qemu gtk-immodules-cache +inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache + +REQUIRED_DISTRO_FEATURES = "x11" + GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" EXTRA_OECONF += "--disable-emacs \ diff --git a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch index 69d26adca9..2499cff72d 100644 --- a/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch +++ b/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch @@ -13,22 +13,22 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 2 files changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am -index e881cca..1321802 100644 +index 4628401..e8989bf 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -5,7 +5,6 @@ SUBDIRS = \ +@@ -11,7 +11,6 @@ SUBDIRS = \ log \ lst \ ini \ -- libltdl \ +- libltdl \ odbcinst \ DriverManager \ exe \ diff --git a/configure.ac b/configure.ac -index 218502f..d50b7af 100644 +index e4bcdaf..58aa5c5 100644 --- a/configure.ac +++ b/configure.ac -@@ -136,9 +136,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) +@@ -144,9 +144,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) dnl LT_CONFIG_LTDL_DIR([libltdl]) dnl LTDL_INIT @@ -39,5 +39,5 @@ index 218502f..d50b7af 100644 dnl Substitute INCLTDL and LIBLTDL in the Makefiles AC_SUBST(LTDLINCL) -- -2.8.1 +2.12.3 diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb index 6f57f375e8..62d9db8439 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb @@ -11,8 +11,8 @@ DEPENDS = "libtool mysql5" SRC_URI = "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ " -SRC_URI[md5sum] = "bd25d261ca1808c947cb687e2034be81" -SRC_URI[sha256sum] = "2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39" +SRC_URI[md5sum] = "a8629fd2953b04b4639d0a9d8a5cf9d1" +SRC_URI[sha256sum] = "88b637f647c052ecc3861a3baa275c3b503b193b6a49ff8c28b2568656d14d69" inherit autotools-brokensep diff --git a/meta-oe/recipes-support/upower/upower_0.99.5.bb b/meta-oe/recipes-support/upower/upower_0.99.7.bb index 9314534d7c..973fbe771e 100644 --- a/meta-oe/recipes-support/upower/upower_0.99.5.bb +++ b/meta-oe/recipes-support/upower/upower_0.99.7.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib polkit" SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ec57b4b7bf0af568f9a7a5603c921d97" -SRC_URI[sha256sum] = "78605664d027c788f6ab63c50950be6e86c6ba5d030c4cf35a6664337d87f3b2" +SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532" +SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401" inherit autotools pkgconfig gettext gobject-introspection systemd @@ -32,8 +32,3 @@ FILES_${PN} += "${datadir}/dbus-1/ \ ${datadir}/polkit-1/ \ ${base_libdir}/udev/* \ " - -FILES_${PN}-dbg += "${base_libdir}/udev/.debug" - - - diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb b/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb new file mode 100644 index 0000000000..b4be853ddb --- /dev/null +++ b/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb @@ -0,0 +1,14 @@ +SUMMARY = "RFC 3986 compliant URI parsing library" +HOMEPAGE = "https://uriparser.github.io" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=72b0f9c74ae96eeab8cf1bf3efe08da2" + +SRC_URI := "${SOURCEFORGE_MIRROR}/project/uriparser/Sources/${PV}/uriparser-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "--disable-test --disable-doc" + +SRC_URI[md5sum] = "9aabdc3611546f553f4af372167de6d6" +SRC_URI[sha256sum] = "ce7ccda4136974889231e8426a785e7578e66a6283009cfd13f1b24a5e657b23" diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb index fdefe03172..e00db4d7e0 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb @@ -12,22 +12,24 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ + file://Makefile.utils \ " -SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3" -SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9" + +SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c" +SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8" S = "${WORKDIR}/vbox_module" export BUILD_TARGET_ARCH="${ARCH}" export BUILD_TARGET_ARCH_x86-64="amd64" -export KERN_DIR="${STAGING_KERNEL_DIR}" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'" addtask export_sources before do_patch after do_unpack do_export_sources() { mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz + ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz # add a mount utility to use shared folder from VBox Addition Source Code @@ -38,6 +40,13 @@ do_export_sources() { } +do_configure_prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + # compile and install mount utility do_compile_append() { oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch new file mode 100644 index 0000000000..2a9ea74cd0 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch @@ -0,0 +1,31 @@ +From 1dd07113f2a7489444a8990a95be42e035f8e9df Mon Sep 17 00:00:00 2001 +From: Kurt Roeckx <kroeckx@debian.org> +Date: Tue, 1 Nov 2016 12:57:35 +0100 +Subject: [PATCH] Fix issue #599 +Forwarded: https://github.com/zaphoyd/websocketpp/pull/600 + +--- + websocketpp/transport/asio/security/tls.hpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index 7b32db8..a8aafec 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -355,13 +355,9 @@ protected: + template <typename ErrorCodeType> + lib::error_code translate_ec(ErrorCodeType ec) { + if (ec.category() == lib::asio::error::get_ssl_category()) { +- if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) { +- return make_error_code(transport::error::tls_short_read); +- } else { + // We know it is a TLS related error, but otherwise don't know + // more. Pass through as TLS generic. + return make_error_code(transport::error::tls_error); +- } + } else { + // We don't know any more information about this error so pass + // through +-- +2.7.4 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch new file mode 100644 index 0000000000..530c960ce5 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch @@ -0,0 +1,155 @@ +From 4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4 Mon Sep 17 00:00:00 2001 +From: Peter Thorson <git@zaphoyd.com> +Date: Sun, 11 Jun 2017 16:13:25 -0500 +Subject: [PATCH] minor adjustments to recent extension negotiation related + fixes, refactor a bit more extension negotiation code to be simpler + +--- + websocketpp/impl/connection_impl.hpp | 6 +-- + websocketpp/processors/hybi13.hpp | 92 ++++++++++++++++++------------------ + 2 files changed, 49 insertions(+), 49 deletions(-) + +Index: websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp +=================================================================== +--- websocketpp-0.7.0.orig/websocketpp/impl/connection_impl.hpp ++++ websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp +@@ -1222,17 +1222,17 @@ + std::pair<lib::error_code,std::string> neg_results; + neg_results = m_processor->negotiate_extensions(m_request); + +- if (neg_results.first == error::make_error_code(error::extension_parse_error)) { ++ if (neg_results.first == processor::error::make_error_code(processor::error::extension_parse_error)) { + // There was a fatal error in extension parsing that should result in + // a failed connection attempt. +- m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); ++ m_elog.write(log::elevel::info, "Bad request: " + neg_results.first.message()); + m_response.set_status(http::status_code::bad_request); + return neg_results.first; + } else if (neg_results.first) { + // There was a fatal error in extension processing that is probably our + // fault. Consider extension negotiation to have failed and continue as + // if extensions were not supported +- m_alog.write(log::alevel::info, ++ m_elog.write(log::elevel::info, + "Extension negotiation failed: " + neg_results.first.message()); + } else { + // extension negotiation succeeded, set response header accordingly +Index: websocketpp-0.7.0/websocketpp/processors/hybi13.hpp +=================================================================== +--- websocketpp-0.7.0.orig/websocketpp/processors/hybi13.hpp ++++ websocketpp-0.7.0/websocketpp/processors/hybi13.hpp +@@ -97,11 +97,6 @@ + /** + * This exists mostly because the code for requests and responses is + * identical and I can't have virtual template methods. +- * +- * NOTE: this method makes assumptions that the permessage-deflate +- * extension is the only one supported. If additional extensions are +- * ever supported it should be reviewed carefully. Most cases where +- * that assumption is made are explicitly noted. + */ + template <typename header_type> + err_str_pair negotiate_extensions_helper(header_type const & header) { +@@ -130,55 +125,60 @@ + + http::parameter_list::const_iterator it; + ++ // look through the list of extension requests to find the first ++ // one that we can accept. + if (m_permessage_deflate.is_implemented()) { + err_str_pair neg_ret; + for (it = p.begin(); it != p.end(); ++it) { +- // look through each extension, if the key is permessage-deflate +- if (it->first == "permessage-deflate") { +- // if we have already successfully negotiated this extension +- // then skip any other requests to negotiate the same one +- // with different parameters +- if (m_permessage_deflate.is_enabled()) { +- continue; +- } +- +- +- neg_ret = m_permessage_deflate.negotiate(it->second); +- +- if (neg_ret.first) { +- // Figure out if this is an error that should halt all +- // extension negotiations or simply cause negotiation of +- // this specific extension to fail. +- //std::cout << "permessage-compress negotiation failed: " +- // << neg_ret.first.message() << std::endl; +- } else { +- // Note: this list will need commas if WebSocket++ ever +- // supports more than one extension +- +- // Actually try to initialize the extension before we +- // deem negotiation complete +- ret.first = m_permessage_deflate.init(base::m_server); +- if (!ret.first) { +- +- // TODO: support multiple extensions. +- // right now, because there is only one extension +- // supported, it failing to negotiate means we are +- // done with all negotiating. In the future if more +- // extensions are supported a better solution will +- // be needed here. +- break; +- } else { +- ret.second += neg_ret.second; +- +- // continue looking for more extensions +- continue; +- } +- +- } ++ // not a permessage-deflate extension request, ignore ++ if (it->first != "permessage-deflate") { ++ continue; ++ } ++ ++ // if we have already successfully negotiated this extension ++ // then skip any other requests to negotiate the same one ++ // with different parameters ++ if (m_permessage_deflate.is_enabled()) { ++ continue; ++ } ++ ++ // attempt to negotiate this offer ++ neg_ret = m_permessage_deflate.negotiate(it->second); ++ ++ if (neg_ret.first) { ++ // negotiation offer failed. Do nothing. We will continue ++ // searching for a permessage-deflate config that succeeds ++ continue; ++ } ++ ++ // Negotiation tentatively succeeded ++ ++ // Actually try to initialize the extension before we ++ // deem negotiation complete ++ lib::error_code ec = m_permessage_deflate.init(base::m_server); ++ ++ if (ec) { ++ // Negotiation succeeded but initialization failed this is ++ // an error that should stop negotiation of permessage ++ // deflate. Return the reason for the init failure ++ ++ ret.first = ec; ++ break; ++ } else { ++ // Successfully initialized, push the negotiated response into ++ // the reply and stop looking for additional permessage-deflate ++ // extensions ++ ret.second += neg_ret.second; ++ break; + } + } + } + ++ // support for future extensions would go here. Should check the value of ++ // ret.first before continuing. Might need to consider whether failure of ++ // negotiation of an earlier extension should stop negotiation of subsequent ++ // ones ++ + return ret; + } + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch new file mode 100644 index 0000000000..94bfeb2fd4 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch @@ -0,0 +1,600 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +From 9ddb300d874a30db35e3ad58f188944bef0bf31b Mon Sep 17 00:00:00 2001 +From: Peter Thorson <git@zaphoyd.com> +Date: Sun, 11 Jun 2017 15:24:43 -0500 +Subject: [PATCH] Update permessage-deflate support to reflect that zlib + doesn't support a 256 bit window. Improve extension negotiation error + checking and documentation. fixes #596 fixes #653 + +--- + changelog.md | 8 ++ + test/extension/permessage_deflate.cpp | 153 +++++++++++++++++---- + .../extensions/permessage_deflate/enabled.hpp | 94 ++++++++++--- + websocketpp/impl/connection_impl.hpp | 10 +- + websocketpp/processors/hybi13.hpp | 28 +++- + 5 files changed, 247 insertions(+), 46 deletions(-) + +diff --git a/changelog.md b/changelog.md +index bba753cb..de98edd2 100644 +#--- a/changelog.md +#+++ b/changelog.md +#@@ -17,6 +17,14 @@ HEAD +# - Compatibility: Update `telemetry_client` to use a slightly more cross platform +# method of sleeping. Should work on windows now. Thank you Meir Yanovich for +# reporting. +#+- Compatibility: Updated permessage-deflate support to reflect that the zlib +#+ library does not actually support a sliding window size of 256 bits. +#+ WebSocket++ will no longer negotiate 256 bit deflate windows. If the user +#+ of the library tries to request a 256 bit window a 512 bit window will be +#+ specified instead (This was the previous behavior). #596 #653 Thank you +#+ Vinnie Falco and Gianfranco Costamagna for reporting. +#+- Compatibility: Better error handling and logging in cases where extension +#+ requests parse correctly but negotiation fails. +# - Bug: Store loggers in shared pointers to avoid crashes related to connections +# trying to write logs entries after their respective endpoint has been +# deallocated. Thank you Thalhammer for reporting and Jupp Müller for the +diff --git a/test/extension/permessage_deflate.cpp b/test/extension/permessage_deflate.cpp +index 4cd3e7b6..805afcc3 100644 +--- a/test/extension/permessage_deflate.cpp ++++ b/test/extension/permessage_deflate.cpp +@@ -186,15 +186,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) { + + BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) { + ext_vars v; ++ ++ // confirm that a request for a value of 8 is interpreted as 9 + v.attr["server_max_window_bits"] = "8"; ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + ++ v.attr["server_max_window_bits"] = "9"; + v.esp = v.exts.negotiate(v.attr); + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + +- v.attr["server_max_window_bits"] = "15"; + ++ v.attr["server_max_window_bits"] = "15"; + v.esp = v.exts.negotiate(v.attr); + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +@@ -213,7 +220,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) { + + BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) { + ext_vars v; +- v.attr["server_max_window_bits"] = "8"; ++ v.attr["server_max_window_bits"] = "9"; + + v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline); + v.esp = v.exts.negotiate(v.attr); +@@ -223,7 +230,7 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) { + BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept_8 ) { + ext_vars v; + v.attr["server_max_window_bits"] = "8"; + +@@ -232,10 +239,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { ++ ext_vars v; ++ v.attr["server_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest_8 ) { + ext_vars v; + v.attr["server_max_window_bits"] = "8"; + +@@ -244,10 +263,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { ++ ext_vars v; ++ v.attr["server_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest_8 ) { + ext_vars v; + v.attr["server_max_window_bits"] = "8"; + +@@ -256,7 +287,19 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { ++ ext_vars v; ++ v.attr["server_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); + } + + // Negotiate server_max_window_bits +@@ -292,7 +335,13 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) { + v.esp = v.exts.negotiate(v.attr); + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++ ++ v.attr["client_max_window_bits"] = "9"; ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + + v.attr["client_max_window_bits"] = "15"; + v.esp = v.exts.negotiate(v.attr); +@@ -311,7 +360,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) { + BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits)); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -323,7 +372,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { + BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(9,pmd_mode::decline); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -332,10 +393,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -344,10 +417,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + } + +-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest_8 ) { + ext_vars v; + v.attr["client_max_window_bits"] = "8"; + +@@ -356,7 +441,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { + BOOST_CHECK( v.exts.is_enabled() ); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); +- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); ++} ++ ++BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { ++ ext_vars v; ++ v.attr["client_max_window_bits"] = "9"; ++ ++ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest); ++ v.esp = v.exts.negotiate(v.attr); ++ BOOST_CHECK( v.exts.is_enabled() ); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); ++ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); + } + + +@@ -507,7 +604,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) { + std::string compress_out; + std::string decompress_out; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -520,7 +618,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) { + BOOST_AUTO_TEST_CASE( compress_data_multiple ) { + ext_vars v; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + for (int i = 0; i < 2; i++) { + std::string compress_in = "Hello"; +@@ -545,11 +644,12 @@ BOOST_AUTO_TEST_CASE( compress_data_large ) { + + websocketpp::http::attribute_list alist; + +- alist["server_max_window_bits"] = "8"; +- v.exts.set_server_max_window_bits(8,websocketpp::extensions::permessage_deflate::mode::smallest); ++ alist["server_max_window_bits"] = "9"; ++ v.exts.set_server_max_window_bits(9,websocketpp::extensions::permessage_deflate::mode::smallest); + + v.exts.negotiate(alist); +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -573,7 +673,8 @@ BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) { + v.exts.enable_server_no_context_takeover(); + + v.exts.negotiate(alist); +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out1); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -609,7 +710,8 @@ BOOST_AUTO_TEST_CASE( compress_empty ) { + std::string compress_out; + std::string decompress_out; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.compress(compress_in,compress_out); + BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); +@@ -640,7 +742,8 @@ BOOST_AUTO_TEST_CASE( decompress_data ) { + std::string out; + std::string reference = "Hello"; + +- v.exts.init(true); ++ v.ec = v.exts.init(true); ++ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); + + v.ec = v.exts.decompress(in,11,out); + +diff --git a/websocketpp/extensions/permessage_deflate/enabled.hpp b/websocketpp/extensions/permessage_deflate/enabled.hpp +index 1581f14c..f20a1b1d 100644 +--- a/websocketpp/extensions/permessage_deflate/enabled.hpp ++++ b/websocketpp/extensions/permessage_deflate/enabled.hpp +@@ -46,7 +46,7 @@ + namespace websocketpp { + namespace extensions { + +-/// Implementation of the draft permessage-deflate WebSocket extension ++/// Implementation of RFC 7692, the permessage-deflate WebSocket extension + /** + * ### permessage-deflate interface + * +@@ -174,18 +174,30 @@ namespace websocketpp { + namespace extensions { + namespace permessage_deflate { + +-/// Default value for server_max_window_bits as defined by draft 17 ++/// Default value for server_max_window_bits as defined by RFC 7692 + static uint8_t const default_server_max_window_bits = 15; +-/// Minimum value for server_max_window_bits as defined by draft 17 ++/// Minimum value for server_max_window_bits as defined by RFC 7692 ++/** ++ * NOTE: A value of 8 is not actually supported by zlib, the deflate ++ * library that WebSocket++ uses. To preserve backwards compatibility ++ * with RFC 7692 and previous versions of the library a value of 8 ++ * is accepted by the library but will always be negotiated as 9. ++ */ + static uint8_t const min_server_max_window_bits = 8; +-/// Maximum value for server_max_window_bits as defined by draft 17 ++/// Maximum value for server_max_window_bits as defined by RFC 7692 + static uint8_t const max_server_max_window_bits = 15; + +-/// Default value for client_max_window_bits as defined by draft 17 ++/// Default value for client_max_window_bits as defined by RFC 7692 + static uint8_t const default_client_max_window_bits = 15; +-/// Minimum value for client_max_window_bits as defined by draft 17 ++/// Minimum value for client_max_window_bits as defined by RFC 7692 ++/** ++ * NOTE: A value of 8 is not actually supported by zlib, the deflate ++ * library that WebSocket++ uses. To preserve backwards compatibility ++ * with RFC 7692 and previous versions of the library a value of 8 ++ * is accepted by the library but will always be negotiated as 9. ++ */ + static uint8_t const min_client_max_window_bits = 8; +-/// Maximum value for client_max_window_bits as defined by draft 17 ++/// Maximum value for client_max_window_bits as defined by RFC 7692 + static uint8_t const max_client_max_window_bits = 15; + + namespace mode { +@@ -372,7 +384,7 @@ class enabled { + /** + * The bits setting is the base 2 logarithm of the maximum window size that + * the server must use to compress outgoing messages. The permitted range +- * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB ++ * is 9 to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB + * window. The default setting is 15. + * + * Mode Options: +@@ -386,6 +398,14 @@ class enabled { + * adjusted by the server. A server may unilaterally set this value without + * client support. + * ++ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed. ++ * Prior to version 0.8.0 a value of 8 was also allowed by this library. ++ * zlib, the deflate compression library that WebSocket++ uses has always ++ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 ++ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0 ++ * continues to perform the 8->9 conversion for backwards compatibility ++ * purposes but this should be considered deprecated functionality. ++ * + * @param bits The size to request for the outgoing window size + * @param mode The mode to use for negotiating this parameter + * @return A status code +@@ -394,6 +414,12 @@ class enabled { + if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) { + return error::make_error_code(error::invalid_max_window_bits); + } ++ ++ // See note in doc comment above about what is happening here ++ if (bits == 8) { ++ bits = 9; ++ } ++ + m_server_max_window_bits = bits; + m_server_max_window_bits_mode = mode; + +@@ -403,8 +429,8 @@ class enabled { + /// Limit client LZ77 sliding window size + /** + * The bits setting is the base 2 logarithm of the window size that the +- * client must use to compress outgoing messages. The permitted range is 8 +- * to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB window. ++ * client must use to compress outgoing messages. The permitted range is 9 ++ * to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB window. + * The default setting is 15. + * + * Mode Options: +@@ -417,6 +443,14 @@ class enabled { + * outgoing window size unilaterally. A server may only limit the client's + * window size if the remote client supports that feature. + * ++ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed. ++ * Prior to version 0.8.0 a value of 8 was also allowed by this library. ++ * zlib, the deflate compression library that WebSocket++ uses has always ++ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 ++ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0 ++ * continues to perform the 8->9 conversion for backwards compatibility ++ * purposes but this should be considered deprecated functionality. ++ * + * @param bits The size to request for the outgoing window size + * @param mode The mode to use for negotiating this parameter + * @return A status code +@@ -425,6 +459,12 @@ class enabled { + if (bits < min_client_max_window_bits || bits > max_client_max_window_bits) { + return error::make_error_code(error::invalid_max_window_bits); + } ++ ++ // See note in doc comment above about what is happening here ++ if (bits == 8) { ++ bits = 9; ++ } ++ + m_client_max_window_bits = bits; + m_client_max_window_bits_mode = mode; + +@@ -642,11 +682,17 @@ class enabled { + * client requested that we use. + * + * options: +- * - decline (refuse to use the attribute) +- * - accept (use whatever the client says) +- * - largest (use largest possible value) ++ * - decline (ignore value, offer our default instead) ++ * - accept (use the value requested by the client) ++ * - largest (use largest value acceptable to both) + * - smallest (use smallest possible value) + * ++ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might ++ * be requested for negotiation by an older client/server, if the result of ++ * the negotiation would be to send a value of 8, a value of 9 is offered ++ * instead. This ensures that WebSocket++ will only ever negotiate connections ++ * with compression settings explicitly supported by zlib. ++ * + * @param [in] value The value of the attribute from the offer + * @param [out] ec A reference to the error code to return errors via + */ +@@ -678,6 +724,11 @@ class enabled { + ec = make_error_code(error::invalid_mode); + m_server_max_window_bits = default_server_max_window_bits; + } ++ ++ // See note in doc comment ++ if (m_server_max_window_bits == 8) { ++ m_server_max_window_bits = 9; ++ } + } + + /// Negotiate client_max_window_bits attribute +@@ -687,11 +738,17 @@ class enabled { + * negotiation mode. + * + * options: +- * - decline (refuse to use the attribute) +- * - accept (use whatever the client says) +- * - largest (use largest possible value) ++ * - decline (ignore value, offer our default instead) ++ * - accept (use the value requested by the client) ++ * - largest (use largest value acceptable to both) + * - smallest (use smallest possible value) + * ++ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might ++ * be requested for negotiation by an older client/server, if the result of ++ * the negotiation would be to send a value of 8, a value of 9 is offered ++ * instead. This ensures that WebSocket++ will only ever negotiate connections ++ * with compression settings explicitly supported by zlib. ++ * + * @param [in] value The value of the attribute from the offer + * @param [out] ec A reference to the error code to return errors via + */ +@@ -727,6 +784,11 @@ class enabled { + ec = make_error_code(error::invalid_mode); + m_client_max_window_bits = default_client_max_window_bits; + } ++ ++ // See note in doc comment ++ if (m_client_max_window_bits == 8) { ++ m_client_max_window_bits = 9; ++ } + } + + bool m_enabled; +diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp +index 105911db..ae55c338 100644 +--- a/websocketpp/impl/connection_impl.hpp ++++ b/websocketpp/impl/connection_impl.hpp +@@ -1222,12 +1222,18 @@ lib::error_code connection<config>::process_handshake_request() { + std::pair<lib::error_code,std::string> neg_results; + neg_results = m_processor->negotiate_extensions(m_request); + +- if (neg_results.first) { ++ if (neg_results.first == error::make_error_code(error::extension_parse_error)) { + // There was a fatal error in extension parsing that should result in + // a failed connection attempt. +- m_alog.write(log::alevel::devel, "Bad request: " + neg_results.first.message()); ++ m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); + m_response.set_status(http::status_code::bad_request); + return neg_results.first; ++ } else if (neg_results.first) { ++ // There was a fatal error in extension processing that is probably our ++ // fault. Consider extension negotiation to have failed and continue as ++ // if extensions were not supported ++ m_alog.write(log::alevel::info, ++ "Extension negotiation failed: " + neg_results.first.message()); + } else { + // extension negotiation succeeded, set response header accordingly + // we don't send an empty extensions header because it breaks many +diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp +index 79486654..a95bc649 100644 +--- a/websocketpp/processors/hybi13.hpp ++++ b/websocketpp/processors/hybi13.hpp +@@ -97,6 +97,11 @@ class hybi13 : public processor<config> { + /** + * This exists mostly because the code for requests and responses is + * identical and I can't have virtual template methods. ++ * ++ * NOTE: this method makes assumptions that the permessage-deflate ++ * extension is the only one supported. If additional extensions are ++ * ever supported it should be reviewed carefully. Most cases where ++ * that assumption is made are explicitly noted. + */ + template <typename header_type> + err_str_pair negotiate_extensions_helper(header_type const & header) { +@@ -149,9 +154,26 @@ class hybi13 : public processor<config> { + } else { + // Note: this list will need commas if WebSocket++ ever + // supports more than one extension +- ret.second += neg_ret.second; +- m_permessage_deflate.init(base::m_server); +- continue; ++ ++ // Actually try to initialize the extension before we ++ // deem negotiation complete ++ ret.first = m_permessage_deflate.init(base::m_server); ++ if (!ret.first) { ++ ++ // TODO: support multiple extensions. ++ // right now, because there is only one extension ++ // supported, it failing to negotiate means we are ++ // done with all negotiating. In the future if more ++ // extensions are supported a better solution will ++ // be needed here. ++ break; ++ } else { ++ ret.second += neg_ret.second; ++ ++ // continue looking for more extensions ++ continue; ++ } ++ + } + } + } diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch new file mode 100644 index 0000000000..342981d4db --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch @@ -0,0 +1,51 @@ +Description: Disable failing test_transport_asio_timers. +Because of "address already in use" error +/«PKGBUILDDIR»/test/transport/asio/timers.cpp(129): error in "tls_handshake_timeout": check ec == make_error_code(tls_handshake_timeout) failed [websocketpp.transport.asio.socket:8 != websocketpp.transport.asio.socket:5] +Author: Gianfranco Costamagna <locutusofborg@debian.org> + +--- websocketpp-0.7.0.orig/test/transport/CMakeLists.txt ++++ websocketpp-0.7.0/test/transport/CMakeLists.txt +@@ -1,24 +1,24 @@ + if (OPENSSL_FOUND) + +-# Test transport integration +-file (GLOB SOURCE integration.cpp) +- +-init_target (test_transport) +-build_test (${TARGET_NAME} ${SOURCE}) +-link_boost () +-link_openssl() +-final_target () +-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") +- +-# Test transport asio timers +-file (GLOB SOURCE asio/timers.cpp) +- +-init_target (test_transport_asio_timers) +-build_test (${TARGET_NAME} ${SOURCE}) +-link_boost () +-link_openssl() +-final_target () +-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") ++## Test transport integration ++#file (GLOB SOURCE integration.cpp) ++# ++#init_target (test_transport) ++#build_test (${TARGET_NAME} ${SOURCE}) ++#link_boost () ++#link_openssl() ++#final_target () ++#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") ++# ++## Test transport asio timers ++#file (GLOB SOURCE asio/timers.cpp) ++# ++#init_target (test_transport_asio_timers) ++#build_test (${TARGET_NAME} ${SOURCE}) ++#link_boost () ++#link_openssl() ++#final_target () ++#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") + + # Test transport asio security + file (GLOB SOURCE asio/security.cpp) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb new file mode 100644 index 0000000000..65fc974b6c --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "C++/Boost Asio based websocket client/server library." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/zaphoyd/websocketpp" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" +DEPENDS = "openssl boost zlib" + +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master" + +# tag 0.7.0 +SRCREV= "378437aecdcb1dfe62096ffd5d944bf1f640ccc3" + +SRC_URI += "file://0001-Fix-issue-599.patch \ + file://9ddb300d874a30db35e3ad58f188944bef0bf31b.patch \ + file://4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch \ + file://disable-tests.patch \ + " + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch b/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch deleted file mode 100644 index b2b0e49988..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 41093d9634bfeddcaec866745d8d4022f4c6f8c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 19 Feb 2017 21:01:39 +0100 -Subject: [PATCH] explicitly disable man generation --disable-documentation is - not enough -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index c01c54f..dcdf7a2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - NULL = - --SUBDIRS=po man -+SUBDIRS=po - - INCLUDES = \ - -I$(top_srcdir) \ --- -2.9.3 - diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop b/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop deleted file mode 100644 index a9a22d3be7..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=User folders update -Exec=xdg-user-dirs-update -StartupNotify=false -NoDisplay=true -X-GNOME-Autostart-Phase=Initialization -X-KDE-autostart-phase=1 - diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb deleted file mode 100644 index c05675976d..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = " \ - http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ - file://0001-explicitly-disable-man-generation-disable-documentat.patch \ - file://xdg-user-dirs.desktop \ -" -SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d" -SRC_URI[sha256sum] = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786" - -inherit autotools gettext - -EXTRA_OECONF = "--disable-documentation" - -do_install_append () { - install -d ${D}${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart -} - -CONFFILES_${PN} += " \ - ${sysconfdir}/xdg/user-dirs.conf \ - ${sysconfdir}/xdg/user-dirs.defaults \ -" diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb new file mode 100644 index 0000000000..e3ce9268cd --- /dev/null +++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "e0564ec6d838e6e41864d872a29b3575" +SRC_URI[sha256sum] = "2a07052823788e8614925c5a19ef5b968d8db734fdee656699ea4f97d132418c" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-documentation" + +CONFFILES_${PN} += " \ + ${sysconfdir}/xdg/user-dirs.conf \ + ${sysconfdir}/xdg/user-dirs.defaults \ +" diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb index 20cf45f06d..0bdafdf3bd 100644 --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb @@ -1,19 +1,20 @@ SUMMARY = "Xorg drivers for xrdp." -LICENSE = "X11" -LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007 \ -" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007" inherit autotools pkgconfig DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git \ - " +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "x11 pam" + +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427" -PV = "0.2.5+git${SRCPV}" +PV = "0.2.5" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb index ccc8e359a7..3ef7c9853f 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb @@ -8,7 +8,7 @@ inherit distro_features_check autotools pkgconfig useradd systemd DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 pam" SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ file://xrdp.sysconfig \ @@ -24,6 +24,9 @@ PV = "0.9.4+git${SRCPV}" S = "${WORKDIR}/git" +PACKAGECONFIG ??= "" +PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" + USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system xrdp" USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ @@ -37,7 +40,7 @@ FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ ${libdir}/xrdp/libscp.so \ ${libdir}/xrdp/libxrdpapi.so " -#EXTRA_OECONF = "--disable-rfxcodec --disable-painter" +EXTRA_OECONF = "--enable-pam-config=suse" do_configure_prepend() { cd ${S} @@ -65,7 +68,6 @@ do_install_append() { sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/pam.d/xrdp-sesman.debian ${D}${sysconfdir}/xrdp/pam.d/xrdp-sesman install -m 0644 ${S}/sesman/sesman.ini ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/xrdp/xrdp.ini ${D}${sysconfdir}/xrdp/ diff --git a/meta-oe/recipes-devtools/cppunit/cppunit_1.13.2.bb b/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb index 65b08b068d..65b08b068d 100644 --- a/meta-oe/recipes-devtools/cppunit/cppunit_1.13.2.bb +++ b/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb diff --git a/meta-oe/recipes-devtools/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch b/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch index 6a20c1283a..6a20c1283a 100644 --- a/meta-oe/recipes-devtools/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch +++ b/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch diff --git a/meta-oe/recipes-devtools/cunit/cunit_2.1-3.bb b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb index c9d87e36d0..c9d87e36d0 100644 --- a/meta-oe/recipes-devtools/cunit/cunit_2.1-3.bb +++ b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb diff --git a/meta-oe/recipes-devtools/cunit/files/fixup-install-docdir.patch b/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch index c328227318..c328227318 100644 --- a/meta-oe/recipes-devtools/cunit/files/fixup-install-docdir.patch +++ b/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch diff --git a/meta-oe/recipes-devtools/cxxtest/cxxtest_4.3.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb index 2915011731..2915011731 100644 --- a/meta-oe/recipes-devtools/cxxtest/cxxtest_4.3.bb +++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb diff --git a/meta-oe/recipes-support/evtest/evtest_git.bb b/meta-oe/recipes-test/evtest/evtest_git.bb index fa0d6e2fe5..fa0d6e2fe5 100644 --- a/meta-oe/recipes-support/evtest/evtest_git.bb +++ b/meta-oe/recipes-test/evtest/evtest_git.bb diff --git a/meta-oe/recipes-support/fbtest/fb-test_git.bb b/meta-oe/recipes-test/fbtest/fb-test_git.bb index 6a9d4b2787..6a9d4b2787 100644 --- a/meta-oe/recipes-support/fbtest/fb-test_git.bb +++ b/meta-oe/recipes-test/fbtest/fb-test_git.bb diff --git a/meta-oe/recipes-test/gtest/gtest_1.8.0.bb b/meta-oe/recipes-test/gtest/gtest_1.8.0.bb index 483dc1f2e9..48cf4e04b0 100644 --- a/meta-oe/recipes-test/gtest/gtest_1.8.0.bb +++ b/meta-oe/recipes-test/gtest/gtest_1.8.0.bb @@ -7,16 +7,13 @@ LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd51 PROVIDES += "gmock" +S = "${WORKDIR}/git" +SRCREV = "ec44c6c1675c25b9827aacd08c02433cccde7780" SRC_URI = "\ - https://github.com/google/googletest/archive/release-${PV}.tar.gz \ + git://github.com/google/googletest.git;protocol=https; \ file://Add-pkg-config-support.patch \ " -SRC_URI[md5sum] = "16877098823401d1bf2ed7891d7dce36" -SRC_URI[sha256sum] = "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8" - -S = "${WORKDIR}/googletest-release-${PV}" - inherit cmake ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb b/meta-oe/recipes-test/pm-qa/pm-qa_git.bb index 1ee6573bdb..1ee6573bdb 100644 --- a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb +++ b/meta-oe/recipes-test/pm-qa/pm-qa_git.bb diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch index f90e704f05..d604f860a1 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch @@ -1,4 +1,4 @@ -From d50203b233cb8820bf83b6651c2a8487e0db1fcf Mon Sep 17 00:00:00 2001 +From 784dcd09d3f266e271d007f4fd257e85036872ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> Date: Tue, 17 Oct 2017 10:13:20 -0500 Subject: [PATCH] Several changes to fix musl build @@ -21,6 +21,7 @@ Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> Upstream-status: Pending + --- cache.c | 4 ++++ stress-madvise.c | 1 + @@ -28,13 +29,13 @@ Upstream-status: Pending stress-pty.c | 18 ------------------ stress-resources.c | 1 - stress-stackmmap.c | 2 +- - 8 files changed, 9 insertions(+), 23 deletions(-) + 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/cache.c b/cache.c -index e01fad0..27870ee 100644 +index fbf7674..936c1ff 100644 --- a/cache.c +++ b/cache.c -@@ -27,6 +27,10 @@ typedef struct { +@@ -28,6 +28,10 @@ typedef struct { #include <glob.h> @@ -46,10 +47,10 @@ index e01fad0..27870ee 100644 #define SYS_CPU_PREFIX "/sys/devices/system/cpu" #define GLOB_PATTERN SYS_CPU_PREFIX "/cpu[0-9]*" diff --git a/stress-madvise.c b/stress-madvise.c -index 43ea454..2e1f8ee 100644 +index 9e71e11..ddf8d2d 100644 --- a/stress-madvise.c +++ b/stress-madvise.c -@@ -141,6 +141,7 @@ static int stress_random_advise(const args_t *args) +@@ -147,6 +147,7 @@ static int stress_random_advise(const args_t *args) #if defined(MADV_SOFT_OFFLINE) if (advise == MADV_SOFT_OFFLINE) { static int soft_offline_count; @@ -58,7 +59,7 @@ index 43ea454..2e1f8ee 100644 /* ..and minimize number of soft offline pages */ if ((soft_offline_count >= NUM_SOFT_OFFLINE_MAX) || diff --git a/stress-malloc.c b/stress-malloc.c -index 8dbe5cc..f505f32 100644 +index a46b8c6..427827a 100644 --- a/stress-malloc.c +++ b/stress-malloc.c @@ -99,7 +99,7 @@ int stress_malloc(const args_t *args) @@ -71,7 +72,7 @@ index 8dbe5cc..f505f32 100644 (void)mallopt(M_MMAP_THRESHOLD, (int)malloc_threshold); #endif diff --git a/stress-pty.c b/stress-pty.c -index 8c3edf8..518f118 100644 +index 1bd1fbd..b1fe573 100644 --- a/stress-pty.c +++ b/stress-pty.c @@ -26,7 +26,6 @@ @@ -114,7 +115,7 @@ index 8c3edf8..518f118 100644 if (ioctl(ptys[i].slave, TIOCGLCKTRMIOS, &ios) < 0) pr_fail_err("ioctl TIOCGLCKTRMIOS on slave pty"); diff --git a/stress-resources.c b/stress-resources.c -index 182e176..880433d 100644 +index 958c99a..af79abd 100644 --- a/stress-resources.c +++ b/stress-resources.c @@ -31,7 +31,6 @@ @@ -126,7 +127,7 @@ index 182e176..880433d 100644 #endif #if defined(HAVE_LIB_PTHREAD) && defined(__linux__) diff --git a/stress-stackmmap.c b/stress-stackmmap.c -index e1378e2..00d1268 100644 +index 9c83a69..2984f09 100644 --- a/stress-stackmmap.c +++ b/stress-stackmmap.c @@ -24,7 +24,7 @@ @@ -138,6 +139,3 @@ index e1378e2..00d1268 100644 #include <ucontext.h> --- -2.11.0 - diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch index 8263401694..ed3287e329 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch @@ -1,4 +1,4 @@ -From 7be4680930e2867cefd5c8fe27a4ae81a4ae2628 Mon Sep 17 00:00:00 2001 +From faadbc147394cea9278bc2494f33e3521d88e742 Mon Sep 17 00:00:00 2001 From: Tim Orling <timothy.t.orling@linux.intel.com> Date: Tue, 9 Jan 2018 18:38:45 -0800 Subject: [PATCH] stress-fcntl: fix build for musl @@ -6,22 +6,20 @@ Subject: [PATCH] stress-fcntl: fix build for musl Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> Upstream-status: Pending + --- stress-fcntl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/stress-fcntl.c b/stress-fcntl.c -index b7eade2..9fa5c38 100644 +index 2ea867b..e91b345 100644 --- a/stress-fcntl.c +++ b/stress-fcntl.c -@@ -413,6 +413,7 @@ ofd_lock_abort: { /* Nowt */ } - - #if defined(F_GET_FILE_RW_HINT) && defined(F_SET_FILE_RW_HINT) +@@ -415,6 +415,7 @@ ofd_lock_abort: { /* Nowt */ } + #if (defined(F_GET_FILE_RW_HINT) && defined(F_SET_FILE_RW_HINT)) | \ + (defined(F_GET_RW_HINT) && defined(F_SET_RW_HINT)) { + int ret; size_t i; unsigned long hint; static const unsigned long hints[] = { --- -2.14.3 - diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch deleted file mode 100644 index 4b6a9b3916..0000000000 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8537dcafb12be4d986b571f1e1d9f3ceecdc8e63 Mon Sep 17 00:00:00 2001 -From: Tim Orling <timothy.t.orling@linux.intel.com> -Date: Sun, 7 Jan 2018 21:29:12 -0800 -Subject: [PATCH] stress-fcntl.c: fix syntax errors - -Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> - -Upstream-status: Accepted -(commit 61d93d6857256cd49df6a6302caf6e7bb69b0f46) ---- - stress-fcntl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/stress-fcntl.c b/stress-fcntl.c -index 7c15d28..b7eade2 100644 ---- a/stress-fcntl.c -+++ b/stress-fcntl.c -@@ -173,7 +173,7 @@ static int do_fcntl(const args_t *args, const int fd) - owner.pid = getpgrp(); - ret = fcntl(fd, F_SETOWN_EX, &owner); - check_return(args, ret, "F_SETOWN_EX, F_OWNER_PGRP"); --#else if defined(HAVE_GETPGRP) && defined(F_OWNER_GID) -+#elif defined(HAVE_GETPGRP) && defined(F_OWNER_GID) - owner.type = F_OWNER_GID; - owner.pid = getpgrp(); - ret = fcntl(fd, F_SETOWN_EX, &owner); -@@ -202,7 +202,7 @@ static int do_fcntl(const args_t *args, const int fd) - owner.type = F_OWNER_PGRP; - ret = fcntl(fd, F_GETOWN_EX, &owner); - check_return(args, ret, "F_GETOWN_EX, F_OWNER_PGRP"); --#ele if defined(F_OWNER_GID) -+#elif defined(F_OWNER_GID) - owner.type = F_OWNER_GID; - ret = fcntl(fd, F_GETOWN_EX, &owner); - check_return(args, ret, "F_GETOWN_EX, F_OWNER_GID"); -@@ -436,7 +436,7 @@ ofd_lock_abort: { /* Nowt */ } - #endif - }; - -- ret = fcntl(fd, F_GET_FILE_RW_HINT, &hint) -+ ret = fcntl(fd, F_GET_FILE_RW_HINT, &hint); - if (ret == 0) { - for (i = 0; i < SIZEOF_ARRAY(hints); i++) { - hint = hints[i]; --- -2.14.3 - diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb index 24f55ada28..7fab43025f 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb +++ b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "zlib libaio" SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ + file://0002-stress-fcntl-fix-build-for-musl.patch \ " SRC_URI_append_libc-musl = " \ file://0001-Several-changes-to-fix-musl-build.patch \ - file://0002-stress-fcntl-fix-build-for-musl.patch \ - file://0003-stress-fcntl.c-fix-syntax-errors.patch" - -SRC_URI[md5sum] = "6e4df71095e780654ccc0a713b8423fe" -SRC_URI[sha256sum] = "e993fddb1d990a0cdb23b2af6cf6c417a1c09e155ada7c558ad80eae8a5feed3" + " +SRC_URI[md5sum] = "1f8b6c2c2830704d2a2814c16082d48e" +SRC_URI[sha256sum] = "02cac34a5cb041197af60c1867844c6cbb089a6d10a38cdcf7b8f27bfaa6ef8f" UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" UPSTREAM_CHECK_REGEX ?= "(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-oe/recipes-extended/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch b/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch index 71782c5b9b..71782c5b9b 100644 --- a/meta-oe/recipes-extended/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch +++ b/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch diff --git a/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch b/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch index 71ca343cc0..71ca343cc0 100644 --- a/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch +++ b/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch diff --git a/meta-oe/recipes-extended/testfloat/testfloat_3a.bb b/meta-oe/recipes-test/testfloat/testfloat_3a.bb index 28e9677625..28e9677625 100644 --- a/meta-oe/recipes-extended/testfloat/testfloat_3a.bb +++ b/meta-oe/recipes-test/testfloat/testfloat_3a.bb diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index a861c3edb7..ece6dd05eb 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf @@ -14,3 +14,5 @@ BBFILE_PRIORITY_perl-layer = "6" LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" + +LAYERSERIES_COMPAT_perl-layer = "sumo" diff --git a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.36.bb b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb index 8f26ab0f7e..db16d8307d 100644 --- a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.36.bb +++ b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb @@ -10,11 +10,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2e9769f0a2613a98bc7fce15dee0c533" SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" -SRC_URI[md5sum] = "48566d81f430a7f755bb4d8f426ce35d" -SRC_URI[sha256sum] = "fefe84d4f2461e867f9be80f3f988e17bcbbcb4e306952cf2fd1dea7e4515490" +SRC_URI[md5sum] = "0aeb8563d533e7f83724ed068b5bfc37" +SRC_URI[sha256sum] = "8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4" S = "${WORKDIR}/CGI-${PV}" inherit cpan +RDEPENDS_${PN} += "\ + perl-module-deprecate \ + perl-module-if \ +" + RPROVIDES_${PN} += "perl-module-cgi" diff --git a/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb b/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb index 0b27b5cb1c..c72e536deb 100644 --- a/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb +++ b/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb @@ -25,6 +25,8 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${PV} SRC_URI[md5sum] = "8f835ddacb9a4a92a52bbe2d24d18a8e" SRC_URI[sha256sum] = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269" +UPSTREAM_CHECK_REGEX = "DBD\-SQLite\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" + S = "${WORKDIR}/DBD-SQLite-${PV}" inherit cpan diff --git a/meta-perl/recipes-perl/libencode/libencode-perl_2.83.bb b/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb index ee8c67d686..9861c56e05 100644 --- a/meta-perl/recipes-perl/libencode/libencode-perl_2.83.bb +++ b/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb @@ -1,3 +1,8 @@ +# NOTE: +# You should use perl-module-encode rather than this package +# unless you specifically need a version newer than what is +# provided by perl. + SUMMARY = "Encode - character encodings" DESCRIPTION = "The \"Encode\" module provides the interfaces between \ Perl's strings and the rest of the system. Perl strings are sequences \ @@ -7,18 +12,27 @@ AUTHOR = "Dan Kogai <dankogai+cpan@gmail.com>" HOMEPAGE = "https://metacpan.org/release/Encode" SECTION = "lib" LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://META.json;md5=fdbebc82e925d8acbce42cfad131c4d1" +LIC_FILES_CHKSUM = "file://META.json;md5=d8e909447b983532b2b460c830e7a7e4" SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" -SRC_URI[md5sum] = "0d3f59e8ea704497647eded665919053" -SRC_URI[sha256sum] = "5d3a90e30aabe78dfcf5e816ffb1da1e33475892dbd0075320315cdce5682988" +SRC_URI[md5sum] = "f995e0eb9e52d01ed57abe835bf3ccb6" +SRC_URI[sha256sum] = "acb3a4af5e3ee38f94de8baa7454e0b836a0649e7ac4180f28dfca439ad60cff" + +UPSTREAM_CHECK_REGEX = "Encode\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" S = "${WORKDIR}/Encode-${PV}" inherit cpan +# file /usr/bin/enc2xs from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +# file /usr/bin/encguess from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +# file /usr/bin/piconv from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +RCONFLICTS_${PN} = "perl-misc" + RDEPENDS_${PN} += " perl-module-bytes \ perl-module-constant \ + perl-module-parent \ + perl-module-storable \ perl-module-xsloader \ " @@ -42,7 +56,7 @@ RPROVIDES_${PN} += "libencode-alias-perl \ libencode-mime-name-perl \ libencode-symbol-perl \ libencode-tw-perl \ - libencode-unicode--perl \ + libencode-unicode-perl \ libencode-unicode-utf7-perl \ libencoding-perl \ libencode-internal-perl \ diff --git a/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.09.bb b/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb index d13cb03ee9..99df6f33ff 100644 --- a/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.09.bb +++ b/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb @@ -12,8 +12,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=81;endline=84;md5=84c0390b90ea8c6702ce659b67bed699" SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETJ/ExtUtils-CppGuess-${PV}.tar.gz" -SRC_URI[md5sum] = "f8ada38ee4ad86a4f1e20d8525ce0c99" -SRC_URI[sha256sum] = "48625195a88c0f2ddc37bbd7a06346aa68ffb6948ba78da3aea47c0db2540f65" +SRC_URI[md5sum] = "28be49072585b25df87e54180f741a4d" +SRC_URI[sha256sum] = "31c47b5b15e3e9fd5ae7b35881a0fffd26a2983b241e7e3a1bc340d6d446186b" S = "${WORKDIR}/ExtUtils-CppGuess-${PV}" diff --git a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_1.997.bb b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb index ba5788a016..ea78bc4e00 100644 --- a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_1.997.bb +++ b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb @@ -12,13 +12,18 @@ SECTION = "libs" LICENSE = "Artistic-1.0|GPLv1+" LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8" -RDEPENDS_${PN} += "perl-module-scalar-util libnet-ssleay-perl" +RDEPENDS_${PN} += "\ + libnet-ssleay-perl \ + perl-module-autoloader \ + perl-module-scalar-util \ + perl-module-io-socket \ +" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "2a6268bb42da81e69d1c1feb2fcb0eea" -SRC_URI[sha256sum] = "acdb67b5b63aea5b7e70c3e4c70a16128810329592b63753a38c794aff76a1dd" +SRC_URI[md5sum] = "e1b412e28d107c716e7ca637e2b7f8bd" +SRC_URI[sha256sum] = "02ea04e9a336a7d3ca9aa604c0c5b5aaf3efa513cefecfc73cc79ceeb5131e4b" S = "${WORKDIR}/IO-Socket-SSL-${PV}" @@ -32,7 +37,6 @@ do_install_append () { cp -pRP ${S}/docs ${D}${docdir}/${PN}/ cp -pRP ${S}/certs ${D}${docdir}/${PN}/ cp -pRP ${S}/example ${D}${docdir}/${PN}/ - cp -pRP ${S}/util ${D}${docdir}/${PN}/ } do_install_ptest () { diff --git a/meta-perl/recipes-perl/libmime/libmime-types-perl_2.13.bb b/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb index fd51c16ac9..414753030b 100644 --- a/meta-perl/recipes-perl/libmime/libmime-types-perl_2.13.bb +++ b/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb @@ -14,13 +14,29 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MIME-Types-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "f2892ae9e6ea660a58746699c3924817" -SRC_URI[sha256sum] = "99c3376357bbe22cc8b6c78f560aa18d81621287695cd629008a6c4e66b77bf8" +SRC_URI[md5sum] = "6f1441addab947137bac92c379a47ba3" +SRC_URI[sha256sum] = "e04ed7d42f1ff3150a303805f2689c28f80b92c511784d4641cb7f040d3e8ff6" S = "${WORKDIR}/MIME-Types-${PV}" inherit cpan ptest +RDEPENDS_${PN} = "\ + perl-module-base \ + perl-module-file-basename \ + perl-module-file-spec \ + perl-module-overload \ +" + +RDEPENDS_${PN}-ptest = "perl-module-lib perl-module-test-more" +#RSUGGESTS_${PN}-ptest = "libmojo-base-perl" + +do_install () { + cpan_do_install + install -d ${D}${bindir} + install -m 755 ${S}/bin/collect-types ${D}${bindir}/collect-types +} + do_install_ptest () { cp -r ${B}/t ${D}${PTEST_PATH} } diff --git a/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb b/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb index c73a15a4fe..aed65d3a8b 100644 --- a/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb +++ b/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb @@ -17,9 +17,14 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=322;endline=325;md5=086450ce010f6fda25db0b38fcc41086" SRCNAME = "Module-Pluggable" -SRC_URI = "https://github.com/moto-timo/${SRCNAME}/archive/${PV}.tar.gz" -SRC_URI[md5sum] = "e32475d6ff5843f738cedacd3b7a2cdb" -SRC_URI[sha256sum] = "58c62292eea6d06959eba1b97598650813211265403242d57efb2f605c96059f" +SRC_URI = "${CPAN_MIRROR}/authors/id/S/SI/SIMONW/${SRCNAME}-${PV}.tar.gz" +SRC_URI[md5sum] = "87ce2971662efd0b69a81bb4dc9ea76c" +SRC_URI[sha256sum] = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df" + +PR = "r1" + +UPSTREAM_CHECK_REGEX = "Module\-Pluggable\-(?P<pver>(\d+\.\d+))" +UPSTREAM_CHECK_URI = "https://metacpan.org/release/${SRCNAME}" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.015.bb b/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb index b92842c463..89f0f709aa 100644 --- a/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.015.bb +++ b/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb @@ -17,12 +17,14 @@ SECTION = "libs" HOMEPAGE = "http://search.cpan.org/~zefram/Module-Runtime/" LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;beginline=45;endline=46;md5=62e24a93342fede7221d66335c716f34" +LIC_FILES_CHKSUM = "file://README;beginline=36;endline=44;md5=9416434672a57853d6181f3da9094963" -SRCNAME = "module-runtime" -SRC_URI = "https://github.com/moto-timo/${SRCNAME}/archive/${PV}.tar.gz" -SRC_URI[md5sum] = "ad6ca179c978aa02ac8aa29244ef9beb" -SRC_URI[sha256sum] = "59effa82b3f6986d28de6154a8f2428157691004d951f936a81e851f4dbcb045" +SRCNAME = "Module-Runtime" +SRC_URI = "${CPAN_MIRROR}/authors/id/Z/ZE/ZEFRAM/${SRCNAME}-${PV}.tar.gz" +SRC_URI[md5sum] = "d3d47222fa2e3dfcb4526f6cc8437b20" +SRC_URI[sha256sum] = "68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024" + +UPSTREAM_CHECK_REGEX = "Module\-Runtime\-(?P<pver>(\d+\.\d+)).tar" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003002.bb b/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb index a0fe4927fa..a260ab87db 100644 --- a/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003002.bb +++ b/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb @@ -10,8 +10,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=731;endline=776;md5=27efedd175eeaddbd18f4e3572bd72a8" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Moo-${PV}.tar.gz" -SRC_URI[md5sum] = "e9f1f3159555ecebcd062e998f297a94" -SRC_URI[sha256sum] = "f3e9741e79baa63e89f5a08706cd80d18c0a5a37e3d898847e002310e06582f1" +SRC_URI[md5sum] = "d4fcd0f240033198571fcc81ce7c5f15" +SRC_URI[sha256sum] = "f8bbb625f8e963eabe05cff9048fdd72bdd26777404ff2c40bc690f558be91e1" S = "${WORKDIR}/Moo-${PV}" diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.13.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb index da274efdf4..efaa7f7b1d 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.13.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb @@ -9,8 +9,8 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[md5sum] = "ed0c4c22daaf88c4071bae13b6f71f99" -SRC_URI[sha256sum] = "7ec76663365f2f96de46fe07bd6c9d45ab21171ae83954e8d1b816428b518c36" +SRC_URI[md5sum] = "0da1099c0a3548d36ea9e31d5bb9e122" +SRC_URI[sha256sum] = "83c38a594eeb2c85d66e60047a0f5b403f34bd92a5d13606f02e828d450299fc" S = "${WORKDIR}/Net-DNS-${PV}" @@ -18,6 +18,8 @@ EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} inherit cpan +RDEPENDS_${PN} = "perl-module-integer" + do_compile() { export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" cpan_do_compile diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.81.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb index a861b69e99..cfecef9cfd 100644 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.81.bb +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb @@ -11,27 +11,30 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=274;endline=294;md5=67d67095d83e339da538a082fad5f38e" DEPENDS = "openssl zlib openssl-native" -RDEPENDS_${PN} += "perl-module-carp \ - perl-module-errno \ - perl-module-extutils-makemaker \ - perl-module-mime-base64 \ - perl-module-socket \ - " +RDEPENDS_${PN} += "\ + libssl \ + libcrypto \ + perl-module-carp \ + perl-module-errno \ + perl-module-extutils-makemaker \ + perl-module-mime-base64 \ + perl-module-socket \ + zlib \ +" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "71932ce34d4db44de8d00399c3405792" -SRC_URI[sha256sum] = "00cbb6174e628b42178e1445c9fd5a3c5ae2cfd6a5a43e03610ba14786f21b7d" +SRC_URI[md5sum] = "cfbe968487149626978f427cc9fb8c77" +SRC_URI[sha256sum] = "823ec3cbb428309d6a9e56f362a9300693ce3215b7fede109adb7be361fff177" S = "${WORKDIR}/Net-SSLeay-${PV}" inherit cpan ptest -EXTRA_CPANFLAGS = "LIBS='-L=${STAGING_LIBDIR} -L=${STAGING_BASELIBDIR}' \ - INC=-I=${STAGING_INCDIR} \ - '-lssl -lcrypto -lz' \ - " +export OPENSSL_PREFIX="${STAGING_LIBDIR}" + +EXTRA_CPANFLAGS = "INC=-I${STAGING_INCDIR} LIBS='-L${STAGING_LIBDIR} -lcrypto -lssl -L${STAGING_BASELIBDIR} -lz'" do_install_ptest() { cp -r ${B}/t ${D}${PTEST_PATH} diff --git a/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000005.bb b/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb index f684f684bf..c2755ea0f7 100644 --- a/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000005.bb +++ b/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb @@ -9,8 +9,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=177;endline=214;md5=26df7e7c20551fb1906e2286624f0b71" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Role-Tiny-${PV}.tar.gz" -SRC_URI[md5sum] = "c8c5cf1e02d2e0a1ed22530b55b67d66" -SRC_URI[sha256sum] = "593a29b621e029bf0218d0154d5dfdf6ec502afc49adeeadae6afd0c70063115" +SRC_URI[md5sum] = "7c277728a7e090f64b495857cadfed08" +SRC_URI[sha256sum] = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382" S = "${WORKDIR}/Role-Tiny-${PV}" diff --git a/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.36.bb b/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb index 1aed5e0d62..c9ba594803 100644 --- a/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.36.bb +++ b/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb @@ -1,3 +1,8 @@ +# NOTE: +# You should use perl-module-test-harness instead of this package, +# unless you specifically need a newer version than what is provided +# by perl in oe-core. + SUMMARY = "Test::Harness - Run Perl standard test scripts with statistics" DESCRIPTION = "Although, for historical reasons, the Test::Harness \ distribution takes its name from this module it now exists only to provide \ @@ -21,12 +26,18 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=29;endline=30;md5=b08db4360eec119e875dddd7cb8a5ddd" SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Test-Harness-${PV}.tar.gz" -SRC_URI[md5sum] = "4c8d9c77e8e06ca96c7383c05c8f3616" -SRC_URI[sha256sum] = "e7566f13b041d028b56f184b77ec2545ec6f0bb5a0f8f5368f7e4a08b496b63e" +SRC_URI[md5sum] = "c794906473f88d6b74194e2d56f16bd6" +SRC_URI[sha256sum] = "0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53" + +UPSTREAM_CHECK_REGEX = "Test\-Harness\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" S = "${WORKDIR}/Test-Harness-${PV}" -inherit cpan +inherit cpan ptest-perl + +RDEPENDS_${PN} += "\ + perl-module-benchmark \ +" RPROVIDES_${PN} += "libapp-prove-perl \ libapp-prove-state-perl \ @@ -77,4 +88,33 @@ RPROVIDES_${PN} += "libapp-prove-perl \ libtap-parser-yamlish-writer-perl \ " +do_install_prepend() { + # these tests are inappropriate on target + rm -rf ${B}/t/000-load.t + rm -rf ${B}/t/state.t + # these tests require "-T" (taint) option on command line + rm -rf ${B}/t/aggregator.t + rm -rf ${B}/t/bailout.t + rm -rf ${B}/t/base.t + rm -rf ${B}/t/callbacks.t + rm -rf ${B}/t/errors.t + rm -rf ${B}/t/nested.t + rm -rf ${B}/t/object.t + rm -rf ${B}/t/premature-bailout.t + rm -rf ${B}/t/results.t + rm -rf ${B}/t/streams.t + rm -rf ${B}/t/yamlish-output.t + rm -rf ${B}/t/compat/version.t +} + +do_install_append() { + install -d ${D}/usr/local/bin + # do not clobber perl-misc /usr/bin/prove + install -m 0755 ${B}/bin/prove ${D}/usr/local/bin/ + rm -rf ${D}${bindir}/prove + rm -rf ${D}${bindir} +} + +FILES_${PN} += "/usr/local/bin/prove" + BBCLASSEXTEND = "native" diff --git a/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0131.bb b/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb index 4105249538..1f18401180 100644 --- a/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0131.bb +++ b/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb @@ -13,10 +13,13 @@ DEPENDS += "libxml2 \ libxml-sax-perl-native \ zlib \ " -RDEPENDS_${PN} += "libxml2 \ - libxml-sax-perl \ - libxml-sax-base-perl \ - zlib \ +RDEPENDS_${PN} += "\ + libxml2 \ + libxml-sax-perl \ + libxml-sax-base-perl \ + perl-module-encode \ + perl-module-data-dumper \ + zlib \ " SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}.tar.gz;name=libxml \ @@ -27,8 +30,8 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}. LIC_FILES_CHKSUM = "file://debian/copyright;md5=64eda1bc135f0ece1d1187f2a8ac82c1 \ file://LICENSE;md5=97871bde150daeb5e61ad95137ff2446 \ " -SRC_URI[libxml.md5sum] = "4dd1efcda5159c9e73139a4546190665" -SRC_URI[libxml.sha256sum] = "b04c77dea55f9f270e1040e3a1d4f79b81dcdcd4da3e648f92dcf6c80bbe19df" +SRC_URI[libxml.md5sum] = "43546fd9a3974f19323f9fb04861ece9" +SRC_URI[libxml.sha256sum] = "721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476" S = "${WORKDIR}/XML-LibXML-${PV}" diff --git a/meta-python/README b/meta-python/README index 905d5ee5e5..705b035d9e 100644 --- a/meta-python/README +++ b/meta-python/README @@ -5,10 +5,6 @@ Introduction ------------------------- This layer is intended to be the home of python modules for OpenEmbedded. -Modules in this layer need to be independent of openembedded-core and -meta-openembedded/meta-oe. Because of this, modules required by 'gateone' -and 'anki' are not included and remain in: - meta-openembedded/meta-oe/recipes-devtools/python. Dependencies ------------------------- @@ -47,8 +43,7 @@ When sending single patches, please use something like: Maintenance ------------------------- -Maintainers: +Layer Maintainers: Tim "moto-timo" Orling <TicoTimo@gmail.com> - Paul "bluelightning" Eggleton <paul.eggleton@linux.intel.com> Derek Straka <derek@asterius.io> diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index d53677fef8..7089071faf 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -14,4 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core openembedded-layer" +LAYERSERIES_COMPAT_meta-python = "sumo" + LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-python/recipes-connectivity/gateone/gateone_git.bb b/meta-python/recipes-connectivity/gateone/gateone_git.bb index 8b2a19263e..4577873ded 100644 --- a/meta-python/recipes-connectivity/gateone/gateone_git.bb +++ b/meta-python/recipes-connectivity/gateone/gateone_git.bb @@ -69,7 +69,6 @@ RDEPENDS_${PN} = "mime-support \ python-pkgutil \ python-pyopenssl \ python-re \ - python-readline \ python-setuptools \ python-shell \ python-simplejson \ diff --git a/meta-python/recipes-connectivity/python-thrift/python-thrift_0.10.0.bb b/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb index e6f61bdd0f..8047ec77b9 100644 --- a/meta-python/recipes-connectivity/python-thrift/python-thrift_0.10.0.bb +++ b/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb @@ -1,11 +1,9 @@ SUMMARY = "Python bindings for the Apache Thrift RPC system" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=26a2009ddcb7c4162f8bafd5ef73c670" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e3641ae1a26cf5c12a3a71bd3030ab0e" -SRC_URI[md5sum] = "76bb768a210257dd203923110042e560" -SRC_URI[sha256sum] = "b7f6c09155321169af03f9fb20dc15a4a0c7481e7c334a5ba8f7f0d864633209" - -PYPI_PACKAGE_EXT = "zip" +SRC_URI[md5sum] = "36165d5c80e6b101dbe9fcf7ef524d51" +SRC_URI[sha256sum] = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b" inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb b/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb index 2272da91a5..9d851abe33 100644 --- a/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb +++ b/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb @@ -22,6 +22,7 @@ FILES_${PN}-tests += " \ RDEPENDS_${PN} += "\ ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ ${PYTHON_PN}-netclient \ " diff --git a/meta-python/recipes-devtools/python/python-alembic.inc b/meta-python/recipes-devtools/python/python-alembic.inc index 2ca60231b2..f1a641299e 100644 --- a/meta-python/recipes-devtools/python/python-alembic.inc +++ b/meta-python/recipes-devtools/python/python-alembic.inc @@ -1,13 +1,15 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d07407716fd24408b5747b0fa2262775" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c5f1361296835ff94bda73db7dd312a6" -SRC_URI[md5sum] = "fcb096bccc87c8770bd07a04606cb989" -SRC_URI[sha256sum] = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732" +SRC_URI[md5sum] = "5cfef58641c9a94d4a5d547e951a7dda" +SRC_URI[sha256sum] = "13b8611788acf0d7b617775db5c2ae26554a6d4263c590ef628d448fd05aef56" PYPI_PACKAGE = "alembic" RDEPENDS_${PN} += "\ + ${PYTHON_PN}-dateutil \ ${PYTHON_PN}-editor \ + ${PYTHON_PN}-mako \ ${PYTHON_PN}-sqlalchemy \ - " +" diff --git a/meta-python/recipes-devtools/python/python-alembic_0.9.6.bb b/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb index efcb2b1deb..efcb2b1deb 100644 --- a/meta-python/recipes-devtools/python/python-alembic_0.9.6.bb +++ b/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb diff --git a/meta-python/recipes-devtools/python/python-asn1crypto.inc b/meta-python/recipes-devtools/python/python-asn1crypto.inc index 0d3ee41528..5c379956fa 100644 --- a/meta-python/recipes-devtools/python/python-asn1crypto.inc +++ b/meta-python/recipes-devtools/python/python-asn1crypto.inc @@ -18,8 +18,6 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-io \ ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-textutils \ - ${PYTHON_PN}-subprocess \ " BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb b/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb index 6af60c2d42..46aace286f 100644 --- a/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb +++ b/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb @@ -1,2 +1,7 @@ inherit setuptools require python-asn1crypto.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-textutils \ +" diff --git a/meta-python/recipes-devtools/python/python-astroid.inc b/meta-python/recipes-devtools/python/python-astroid.inc index 971aaf47d9..ead2b6e73f 100644 --- a/meta-python/recipes-devtools/python/python-astroid.inc +++ b/meta-python/recipes-devtools/python/python-astroid.inc @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI[md5sum] = "6f8f60b316218455726958f08c6e17f1" -SRC_URI[sha256sum] = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f" +SRC_URI[md5sum] = "7d7dc000b25f0cbfcca20cb9a8dc0310" +SRC_URI[sha256sum] = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2" inherit pypi @@ -19,10 +19,9 @@ FILES_${PN}-tests += " \ RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-distutils \ ${PYTHON_PN}-lazy-object-proxy \ + ${PYTHON_PN}-logging \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-wrapt \ - ${PYTHON_PN}-re \ ${PYTHON_PN}-setuptools \ " diff --git a/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb b/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb index 3ced19a09d..687394da63 100644 --- a/meta-python/recipes-devtools/python/python-astroid_1.6.0.bb +++ b/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb @@ -4,6 +4,7 @@ require python-astroid.inc RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-enum34 \ ${PYTHON_PN}-backports-functools-lru-cache \ - ${PYTHON_PN}-importlib \ + ${PYTHON_PN}-re \ ${PYTHON_PN}-singledispatch \ + ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-attrs.inc b/meta-python/recipes-devtools/python/python-attrs.inc index ea8d3bf71b..c29f058fa1 100644 --- a/meta-python/recipes-devtools/python/python-attrs.inc +++ b/meta-python/recipes-devtools/python/python-attrs.inc @@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83 inherit pypi RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-cryptography \ ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb b/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb index a6fdf158dc..e3bec0fdfd 100644 --- a/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb +++ b/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb @@ -1,2 +1,6 @@ inherit setuptools require python-attrs.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch index 0ebb220756..d6def98c9c 100644 --- a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch +++ b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch @@ -15,10 +15,10 @@ Signed-off-by: Derek Straka <derek@asterius.io> setup.py | 10 ---------- 1 file changed, 10 deletions(-) -diff --git a/setup.py b/setup.py -index d360c64..7b4180a 100644 ---- a/setup.py -+++ b/setup.py +Index: Automat-0.6.0/setup.py +=================================================================== +--- Automat-0.6.0.orig/setup.py ++++ Automat-0.6.0/setup.py @@ -4,14 +4,6 @@ Setup file for automat from setuptools import setup, find_packages @@ -46,7 +46,4 @@ index d360c64..7b4180a 100644 - 'm2r', ], install_requires=[ - "attrs>=16.1.0", --- -2.7.4 - + "attrs", diff --git a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc index 177b819d4c..a3299e4ac6 100644 --- a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc +++ b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc @@ -1,7 +1,11 @@ DESCRIPTION = "SDK for connecting to AWS IoT using Python." HOMEPAGE = "https://github.com/aws/aws-iot-device-sdk-python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9ac49901b833e769c7d6f21e8dbd7b30" +LICENSE = "Apache-2.0 & (EPL-1.0 | EDL-1.0)" +LICENSE_${PN}-examples = "Apache-2.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE.txt;md5=9ac49901b833e769c7d6f21e8dbd7b30 \ + file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ +" SRC_URI[md5sum] = "97e8cf0d40ef3765d979c19b534a716d" SRC_URI[sha256sum] = "d68cbff396143e837b4c23b6621d3b7ae374281afc75eed8e51a28625d9125ba" @@ -10,9 +14,28 @@ inherit pypi PYPI_PACKAGE = "AWSIoTPythonSDK" +do_install_append() { + install -d -m0755 ${D}${datadir}/${BPN}/examples + cp --preserve=mode,timestamps -R ${S}/samples/* ${D}${datadir}/${BPN}/examples + # this requires the full blown AWS Python SDK + rm -r ${D}${datadir}/${BPN}/examples/basicPubSub +} + +PACKAGES =+ "${PN}-examples" + RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ " +RDEPENDS_${PN}-examples += "${PN}" + +FILES_${PN}-examples = "${datadir}/${BPN}/examples" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb index 12ae978e34..490e973917 100644 --- a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb @@ -1,2 +1,4 @@ inherit setuptools require python-aws-iot-device-sdk-python.inc + +RDEPENDS_${PN}-examples += "${PYTHON_PN}-argparse" diff --git a/meta-python/recipes-devtools/python/python-babel.inc b/meta-python/recipes-devtools/python/python-babel.inc index 6d8c05dac9..4dcb255c86 100644 --- a/meta-python/recipes-devtools/python/python-babel.inc +++ b/meta-python/recipes-devtools/python/python-babel.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://babel.edgewall.org/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6eeaabc92cfc2d03f53e789324d7292" -SRC_URI[md5sum] = "60228b3ce93a203357158b909afe8ae1" -SRC_URI[sha256sum] = "6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811" +SRC_URI[md5sum] = "152a6b17fe4110b95675aceb9af9fab2" +SRC_URI[sha256sum] = "8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14" PYPI_PACKAGE = "Babel" @@ -21,6 +21,5 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-pickle \ ${PYTHON_PN}-pytz \ ${PYTHON_PN}-shell \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-threading \ " diff --git a/meta-python/recipes-devtools/python/python-babel_2.5.3.bb b/meta-python/recipes-devtools/python/python-babel_2.5.3.bb new file mode 100644 index 0000000000..f7c166ebab --- /dev/null +++ b/meta-python/recipes-devtools/python/python-babel_2.5.3.bb @@ -0,0 +1,6 @@ +inherit setuptools +require python-babel.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-bcrypt.inc b/meta-python/recipes-devtools/python/python-bcrypt.inc index 3e6fa7a37d..449096978f 100644 --- a/meta-python/recipes-devtools/python/python-bcrypt.inc +++ b/meta-python/recipes-devtools/python/python-bcrypt.inc @@ -14,5 +14,4 @@ RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb b/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb index 24333540b6..b136aa4895 100644 --- a/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb +++ b/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb @@ -1,2 +1,6 @@ inherit setuptools require python-bcrypt.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-behave_1.2.5.bb b/meta-python/recipes-devtools/python/python-behave_1.2.5.bb deleted file mode 100644 index 541a79d7bd..0000000000 --- a/meta-python/recipes-devtools/python/python-behave_1.2.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "A behavior-driven development framework, Python style" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" - -SRC_URI[md5sum] = "3af4bc2886d2be982e41bfaba61da3bc" -SRC_URI[sha256sum] = "81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b" - -RDEPENDS_${PN} += "python-difflib python-setuptools python-pkgutil python-misc python-argparse python-xml python-importlib python-enum34 python-parse python-parse-type python-six" - -inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-behave_1.2.6.bb b/meta-python/recipes-devtools/python/python-behave_1.2.6.bb new file mode 100644 index 0000000000..679730262b --- /dev/null +++ b/meta-python/recipes-devtools/python/python-behave_1.2.6.bb @@ -0,0 +1,10 @@ +SUMMARY = "A behavior-driven development framework, Python style" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d950439e8ea6ed233e4288f5e1a49c06" + +SRC_URI[md5sum] = "3f05c859a1c45f5ed33e925817ad887d" +SRC_URI[sha256sum] = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86" + +RDEPENDS_${PN} += "python-difflib python-setuptools python-pkgutil python-misc python-argparse python-xml python-enum34 python-parse python-parse-type python-six" + +inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-can.inc b/meta-python/recipes-devtools/python/python-can.inc index 802098ad32..a71c47be4d 100644 --- a/meta-python/recipes-devtools/python/python-can.inc +++ b/meta-python/recipes-devtools/python/python-can.inc @@ -3,18 +3,15 @@ SECTION = "devel/python" LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=38138baa100d7259934590850bc0406e" -SRC_URI[md5sum] = "d899550617614d542c0319773989920c" -SRC_URI[sha256sum] = "da89e94fa234d4ebe7f43a26d4b06a5d14ea767fbd2c4767732e4d964473dfb0" +SRC_URI[md5sum] = "3310f0aa2a8492d0ff614ecf636ec8a8" +SRC_URI[sha256sum] = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc" PYPI_PACKAGE="python-can" RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-argparse \ ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-importlib \ ${PYTHON_PN}-logging \ ${PYTHON_PN}-misc \ ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-sqlite3 \ " diff --git a/meta-python/recipes-devtools/python/python-can_2.0.0.bb b/meta-python/recipes-devtools/python/python-can_2.1.0.bb index a698ad3651..f0edb6408b 100644 --- a/meta-python/recipes-devtools/python/python-can_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python-can_2.1.0.bb @@ -2,5 +2,7 @@ require python-can.inc inherit pypi setuptools RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-zlib \ " diff --git a/meta-python/recipes-devtools/python/python-cassandra-driver.inc b/meta-python/recipes-devtools/python/python-cassandra-driver.inc index d11e657e6c..1648d3e94c 100644 --- a/meta-python/recipes-devtools/python/python-cassandra-driver.inc +++ b/meta-python/recipes-devtools/python/python-cassandra-driver.inc @@ -8,8 +8,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SRCNAME = "cassandra-driver" -SRC_URI[md5sum] = "33bfaebe3245bc9f9be3993baf67962f" -SRC_URI[sha256sum] = "cbd9504e241c6b16d8e50b32ccca2a48b04bb3b855741f010a92b3f3bbbc5627" +SRC_URI[md5sum] = "5c8b4a3adfc48180e8ec38b8c4e996fd" +SRC_URI[sha256sum] = "61b670fb2ba95d51d91fa7b589aae3666df494713f5d1ed78bb5c510778d77f0" DISTUTILS_BUILD_ARGS += " \ --no-libev \ diff --git a/meta-python/recipes-devtools/python/python-certifi.inc b/meta-python/recipes-devtools/python/python-certifi.inc index 97be1fb3bd..26df5c1155 100644 --- a/meta-python/recipes-devtools/python/python-certifi.inc +++ b/meta-python/recipes-devtools/python/python-certifi.inc @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" -SRC_URI[md5sum] = "c15ac46ed1fe4b607ff3405928f9a992" -SRC_URI[sha256sum] = "5ec74291ca1136b40f0379e1128ff80e866597e4e2c1e755739a913bbc3613c0" +SRC_URI[md5sum] = "068fd5c3c690ae47504b3e0bf4e56c4c" +SRC_URI[sha256sum] = "edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-certifi_2017.11.5.bb b/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb index adfe6238ec..adfe6238ec 100644 --- a/meta-python/recipes-devtools/python/python-certifi_2017.11.5.bb +++ b/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb diff --git a/meta-python/recipes-devtools/python/python-cffi.inc b/meta-python/recipes-devtools/python/python-cffi.inc index 9c934b2f0a..e6071eecaf 100644 --- a/meta-python/recipes-devtools/python/python-cffi.inc +++ b/meta-python/recipes-devtools/python/python-cffi.inc @@ -4,14 +4,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[md5sum] = "8ef0f852498908b20bc508799901fe93" -SRC_URI[sha256sum] = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d" +SRC_URI[md5sum] = "ac8492f4ad952360737413e82d661908" +SRC_URI[sha256sum] = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4" RDEPENDS_${PN}_class-target = " \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-io \ ${PYTHON_PN}-shell \ - ${PYTHON_PN}-subprocess \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-cffi_1.11.4.bb b/meta-python/recipes-devtools/python/python-cffi_1.11.4.bb deleted file mode 100644 index 3cd62d1f78..0000000000 --- a/meta-python/recipes-devtools/python/python-cffi_1.11.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-cffi.inc -inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb b/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb new file mode 100644 index 0000000000..bc667b8056 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb @@ -0,0 +1,6 @@ +require python-cffi.inc +inherit pypi setuptools + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-chardet.inc b/meta-python/recipes-devtools/python/python-chardet.inc index 246a65aa60..6305299780 100644 --- a/meta-python/recipes-devtools/python/python-chardet.inc +++ b/meta-python/recipes-devtools/python/python-chardet.inc @@ -19,6 +19,5 @@ FILES_${PN}-cli += " \ " RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-argparse \ ${PYTHON_PN}-logging \ " diff --git a/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb b/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb index b7a46e9d7b..3b6feeef11 100644 --- a/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb +++ b/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb @@ -1,2 +1,4 @@ inherit setuptools require python-chardet.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-argparse" diff --git a/meta-python/recipes-devtools/python/python-cmd2_0.7.9.bb b/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb index e740099c17..145ab98901 100644 --- a/meta-python/recipes-devtools/python/python-cmd2_0.7.9.bb +++ b/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb @@ -1,10 +1,10 @@ SUMMARY = "Extra features for standard library's cmd module" HOMEPAGE = "http://packages.python.org/cmd2/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;beginline=50;endline=50;md5=0f13c9cfc75288223cf7edd2f3b985a2" +LIC_FILES_CHKSUM = "file://setup.py;beginline=51;endline=51;md5=0f13c9cfc75288223cf7edd2f3b985a2" -SRC_URI[md5sum] = "eeb80d5c29715b4ac39ecc032842a25f" -SRC_URI[sha256sum] = "f518d30c641483c8d6c246afae6e4447f816f8300befc6a11c476eeb62a496e6" +SRC_URI[md5sum] = "701b916ffac99137bea413205106f993" +SRC_URI[sha256sum] = "d09976f9ad2327883c2d07b5acb42e66ad52b17e352873c22041ed124bfe8aba" inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-configparser.inc b/meta-python/recipes-devtools/python/python-configparser.inc new file mode 100644 index 0000000000..c1fb8582c3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-configparser.inc @@ -0,0 +1,11 @@ +SUMMARY = "This module provides the ConfigParser class which implements a basic configuration language which provides a structure similar to what’s found in Microsoft Windows INI files." +SECTION = "devel/python" +HOMEPAGE = "https://docs.python.org/3/library/configparser.html" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[md5sum] = "cfdd915a5b7a6c09917a64a573140538" +SRC_URI[sha256sum] = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a" + +inherit pypi diff --git a/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb b/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb new file mode 100644 index 0000000000..69f045dbab --- /dev/null +++ b/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-configparser.inc diff --git a/meta-python/recipes-devtools/python/python-cryptography.inc b/meta-python/recipes-devtools/python/python-cryptography.inc index 80d6b0a3ba..4be79077e3 100644 --- a/meta-python/recipes-devtools/python/python-cryptography.inc +++ b/meta-python/recipes-devtools/python/python-cryptography.inc @@ -28,7 +28,6 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-asn1crypto \ ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ ${PYTHON_PN}-threading \ diff --git a/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb b/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb index f5b1e0b3b5..9c2f88418d 100644 --- a/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb +++ b/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb @@ -18,4 +18,5 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-enum34 \ ${PYTHON_PN}-ipaddress \ ${PYTHON_PN}-contextlib \ + ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-cython.inc b/meta-python/recipes-devtools/python/python-cython.inc index 8d8f27c027..5d3b9d5baf 100644 --- a/meta-python/recipes-devtools/python/python-cython.inc +++ b/meta-python/recipes-devtools/python/python-cython.inc @@ -5,17 +5,31 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "6149238287d662bd5d5e572482252493" -SRC_URI[sha256sum] = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64" +SRC_URI[md5sum] = "0e0568d6bed4b09ad01afe0a38805305" +SRC_URI[sha256sum] = "634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a" inherit pypi RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-misc \ ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-shell \ + ${PYTHON_PN}-xml \ +" + +RDEPENDS_${PN}_class-nativesdk += "\ + nativesdk-${PYTHON_PN}-misc \ + nativesdk-${PYTHON_PN}-netserver \ + nativesdk-${PYTHON_PN}-pkgutil \ + nativesdk-${PYTHON_PN}-pyparsing \ + nativesdk-${PYTHON_PN}-setuptools \ + nativesdk-${PYTHON_PN}-shell \ + nativesdk-${PYTHON_PN}-xml \ " do_install_append() { diff --git a/meta-python/recipes-devtools/python/python-cython_0.27.3.bb b/meta-python/recipes-devtools/python/python-cython_0.28.2.bb index bdf9490c63..d803a6ed4c 100644 --- a/meta-python/recipes-devtools/python/python-cython_0.27.3.bb +++ b/meta-python/recipes-devtools/python/python-cython_0.28.2.bb @@ -5,5 +5,6 @@ UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Cython/" UPSTREAM_CHECK_REGEX = "/Cython/(?P<pver>(\d+[\.\-_]*)+)" RDEPENDS_${PN} += "\ - python-distribute \ + ${PYTHON_PN}-distribute \ + ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-dateutil.inc b/meta-python/recipes-devtools/python/python-dateutil.inc index 0e076b4aae..333b5e224b 100644 --- a/meta-python/recipes-devtools/python/python-dateutil.inc +++ b/meta-python/recipes-devtools/python/python-dateutil.inc @@ -1,11 +1,11 @@ SUMMARY = "Extensions to the standard Python datetime module" DESCRIPTION = "The dateutil module provides powerful extensions to the datetime module available in the Python standard library." HOMEPAGE = "https://dateutil.readthedocs.org" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=31f72d4cad3675fb091537b9b2f32de0" +LICENSE = "BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996" -SRC_URI[md5sum] = "db38f6b4511cefd76014745bb0cc45a4" -SRC_URI[sha256sum] = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca" +SRC_URI[md5sum] = "03a08c8bcf0a2b29f1cd21b9de4d12fb" +SRC_URI[sha256sum] = "9d8074be4c993fbe4947878ce593052f71dac82932a677d49194d8ce9778002e" PYPI_PACKAGE = "python-dateutil" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-dateutil_2.6.1.bb b/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb index 12ae4c3118..12ae4c3118 100644 --- a/meta-python/recipes-devtools/python/python-dateutil_2.6.1.bb +++ b/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb diff --git a/meta-python/recipes-devtools/python/python-dbus_1.2.4.bb b/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb index 271b559b77..0f18ccc881 100644 --- a/meta-python/recipes-devtools/python/python-dbus_1.2.4.bb +++ b/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb @@ -1,15 +1,16 @@ SUMMARY = "Python bindings for the DBus inter-process communication system" SECTION = "devel/python" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=0b83047ce9e948b67c0facc5f233476a" +LICENSE = "MIT & AFL-2.1 | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4 \ + file://dbus-gmain/COPYING;md5=05c3eacd50f69bb1d58afec460baad57 " DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ " -SRC_URI[md5sum] = "7372a588c83a7232b4e08159bfd48fe5" -SRC_URI[sha256sum] = "e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc" +SRC_URI[md5sum] = "1ce1ddf2582060f8f971652ea54cc17e" +SRC_URI[sha256sum] = "32f29c17172cdb9cb61c68b1f1a71dfe7351506fc830869029c47449bd04faeb" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools pkgconfig diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch index fdd00b6a4d..c4d817849f 100644 --- a/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch +++ b/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch @@ -1,7 +1,8 @@ -From eebe0f66435c4d821b0f5f93f69efe17b4a384c2 Mon Sep 17 00:00:00 2001 +From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001 From: Simon Busch <simon.busch@lge.com> Date: Wed, 9 Apr 2014 13:18:33 +0200 -Subject: [PATCH 1/2] Add functionality to add own objects to internal object +Subject: [PATCH] Add functionality to add own objects to internal object + list In some case the tests might want to create dynamically dbus objects which extended @@ -9,17 +10,18 @@ functionality from own class definitions within templates. In such cases we need register those objects with the internal object manager of dbusmock. Signed-off-by: Simon Busch <simon.busch@lge.com> + --- - dbusmock/__init__.py | 4 ++-- - dbusmock/mockobject.py | 8 ++++++++ + dbusmock/__init__.py | 4 ++-- + dbusmock/mockobject.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py -index f799cc7..6718c06 100644 +index 8a482ab..3d5d71a 100644 --- a/dbusmock/__init__.py +++ b/dbusmock/__init__.py @@ -14,8 +14,8 @@ __license__ = 'LGPL 3+' - __version__ = '0.10.1' + __version__ = '0.16.7' from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE, - OBJECT_MANAGER_IFACE, get_object, get_objects) @@ -30,10 +32,10 @@ index f799cc7..6718c06 100644 - 'DBusTestCase', 'get_object', 'get_objects'] + 'DBusTestCase', 'get_object', 'get_objects', 'add_object'] diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py -index 97b79ce..a98e03d 100644 +index 586dbad..e4f130f 100644 --- a/dbusmock/mockobject.py +++ b/dbusmock/mockobject.py -@@ -682,6 +682,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup +@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup # Helper API for templates # @@ -48,6 +50,3 @@ index 97b79ce..a98e03d 100644 def get_objects(): '''Return all existing object paths''' --- -1.7.9.5 - diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch index 981694f0e8..06ab1f05e2 100644 --- a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch +++ b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch @@ -1,22 +1,23 @@ -From ff1dffd5673bcd2cbd9554ad62476d108dbc18af Mon Sep 17 00:00:00 2001 +From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001 From: Simon Busch <simon.busch@lge.com> Date: Wed, 9 Apr 2014 13:20:33 +0200 -Subject: [PATCH 2/2] Add possibility to import templates from packages +Subject: [PATCH] Add possibility to import templates from packages Does not have any unit tests yet. Signed-off-by: Simon Busch <simon.busch@lge.com> + --- - dbusmock/mockobject.py | 3 +++ + dbusmock/mockobject.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py -index a98e03d..9530c2a 100644 +index e4f130f..389df70 100644 --- a/dbusmock/mockobject.py +++ b/dbusmock/mockobject.py -@@ -49,6 +49,9 @@ def load_module(name): - - return module +@@ -46,6 +46,9 @@ def load_module(name): + exec(f.read(), mod.__dict__, mod.__dict__) + return mod + if '.' in name: + return importlib.import_module(name) @@ -24,6 +25,3 @@ index a98e03d..9530c2a 100644 return importlib.import_module('dbusmock.templates.' + name) --- -1.7.9.5 - diff --git a/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb b/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb index fb8c0aa602..ec8c54aacc 100644 --- a/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb +++ b/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb @@ -20,7 +20,6 @@ inherit pypi setuptools RDEPENDS_${PN} += "\ ${PYTHON_PN}-dbus \ - ${PYTHON_PN}-importlib \ ${PYTHON_PN}-pygobject \ ${PYTHON_PN}-xml \ " diff --git a/meta-python/recipes-devtools/python/python-decorator.inc b/meta-python/recipes-devtools/python/python-decorator.inc index eaab3b085b..44edb8ad7e 100644 --- a/meta-python/recipes-devtools/python/python-decorator.inc +++ b/meta-python/recipes-devtools/python/python-decorator.inc @@ -9,8 +9,8 @@ decorator, just because you can." LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=893f896413826096ce5270c700a498fd" -SRC_URI[md5sum] = "e886337e9f70e70d45d67266b8e66044" -SRC_URI[sha256sum] = "7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e" +SRC_URI[md5sum] = "249e7299b9b4bced0c382343f84eb1c0" +SRC_URI[sha256sum] = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-decorator_4.2.1.bb b/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb index 2a2b455f56..2a2b455f56 100644 --- a/meta-python/recipes-devtools/python/python-decorator_4.2.1.bb +++ b/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc index 8fff75d5ac..4ef2d7f9db 100644 --- a/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-python/recipes-devtools/python/python-django.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.djangoproject.com/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" -SRC_URI[md5sum] = "08ad028fc50ee961dea35e1e1f657b65" -SRC_URI[sha256sum] = "353d129f22e1d24980d6061666f435781141c2dfd852f14ffc8a670175821034" +SRC_URI[md5sum] = "f306015e16a8d5024dbac923ac34fffb" +SRC_URI[sha256sum] = "22383567385a9c406d8a5ce080a2694c82c6b733e157922197e8b393bb3aacd9" PYPI_PACKAGE = "Django" inherit pypi @@ -14,20 +14,18 @@ FILES_${PN} += "${datadir}/django" BBCLASSEXTEND = "native nativesdk" RDEPENDS_${PN} += "\ - ${PYTHON_PN}-argparse \ ${PYTHON_PN}-compression \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-email \ ${PYTHON_PN}-html \ - ${PYTHON_PN}-importlib \ ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-netserver \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-unixadmin \ ${PYTHON_PN}-xml \ diff --git a/meta-python/recipes-devtools/python/python-django_1.11.10.bb b/meta-python/recipes-devtools/python/python-django_1.11.10.bb new file mode 100644 index 0000000000..d2347cc963 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-django_1.11.10.bb @@ -0,0 +1,8 @@ +require python-django.inc +inherit setuptools + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-zlib \ +" diff --git a/meta-python/recipes-devtools/python/python-django_1.11.9.bb b/meta-python/recipes-devtools/python/python-django_1.11.9.bb deleted file mode 100644 index ed92c9bfe0..0000000000 --- a/meta-python/recipes-devtools/python/python-django_1.11.9.bb +++ /dev/null @@ -1,4 +0,0 @@ -require python-django.inc -inherit setuptools - -RDEPENDS_${PN} += "${PYTHON_PN}-zlib" diff --git a/meta-python/recipes-devtools/python/python-evdev.inc b/meta-python/recipes-devtools/python/python-evdev.inc new file mode 100644 index 0000000000..5a3884a6f9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-evdev.inc @@ -0,0 +1,21 @@ +SUMMARY = "Python evdev lib" +HOMEPAGE = "https://github.com/gvalkov/python-evdev" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" + +SRC_URI[md5sum] = "c7e855ae9f97f869a59e75b29f05ce74" +SRC_URI[sha256sum] = "57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1" + +do_compile_prepend() { + rm -rf ${S}/evdev/ecodes.c +} + +DISTUTILS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ + " diff --git a/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb b/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb index 0875da45c3..63541363e3 100644 --- a/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb +++ b/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb @@ -1,17 +1,2 @@ -SUMMARY = "Python evdev lib" -HOMEPAGE = "https://github.com/gvalkov/python-evdev" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" - -SRC_URI[md5sum] = "c7e855ae9f97f869a59e75b29f05ce74" -SRC_URI[sha256sum] = "57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1" - inherit pypi setuptools - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - " +require python-evdev.inc diff --git a/meta-python/recipes-devtools/python/python-flask-restful.inc b/meta-python/recipes-devtools/python/python-flask-restful.inc new file mode 100644 index 0000000000..0485f85aac --- /dev/null +++ b/meta-python/recipes-devtools/python/python-flask-restful.inc @@ -0,0 +1,16 @@ +SUMMARY = "Simple framework for creating REST APIs" +DESCRIPTION = "\ +Flask-RESTful is an extension for Flask that adds support for quickly building \ +REST APIs" +HOMEPAGE = "https://github.com/flask-restful/flask-restful" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=685bb55ed99a366bb431995f5eef2783" + +SRC_URI[md5sum] = "8243ca101185b130d8fa529cbdbdbddd" +SRC_URI[sha256sum] = "5795519501347e108c436b693ff9a4d7b373a3ac9069627d64e4001c05dd3407" + +inherit pypi + +PYPI_PACKAGE = "Flask-RESTful" + +RDEPENDS_${PN} = "${PYTHON_PN}-flask" diff --git a/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb b/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb new file mode 100644 index 0000000000..1968d1d9d2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-flask-restful.inc diff --git a/meta-python/recipes-devtools/python/python-flask.inc b/meta-python/recipes-devtools/python/python-flask.inc index 76b5fbae26..ecf5619ec2 100644 --- a/meta-python/recipes-devtools/python/python-flask.inc +++ b/meta-python/recipes-devtools/python/python-flask.inc @@ -13,4 +13,4 @@ CLEANBROKEN = "1" PYPI_PACKAGE = "Flask" -RDEPENDS_${PN} = "${PYTHON_PN}-werkzeug ${PYTHON_PN}-jinja2 ${PYTHON_PN}-itsdangerous ${PYTHON_PN}-click" +RDEPENDS_${PN} = "${PYTHON_PN}-werkzeug ${PYTHON_PN}-werkzeug-tests ${PYTHON_PN}-jinja2 ${PYTHON_PN}-itsdangerous ${PYTHON_PN}-click" diff --git a/meta-python/recipes-devtools/python/python-gevent.inc b/meta-python/recipes-devtools/python/python-gevent.inc index 8889cfb5a7..13513f2192 100644 --- a/meta-python/recipes-devtools/python/python-gevent.inc +++ b/meta-python/recipes-devtools/python/python-gevent.inc @@ -11,7 +11,6 @@ DEPENDS += "${PYTHON_PN}-greenlet" RDEPENDS_${PN} = "${PYTHON_PN}-greenlet \ ${PYTHON_PN}-mime \ ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-re \ " FILESEXTRAPATHS_prepend := "${THISDIR}/python-gevent:" diff --git a/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb b/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb index f357c95273..f13bfd7b73 100644 --- a/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb +++ b/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb @@ -1,3 +1,4 @@ require python-gevent.inc inherit setuptools +RDEPENDS_${PN} += "${PYTHON_PN}-re" diff --git a/meta-python/recipes-devtools/python/python-greenlet.inc b/meta-python/recipes-devtools/python/python-greenlet.inc index 35820db2f2..7a42240fe2 100644 --- a/meta-python/recipes-devtools/python/python-greenlet.inc +++ b/meta-python/recipes-devtools/python/python-greenlet.inc @@ -3,7 +3,7 @@ LICENSE = "MIT & PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI[md5sum] = "e8637647d58a26c4a1f51ca393e53c00" -SRC_URI[sha256sum] = "e4c99c6010a5d153d481fdaf63b8a0782825c0721506d880403a3b9b82ae347e" +SRC_URI[md5sum] = "6e0b9dd5385f81d478451ec8ed1d62b3" +SRC_URI[sha256sum] = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-greenlet_0.4.12.bb b/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb index c14976ed32..c14976ed32 100644 --- a/meta-python/recipes-devtools/python/python-greenlet_0.4.12.bb +++ b/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb diff --git a/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.3.bb b/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb index 85bb000ddb..45e0cc1b1e 100644 --- a/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.3.bb +++ b/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit pypi setuptools -SRC_URI[md5sum] = "108e5d231074d5eeac9dd5515e0c434f" -SRC_URI[sha256sum] = "195e5b8d4cfac2492769eb6b0f7b53fda54344a1dc7b4bbfa653889a83038219" +SRC_URI[md5sum] = "e04e65afe60410cf178ff2698f052a7c" +SRC_URI[sha256sum] = "edc84c09039d3a01012ccd97450abd06ee6b980710f6d9f191b50deb6774a75c" # For usage in other recipies when compiling protobuf files (e.g. by grpcio-tools) BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 3abbc6d6f1..0c1d964a61 100644 --- a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -18,19 +18,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/setup.py b/setup.py -index cb85273..f79878d 100644 ---- a/setup.py -+++ b/setup.py -@@ -116,7 +116,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: - elif 'win32' in sys.platform: - EXTRA_ENV_COMPILE_ARGS += ' -D_PYTHON_MSVC' +Index: grpcio-1.8.4/setup.py +=================================================================== +--- grpcio-1.8.4.orig/setup.py ++++ grpcio-1.8.4/setup.py +@@ -115,7 +115,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: + else: + EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64' elif "linux" in sys.platform: - EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions' + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' elif "darwin" in sys.platform: - EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv' + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' --- -2.13.4 - diff --git a/meta-python/recipes-devtools/python/python-grpcio_1.8.3.bb b/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb index ab0b85c5a0..bec9d846b5 100644 --- a/meta-python/recipes-devtools/python/python-grpcio_1.8.3.bb +++ b/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit pypi setuptools -SRC_URI[md5sum] = "a611ac877a1e613ba7dc24dc06d9bf88" -SRC_URI[sha256sum] = "6ce5fd3093ddc09a152981d5c477ac645eda19dfcc819e45d8c57da6b743bd53" +SRC_URI[md5sum] = "7860f7c61de3890323670b7b1ff63e56" +SRC_URI[sha256sum] = "88d87aab9c7889b3ab29dd74aac1a5493ed78b9bf5afba1c069c9dd5531f951d" # For usage in other recipes when compiling protobuf files (e.g. by grpcio-tools) BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python-humanize.inc b/meta-python/recipes-devtools/python/python-humanize.inc index d9fac09098..17a3449e73 100644 --- a/meta-python/recipes-devtools/python/python-humanize.inc +++ b/meta-python/recipes-devtools/python/python-humanize.inc @@ -7,4 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=d2eff82fc25dd07c919a02465884f02e" SRC_URI[md5sum] = "e8473d9dc1b220911cac2edd53b1d973" SRC_URI[sha256sum] = "a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-iso8601.inc b/meta-python/recipes-devtools/python/python-iso8601.inc index 45da75f6b9..61e9abbac6 100644 --- a/meta-python/recipes-devtools/python/python-iso8601.inc +++ b/meta-python/recipes-devtools/python/python-iso8601.inc @@ -6,4 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b05625f2336fa024e8d57e65c6595844" SRC_URI[md5sum] = "4de940f691c5ea759fb254384c8ddcf6" SRC_URI[sha256sum] = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-isort.inc b/meta-python/recipes-devtools/python/python-isort.inc index 9884c44f18..6d13e5f7ce 100644 --- a/meta-python/recipes-devtools/python/python-isort.inc +++ b/meta-python/recipes-devtools/python/python-isort.inc @@ -4,7 +4,12 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "34915a2ce60e6fe3dbcbf5982deef9b4" -SRC_URI[sha256sum] = "79f46172d3a4e2e53e7016e663cc7a8b538bec525c36675fcfd2767df30b3983" +SRC_URI[md5sum] = "fb554e9c8f9aa76e333a03d470a5cf52" +SRC_URI[sha256sum] = "b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8" inherit pypi + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ +" diff --git a/meta-python/recipes-devtools/python/python-isort_4.2.15.bb b/meta-python/recipes-devtools/python/python-isort_4.3.4.bb index fa46d89b5e..fa46d89b5e 100644 --- a/meta-python/recipes-devtools/python/python-isort_4.2.15.bb +++ b/meta-python/recipes-devtools/python/python-isort_4.3.4.bb diff --git a/meta-python/recipes-devtools/python/python-javaobj-py3.inc b/meta-python/recipes-devtools/python/python-javaobj-py3.inc index 8fa3e15f3e..a0e802ca7b 100644 --- a/meta-python/recipes-devtools/python/python-javaobj-py3.inc +++ b/meta-python/recipes-devtools/python/python-javaobj-py3.inc @@ -7,8 +7,8 @@ HOMEPAGE = "https://github.com/tcalmant/python-javaobj" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://javaobj.py;beginline=21;endline=33;md5=8b504419ce78f8133b21b4d4a89ef7e9" -SRC_URI[md5sum] = "1e3f02b5c4c0853d653b7b8590d9ed2b" -SRC_URI[sha256sum] = "1dea6be0848c58013d92d8249ef6bc8688bbff7f13c78e02dbf08a449b4c0885" +SRC_URI[md5sum] = "f669bb8099380e3dd84db3d542aa5b68" +SRC_URI[sha256sum] = "b8b0d310fd97e1c7914d7911ee9d3f4b3d84d2a674aa95a4b0da3d8f155fc1bb" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.3.bb b/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb index ed34740e80..ed34740e80 100644 --- a/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.3.bb +++ b/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb diff --git a/meta-python/recipes-devtools/python/python-jinja2.inc b/meta-python/recipes-devtools/python/python-jinja2.inc index cd50d931ba..0c0bf0defa 100644 --- a/meta-python/recipes-devtools/python/python-jinja2.inc +++ b/meta-python/recipes-devtools/python/python-jinja2.inc @@ -8,8 +8,8 @@ SRC_URI[md5sum] = "61ef1117f945486472850819b8d1eb3d" SRC_URI[sha256sum] = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" RDEPENDS_${PN} += "${PYTHON_PN}-io ${PYTHON_PN}-pickle ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-math ${PYTHON_PN}-netclient ${PYTHON_PN}-re ${PYTHON_PN}-textutils \ - ${PYTHON_PN}-lang ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-markupsafe \ + ${PYTHON_PN}-math ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-markupsafe \ ${PYTHON_PN}-json ${PYTHON_PN}-threading ${PYTHON_PN}-numbers" CLEANBROKEN = "1" diff --git a/meta-python/recipes-devtools/python/python-jinja2_2.10.bb b/meta-python/recipes-devtools/python/python-jinja2_2.10.bb index ec8e7ed2d8..5233cf40c0 100644 --- a/meta-python/recipes-devtools/python/python-jinja2_2.10.bb +++ b/meta-python/recipes-devtools/python/python-jinja2_2.10.bb @@ -1,2 +1,8 @@ inherit pypi setuptools require python-jinja2.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-lang \ + ${PYTHON_PN}-re \ + ${PYTHON_PN}-textutils \ +" diff --git a/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-python/recipes-devtools/python/python-jsonpatch.inc index 838dbe3321..409c09ad77 100644 --- a/meta-python/recipes-devtools/python/python-jsonpatch.inc +++ b/meta-python/recipes-devtools/python/python-jsonpatch.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi -SRC_URI[md5sum] = "0b20d819daf120ed3fef3be608f2ce18" -SRC_URI[sha256sum] = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153" +SRC_URI[md5sum] = "83c4c9faccb4a2ff8c1db80cbddc590d" +SRC_URI[sha256sum] = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9" -RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-re ${PYTHON_PN}-stringold" +RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold" diff --git a/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb b/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb new file mode 100644 index 0000000000..90cd318026 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb @@ -0,0 +1,4 @@ +inherit setuptools +require python-jsonpatch.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-re" diff --git a/meta-python/recipes-devtools/python/python-jsonpointer.inc b/meta-python/recipes-devtools/python/python-jsonpointer.inc index e678198cc4..4ed01ed6cd 100644 --- a/meta-python/recipes-devtools/python/python-jsonpointer.inc +++ b/meta-python/recipes-devtools/python/python-jsonpointer.inc @@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi -SRC_URI[md5sum] = "190aeb8afcb0efddfe831a4e533e163b" -SRC_URI[sha256sum] = "c681af823545c731b7b38aedd5d4eee4c5eff87bc0f25e0ff25444a4189eac4d" +SRC_URI[md5sum] = "741b98d0e693b08b5e44e0a9da5a7bb7" +SRC_URI[sha256sum] = "c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362" RDEPENDS_${PN} += " \ ${PYTHON_PN}-json \ - ${PYTHON_PN}-re \ " diff --git a/meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb b/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb index 064bd6c5da..e13a776adb 100644 --- a/meta-python/recipes-devtools/python/python-jsonpointer_1.14.bb +++ b/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb @@ -1,2 +1,4 @@ inherit setuptools require python-jsonpointer.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-re" diff --git a/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-python/recipes-devtools/python/python-jsonschema.inc index db57c69a4c..6fdc02498f 100644 --- a/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -11,17 +11,13 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-core \ ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ - ${PYTHON_PN}-lang \ ${PYTHON_PN}-netclient \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-re \ ${PYTHON_PN}-rfc3987 \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-strict-rfc3339 \ - ${PYTHON_PN}-subprocess \ - ${PYTHON_PN}-textutils \ ${PYTHON_PN}-unittest \ " diff --git a/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb b/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb index 3bb5220188..b677c646e7 100644 --- a/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb +++ b/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb @@ -5,4 +5,8 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-argparse \ ${PYTHON_PN}-contextlib \ ${PYTHON_PN}-functools32 \ + ${PYTHON_PN}-lang \ + ${PYTHON_PN}-re \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-textutils \ " diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc index 98a1af4b89..3f3a1e27c5 100644 --- a/meta-python/recipes-devtools/python/python-lxml.inc +++ b/meta-python/recipes-devtools/python/python-lxml.inc @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[md5sum] = "0265ad6701951347f2dbbb470e3d1512" -SRC_URI[sha256sum] = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e" +SRC_URI[md5sum] = "c266d9062e23b08f66426979a2b36f51" +SRC_URI[sha256sum] = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b" DISTUTILS_BUILD_ARGS += " \ --with-xslt-config='pkg-config libxslt' \ diff --git a/meta-python/recipes-devtools/python/python-lxml_4.1.1.bb b/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb index 81ccb12d87..81ccb12d87 100644 --- a/meta-python/recipes-devtools/python/python-lxml_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb diff --git a/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch index 819c8e5697..c71b16fece 100644 --- a/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ b/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch @@ -1,4 +1,4 @@ -From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 +From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Fri, 29 Mar 2013 15:17:17 +0100 Subject: [PATCH] setup.py: link in sysroot, not in host directories @@ -10,12 +10,12 @@ Upstream-status: Unknown setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: M2Crypto-0.23.0/setup.py -=================================================================== ---- M2Crypto-0.23.0.orig/setup.py -+++ M2Crypto-0.23.0/setup.py -@@ -62,7 +62,7 @@ class _M2CryptoBuildExt(build_ext.build_ - self.openssl = 'c:\\pkg' +diff --git a/setup.py b/setup.py +index 3407c82..15ed7cd 100644 +--- a/setup.py ++++ b/setup.py +@@ -127,7 +127,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.openssl = os.path.join(self.openssl, 'OpenSSL') else: self.libraries = ['ssl', 'crypto'] - self.openssl = '/usr' @@ -23,7 +23,7 @@ Index: M2Crypto-0.23.0/setup.py def finalize_options(self): '''Overloaded build_ext implementation to append custom openssl -@@ -75,8 +75,8 @@ class _M2CryptoBuildExt(build_ext.build_ +@@ -143,8 +143,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): if _openssl and os.path.isdir(_openssl): self.openssl = _openssl @@ -34,3 +34,6 @@ Index: M2Crypto-0.23.0/setup.py if platform.system() == "Linux": if _multiarch: # on Fedora/RHEL it is an empty string +-- +2.7.4 + diff --git a/meta-python/recipes-devtools/python/python-mako.inc b/meta-python/recipes-devtools/python/python-mako.inc new file mode 100644 index 0000000000..a9fa556398 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-mako.inc @@ -0,0 +1,21 @@ +SUMMARY = "A super-fast templating language that borrows the best ideas from the existing templating languages" +HOMEPAGE = "http://www.makotemplates.org/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1bb21fa2d2f7a534c884b990430a6863" + +PYPI_PACKAGE = "Mako" + +inherit pypi + +SRC_URI[md5sum] = "5836cc997b1b773ef389bf6629c30e65" +SRC_URI[sha256sum] = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae" + +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-mako_1.0.7.bb b/meta-python/recipes-devtools/python/python-mako_1.0.7.bb new file mode 100644 index 0000000000..3372eeb28c --- /dev/null +++ b/meta-python/recipes-devtools/python/python-mako_1.0.7.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-mako.inc diff --git a/meta-python/recipes-devtools/python/python-markupsafe.inc b/meta-python/recipes-devtools/python/python-markupsafe.inc index e50f8ce389..927f84452a 100644 --- a/meta-python/recipes-devtools/python/python-markupsafe.inc +++ b/meta-python/recipes-devtools/python/python-markupsafe.inc @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad491 PYPI_PACKAGE = "MarkupSafe" inherit pypi -RDEPENDS_${PN} += "${PYTHON_PN}-re ${PYTHON_PN}-stringold" +RDEPENDS_${PN} += "${PYTHON_PN}-stringold" diff --git a/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb b/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb index 5c9884b9f1..05bbe8a357 100644 --- a/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb +++ b/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb @@ -1,4 +1,6 @@ inherit setuptools require python-markupsafe.inc +RDEPENDS_${PN} += "${PYTHON_PN}-re" + BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python-msgpack.inc b/meta-python/recipes-devtools/python/python-msgpack.inc index 2729c6aef7..fdc8926104 100644 --- a/meta-python/recipes-devtools/python/python-msgpack.inc +++ b/meta-python/recipes-devtools/python/python-msgpack.inc @@ -2,8 +2,8 @@ SUMMARY = "MessagePack (de)serializer" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" -SRC_URI[md5sum] = "29ef230aab635b7d3daaa349c735a1a0" -SRC_URI[sha256sum] = "69aa1eb0e13be1d3bd495ca937eae66df4431126f5cfd5491dc40370e5644853" +SRC_URI[md5sum] = "6d644c06a87a5a111bbbf5b34b4be440" +SRC_URI[sha256sum] = "378cc8a6d3545b532dfd149da715abae4fda2a3adb6d74e525d0d5e51f46909b" PYPI_PACKAGE = "msgpack-python" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-msgpack_0.5.1.bb b/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb index 2c2c8f2add..2c2c8f2add 100644 --- a/meta-python/recipes-devtools/python/python-msgpack_0.5.1.bb +++ b/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb diff --git a/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc b/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc index 133cab10f5..d743023985 100644 --- a/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc +++ b/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://python-requests.org" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=ce22c0cd986d2de3f7073cd6b5523ae0" -SRC_URI[md5sum] = "59a2f0a5b3b60e6c520a9cc7be9aff87" -SRC_URI[sha256sum] = "7bfd8c5cfcbc241a93ca6a4e45f952650f5c7ecf7c49b1dbcf5f4d390240be0b" +SRC_URI[md5sum] = "a0d349cf9530e331697a6e5ab1f40de6" +SRC_URI[sha256sum] = "fba4d4798dcac2965874f24afb6631b4326baa4bd02505744d34f690c354856a" PYPI_PACKAGE = "ndg_httpsclient" @@ -13,6 +13,13 @@ DEPENDS += " \ ${PYTHON_PN}-pyasn1 \ " +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-pyasn1 \ +" + BBCLASSEXTEND = "native nativesdk" UPSTREAM_CHECK_REGEX = "" diff --git a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.3.bb b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb index ca0eb32638..ca0eb32638 100644 --- a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.3.bb +++ b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb diff --git a/meta-python/recipes-devtools/python/python-netaddr.inc b/meta-python/recipes-devtools/python/python-netaddr.inc index 486bfc6001..5b6d4dffa1 100644 --- a/meta-python/recipes-devtools/python/python-netaddr.inc +++ b/meta-python/recipes-devtools/python/python-netaddr.inc @@ -9,6 +9,5 @@ inherit pypi RDEPENDS_${PN} += " \ ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-textutils \ ${PYTHON_PN}-xml \ " diff --git a/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb b/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb index 5e089a90f2..ca5a79a788 100644 --- a/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb +++ b/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb @@ -1,2 +1,6 @@ require python-netaddr.inc inherit setuptools + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-textutils \ +" diff --git a/meta-python/recipes-devtools/python/python-networkx_2.0.bb b/meta-python/recipes-devtools/python/python-networkx_2.0.bb deleted file mode 100644 index bd9fe56503..0000000000 --- a/meta-python/recipes-devtools/python/python-networkx_2.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python package for creating and manipulating graphs and networks" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=050668f0cfbb54d1861e798b2104b161" - -SRC_URI[md5sum] = "34f9cc01b2eca37f362673b8eb65316b" -SRC_URI[sha256sum] = "cd5ff8f75d92c79237f067e2f0876824645d37f017cfffa5b7c9678cae1454aa" - -PYPI_PACKAGE_EXT = "zip" - -inherit pypi setuptools - -RDEPENDS_${PN} += "python-2to3" diff --git a/meta-python/recipes-devtools/python/python-networkx_2.1.bb b/meta-python/recipes-devtools/python/python-networkx_2.1.bb new file mode 100644 index 0000000000..bc0c6863d0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-networkx_2.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Python package for creating and manipulating graphs and networks" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde" + +SRC_URI[md5sum] = "4a2c2a62dfc46ba7d594daca7c834995" +SRC_URI[sha256sum] = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1" + +PYPI_PACKAGE_EXT = "zip" + +inherit pypi setuptools + +RDEPENDS_${PN} += "python-2to3" diff --git a/meta-python/recipes-devtools/python/python-oauthlib.inc b/meta-python/recipes-devtools/python/python-oauthlib.inc new file mode 100644 index 0000000000..c5de8a091a --- /dev/null +++ b/meta-python/recipes-devtools/python/python-oauthlib.inc @@ -0,0 +1,25 @@ +SUMMARY = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" +HOMEPAGE = "https://github.com/idan/oauthlib" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5ba9ce41463615e082609806255bce1b" + +SRC_URI = "https://pypi.python.org/packages/a5/8a/212e9b47fb54be109f3ff0684165bb38c51117f34e175c379fce5c7df754/oauthlib-${PV}.tar.gz" +SRC_URI[md5sum] = "277a9a966cc8c72e492b4eeb41332445" +SRC_URI[sha256sum] = "ce57b501e906ff4f614e71c36a3ab9eacbb96d35c24d1970d2539bbc3ec70ce1" + +S = "${WORKDIR}/oauthlib-${PV}" + +# The following configs & dependencies are from setuptools extras_require. +# These dependencies are optional, hence can be controlled via PACKAGECONFIG. +# The upstream names may not correspond exactly to bitbake package names. +# +# Uncomment this line to enable all the optional features. +#PACKAGECONFIG ?= "test signedtoken signals rsa" +PACKAGECONFIG[test] = ",,,${PYTHON_PN}-blinker ${PYTHON_PN}-cryptography ${PYTHON_PN}-nose ${PYTHON_PN}-pyjwt" +PACKAGECONFIG[signedtoken] = ",,,${PYTHON_PN}-cryptography ${PYTHON_PN}-pyjwt" +PACKAGECONFIG[signals] = ",,,${PYTHON_PN}-blinker" +PACKAGECONFIG[rsa] = ",,,${PYTHON_PN}-cryptography" + +RDEPENDS_${PN} += "${PYTHON_PN}-core ${PYTHON_PN}-crypt ${PYTHON_PN}-datetime ${PYTHON_PN}-json ${PYTHON_PN}-logging ${PYTHON_PN}-math ${PYTHON_PN}-netclient ${PYTHON_PN}-unittest" + diff --git a/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb b/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb new file mode 100644 index 0000000000..4329d21a15 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb @@ -0,0 +1,4 @@ +inherit setuptools +require python-oauthlib.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-re ${PYTHON_PN}-lang" diff --git a/meta-python/recipes-devtools/python/python-paho-mqtt.inc b/meta-python/recipes-devtools/python/python-paho-mqtt.inc index 6459e68b4a..f834e6fd87 100644 --- a/meta-python/recipes-devtools/python/python-paho-mqtt.inc +++ b/meta-python/recipes-devtools/python/python-paho-mqtt.inc @@ -13,9 +13,9 @@ SRC_URI[sha256sum] = "31911f6031de306c27ed79dc77b690d7c55b0dcb0f0434ca34ec6361d0 DEPENDS += "${PYTHON_PN}-pytest-runner-native" RDEPENDS_${PN} = "\ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-threading \ " diff --git a/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb b/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb index f369b2e848..a1031176e4 100644 --- a/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb @@ -1,3 +1,6 @@ inherit setuptools require python-paho-mqtt.inc +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-pam_1.8.2.bb b/meta-python/recipes-devtools/python/python-pam_1.8.2.bb index 05bddd527b..60a3b43de5 100644 --- a/meta-python/recipes-devtools/python/python-pam_1.8.2.bb +++ b/meta-python/recipes-devtools/python/python-pam_1.8.2.bb @@ -10,3 +10,6 @@ PYPI_PACKAGE = "python-pam" inherit pypi setuptools RDEPENDS_${PN} = "libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb b/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb index 355074cb25..b3bfab9693 100644 --- a/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb +++ b/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb @@ -4,5 +4,4 @@ require python-pandas.inc RDEPENDS_${PN} += " \ ${PYTHON_PN}-future \ ${PYTHON_PN}-json \ - ${PYTHON_PN}-importlib \ " diff --git a/meta-python/recipes-devtools/python/python-passlib.inc b/meta-python/recipes-devtools/python/python-passlib.inc index f289c0ec39..9e477ecf9f 100644 --- a/meta-python/recipes-devtools/python/python-passlib.inc +++ b/meta-python/recipes-devtools/python/python-passlib.inc @@ -11,3 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=73eed1a5470b969951dac411086c7036" SRC_URI[md5sum] = "254869dae3fd9f09f0746a3cb29a0b15" SRC_URI[sha256sum] = "3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ +" diff --git a/meta-python/recipes-devtools/python/python-pexpect.inc b/meta-python/recipes-devtools/python/python-pexpect.inc index 28d7b60c88..fa8ad01195 100644 --- a/meta-python/recipes-devtools/python/python-pexpect.inc +++ b/meta-python/recipes-devtools/python/python-pexpect.inc @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c7a725251880af8c6a148181665385b" -SRC_URI[md5sum] = "16aa4549136b2d1b2bf1e0e9788d75a6" -SRC_URI[sha256sum] = "8e287b171dbaf249d0b06b5f2e88cb7e694651d2d0b8c15bccb83170d3c55575" +SRC_URI[md5sum] = "913fc0a68a915cdf6ad4250493c94cf7" +SRC_URI[sha256sum] = "9f8eb3277716a01faafaba553d629d3d60a1a624c7cf45daa600d2148c30020c" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect" diff --git a/meta-python/recipes-devtools/python/python-pexpect_4.3.1.bb b/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb index 1c46b47a21..1c46b47a21 100644 --- a/meta-python/recipes-devtools/python/python-pexpect_4.3.1.bb +++ b/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb diff --git a/meta-python/recipes-devtools/python/python-pip_9.0.1.bb b/meta-python/recipes-devtools/python/python-pip_9.0.3.bb index 5ddd8d5240..e3fc6ba655 100644 --- a/meta-python/recipes-devtools/python/python-pip_9.0.1.bb +++ b/meta-python/recipes-devtools/python/python-pip_9.0.3.bb @@ -3,12 +3,12 @@ HOMEPAGE = "https://pip.pypa.io/" LICENSE = "MIT & LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=25fba45109565f87de20bae85bc39452" -SRC_URI[md5sum] = "35f01da33009719497f01a4ba69d63c9" -SRC_URI[sha256sum] = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d" +SRC_URI[md5sum] = "b15b33f9aad61f88d0f8c866d16c55d8" +SRC_URI[sha256sum] = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796" inherit pypi setuptools # Since PIP is like CPAN for PERL we need to drag in all python modules to ensure everything works -RDEPENDS_${PN}_class-target = "python-modules python-distribute" +RDEPENDS_${PN}_class-target = "python-modules python-distribute python-misc" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-ply.inc b/meta-python/recipes-devtools/python/python-ply.inc index a6cdf4b40d..a744950b6e 100644 --- a/meta-python/recipes-devtools/python/python-ply.inc +++ b/meta-python/recipes-devtools/python/python-ply.inc @@ -3,10 +3,10 @@ DESCRIPTION = "Python ply: PLY is yet another implementation of lex and yacc for HOMEPAGE = "https://pypi.python.org/pypi/ply" SECTION = "devel/python" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://README.md;beginline=3;endline=30;md5=fcb04bc2f765e46ab7084d6ab6e452bb" +LIC_FILES_CHKSUM = "file://README.md;beginline=5;endline=32;md5=f5ee5c355c0e6719c787a71b8f0fa96c" -SRC_URI[md5sum] = "1d63c166ab250bab87d8dcc42dcca70e" -SRC_URI[sha256sum] = "96e94af7dd7031d8d6dd6e2a8e0de593b511c211a86e28a9c9621c275ac8bacb" +SRC_URI[md5sum] = "6465f602e656455affcd7c5734c638f8" +SRC_URI[sha256sum] = "00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-ply_3.10.bb b/meta-python/recipes-devtools/python/python-ply_3.11.bb index 2b6165c5be..2b6165c5be 100644 --- a/meta-python/recipes-devtools/python/python-ply_3.10.bb +++ b/meta-python/recipes-devtools/python/python-ply_3.11.bb diff --git a/meta-python/recipes-devtools/python/python-pretend.inc b/meta-python/recipes-devtools/python/python-pretend.inc index 78b671712a..b342aef526 100644 --- a/meta-python/recipes-devtools/python/python-pretend.inc +++ b/meta-python/recipes-devtools/python/python-pretend.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/alex/pretend" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=411780c0b7fa756753e94affeee5bc99" -SRC_URI[md5sum] = "7147050a95c9f494248557b42b58ad79" -SRC_URI[sha256sum] = "930f2c1e18503e8f8c403abe2e02166c4a881941745147e712cdd4f49f3fb964" +SRC_URI[md5sum] = "ad53883ede48aeac7ae584f0de0240e8" +SRC_URI[sha256sum] = "c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-pretend_1.0.8.bb b/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb index 73b8ed4d7c..73b8ed4d7c 100644 --- a/meta-python/recipes-devtools/python/python-pretend_1.0.8.bb +++ b/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb diff --git a/meta-python/recipes-devtools/python/python-prompt-toolkit.inc b/meta-python/recipes-devtools/python/python-prompt-toolkit.inc index f5ed349f2e..cc409a4eb3 100644 --- a/meta-python/recipes-devtools/python/python-prompt-toolkit.inc +++ b/meta-python/recipes-devtools/python/python-prompt-toolkit.inc @@ -10,7 +10,6 @@ PYPI_PACKAGE = "prompt_toolkit" RDEPENDS_${PN} += " \ ${PYTHON_PN}-core \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-terminal \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-wcwidth \ diff --git a/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb b/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb index 76e841014a..527c905a83 100644 --- a/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb +++ b/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb @@ -1,2 +1,6 @@ inherit pypi setuptools require python-prompt-toolkit.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-python/recipes-devtools/python/python-protobuf.inc index 07346d372c..b84983d5b9 100644 --- a/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-python/recipes-devtools/python/python-protobuf.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit pypi -SRC_URI[md5sum] = "27b52592aab674f96a1762d66d48a57c" -SRC_URI[sha256sum] = "95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863" +SRC_URI[md5sum] = "393a53483224cb338df5c643646c0300" +SRC_URI[sha256sum] = "09879a295fd7234e523b62066223b128c5a8a88f682e3aff62fb115e4a0d8be0" RDEPENDS_${PN} += " \ ${PYTHON_PN}-datetime \ diff --git a/meta-python/recipes-devtools/python/python-protobuf_3.5.1.bb b/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb index f04fc489f0..f04fc489f0 100644 --- a/meta-python/recipes-devtools/python/python-protobuf_3.5.1.bb +++ b/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb diff --git a/meta-python/recipes-devtools/python/python-psutil.inc b/meta-python/recipes-devtools/python/python-psutil.inc index b96d54f3fa..5d8e61f4b5 100644 --- a/meta-python/recipes-devtools/python/python-psutil.inc +++ b/meta-python/recipes-devtools/python/python-psutil.inc @@ -15,7 +15,6 @@ FILES_${PN}-tests += " \ RDEPENDS_${PN} += " \ ${PYTHON_PN}-shell \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-xml \ " diff --git a/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb b/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb index bf402aa476..9aabfb2069 100644 --- a/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb +++ b/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb @@ -1,2 +1,6 @@ inherit pypi setuptools require python-psutil.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-pyasn1.inc b/meta-python/recipes-devtools/python/python-pyasn1.inc index 2539101ce3..f3c32e08af 100644 --- a/meta-python/recipes-devtools/python/python-pyasn1.inc +++ b/meta-python/recipes-devtools/python/python-pyasn1.inc @@ -8,7 +8,6 @@ SRC_URI[sha256sum] = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49 RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-lang \ ${PYTHON_PN}-logging \ ${PYTHON_PN}-math \ ${PYTHON_PN}-shell \ diff --git a/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb b/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb index 4461918cac..a13c74dda8 100644 --- a/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb +++ b/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb @@ -1,2 +1,6 @@ inherit pypi setuptools require python-pyasn1.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-lang \ +" diff --git a/meta-python/recipes-devtools/python/python-pybind11.inc b/meta-python/recipes-devtools/python/python-pybind11.inc index e273a8d25e..e441dc6dee 100644 --- a/meta-python/recipes-devtools/python/python-pybind11.inc +++ b/meta-python/recipes-devtools/python/python-pybind11.inc @@ -1,7 +1,7 @@ SUMMARY = "Seamless operability between C++11 and Python" HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9b27fac7e937323e3de9ca3a7db38e37" +LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" -SRC_URI[md5sum] = "f454d8991f47befe56d4126df861fc96" -SRC_URI[sha256sum] = "a96a924fae6e2721efbf24f47561284fd1ea0b655619a8621c4423036183b824" +SRC_URI[md5sum] = "2c651a75a20dabbaa18a8b023ffd54c0" +SRC_URI[sha256sum] = "cbb036a8aad59a199ad672f98813f85c672642c6a67b4ff3868b1d6abc5fae3e" diff --git a/meta-python/recipes-devtools/python/python-pybind11_2.2.1.bb b/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb index e56743002e..e56743002e 100644 --- a/meta-python/recipes-devtools/python/python-pybind11_2.2.1.bb +++ b/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb diff --git a/meta-python/recipes-devtools/python/python-pybluez.inc b/meta-python/recipes-devtools/python/python-pybluez.inc new file mode 100644 index 0000000000..399fe579f7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pybluez.inc @@ -0,0 +1,21 @@ +DESCRIPTION = "Bluetooth Python extension module" +HOMEPAGE = "http://karulis.github.io/pybluez/" +SECTION = "devel/python" + +DEPENDS = "bluez5" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" + +inherit pypi + +SRC_URI = "https://pypi.python.org/packages/c1/98/3149481d508bee174335be6725880f00d297afebe75c15e917af8f6fe169/PyBluez-0.22.zip" +SRC_URI[md5sum] = "49dab9d5a8f0b798c8125c7f649be3cd" +SRC_URI[sha256sum] = "4ce006716a54d9d18e8186a3f1c8b12a8e6befecffe8fd5828a291fb694ce49d" + +S = "${WORKDIR}/PyBluez-${PV}" + +RDEPENDS_${PN} += "\ + bluez5 \ + ${PYTHON_PN}-fcntl \ +" diff --git a/meta-python/recipes-devtools/python/python-pybluez_0.22.bb b/meta-python/recipes-devtools/python/python-pybluez_0.22.bb index eab9c54209..3158f4b647 100644 --- a/meta-python/recipes-devtools/python/python-pybluez_0.22.bb +++ b/meta-python/recipes-devtools/python/python-pybluez_0.22.bb @@ -1,17 +1,2 @@ -DESCRIPTION = "Bluetooth Python extension module" -HOMEPAGE = "http://karulis.github.io/pybluez/" -SECTION = "devel/python" - -RDEPENDS_${PN} = "bluez5" -DEPENDS = "bluez5" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" - -inherit pypi setuptools - -SRC_URI = "https://pypi.python.org/packages/c1/98/3149481d508bee174335be6725880f00d297afebe75c15e917af8f6fe169/PyBluez-0.22.zip" -SRC_URI[md5sum] = "49dab9d5a8f0b798c8125c7f649be3cd" -SRC_URI[sha256sum] = "4ce006716a54d9d18e8186a3f1c8b12a8e6befecffe8fd5828a291fb694ce49d" - -S = "${WORKDIR}/PyBluez-${PV}" +require python-pybluez.inc +inherit setuptools diff --git a/meta-python/recipes-devtools/python/python-pycparser.inc b/meta-python/recipes-devtools/python/python-pycparser.inc index f445a2093e..d112d9f774 100644 --- a/meta-python/recipes-devtools/python/python-pycparser.inc +++ b/meta-python/recipes-devtools/python/python-pycparser.inc @@ -11,7 +11,6 @@ BBCLASSEXTEND = "native nativesdk" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-ply \ ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-subprocess \ cpp \ cpp-symlinks \ " diff --git a/meta-python/recipes-devtools/python/python-pycparser_2.18.bb b/meta-python/recipes-devtools/python/python-pycparser_2.18.bb index adbc1a8f46..98742737fd 100644 --- a/meta-python/recipes-devtools/python/python-pycparser_2.18.bb +++ b/meta-python/recipes-devtools/python/python-pycparser_2.18.bb @@ -1,2 +1,6 @@ inherit pypi setuptools require python-pycparser.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-pycryptodome.inc b/meta-python/recipes-devtools/python/python-pycryptodome.inc index ecfcc9d803..c4969f9667 100644 --- a/meta-python/recipes-devtools/python/python-pycryptodome.inc +++ b/meta-python/recipes-devtools/python/python-pycryptodome.inc @@ -3,11 +3,27 @@ DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ cryptographic primitives." HOMEPAGE = "http://www.pycryptodome.org" LICENSE = "PD & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=690cd8c71f0367a558f24fe53d943a2e" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=775fe77831c03bf82f35abc0e230d4c1" -SRC_URI[md5sum] = "8744863c7d5980ae3f81c2e288701a61" -SRC_URI[sha256sum] = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7" +SRC_URI[md5sum] = "a2587b6381b0ef4eb960cea1e7507d04" +SRC_URI[sha256sum] = "c5dd29e9f1b733e74311bf95d0e544e91bd1d14bc0366e8f443562d8d9920b7d" inherit pypi +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN}-tests += " \ + ${PYTHON_PN}-unittest \ +" + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/Crypto/SelfTest/ \ + ${PYTHON_SITEPACKAGES_DIR}/Crypto/SelfTest/__pycache__/ \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-pycryptodome_3.4.7.bb b/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb index c7701eb9f9..c7701eb9f9 100644 --- a/meta-python/recipes-devtools/python/python-pycryptodome_3.4.7.bb +++ b/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb diff --git a/meta-python/recipes-devtools/python/python-pyexpect.inc b/meta-python/recipes-devtools/python/python-pyexpect.inc new file mode 100644 index 0000000000..d2d41d51d2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyexpect.inc @@ -0,0 +1,11 @@ +SUMMARY = "Python expectaton library" +DESCRIPTION = "Minimal but very flexible implementation of the expect pattern" +SECTION = "devel/python" +HOMEPAGE = " https://bitbucket.org/dwt/pyexpect" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://README.md;md5=500b884e9dcd5f677a53cbbee8ace939" + +inherit pypi + +SRC_URI[md5sum] = "c71307d6c7096fdbde0813018dfa0092" +SRC_URI[sha256sum] = "d656ef7e07a8aa539ce0a4883a683341037b6fc1c329bf55b63bffbf2cce9582" diff --git a/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb b/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb new file mode 100644 index 0000000000..d26beb7944 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pyexpect.inc diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch b/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch index f5870372a1..1f31cb805e 100644 --- a/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch +++ b/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch @@ -1,7 +1,7 @@ -From 1c1812def711803382cc28caea1f35fb7ef774b0 Mon Sep 17 00:00:00 2001 +From ed44474c11f577c1644910964a917a4cf701bb0f Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Date: Tue, 26 Jan 2016 14:24:26 -0500 -Subject: [PATCH 1/5] reflect 2.1 reporting for key imports +Subject: [PATCH] reflect 2.1 reporting for key imports GnuPG 2.1 changes how it reports key imports. These changes should make the pygpgme test suite compatible with GnuPG 2.1. @@ -12,6 +12,7 @@ https://lists.gnupg.org/pipermail/gnupg-devel/2016-January/030718.html Upstream-Status: Backport Signed-off-by: Catalin Enache <catalin.enache@windriver.com> + --- tests/test_import.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) @@ -86,3 +87,4 @@ index 10eb816..597eb47 100644 + None, gpgme.IMPORT_NEW | gpgme.IMPORT_SECRET)) self.assertEqual(result.imports[3], ('93C2240D6B8AA10AB28F701D2CF46B7FC97E6B0F', + None, gpgme.IMPORT_NEW)) diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch b/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch index ccd941f7bb..c18cf3feba 100644 --- a/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch +++ b/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch @@ -1,7 +1,7 @@ -From dc75482af095d667a4a92655c4e7eb312e80c42d Mon Sep 17 00:00:00 2001 +From ba0dc8273e4f83bcd2d43baa5910aae34b93048c Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Date: Mon, 1 Feb 2016 19:25:12 -0500 -Subject: [PATCH 2/5] passphrase_cb is deprecated +Subject: [PATCH] passphrase_cb is deprecated https://bugs.gnupg.org/gnupg/issue767 indicates that gpgme_set_passphrase_cb is a deprecated corner of the API and that @@ -19,6 +19,7 @@ test suite to be able to make those tests. Upstream-Status: Backport Signed-off-by: Catalin Enache <catalin.enache@windriver.com> + --- tests/util.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) @@ -48,3 +49,4 @@ index cd803c2..86892ca 100644 + # import requested keys into the keyring ctx = gpgme.Context() + for key in self.import_keys: diff --git a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch b/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch index 462f442286..6acb68bfe7 100644 --- a/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch +++ b/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch @@ -1,7 +1,7 @@ -From 024fe219582143017b2f02bc924c0ed107b63619 Mon Sep 17 00:00:00 2001 +From 579b5930e15de8855bf63b3c20b6c3aaf894c3eb Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Date: Mon, 1 Feb 2016 19:27:59 -0500 -Subject: [PATCH 3/5] handle generic error when no passphrase callback present +Subject: [PATCH] handle generic error when no passphrase callback present apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was in loopback mode and no passphrase callback was supplied. Earlier @@ -10,6 +10,7 @@ versions supplied ERR_BAD_PASSPHRASE. Upstream-Status: Backport Signed-off-by: Catalin Enache <catalin.enache@windriver.com> + --- tests/test_passphrase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -26,3 +27,4 @@ index 0a235e9..35b3c59 100644 + self.assertEqual(exc.args[1], gpgme.ERR_GENERAL) else: self.fail('gpgme.GpgmeError not raised') + diff --git a/meta-python/recipes-devtools/python/python-pyiface.inc b/meta-python/recipes-devtools/python/python-pyiface.inc new file mode 100644 index 0000000000..620b244c65 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyiface.inc @@ -0,0 +1,11 @@ +SUMMARY = "Pyiface is a package that exposes the network interfaces of the operating system in a easy to use and transparent way" +SECTION = "devel/python" +HOMEPAGE = "https://pypi.python.org/pypi/pyiface/" +LICENSE = "GPLv3+" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1" + +SRC_URI[md5sum] = "06c3c71fe51df740dae6a88a13afb5e0" +SRC_URI[sha256sum] = "4bb79100cbcf7344a1ccaddc578cd6455da47d8eac6eb1bf903ec32e043af924" + +inherit pypi diff --git a/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb b/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb new file mode 100644 index 0000000000..854cb30eee --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pyiface.inc
\ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python-pyinotify.inc b/meta-python/recipes-devtools/python/python-pyinotify.inc index 7fcbb1850f..975f11c10b 100644 --- a/meta-python/recipes-devtools/python/python-pyinotify.inc +++ b/meta-python/recipes-devtools/python/python-pyinotify.inc @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ab173cade7965b411528464589a08382" RDEPENDS_${PN} += "\ ${PYTHON_PN}-threading \ ${PYTHON_PN}-io \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-misc \ ${PYTHON_PN}-shell \ " diff --git a/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb b/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb index d1f84c3ca8..0c9a2c72e1 100644 --- a/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb +++ b/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb @@ -1,2 +1,6 @@ inherit setuptools require python-pyinotify.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-pyjwt.inc b/meta-python/recipes-devtools/python/python-pyjwt.inc index dda4b942d9..9f9282eac0 100644 --- a/meta-python/recipes-devtools/python/python-pyjwt.inc +++ b/meta-python/recipes-devtools/python/python-pyjwt.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" -SRC_URI[md5sum] = "739494379f582ca98c89fb7ac229915b" -SRC_URI[sha256sum] = "500be75b17a63f70072416843dc80c8821109030be824f4d14758f114978bae7" +SRC_URI[md5sum] = "f7dbe0d62f2087a7605946aeeca02541" +SRC_URI[sha256sum] = "dacba5786fe3bf1a0ae8673874e29f9ac497860955c501289c63b15d3daae63a" PYPI_PACKAGE = "PyJWT" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-pyjwt_1.5.3.bb b/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb index f0a77b674b..f0a77b674b 100644 --- a/meta-python/recipes-devtools/python/python-pyjwt_1.5.3.bb +++ b/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb diff --git a/meta-python/recipes-devtools/python/python-pylint.inc b/meta-python/recipes-devtools/python/python-pylint.inc index 9dd1d65274..ba85b98878 100644 --- a/meta-python/recipes-devtools/python/python-pylint.inc +++ b/meta-python/recipes-devtools/python/python-pylint.inc @@ -3,8 +3,8 @@ HOMEPAGE= "http://www.pylint.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -SRC_URI[md5sum] = "b7cca873fb60d420a4db8d3bfa4824b1" -SRC_URI[sha256sum] = "3035e44e37cd09919e9edad5573af01d7c6b9c52a0ebb4781185ae7ab690458b" +SRC_URI[md5sum] = "2eb5f3cb8fe567eaf5420dd415012202" +SRC_URI[sha256sum] = "c77311859e0c2d7932095f30d2b1bfdc4b6fe111f534450ba727a52eae330ef2" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-pylint_1.8.1.bb b/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb index 7b51d3fbd5..7b51d3fbd5 100644 --- a/meta-python/recipes-devtools/python/python-pylint_1.8.1.bb +++ b/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb diff --git a/meta-python/recipes-devtools/python/python-pymisp.inc b/meta-python/recipes-devtools/python/python-pymisp.inc index f9171f9c13..7765cc59cc 100644 --- a/meta-python/recipes-devtools/python/python-pymisp.inc +++ b/meta-python/recipes-devtools/python/python-pymisp.inc @@ -3,10 +3,11 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[md5sum] = "7d924d9a776c5e41f735412131571178" -SRC_URI[sha256sum] = "71e8515bb2209bb8b96e8edaa66d5341553f99822f94b32545d9efb404b6ba67" +SRC_URI[md5sum] = "d4fee2abb2d7468010b7fe9ebc68b0cb" +SRC_URI[sha256sum] = "304fbd8862dfde27d767c093de87fec42fc63c70d8393643d1a3b4f765aae78f" RDEPENDS_${PN} += " \ + ${PYTHON_PN}-dateutil \ ${PYTHON_PN}-json \ ${PYTHON_PN}-jsonschema \ ${PYTHON_PN}-requests \ diff --git a/meta-python/recipes-devtools/python/python-pymisp_2.4.85.1.bb b/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb index 1b1fbe956e..1b1fbe956e 100644 --- a/meta-python/recipes-devtools/python/python-pymisp_2.4.85.1.bb +++ b/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb diff --git a/meta-python/recipes-devtools/python/python-pymongo.inc b/meta-python/recipes-devtools/python/python-pymongo.inc index 2bb075af76..baf3dd547a 100644 --- a/meta-python/recipes-devtools/python/python-pymongo.inc +++ b/meta-python/recipes-devtools/python/python-pymongo.inc @@ -8,8 +8,8 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[md5sum] = "2f64fa7691c77535b72050704cc12afb" -SRC_URI[sha256sum] = "c6de26d1e171cdc449745b82f1addbc873d105b8e7335097da991c0fc664a4a8" +SRC_URI[md5sum] = "0d72c87fb93cea0759529befafefce54" +SRC_URI[sha256sum] = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796" PACKAGES =+ "${PYTHON_PN}-bson" diff --git a/meta-python/recipes-devtools/python/python-pymongo_3.6.0.bb b/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb index b1778b2f13..b1778b2f13 100644 --- a/meta-python/recipes-devtools/python/python-pymongo_3.6.0.bb +++ b/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb diff --git a/meta-python/recipes-devtools/python/python-pynetlinux.inc b/meta-python/recipes-devtools/python/python-pynetlinux.inc new file mode 100644 index 0000000000..6a39896279 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pynetlinux.inc @@ -0,0 +1,11 @@ +SUMMARY = "Linux network configuration library for Python" +DESCRIPTION = "This library contains Python bindings to ioctl calls" +SECTION = "devel/python" +HOMEPAGE = "http://github.com/rlisagor/pynetlinux" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=74e1861736ee959824fe7542323c12e9" + +inherit pypi + +SRC_URI[md5sum] = "3336e5d4a478acca4e35bf3125b4f883" +SRC_URI[sha256sum] = "4ad08298c9f5ba15a11cddc639ba8778cabdfc402b51066d9e0a325e5a5b391c" diff --git a/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb b/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb new file mode 100644 index 0000000000..c45ad6ad66 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pynetlinux.inc diff --git a/meta-python/recipes-devtools/python/python-pyparsing.inc b/meta-python/recipes-devtools/python/python-pyparsing.inc index 19f6d55f99..e30839f875 100644 --- a/meta-python/recipes-devtools/python/python-pyparsing.inc +++ b/meta-python/recipes-devtools/python/python-pyparsing.inc @@ -18,4 +18,4 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-threading \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-pyperclip.inc b/meta-python/recipes-devtools/python/python-pyperclip.inc index c712fdd7c9..e05de6723e 100644 --- a/meta-python/recipes-devtools/python/python-pyperclip.inc +++ b/meta-python/recipes-devtools/python/python-pyperclip.inc @@ -9,5 +9,4 @@ inherit pypi RDEPENDS_${PN} += " \ ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb b/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb index 6e93b81796..6c9fcbd84e 100644 --- a/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb +++ b/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb @@ -1,4 +1,7 @@ inherit setuptools require python-pyperclip.inc -RDEPENDS_${PN} += "${PYTHON_PN}-contextlib" +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-contextlib \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-pyroute2.inc b/meta-python/recipes-devtools/python/python-pyroute2.inc index f63ccbd660..9ec9866d8a 100644 --- a/meta-python/recipes-devtools/python/python-pyroute2.inc +++ b/meta-python/recipes-devtools/python/python-pyroute2.inc @@ -13,13 +13,13 @@ inherit pypi RDEPENDS_${PN} += " \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-importlib \ + ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ ${PYTHON_PN}-logging \ ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-pickle \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-pprint \ ${PYTHON_PN}-shell \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-unixadmin \ " diff --git a/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb b/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb index 7b9c8e0445..f25f1b4ab3 100644 --- a/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb +++ b/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb @@ -1,2 +1,6 @@ require python-pyroute2.inc inherit setuptools + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-pyserial.inc b/meta-python/recipes-devtools/python/python-pyserial.inc index 8fe3f2c5ec..52a7e05ce6 100644 --- a/meta-python/recipes-devtools/python/python-pyserial.inc +++ b/meta-python/recipes-devtools/python/python-pyserial.inc @@ -31,7 +31,6 @@ FILES_${PN}-win32 = " \ " RDEPENDS_${PN} = "\ - ${PYTHON_PN}-argparse \ ${PYTHON_PN}-fcntl \ ${PYTHON_PN}-io \ ${PYTHON_PN}-logging \ diff --git a/meta-python/recipes-devtools/python/python-pyserial_3.4.bb b/meta-python/recipes-devtools/python/python-pyserial_3.4.bb index 91a0f26ac3..fd852a2bf8 100644 --- a/meta-python/recipes-devtools/python/python-pyserial_3.4.bb +++ b/meta-python/recipes-devtools/python/python-pyserial_3.4.bb @@ -1,4 +1,4 @@ inherit setuptools require python-pyserial.inc -RDEPENDS_${PN} += "${PYTHON_PN}-importlib" +RDEPENDS_${PN} += "${PYTHON_PN}-argparse" diff --git a/meta-python/recipes-devtools/python/python-pystache.inc b/meta-python/recipes-devtools/python/python-pystache.inc new file mode 100644 index 0000000000..6dbc99f530 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pystache.inc @@ -0,0 +1,13 @@ +SUMMARY = "Python implementation of Mustache" +HOMEPAGE = "https://github.com/defunkt/pystache" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb4417802c56384aac71b34505528a60" + +SRC_URI[md5sum] = "485885e67a0f6411d5252e69b20a35ca" +SRC_URI[sha256sum] = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-netserver \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb b/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb new file mode 100644 index 0000000000..a455012471 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pystache.inc diff --git a/meta-python/recipes-devtools/python/python-pytest-runner.inc b/meta-python/recipes-devtools/python/python-pytest-runner.inc index 262448de1b..7546743fb4 100644 --- a/meta-python/recipes-devtools/python/python-pytest-runner.inc +++ b/meta-python/recipes-devtools/python/python-pytest-runner.inc @@ -10,7 +10,7 @@ inherit pypi DEPENDS += " \ ${PYTHON_PN}-setuptools-scm-native" -RDEPENDS_${PN} = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-argparse ${PYTHON_PN}-debugger ${PYTHON_PN}-json \ +RDEPENDS_${PN} = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-debugger ${PYTHON_PN}-json \ ${PYTHON_PN}-io" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb b/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb index 0a5055cb37..1765a732d0 100644 --- a/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb +++ b/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb @@ -2,4 +2,4 @@ inherit setuptools require python-pytest-runner.inc # Dependency only exists for python2 -RDEPENDS_${PN} += "python-compiler" +RDEPENDS_${PN} += "python-argparse python-compiler" diff --git a/meta-python/recipes-devtools/python/python-pytest.inc b/meta-python/recipes-devtools/python/python-pytest.inc index 17d8233f82..4feb9a03cf 100644 --- a/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,16 +3,16 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c39b24965f4aef64222cb35de9d47cc4" -SRC_URI[md5sum] = "c3757fbdfebd5d8f402fdd5fc1dcb9b5" -SRC_URI[sha256sum] = "53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4" +SRC_URI[md5sum] = "1b83a25d45fad893f430fc5031653c56" +SRC_URI[sha256sum] = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ file://pytest_version_fix.patch " RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-argparse \ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-doctest \ ${PYTHON_PN}-json \ ${PYTHON_PN}-pluggy \ ${PYTHON_PN}-py \ diff --git a/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch b/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch index 908f862b52..b373d93e8f 100644 --- a/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch +++ b/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch @@ -36,7 +36,7 @@ Index: pytest-3.2.2/setup.py + return version_match.group(1) + raise RuntimeError("Unable to find version string.") - def has_environment_marker_support(): + def get_environment_marker_support_level(): """ @@ -59,9 +72,7 @@ def main(): name='pytest', diff --git a/meta-python/recipes-devtools/python/python-pytest_3.3.2.bb b/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb index d7bd0a4028..201ab050cd 100644 --- a/meta-python/recipes-devtools/python/python-pytest_3.3.2.bb +++ b/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb @@ -2,6 +2,7 @@ inherit pypi setuptools require python-pytest.inc RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-argparse \ ${PYTHON_PN}-compiler \ ${PYTHON_PN}-funcsigs \ " diff --git a/meta-python/recipes-devtools/python/python-pytz.inc b/meta-python/recipes-devtools/python/python-pytz.inc index e79f4334b6..519487f491 100644 --- a/meta-python/recipes-devtools/python/python-pytz.inc +++ b/meta-python/recipes-devtools/python/python-pytz.inc @@ -1,18 +1,18 @@ SUMMARY = "World timezone definitions, modern and historical" HOMEPAGE = "http://pythonhosted.org/pytz" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=39ea92752a35cf67d8a885d8e3af3c69" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4878a915709225bceab739bdc2a18e8d" inherit pypi -PYPI_PACKAGE_EXT = "zip" -SRC_URI[md5sum] = "7006b56c0d68a162d9fe57d4249c3171" -SRC_URI[sha256sum] = "fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7" +SRC_URI[md5sum] = "f054437920c895dd14a4509fabafe029" +SRC_URI[sha256sum] = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-doctest \ ${PYTHON_PN}-io \ + ${PYTHON_PN}-pickle \ ${PYTHON_PN}-pprint \ ${PYTHON_PN}-threading \ " diff --git a/meta-python/recipes-devtools/python/python-pytz_2017.3.bb b/meta-python/recipes-devtools/python/python-pytz_2018.4.bb index f2ffc596f8..f2ffc596f8 100755 --- a/meta-python/recipes-devtools/python/python-pytz_2017.3.bb +++ b/meta-python/recipes-devtools/python/python-pytz_2018.4.bb diff --git a/meta-python/recipes-devtools/python/python-pyudev.inc b/meta-python/recipes-devtools/python/python-pyudev.inc index ab4c5fd7d5..cb906c9ec9 100644 --- a/meta-python/recipes-devtools/python/python-pyudev.inc +++ b/meta-python/recipes-devtools/python/python-pyudev.inc @@ -14,6 +14,5 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-misc \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-threading \ " diff --git a/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb b/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb index 32573b7a0d..a3e15014a4 100644 --- a/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb +++ b/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb @@ -2,6 +2,7 @@ require python-pyudev.inc RDEPENDS_${PN} = "\ ${PYTHON_PN}-contextlib \ + ${PYTHON_PN}-subprocess \ " inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-pyyaml.inc b/meta-python/recipes-devtools/python/python-pyyaml.inc index a3cf677f4f..3fef0cacd4 100644 --- a/meta-python/recipes-devtools/python/python-pyyaml.inc +++ b/meta-python/recipes-devtools/python/python-pyyaml.inc @@ -11,4 +11,8 @@ inherit pypi SRC_URI[md5sum] = "4c129761b661d181ebf7ff4eb2d79950" SRC_URI[sha256sum] = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-redis.inc b/meta-python/recipes-devtools/python/python-redis.inc index 571bb084a1..1a65d73144 100644 --- a/meta-python/recipes-devtools/python/python-redis.inc +++ b/meta-python/recipes-devtools/python/python-redis.inc @@ -6,3 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" SRC_URI[md5sum] = "048348d8cfe0b5d0bba2f4d835005c3b" SRC_URI[sha256sum] = "a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" diff --git a/meta-python/recipes-devtools/python/python-robotframework.inc b/meta-python/recipes-devtools/python/python-robotframework.inc new file mode 100644 index 0000000000..78bbbc6de0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-robotframework.inc @@ -0,0 +1,26 @@ +SUMMARY = "A Python generic test automation framework" +DESCRIPTION = "Generic open source test atomation framework for acceptance\ +testing and acceptance test-driven development (ATDD). It has easy-to-use\ +tabular test data syntax and it utilizes the keyword-driven testing approach.\ +Its testing capabilities can be extended by test libraries implemented either\ +with Python or Java, and users can create new higher-level keywords from\ +existing ones using the same syntax that is used for creating test cases." +HOMEPAGE = "http://robotframework.org" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi + +SRC_URI[md5sum] = "ea49a54b9d7e38302712194e85c37eaa" +SRC_URI[sha256sum] = "2018f233568227f9af8c366f93e243a157b742f3baf5b649ecc9750ac0ee1ff7" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-docutils \ + ${PYTHON_PN}-ctypes \ +" diff --git a/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb b/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb new file mode 100644 index 0000000000..ff7dedb559 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb @@ -0,0 +1,6 @@ +inherit setuptools +require python-robotframework.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-zlib \ +" diff --git a/meta-python/recipes-devtools/python/python-scrypt.inc b/meta-python/recipes-devtools/python/python-scrypt.inc index 85f1d277bd..783d05b7e7 100644 --- a/meta-python/recipes-devtools/python/python-scrypt.inc +++ b/meta-python/recipes-devtools/python/python-scrypt.inc @@ -3,8 +3,12 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378" HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/overview" -SRC_URI[md5sum] = "0704e59cc3afb3845c27bb3827baeea9" -SRC_URI[sha256sum] = "d4a5a4f53450b8ef629bbf1ee4be6105c69936e49b3d8bc621ac2287f0c86020" +FILESEXTRAPATHS_prepend := "${THISDIR}/python-scrypt:" + +SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" + +SRC_URI[md5sum] = "ae8e3263aa31b040c1f9c7f1e1843a56" +SRC_URI[sha256sum] = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch new file mode 100644 index 0000000000..d535e43261 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch @@ -0,0 +1,26 @@ +From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001 +From: Derek Straka <derek@asterius.io> +Date: Sun, 11 Mar 2018 19:55:38 -0400 +Subject: [PATCH] py-scrypt: remove the hard coded include paths + +Upstream-Status: Pending + +Signed-off-by: Derek Straka <derek@asterius.io> +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e36adc4..2ebfbf1 100644 +--- a/setup.py ++++ b/setup.py +@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'): + ('HAVE_SYS_SYSINFO_H', '1'), + ('_FILE_OFFSET_BITS', '64')] + libraries = ['crypto', 'rt'] +- includes = ['/usr/local/include', '/usr/include'] + CFLAGS.append('-O2') + elif sys.platform.startswith('win32'): + define_macros = [('inline', '__inline')] +-- +2.7.4 diff --git a/meta-python/recipes-devtools/python/python-scrypt_0.8.0.bb b/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb index 9fbd00e049..9fbd00e049 100644 --- a/meta-python/recipes-devtools/python/python-scrypt_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb diff --git a/meta-python/recipes-devtools/python/python-serpent.inc b/meta-python/recipes-devtools/python/python-serpent.inc index 6454ee0f31..3f51bc29bd 100644 --- a/meta-python/recipes-devtools/python/python-serpent.inc +++ b/meta-python/recipes-devtools/python/python-serpent.inc @@ -1,9 +1,9 @@ SUMMARY = "Serialization based on ast.literal_eval" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9f611d4c9e2816d387bab64c40d93294" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=acdea68f0e5a89eb6cbfdf54e38c356e" -SRC_URI[md5sum] = "d9d6afa51f2560cf5933dcdfd947011d" -SRC_URI[sha256sum] = "8480ce3d8864b8974d9fe396998c6a7dae96edb68edf905bfd32ea9a11853ba5" +SRC_URI[md5sum] = "d0c50f1943ff86d830eb3fe40f6dc1e3" +SRC_URI[sha256sum] = "b6855483d95a03b6aee358363684cd38a3a670240da5bc6da4253079cb07b8df" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-serpent_1.23.bb b/meta-python/recipes-devtools/python/python-serpent_1.24.bb index 0db3cf98aa..0db3cf98aa 100644 --- a/meta-python/recipes-devtools/python/python-serpent_1.23.bb +++ b/meta-python/recipes-devtools/python/python-serpent_1.24.bb diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm.inc b/meta-python/recipes-devtools/python/python-setuptools-scm.inc index 81bbf33854..eb66580a6e 100644 --- a/meta-python/recipes-devtools/python/python-setuptools-scm.inc +++ b/meta-python/recipes-devtools/python/python-setuptools-scm.inc @@ -1,14 +1,14 @@ SUMMARY = "the blessed package to manage your versions by scm tags" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "f17493d53f0d842bb0152f214775640b" -SRC_URI[sha256sum] = "49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f" +SRC_URI[md5sum] = "1b55f9cedde4a33ab5d286c5f30e86db" +SRC_URI[sha256sum] = "e163e8a12d2121f77575773cfc2b5988275dc1f1d2541fdf780127c29dbbea9c" PYPI_PACKAGE = "setuptools_scm" inherit pypi -RDEPENDS_${PN}_class-target = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-argparse ${PYTHON_PN}-debugger ${PYTHON_PN}-json" +RDEPENDS_${PN}_class-target = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-debugger ${PYTHON_PN}-json" RDEPENDS_${PN}_class-native = "${PYTHON_PN}-setuptools-native" BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.6.bb b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb index 5f9bb0b5c0..64b36e3a01 100644 --- a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.6.bb +++ b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb @@ -1,2 +1,4 @@ inherit setuptools require python-setuptools-scm.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-argparse" diff --git a/meta-python/recipes-devtools/python/python-simplejson.inc b/meta-python/recipes-devtools/python/python-simplejson.inc index 95df3f356f..e28d51859e 100644 --- a/meta-python/recipes-devtools/python/python-simplejson.inc +++ b/meta-python/recipes-devtools/python/python-simplejson.inc @@ -10,7 +10,6 @@ SRC_URI[sha256sum] = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a3 inherit pypi RDEPENDS_${PN} += "\ - ${PYTHON_PN}-re \ ${PYTHON_PN}-io \ ${PYTHON_PN}-netserver \ ${PYTHON_PN}-numbers \ diff --git a/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb b/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb index e33edfebaa..24ad9a9608 100644 --- a/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb +++ b/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb @@ -1,2 +1,4 @@ inherit setuptools require python-simplejson.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-re" diff --git a/meta-python/recipes-devtools/python/python-smbus.inc b/meta-python/recipes-devtools/python/python-smbus.inc index de2a2704e1..f472a57f43 100644 --- a/meta-python/recipes-devtools/python/python-smbus.inc +++ b/meta-python/recipes-devtools/python/python-smbus.inc @@ -1,18 +1,12 @@ SUMMARY = "Set of i2c tools for linux - Python module" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" +PR = "r1" -SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/i2c-tools-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962" -SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441" +SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/i2c-tools-${PV}.tar.gz " +SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa" +SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403" DEPENDS += "i2c-tools" S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" - -do_configure_prepend() { - # Adjust for OE header rename - sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk - sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c -} diff --git a/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb b/meta-python/recipes-devtools/python/python-smbus_4.0.bb index 1b95778877..1b95778877 100644 --- a/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb +++ b/meta-python/recipes-devtools/python/python-smbus_4.0.bb diff --git a/meta-python/recipes-devtools/python/python-sqlalchemy.inc b/meta-python/recipes-devtools/python/python-sqlalchemy.inc index 2683a6ab12..0c191ae7d5 100644 --- a/meta-python/recipes-devtools/python/python-sqlalchemy.inc +++ b/meta-python/recipes-devtools/python/python-sqlalchemy.inc @@ -2,13 +2,13 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ application developers the full power and flexibility of SQL" HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=452f4b8adb0feba42e5be5f1fbfbf538" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1c412c9d8d1ce018f7a9374407c22bb" PYPI_PACKAGE = "SQLAlchemy" inherit pypi -SRC_URI[md5sum] = "077f9bd3339957f53068b5572a152674" -SRC_URI[sha256sum] = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a" +SRC_URI[md5sum] = "03db1c8f8ae911977c0bf3950a4c9c21" +SRC_URI[sha256sum] = "6b55ec379c11ad696f9371ce8e0de93c7f21134323f56a56a1b0d8fbef17013c" RDEPENDS_${PN} += " \ ${PYTHON_PN}-json \ diff --git a/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.15.bb b/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb index 53c8fecf70..53c8fecf70 100644 --- a/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.15.bb +++ b/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb diff --git a/meta-python/recipes-devtools/python/python-systemd.inc b/meta-python/recipes-devtools/python/python-systemd.inc new file mode 100644 index 0000000000..5be5de092a --- /dev/null +++ b/meta-python/recipes-devtools/python/python-systemd.inc @@ -0,0 +1,18 @@ +SUMMARY = "Python interface for libsystemd" +HOMEPAGE = "https://github.com/systemd/python-systemd" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" + +PYPI_PACKAGE = "systemd-python" +DEPENDS += "systemd (<=234)" +RDEPENDS_${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging" +REQUIRED_DISTRO_FEATURES = "systemd" +inherit pypi distro_features_check + +SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" +SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" + +# allow for common patches for python- and python3-systemd +FILESEXTRAPATHS_prepend := "${THISDIR}/python-systemd:" + +SRC_URI_append_libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" diff --git a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch new file mode 100644 index 0000000000..d7085a8565 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch @@ -0,0 +1,42 @@ +From 8b639f9faf6199e47b9eae0698d01a22917b6abe Mon Sep 17 00:00:00 2001 +From: Tim Orling <timothy.t.orling@linux.intel.com> +Date: Fri, 29 Dec 2017 09:17:17 -0800 +Subject: [PATCH] Provide implementation of strndupa for musl + +Reuse the approach from oe-core: +/meta/recipes-core/systemd/systemd/0002-src-basic-missing.h-check-for-missing-strndupa.patch + +Original patch author: Emil Renner Berthing <systemd@esmil.dk> + +Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com +--- +Upstream-Status: Pending + + systemd/util.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/systemd/util.c b/systemd/util.c +index e02c825..277e611 100644 +--- a/systemd/util.c ++++ b/systemd/util.c +@@ -34,6 +34,17 @@ + + #include "util.h" + ++#if !HAVE_DECL_STRNDUPA ++#define strndupa(s, n) \ ++ ({ \ ++ const char *__old = (s); \ ++ size_t __len = strnlen(__old, (n)); \ ++ char *__new = (char *)alloca(__len + 1); \ ++ __new[__len] = '\0'; \ ++ (char *)memcpy(__new, __old, __len); \ ++ }) ++#endif ++ + int safe_atou(const char *s, unsigned *ret_u) { + char *x = NULL; + unsigned long l; +-- +2.13.6 + diff --git a/meta-python/recipes-devtools/python/python-systemd_234.bb b/meta-python/recipes-devtools/python/python-systemd_234.bb index ef1183171d..80f2900776 100644 --- a/meta-python/recipes-devtools/python/python-systemd_234.bb +++ b/meta-python/recipes-devtools/python/python-systemd_234.bb @@ -1,13 +1,2 @@ -SUMMARY = "Python interface for libsystemd" -HOMEPAGE = "https://github.com/systemd/python-systemd" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" - -PYPI_PACKAGE = "systemd-python" -DEPENDS += "systemd (<=234)" -RDEPENDS_${PN} += "systemd" -REQUIRED_DISTRO_FEATURES = "systemd" -inherit pypi setuptools distro_features_check - -SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" -SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" +require python-systemd.inc +inherit setuptools diff --git a/meta-python/recipes-devtools/python/python-tornado.inc b/meta-python/recipes-devtools/python/python-tornado.inc index c8d14178bd..29d10da6bd 100644 --- a/meta-python/recipes-devtools/python/python-tornado.inc +++ b/meta-python/recipes-devtools/python/python-tornado.inc @@ -4,12 +4,12 @@ By using non-blocking network I/O, Tornado can scale to tens of thousands of ope polling, WebSockets, and other applications that require a long-lived connection to each user." HOMEPAGE = "http://www.tornadoweb.org/en/stable/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=15;md5=5ab7571a79ad62d0ca7aea308bac7560" +LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=15;md5=8d463fc66ff8f275354ffe88d1896e12" SRC_URI[md5sum] = "a5fc7fd4aea94867609a491ce65786f1" SRC_URI[sha256sum] = "6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a" -RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email ${PYTHON_PN}-subprocess \ +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email \ ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi ${PYTHON_PN}-threading \ ${PYTHON_PN}-ctypes" diff --git a/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb b/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb index 5d11475567..193a4db7d2 100644 --- a/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb +++ b/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb @@ -1,3 +1,8 @@ inherit pypi setuptools require python-tornado.inc -RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl ${PYTHON_PN}-backports-abc ${PYTHON_PN}-singledispatch" +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-backports-abc \ + ${PYTHON_PN}-backports-ssl \ + ${PYTHON_PN}-singledispatch \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-typing.inc b/meta-python/recipes-devtools/python/python-typing.inc index 46be47c9f8..a0ee6b24b9 100644 --- a/meta-python/recipes-devtools/python/python-typing.inc +++ b/meta-python/recipes-devtools/python/python-typing.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/python/typing" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" -SRC_URI[md5sum] = "143af0bf3afd1887622771f2f1ffe8e1" -SRC_URI[sha256sum] = "d514bd84b284dd3e844f0305ac07511f097e325171f6cc4a20878d11ad771849" +SRC_URI[md5sum] = "5b2ade08d83be488f17b5fe587c27c74" +SRC_URI[sha256sum] = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-typing_3.6.2.bb b/meta-python/recipes-devtools/python/python-typing_3.6.4.bb index 04ce063c98..04ce063c98 100644 --- a/meta-python/recipes-devtools/python/python-typing_3.6.2.bb +++ b/meta-python/recipes-devtools/python/python-typing_3.6.4.bb diff --git a/meta-python/recipes-devtools/python/python-webcolors.inc b/meta-python/recipes-devtools/python/python-webcolors.inc index fe1ab95d85..a02bbbbedf 100644 --- a/meta-python/recipes-devtools/python/python-webcolors.inc +++ b/meta-python/recipes-devtools/python/python-webcolors.inc @@ -1,9 +1,9 @@ SUMMARY = "Simple Python module for working with HTML/CSS color definitions." LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=358df7e9eb65e1843dbb36abd476c5c0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=197add016087e6884a012b0f185d44ad" -SRC_URI[md5sum] = "4733fa1077f680bbdd918cdef1e32c11" -SRC_URI[sha256sum] = "e47e68644d41c0b1f1e4d939cfe4039bdf1ab31234df63c7a4f59d4766487206" +SRC_URI[md5sum] = "40890db38b2a856e526a568864025fe6" +SRC_URI[sha256sum] = "030562f624467a9901f0b455fef05486a88cfb5daa1e356bd4aacea043850b59" RDEPENDS_${PN}_class-target = "\ ${PYTHON_PN}-stringold \ diff --git a/meta-python/recipes-devtools/python/python-webcolors_1.7.bb b/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb index a0b6708caf..a0b6708caf 100644 --- a/meta-python/recipes-devtools/python/python-webcolors_1.7.bb +++ b/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb diff --git a/meta-python/recipes-devtools/python/python-werkzeug.inc b/meta-python/recipes-devtools/python/python-werkzeug.inc index 5e6003f20b..c04a4e0c4f 100644 --- a/meta-python/recipes-devtools/python/python-werkzeug.inc +++ b/meta-python/recipes-devtools/python/python-werkzeug.inc @@ -37,7 +37,6 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-subprocess \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-unixadmin \ " diff --git a/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb b/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb index 3892f1357b..db41161b35 100644 --- a/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb +++ b/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb @@ -1,4 +1,7 @@ inherit pypi setuptools require python-werkzeug.inc -RDEPENDS_${PN} += "${PYTHON_PN}-zlib" +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-zlib \ +" diff --git a/meta-python/recipes-devtools/python/python-whoosh.inc b/meta-python/recipes-devtools/python/python-whoosh.inc index f43d8c1b0c..a4ca5dcd48 100644 --- a/meta-python/recipes-devtools/python/python-whoosh.inc +++ b/meta-python/recipes-devtools/python/python-whoosh.inc @@ -21,5 +21,4 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-pickle \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-subprocess \ " diff --git a/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb b/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb index 48df360179..3b4291f40d 100644 --- a/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb +++ b/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb @@ -1,2 +1,6 @@ inherit pypi setuptools require python-whoosh.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-devtools/python/python-yappi.inc b/meta-python/recipes-devtools/python/python-yappi.inc new file mode 100644 index 0000000000..651ce7731b --- /dev/null +++ b/meta-python/recipes-devtools/python/python-yappi.inc @@ -0,0 +1,16 @@ +SUMMARY = "Yet Another Python Profiler" +HOMEPAGE = "http://yappi.googlecode.com/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b131c3041637f6a5175a43112dde05c" + +SRC_URI[md5sum] = "dc56240575c99938a924eaeb7c0d8beb" +SRC_URI[sha256sum] = "5f657129e1b9b952379ffbc009357d0dcdb58c50f3bfe88ffbb992e4b27b263c" + +inherit pypi setuptools + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-threading \ + " diff --git a/meta-python/recipes-devtools/python/python-yappi_0.98.bb b/meta-python/recipes-devtools/python/python-yappi_0.98.bb index 651ce7731b..a3bdde5c2d 100644 --- a/meta-python/recipes-devtools/python/python-yappi_0.98.bb +++ b/meta-python/recipes-devtools/python/python-yappi_0.98.bb @@ -1,16 +1,2 @@ -SUMMARY = "Yet Another Python Profiler" -HOMEPAGE = "http://yappi.googlecode.com/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b131c3041637f6a5175a43112dde05c" - -SRC_URI[md5sum] = "dc56240575c99938a924eaeb7c0d8beb" -SRC_URI[sha256sum] = "5f657129e1b9b952379ffbc009357d0dcdb58c50f3bfe88ffbb992e4b27b263c" - -inherit pypi setuptools - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-threading \ - " +require python-yappi.inc +inherit setuptools diff --git a/meta-python/recipes-devtools/python/python3-alembic_0.9.6.bb b/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb index e248fe7ce9..e248fe7ce9 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_0.9.6.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb diff --git a/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb b/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb index bc672158a9..cfbe57520c 100644 --- a/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb +++ b/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb @@ -2,7 +2,5 @@ inherit setuptools3 require python-asn1crypto.inc RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-enum \ - ${PYTHON_PN}-selectors \ ${PYTHON_PN}-shell \ " diff --git a/meta-python/recipes-devtools/python/python3-astroid_1.6.0.bb b/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb index 6e32c288f2..6e32c288f2 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_1.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb diff --git a/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb b/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb index 0469e61380..2c747643ff 100644 --- a/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb @@ -1,4 +1,2 @@ inherit setuptools3 require python-automat.inc - -RDEPENDS_${PN} += "${PYTHON_PN}-enum " diff --git a/meta-python/recipes-devtools/python/python3-babel_2.5.1.bb b/meta-python/recipes-devtools/python/python3-babel_2.5.1.bb deleted file mode 100644 index 05084ac2e5..0000000000 --- a/meta-python/recipes-devtools/python/python3-babel_2.5.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-babel.inc - -# Requires _pydecimal.py which is in misc -RDEPENDS_${PN} += "${PYTHON_PN}-misc" diff --git a/meta-python/recipes-devtools/python/python-babel_2.5.1.bb b/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb index e0eadcda8a..0715d59f42 100644 --- a/meta-python/recipes-devtools/python/python-babel_2.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-babel.inc diff --git a/meta-python/recipes-devtools/python/python3-can_2.0.0.bb b/meta-python/recipes-devtools/python/python3-can_2.1.0.bb index aaa9e811ce..aaa9e811ce 100644 --- a/meta-python/recipes-devtools/python/python3-can_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-can_2.1.0.bb diff --git a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.12.0.bb b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb index 34f149d3f5..34f149d3f5 100644 --- a/meta-python/recipes-devtools/python/python3-cassandra-driver_3.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb diff --git a/meta-python/recipes-devtools/python/python3-certifi_2017.11.5.bb b/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb index 70f674b22c..70f674b22c 100644 --- a/meta-python/recipes-devtools/python/python3-certifi_2017.11.5.bb +++ b/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb diff --git a/meta-python/recipes-devtools/python/python3-cffi_1.11.4.bb b/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb index e888084347..e888084347 100644 --- a/meta-python/recipes-devtools/python/python3-cffi_1.11.4.bb +++ b/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb diff --git a/meta-python/recipes-devtools/python/python3-click_6.7.bb b/meta-python/recipes-devtools/python/python3-click_6.7.bb index ecd1514a82..1920644042 100644 --- a/meta-python/recipes-devtools/python/python3-click_6.7.bb +++ b/meta-python/recipes-devtools/python/python3-click_6.7.bb @@ -1,4 +1,2 @@ inherit pypi setuptools3 require python-click.inc - -RDEPENDS_${PN} += "${PYTHON_PN}-enum" diff --git a/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb b/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb new file mode 100644 index 0000000000..770cba5962 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-configparser.inc diff --git a/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb b/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb index f807042ec0..195923343b 100644 --- a/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb +++ b/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb @@ -1,10 +1,8 @@ inherit pypi setuptools3 require python-cryptography.inc +LDSHARED += "-pthread" + SRC_URI += " \ file://run-ptest \ " - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-lang \ -" diff --git a/meta-python/recipes-devtools/python/python3-cython_0.27.3.bb b/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb index 2ce6bdbd68..2ce6bdbd68 100644 --- a/meta-python/recipes-devtools/python/python3-cython_0.27.3.bb +++ b/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb diff --git a/meta-python/recipes-devtools/python/python3-dateutil_2.6.1.bb b/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb index 1d2baf55c9..1d2baf55c9 100644 --- a/meta-python/recipes-devtools/python/python3-dateutil_2.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb diff --git a/meta-python/recipes-devtools/python/python3-decorator_4.2.1.bb b/meta-python/recipes-devtools/python/python3-decorator_4.2.1.bb deleted file mode 100644 index 7840b20c0f..0000000000 --- a/meta-python/recipes-devtools/python/python3-decorator_4.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit setuptools3 -require python-decorator.inc - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-enum \ -" diff --git a/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb b/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb new file mode 100644 index 0000000000..844cbdc9a9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-decorator.inc diff --git a/meta-python/recipes-devtools/python/python3-django_1.11.10.bb b/meta-python/recipes-devtools/python/python3-django_1.11.10.bb new file mode 100644 index 0000000000..e1e38c3225 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django_1.11.10.bb @@ -0,0 +1,2 @@ +require python-django.inc +inherit setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-django_1.11.9.bb b/meta-python/recipes-devtools/python/python3-django_1.11.9.bb deleted file mode 100644 index ef77603a62..0000000000 --- a/meta-python/recipes-devtools/python/python3-django_1.11.9.bb +++ /dev/null @@ -1,7 +0,0 @@ -require python-django.inc -inherit setuptools3 - -# Requires _pydecimal which is in misc -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-misc \ -" diff --git a/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb b/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb index 26024c68fd..ce4dfdc74a 100644 --- a/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb +++ b/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb @@ -1,9 +1,2 @@ inherit setuptools3 require python-dnspython.inc - -# Requires _pydecimal.py which is in misc -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-enum \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-selectors \ -" diff --git a/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb b/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb new file mode 100644 index 0000000000..3a92b6ec96 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-evdev.inc diff --git a/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb b/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb new file mode 100644 index 0000000000..6bff59a565 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-flask-restful.inc diff --git a/meta-python/recipes-devtools/python/python3-greenlet_0.4.12.bb b/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb index 1aedf7fa8d..1aedf7fa8d 100644 --- a/meta-python/recipes-devtools/python/python3-greenlet_0.4.12.bb +++ b/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb diff --git a/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb b/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb index 3d30af29ad..70813bf34c 100644 --- a/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb @@ -1,4 +1,2 @@ inherit setuptools3 require python-hyperlink.inc - -RDEPENDS_${PN} += "${PYTHON_PN}-selectors ${PYTHON_PN}-enum" diff --git a/meta-python/recipes-devtools/python/python3-isort_4.2.15.bb b/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb index 755b3e2f23..755b3e2f23 100644 --- a/meta-python/recipes-devtools/python/python3-isort_4.2.15.bb +++ b/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb diff --git a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.3.bb b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb index 0ec23ba991..0ec23ba991 100644 --- a/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.3.bb +++ b/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb diff --git a/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb b/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb index 8375f8cf4e..61156b630b 100644 --- a/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb +++ b/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb @@ -1,7 +1,2 @@ inherit pypi setuptools3 require python-jinja2.inc - -# Requires _pydecimal which is in misc -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-misc \ -" diff --git a/meta-python/recipes-devtools/python/python3-jsonpatch_1.21.bb b/meta-python/recipes-devtools/python/python3-jsonpatch_1.21.bb deleted file mode 100644 index eb55934858..0000000000 --- a/meta-python/recipes-devtools/python/python3-jsonpatch_1.21.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit setuptools3 -require python-jsonpatch.inc - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-enum \ -" diff --git a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb b/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb index e45699a6d6..73efceeed3 100644 --- a/meta-python/recipes-devtools/python/python-jsonpatch_1.21.bb +++ b/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-jsonpatch.inc diff --git a/meta-python/recipes-devtools/python/python3-jsonpointer_1.14.bb b/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb index 8d0a09b432..8d0a09b432 100644 --- a/meta-python/recipes-devtools/python/python3-jsonpointer_1.14.bb +++ b/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb diff --git a/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb b/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb index 5aaee682b6..9269907476 100644 --- a/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb @@ -1,6 +1,2 @@ inherit pypi setuptools3 require python-jsonschema.inc - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-misc \ -" diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb index 177a2b5292..0ca58c7b73 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb @@ -22,11 +22,8 @@ DISTUTILS_INSTALL_ARGS = "--prefix=${D}/${prefix} \ FILES_${PN} += "${datadir}/*" RDEPENDS_${PN} += " \ - ${PYTHON_PN}-argparse \ ${PYTHON_PN}-compression \ ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-enum \ ${PYTHON_PN}-logging \ - ${PYTHON_PN}-signal \ ${PYTHON_PN}-xml \ " diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.1.1.bb b/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb index ff4bc7faad..ff4bc7faad 100644 --- a/meta-python/recipes-devtools/python/python3-lxml_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb diff --git a/meta-python/recipes-devtools/python/python3-msgpack_0.5.1.bb b/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb index 096d7ddcb8..096d7ddcb8 100644 --- a/meta-python/recipes-devtools/python/python3-msgpack_0.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb diff --git a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.3.bb b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb index 3f07b2ed27..3f07b2ed27 100644 --- a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.3.bb +++ b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb diff --git a/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb b/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb index a64abcc836..30416a4ffe 100644 --- a/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb +++ b/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb @@ -1,7 +1,2 @@ require python-netaddr.inc inherit setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-enum \ - ${PYTHON_PN}-selectors \ -" diff --git a/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb b/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb index 080372c4f0..93df83ad3c 100644 --- a/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools3 python3native pypi -RDEPENDS_${PN} += "${PYTHON_PN}-datetime ${PYTHON_PN}-selectors ${PYTHON_PN}-enum" +RDEPENDS_${PN} += "${PYTHON_PN}-datetime" diff --git a/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb b/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb new file mode 100644 index 0000000000..da13b55d8a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-oauthlib.inc diff --git a/meta-python/recipes-devtools/python/python3-pexpect_4.3.1.bb b/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb index cf39233a3a..cf39233a3a 100644 --- a/meta-python/recipes-devtools/python/python3-pexpect_4.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb diff --git a/meta-python/recipes-devtools/python/python3-pid_2.1.1.bb b/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb index c88d9a0b55..e438319896 100644 --- a/meta-python/recipes-devtools/python/python3-pid_2.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/trbs/pid/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=83d53cbd3105063f20305bc313464e29" -SRC_URI[md5sum] = "9634b1e3d545544a9d496e25e4530d14" -SRC_URI[sha256sum] = "b443169d3dc21397695b4a82016fadb4cfdb0ed8b2ddb4aaa428e1701bb34e1f" +SRC_URI[md5sum] = "04d30308013d16aa882b3806feda8ab2" +SRC_URI[sha256sum] = "d8bb2ceec21a4ae84be6e9d320db1f56934b30e676e31c6f098ca7218b3d67d4" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-ply_3.10.bb b/meta-python/recipes-devtools/python/python3-ply_3.10.bb deleted file mode 100644 index de8881d514..0000000000 --- a/meta-python/recipes-devtools/python/python3-ply_3.10.bb +++ /dev/null @@ -1,6 +0,0 @@ -require python-ply.inc -inherit setuptools3 - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-enum \ -" diff --git a/meta-python/recipes-devtools/python/python3-ply_3.11.bb b/meta-python/recipes-devtools/python/python3-ply_3.11.bb new file mode 100644 index 0000000000..72410baebf --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ply_3.11.bb @@ -0,0 +1,2 @@ +require python-ply.inc +inherit setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pretend_1.0.8.bb b/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb index 9c5d8a8437..9c5d8a8437 100644 --- a/meta-python/recipes-devtools/python/python3-pretend_1.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb diff --git a/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb b/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb index d8f6389cc4..0e99917c21 100644 --- a/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb +++ b/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb @@ -3,7 +3,5 @@ require python-prompt-toolkit.inc RDEPENDS_${PN} += " \ ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-enum \ ${PYTHON_PN}-shell \ - ${PYTHON_PN}-textutils \ " diff --git a/meta-python/recipes-devtools/python/python3-protobuf_3.5.1.bb b/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb index 781d1dc4da..781d1dc4da 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_3.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.2.1.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb index 355e28460e..355e28460e 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11_2.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb diff --git a/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb b/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb new file mode 100644 index 0000000000..9712a76085 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb @@ -0,0 +1,2 @@ +require python-pybluez.inc +inherit setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.7.bb b/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb index 0c062dddf8..0c062dddf8 100644 --- a/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb diff --git a/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb b/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb new file mode 100644 index 0000000000..bfd5840410 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyexpect.inc diff --git a/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb b/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb new file mode 100644 index 0000000000..721e7b1c99 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyiface.inc diff --git a/meta-python/recipes-devtools/python/python3-pyjwt_1.5.3.bb b/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb index dc16d22825..dc16d22825 100644 --- a/meta-python/recipes-devtools/python/python3-pyjwt_1.5.3.bb +++ b/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb diff --git a/meta-python/recipes-devtools/python/python3-pylint_1.8.1.bb b/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb index 563e8316cf..563e8316cf 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_1.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.85.1.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb index 4523d9e30a..4523d9e30a 100644 --- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.85.1.bb +++ b/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb diff --git a/meta-python/recipes-devtools/python/python3-pymongo_3.6.0.bb b/meta-python/recipes-devtools/python/python3-pymongo_3.6.0.bb deleted file mode 100644 index 9f02cab137..0000000000 --- a/meta-python/recipes-devtools/python/python3-pymongo_3.6.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -inherit pypi setuptools3 -require python-pymongo.inc - -# Requires _pydecimal which is in misc -RDEPENDS_${PYTHON_PN}-bson += " \ - ${PYTHON_PN}-enum \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-selectors \ - ${PYTHON_PN}-subprocess \ -" diff --git a/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb b/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb new file mode 100644 index 0000000000..5164b186bf --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pymongo.inc diff --git a/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb b/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb new file mode 100644 index 0000000000..f6d9e3c06e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pynetlinux.inc diff --git a/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb b/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb index 44c13685e9..17ed3f8bc4 100644 --- a/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb +++ b/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb @@ -5,5 +5,3 @@ do_install_append() { rm -f ${D}${bindir}/miniterm.py rmdir ${D}${bindir} } - -RDEPENDS_${PN} += "${PYTHON_PN}-enum ${PYTHON_PN}-selectors" diff --git a/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb b/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb index f8aa01be81..bbda05a518 100644 --- a/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb +++ b/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb @@ -2,7 +2,5 @@ inherit pypi setuptools3 require python-pysocks.inc RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-enum \ ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-selectors \ " diff --git a/meta-python/recipes-devtools/python/python3-pytest_3.3.2.bb b/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb index 466cfa8253..466cfa8253 100644 --- a/meta-python/recipes-devtools/python/python3-pytest_3.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb diff --git a/meta-python/recipes-devtools/python/python3-pytz_2017.3.bb b/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb index 19a89dc55d..19a89dc55d 100755 --- a/meta-python/recipes-devtools/python/python3-pytz_2017.3.bb +++ b/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb index 0292555c74..a62d944bac 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb @@ -1,8 +1,2 @@ require python-pyudev.inc - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-lang \ -" - inherit pypi setuptools3 - diff --git a/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb b/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb index d91d993bf2..0a2410f85c 100644 --- a/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb +++ b/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb @@ -1,5 +1,2 @@ inherit setuptools3 require python-requests.inc - -# Add the runtime depends for selectors.py -RDEPENDS_${PN} += "${PYTHON_PN}-misc" diff --git a/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb b/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb new file mode 100644 index 0000000000..8f613c3868 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-robotframework.inc diff --git a/meta-python/recipes-devtools/python/python3-scapy_0.23.bb b/meta-python/recipes-devtools/python/python3-scapy_0.23.bb new file mode 100644 index 0000000000..3e7baf45c7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-scapy_0.23.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Packet crafting/sending/sniffing, PCAP processing tool,\ +based on scapy with python3 compatibility" +SECTION = "devel/python" +HOMEPAGE = "https://github.com/phaethon/scapy" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=95ea6ecfc360eb47fe6f470ad736d7cd" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "scapy-python3" + +SRC_URI[md5sum] = "8642d09ca727e7e2b455223ae94059b7" +SRC_URI[sha256sum] = "8760991a67162f43af4d9e64828bcefc100ba88859b75177ae9f7ace56e58186" diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.0.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb index f49665322e..f49665322e 100644 --- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb diff --git a/meta-python/recipes-devtools/python/python3-serpent_1.23.bb b/meta-python/recipes-devtools/python/python3-serpent_1.23.bb deleted file mode 100644 index 199dcfafda..0000000000 --- a/meta-python/recipes-devtools/python/python3-serpent_1.23.bb +++ /dev/null @@ -1,8 +0,0 @@ -inherit setuptools3 -require python-serpent.inc - -# Requires _pydecimal which is in misc -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-enum \ - ${PYTHON_PN}-misc \ -" diff --git a/meta-python/recipes-devtools/python/python3-serpent_1.24.bb b/meta-python/recipes-devtools/python/python3-serpent_1.24.bb new file mode 100644 index 0000000000..1e04def7b7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-serpent_1.24.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-serpent.inc diff --git a/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.6.bb b/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb index 5bf5983874..5bf5983874 100644 --- a/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.6.bb +++ b/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb diff --git a/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb b/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb index d44bc1526d..38f406c5de 100644 --- a/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb +++ b/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb @@ -1,7 +1,2 @@ inherit setuptools3 require python-simplejson.inc - -# Requires _pydecimal which is in misc -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-misc \ -" diff --git a/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb b/meta-python/recipes-devtools/python/python3-smbus_4.0.bb index b357bcd822..b357bcd822 100644 --- a/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-smbus_4.0.bb diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.15.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.15.bb deleted file mode 100644 index 01f1e97ec8..0000000000 --- a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.15.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-sqlalchemy.inc - -# Requires _pydecimal.py which is in misc -RDEPENDS_${PN} += "${PYTHON_PN}-enum ${PYTHON_PN}-misc" diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb new file mode 100644 index 0000000000..86cf9eddeb --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-sqlalchemy.inc diff --git a/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-python/recipes-devtools/python/python3-systemd_234.bb index 845b7d9e10..580d99352e 100644 --- a/meta-python/recipes-devtools/python/python3-systemd_234.bb +++ b/meta-python/recipes-devtools/python/python3-systemd_234.bb @@ -1,13 +1,2 @@ -SUMMARY = "Python interface for libsystemd" -HOMEPAGE = "https://github.com/systemd/python-systemd" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" - -PYPI_PACKAGE = "systemd-python" -DEPENDS += "systemd (<=234)" -RDEPENDS_${PN} += "systemd" -REQUIRED_DISTRO_FEATURES = "systemd" -inherit pypi setuptools3 distro_features_check - -SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" -SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" +require python-systemd.inc +inherit setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb b/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb index d7533d8e70..6bd8c52eb0 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb @@ -1,7 +1,7 @@ inherit pypi setuptools3 require python-twisted.inc -RDEPENDS_${PN}-core += "python3-lang" +PACKAGES_remove = "${PN}-src" FILES_${PN}-core_append += " \ ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ diff --git a/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb b/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb index 189a65a98b..f6372c8d56 100644 --- a/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb @@ -17,8 +17,4 @@ do_install_append() { install -m 0644 ${S}/vcversioner*.egg ${D}/${PYTHON_SITEPACKAGES_DIR}/ } -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-subprocess \ - " - BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-webcolors_1.7.bb b/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb index fcd9f70726..fcd9f70726 100644 --- a/meta-python/recipes-devtools/python/python3-webcolors_1.7.bb +++ b/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb diff --git a/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb b/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb new file mode 100644 index 0000000000..414129c59d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" +HOMEPAGE = "https://github.com/aaugustin/websockets" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5070256738c06d2e59adbec1f4057dac" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "9e8c6b3c70def4146d75fbb0f52bdfc7" +SRC_URI[sha256sum] = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-asyncio \ +" diff --git a/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb b/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb index 4a4e679fbb..5d8af303c7 100644 --- a/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb +++ b/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb @@ -1,9 +1,2 @@ inherit pypi setuptools3 require python-whoosh.inc - -# Requires _pydecimal.py which is in misc -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-enum \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-selectors \ -" diff --git a/meta-python/recipes-devtools/python/python3-yappi_0.98.bb b/meta-python/recipes-devtools/python/python3-yappi_0.98.bb new file mode 100644 index 0000000000..07da5b6ebd --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-yappi_0.98.bb @@ -0,0 +1,2 @@ +require python-yappi.inc +inherit setuptools3 diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch new file mode 100644 index 0000000000..12a9e4f544 --- /dev/null +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch @@ -0,0 +1,31 @@ +From 92fe7dfd01131c93a9b2013cabf77d5f46900fab Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 6 Mar 2018 17:28:56 +0800 +Subject: [PATCH] invoking dd with infinite timeout + +This large timeout is needed when running on machines with +lots of disks, or with slow disks. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + blivet/devices/partition.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py +index a7372fb..8947472 100644 +--- a/blivet/devices/partition.py ++++ b/blivet/devices/partition.py +@@ -594,7 +594,7 @@ class PartitionDevice(StorageDevice): + cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs, + "seek=%d" % start, "count=%d" % count] + try: +- util.run_program(cmd) ++ util.run_program(cmd, timeout=-1) + except OSError as e: + log.error(str(e)) + finally: +-- +1.8.3.1 + diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb index cacca67e24..46dc32de76 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb @@ -23,6 +23,7 @@ SRC_URI = "git://github.com/rhinstaller/blivet;branch=2.2-devel \ file://0011-invoking-fsck-with-infinite-timeout.patch \ file://0012-invoking-mkfs-with-infinite-timeout.patch \ file://0013-Revert-Adapt-to-logging-module-name-change.patch \ + file://0014-invoking-dd-with-infinite-timeout.patch \ " inherit distro_features_check diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb index ac507ca0e4..28c2565a14 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ " inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES = "x11 systemd" inherit setuptools3 python3native diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.45.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb index 6ace497811..40e2cbd4a7 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh_0.45.bb +++ b/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ " -SRCREV = "2bfc751fd680515d44f7096945a1e282a1f7d6aa" +SRCREV = "bb1156728a4f76e5e3638ab20b9454a1568a99db" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" FILES_${PN} += "${datadir}/*" diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-python/recipes-extended/python-pyparted/python-pyparted.inc index c82909d100..a0ec02817a 100644 --- a/meta-python/recipes-extended/python-pyparted/python-pyparted.inc +++ b/meta-python/recipes-extended/python-pyparted/python-pyparted.inc @@ -18,6 +18,5 @@ S = "${WORKDIR}/git" RDEPENDS_${PN}_class-target += " \ parted (>= 2.3) \ - ${PYTHON_PN}-subprocess \ " RDEPENDS_${PN}_class-native = "" diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb b/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb index 81d61c62a3..7d00fd7d93 100644 --- a/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb +++ b/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb @@ -4,7 +4,7 @@ PV = "3.10.7+git${SRCPV}" inherit distutils -RDEPENDS_${PN} += "python-stringold python-codecs python-math" +RDEPENDS_${PN} += "python-stringold python-codecs python-math python-subprocess" RDEPENDS_${PN}_class-native = "" BBCLASSEXTEND = "native" diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index 84fdd81d1f..f205ef23b1 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf @@ -17,6 +17,8 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" +LAYERSERIES_COMPAT_webserver = "sumo" + LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch index c90279d449..92c53f31d7 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch @@ -4,11 +4,13 @@ # # Upstream-Status: Inappropriate [configuration] ---- a/configure.in -+++ b/configure.in -@@ -638,10 +638,7 @@ - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) +Index: httpd-2.4.29/configure.in +=================================================================== +--- httpd-2.4.29.orig/configure.in ++++ httpd-2.4.29/configure.in +@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, " + AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", + [Location of the MIME types config file, relative to the Apache root directory]) -perlbin=`$ac_aux_dir/PrintPath perl` -if test "x$perlbin" = "x"; then diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch index 413dc535e4..f13da91f39 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch @@ -1,11 +1,11 @@ build/ltmain.sh | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) -diff --git a/build/ltmain.sh b/build/ltmain.sh -index 5eca4ae..805b461 100644 ---- a/build/ltmain.sh -+++ b/build/ltmain.sh -@@ -6944,7 +6944,7 @@ func_mode_link () +Index: httpd-2.4.29/build/ltmain.sh +=================================================================== +--- httpd-2.4.29.orig/build/ltmain.sh ++++ httpd-2.4.29/build/ltmain.sh +@@ -6969,7 +6969,7 @@ func_mode_link () dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in @@ -14,7 +14,7 @@ index 5eca4ae..805b461 100644 *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ -@@ -8137,7 +8137,7 @@ func_mode_link () +@@ -8167,7 +8167,7 @@ func_mode_link () $ECHO "*** $linklib is not portable!" fi if test lib = "$linkmode" && @@ -23,7 +23,7 @@ index 5eca4ae..805b461 100644 # Hardcode the library path. # Skip directories that are in the system default run-time # search path. -@@ -8404,7 +8404,7 @@ func_mode_link () +@@ -8434,7 +8434,7 @@ func_mode_link () if test lib = "$linkmode"; then if test -n "$dependency_libs" && @@ -32,7 +32,7 @@ index 5eca4ae..805b461 100644 test yes = "$build_old_libs" || test yes = "$link_static"; }; then # Extract -R from dependency_libs -@@ -9025,7 +9025,8 @@ func_mode_link () +@@ -9086,7 +9086,8 @@ func_mode_link () *) func_append finalize_rpath " $libdir" ;; esac done @@ -42,7 +42,7 @@ index 5eca4ae..805b461 100644 dependency_libs="$temp_xrpath $dependency_libs" fi fi -@@ -9473,7 +9474,7 @@ EOF +@@ -9534,7 +9535,7 @@ EOF case $archive_cmds in *\$LD\ *) wl= ;; esac @@ -51,7 +51,7 @@ index 5eca4ae..805b461 100644 # Hardcode the library paths hardcode_libdirs= dep_rpath= -@@ -10211,6 +10212,27 @@ EOF +@@ -10272,6 +10273,27 @@ EOF # Now hardcode the library paths rpath= hardcode_libdirs= @@ -79,6 +79,3 @@ index 5eca4ae..805b461 100644 for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then --- -1.9.1 - diff --git a/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch b/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch index 584ddc8d94..e4e01b2af6 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch @@ -10,11 +10,11 @@ Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> support/apachectl.in | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) -diff --git a/support/apachectl.in b/support/apachectl.in -index d4dff38..109ea13 100644 ---- a/support/apachectl.in -+++ b/support/apachectl.in -@@ -51,11 +51,11 @@ fi +Index: httpd-2.4.29/support/apachectl.in +=================================================================== +--- httpd-2.4.29.orig/support/apachectl.in ++++ httpd-2.4.29/support/apachectl.in +@@ -52,11 +52,11 @@ fi # a command that outputs a formatted text version of the HTML at the # url given on the command line. Designed for lynx, however other # programs may work. @@ -28,7 +28,7 @@ index d4dff38..109ea13 100644 # # Set this variable to a command that increases the maximum # number of file descriptors allowed per child process. This is -@@ -91,10 +91,16 @@ configtest) +@@ -92,10 +92,16 @@ configtest) ERROR=$? ;; status) @@ -46,7 +46,4 @@ index d4dff38..109ea13 100644 + fi ;; *) - $HTTPD $ARGV --- -1.6.4 - + $HTTPD "$@" diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb index f0298b91ab..c422092f83 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb @@ -29,7 +29,10 @@ SRC_URI[sha256sum] = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b63999 S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd +inherit autotools update-rc.d pkgconfig systemd update-alternatives + +ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" SYSTEMD_SERVICE_${PN} = "apache2.service" SYSTEMD_AUTO_ENABLE_${PN} = "disable" diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb index 97dc2769a3..559d251bdf 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb @@ -17,6 +17,9 @@ SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22" +UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" +UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" + EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ --logdir=${localstatedir}/log/monkey/ \ --pidfile=${localstatedir}/run/monkey.pid \ diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch index 5e96644aa2..0a18bcd33d 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch @@ -3,10 +3,11 @@ We do not have capability to run binaries when cross compiling Upstream-Status: Pending -diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature ---- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.000000000 -0500 -+++ nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 -@@ -49,12 +49,20 @@ +Index: nginx-1.12.2/auto/feature +=================================================================== +--- nginx-1.12.2.orig/auto/feature ++++ nginx-1.12.2/auto/feature +@@ -49,12 +49,20 @@ eval "/bin/sh -c \"$ngx_test\" >> $NGX_A if [ -x $NGX_AUTOTEST ]; then @@ -29,7 +30,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature ngx_found=yes if test -n "$ngx_feature_name"; then -@@ -68,17 +75,27 @@ +@@ -68,17 +76,27 @@ if [ -x $NGX_AUTOTEST ]; then value) # /bin/sh is used to intercept "Killed" or "Abort trap" messages @@ -61,7 +62,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature else echo " found but is not working" fi -@@ -86,7 +105,7 @@ +@@ -86,7 +104,7 @@ END bug) # /bin/sh is used to intercept "Killed" or "Abort trap" messages @@ -70,10 +71,11 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature echo " not found" else -diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options ---- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.000000000 -0600 -+++ nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 -@@ -353,6 +353,18 @@ +Index: nginx-1.12.2/auto/options +=================================================================== +--- nginx-1.12.2.orig/auto/options ++++ nginx-1.12.2/auto/options +@@ -386,6 +386,18 @@ $0: warning: the \"--with-sha1-asm\" opt --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; @@ -92,7 +94,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options *) echo "$0: error: invalid option \"$option\"" exit 1 -@@ -533,6 +445,17 @@ +@@ -568,6 +580,17 @@ cat << END --with-debug enable debug logging @@ -110,7 +112,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options END exit 1 -@@ -554,6 +577,8 @@ +@@ -576,6 +599,8 @@ fi if [ ".$NGX_PLATFORM" = ".win32" ]; then NGX_WINE=$WINE @@ -119,10 +121,11 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options fi -diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof ---- nginx-1.0.11.orig/auto/types/sizeof 2006-06-28 11:00:26.000000000 -0500 -+++ nginx-1.0.11/auto/types/sizeof 2011-12-27 13:56:42.323370040 -0600 -@@ -12,9 +12,12 @@ +Index: nginx-1.12.2/auto/types/sizeof +=================================================================== +--- nginx-1.12.2.orig/auto/types/sizeof ++++ nginx-1.12.2/auto/types/sizeof +@@ -12,9 +12,12 @@ checking for $ngx_type size END @@ -137,7 +140,7 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof #include <sys/types.h> #include <sys/time.h> -@@ -33,15 +36,16 @@ +@@ -33,15 +36,16 @@ int main(void) { END @@ -160,10 +163,11 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof fi -diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix ---- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 -+++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600 -@@ -393,13 +393,13 @@ +Index: nginx-1.12.2/auto/unix +=================================================================== +--- nginx-1.12.2.orig/auto/unix ++++ nginx-1.12.2/auto/unix +@@ -587,13 +587,13 @@ ngx_feature_libs= # C types @@ -181,8 +185,8 @@ diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value -@@ -416,7 +416,7 @@ - +@@ -604,7 +604,7 @@ NGX_INCLUDE_AUTO_CONFIG_H="#include \"ng + ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef -ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef @@ -190,9 +194,9 @@ diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix . auto/types/sizeof ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value -@@ -432,15 +432,15 @@ +@@ -620,15 +620,15 @@ ngx_type="rlim_t"; ngx_types="int"; . au - . auto/endianess + . auto/endianness -ngx_type="size_t"; . auto/types/sizeof +ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof @@ -208,4 +212,4 @@ diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix +ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value - + ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 51523b606f..e6ae52a09f 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -51,7 +51,7 @@ do_configure () { ./configure \ --crossbuild=Linux:${TUNE_ARCH} \ - --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ --with-int=4 \ --with-long=${PTRSIZE} \ --with-long-long=8 \ diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb deleted file mode 100644 index 85ad29b081..0000000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=903753de5f86a1ee0341fd2f9491b282" - -SRC_URI[md5sum] = "4d2fc76211435f029271f1cf6d7eeae3" -SRC_URI[sha256sum] = "305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.13.12.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.13.12.bb new file mode 100644 index 0000000000..e6293808bc --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.13.12.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.14.x branch is the current stable branch, the recommended default +# 1.13.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" + +SRC_URI[md5sum] = "20871b2cf21a16dbfb83078b4dc2dde0" +SRC_URI[sha256sum] = "fb92f5602cdb8d3ab1ad47dbeca151b185d62eedb67d347bbe9d79c1438c85de" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.13.8.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.13.8.bb deleted file mode 100644 index 25890972b8..0000000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.13.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.12.x branch is the current stable branch, the recommended default -# 1.13.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=903753de5f86a1ee0341fd2f9491b282" - -SRC_URI[md5sum] = "df4be9294365782dc1349ca33ce8c4ac" -SRC_URI[sha256sum] = "8410b6c31ff59a763abf7e5a5316e7629f5a5033c95a3a0ebde727f9ec8464c5" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb new file mode 100644 index 0000000000..de229605ee --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" + +SRC_URI[md5sum] = "2d856aca3dfe1d32e3c9f8c4cac0cc95" +SRC_URI[sha256sum] = "5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5" diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index c9fe55b489..81815d6526 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -14,9 +14,16 @@ SRC_URI = "https://github.com/blueness/${BPN}/archive/v${PV}.tar.gz;downloadfile SRC_URI[md5sum] = "3cda1b6c8c8542b1510eadb8e540d8b6" SRC_URI[sha256sum] = "a1ee2806432eaf5b5dd267a0523701f9f1fa00fefd499d5bec42165a41e05846" +UPSTREAM_CHECK_URI = "https://github.com/blueness/sthttpd/releases/" +UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" + S = "${WORKDIR}/sthttpd-${PV}" -inherit autotools update-rc.d systemd +inherit autotools update-rc.d systemd update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" SRV_DIR ?= "${servicedir}/www" diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.6.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb index 672db58dca..071572d69c 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.6.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb @@ -11,8 +11,11 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la file://apache.conf \ " -SRC_URI[md5sum] = "a9aec05d44c68b4ac5e4987118d70cd7" -SRC_URI[sha256sum] = "5fab6b92336386646bbb189d55817799487b5c27b06cab0cdfdcab3c88f5988f" +SRC_URI[md5sum] = "0a862e3fa52c8b9078e0441ee82be831" +SRC_URI[sha256sum] = "f19b503f0afb0dd3389d4bb11dab3f438d36e85eef11a5c400c592fd5f539398" + +UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" +UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz" S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb index 77413784d2..6516988d72 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb @@ -2,12 +2,12 @@ SUMMARY = "Debugging and profiling extension for PHP" LICENSE = "Xdebug" LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" -DEPENDS = "php" +DEPENDS = "php re2c-native" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -SRC_URI[md5sum] = "6167b1e104f1108d77f08eb561a12b22" -SRC_URI[sha256sum] = "7fda9020fd5a2c549ae5a692fcabbb00f74e39dda81d53d25e622bdab4880ec2" +SRC_URI[md5sum] = "ed3545852e6f4a00fb8730362d0431ee" +SRC_URI[sha256sum] = "b5264cc03bf68fcbb04b97229f96dca505d7b87ec2fb3bd4249896783d29cbdc" inherit autotools diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 1ca1480c31..9aad894e0c 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -7,11 +7,11 @@ Upstream-status: Inappropriate Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl -index 57a37f7..838b944 100755 ---- a/webmin/webmin-lib.pl -+++ b/webmin/webmin-lib.pl -@@ -1086,28 +1086,28 @@ +Index: webmin-1.850/webmin/webmin-lib.pl +=================================================================== +--- webmin-1.850.orig/webmin/webmin-lib.pl ++++ webmin-1.850/webmin/webmin-lib.pl +@@ -1112,28 +1112,28 @@ my %miniserv; &load_theme_library(); # So that UI functions work # Need OS upgrade @@ -62,4 +62,3 @@ index 57a37f7..838b944 100755 # Password close to expiry my $warn_days = $config{'warn_days'}; - diff --git a/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch b/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch index 177d8a372e..d5dfed5ad4 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch @@ -14,11 +14,11 @@ Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> exports/exports-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/exports/exports-lib.pl b/exports/exports-lib.pl -index 22891c0..1c67494 100755 ---- a/exports/exports-lib.pl -+++ b/exports/exports-lib.pl -@@ -273,7 +273,7 @@ return !&has_command("rpc.nfsd") && !&has_command("nfsd") && +Index: webmin-1.850/exports/exports-lib.pl +=================================================================== +--- webmin-1.850.orig/exports/exports-lib.pl ++++ webmin-1.850/exports/exports-lib.pl +@@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha sub restart_mountd { # Try exportfs -r first @@ -27,6 +27,3 @@ index 22891c0..1c67494 100755 my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); if (!$? && $out !~ /invalid|error|failed/i) { # Looks like it worked! --- -1.7.9.5 - diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch index 5563227d55..4212917f6e 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch @@ -11,11 +11,11 @@ init/init-lib.pl | 5 +++-- 2 files changed, 17 insertions(+), 15 deletions(-) -diff --git a/init/index.cgi b/init/index.cgi -index d48b793..30dafd4 100755 ---- a/init/index.cgi -+++ b/init/index.cgi -@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{'bootup'}) { +Index: webmin-1.850/init/index.cgi +=================================================================== +--- webmin-1.850.orig/init/index.cgi ++++ webmin-1.850/init/index.cgi +@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{' : "$config{'init_dir'}/$ac[0]"); } @runlevels = &list_runlevels(); @@ -49,11 +49,11 @@ index d48b793..30dafd4 100755 # For each action, look at /etc/rc*.d/* files to see if it is # started at boot -diff --git a/init/init-lib.pl b/init/init-lib.pl -index ead21ed..b41794b 100755 ---- a/init/init-lib.pl -+++ b/init/init-lib.pl -@@ -119,8 +119,9 @@ List boot time action names from init.d, such as httpd and cron. +Index: webmin-1.850/init/init-lib.pl +=================================================================== +--- webmin-1.850.orig/init/init-lib.pl ++++ webmin-1.850/init/init-lib.pl +@@ -124,8 +124,9 @@ List boot time action names from init.d, =cut sub list_actions { @@ -64,7 +64,7 @@ index ead21ed..b41794b 100755 opendir(DIR, $dir); foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" || -@@ -128,7 +129,7 @@ foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { +@@ -133,7 +134,7 @@ foreach $f (sort { lc($a) cmp lc($b) } r -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" || $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ || $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' || @@ -73,6 +73,3 @@ index ead21ed..b41794b 100755 if (@stbuf = stat("$dir/$f")) { push(@rv, "$f $stbuf[1]"); } --- -2.0.0 - diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 7d20affb22..5549392851 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -3,9 +3,11 @@ # Upstream-status: Not appropriate [config] # # Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- webmin-1.570.orig/net/module.info -+++ webmin-1.570/net/module.info -@@ -11,7 +11,7 @@ desc_ko_KR.UTF-8=네트워크 구성 +Index: webmin-1.850/net/module.info +=================================================================== +--- webmin-1.850.orig/net/module.info ++++ webmin-1.850/net/module.info +@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성 name=Networking desc_tr=A Yaplandrmas desc_de=Netzwerkkonfiguration @@ -14,8 +16,10 @@ desc_sk=Konfigurcia siete desc_zh_CN= risk=low medium high +Index: webmin-1.850/net/generic-linux-lib.pl +=================================================================== --- /dev/null -+++ webmin-1.570/net/generic-linux-lib.pl ++++ webmin-1.850/net/generic-linux-lib.pl @@ -0,0 +1,2 @@ +do 'linux-lib.pl'; + diff --git a/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch b/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch index c17e3b2167..426d63737e 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch @@ -12,11 +12,11 @@ Upstream-Status: Pending Signed-off-by: Yu Ke <ke.yu@intel.com> -diff --git a/exports/save_export.cgi b/exports/save_export.cgi -index 3bc2f97..3e60298 100755 ---- a/exports/save_export.cgi -+++ b/exports/save_export.cgi -@@ -40,7 +40,7 @@ else { +Index: webmin-1.850/exports/save_export.cgi +=================================================================== +--- webmin-1.850.orig/exports/save_export.cgi ++++ webmin-1.850/exports/save_export.cgi +@@ -50,7 +50,7 @@ else { &error(&text('save_enetmask', $in{'netmask'})); $exp{'host'} = $in{'network'}."/".$in{'netmask'}; } @@ -25,9 +25,9 @@ index 3bc2f97..3e60298 100755 else { $in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) || &error(&text('save_ehost', $in{'host'})); -@@ -70,6 +70,11 @@ else { - - delete($opts{'no_subtree_check'}); delete($opts{'subtree_check'}); +@@ -87,6 +87,11 @@ else { + delete($opts{'no_subtree_check'}); + delete($opts{'subtree_check'}); $opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'}); + if ($in{'no_subtree_check'}) { + $opts{'no_subtree_check'} = ""; @@ -35,5 +35,5 @@ index 3bc2f97..3e60298 100755 + $opts{'subtree_check'} = ""; + } - delete($opts{'nohide'}); delete($opts{'hide'}); - $opts{'nohide'} = "" if ($in{'nohide'}); + delete($opts{'nohide'}); + delete($opts{'hide'}); diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb index ae88eb6737..ce9bc92805 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb @@ -24,6 +24,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b" SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1" +UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" +UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" + inherit perlnative update-rc.d systemd do_configure() { diff --git a/meta-xfce/README b/meta-xfce/README index 33ef5096e8..7431e8b7c4 100644 --- a/meta-xfce/README +++ b/meta-xfce/README @@ -19,4 +19,4 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce When sending single patches, please using something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][PATCH' -Interim layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> +Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index ad25dcb134..bee8e70441 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -18,6 +18,8 @@ LAYERDEPENDS_xfce-layer += "gnome-layer" LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" +LAYERSERIES_COMPAT_xfce-layer = "sumo" + SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ xfce4-session->machine-host \ " diff --git a/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch b/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch deleted file mode 100644 index fb2dfc90af..0000000000 --- a/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1060e7ac8a63b93d56006718f0e9b1d9382b2226 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 31 Oct 2016 08:33:16 +0100 -Subject: [PATCH] add_launcher: Exit early if no row is selected -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] http://pkgs.fedoraproject.org/cgit/rpms/menulibre.git/tree/menulibre-add-launcher-none-check.patch - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - menulibre/MenulibreApplication.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/menulibre/MenulibreApplication.py b/menulibre/MenulibreApplication.py -index e234800..ac73b03 100644 ---- a/menulibre/MenulibreApplication.py -+++ b/menulibre/MenulibreApplication.py -@@ -1418,6 +1418,10 @@ class MenulibreWindow(Gtk.ApplicationWindow): - model, parent_data = self.treeview.get_parent_row_data() - model, row_data = self.treeview.get_selected_row_data() - -+ # Exit early if no row is selected -+ if not row_data: -+ return -+ - # Currently selected item is a directory, take its categories. - if row_data[2] == MenuItemTypes.DIRECTORY: - self.treeview.add_child(new_row_data) --- -2.5.5 - diff --git a/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch b/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch deleted file mode 100644 index b63d4dc3bb..0000000000 --- a/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 99788b4557543c490493ce1b827538c49142c25d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 31 Oct 2016 09:08:51 +0100 -Subject: [PATCH] setup.py: avoid /usr/share/share paths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 5fc237d..c4fbf7c 100644 ---- a/setup.py -+++ b/setup.py -@@ -143,7 +143,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): - - if self.root: - target_data = os.path.relpath(self.install_data, self.root) + os.sep -- target_pkgdata = os.path.join(target_data, 'share', 'menulibre', '') -+ target_pkgdata = os.path.join(target_data, 'menulibre', '') - target_scripts = os.path.join(self.install_scripts, '') - - data_dir = os.path.join(self.prefix, 'share', 'menulibre', '') -@@ -152,7 +152,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): - # --user install - self.root = '' - target_data = os.path.relpath(self.install_data) + os.sep -- target_pkgdata = os.path.join(target_data, 'share', 'menulibre', '') -+ target_pkgdata = os.path.join(target_data, 'menulibre', '') - target_scripts = os.path.join(self.install_scripts, '') - - # Use absolute paths --- -2.5.5 - diff --git a/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch b/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch deleted file mode 100644 index 1e92088e18..0000000000 --- a/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 90098d835b62b38ac396d55b80a684770dbaacde Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 31 Oct 2016 15:50:52 +0100 -Subject: [PATCH] MenulibreXdg.py: fix loading of desktop files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes: -| UnicodeDecodeError: 'ascii' codec can't decode byet 0xd9 in position 235: ordinal not in range(128) - -and information display not properly filled. - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - menulibre/MenulibreXdg.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/menulibre/MenulibreXdg.py b/menulibre/MenulibreXdg.py -index e04c5e6..14b2593 100644 ---- a/menulibre/MenulibreXdg.py -+++ b/menulibre/MenulibreXdg.py -@@ -74,7 +74,7 @@ class MenulibreDesktopEntry: - - def load_properties(self, filename): - """Load the properties.""" -- input_file = open(filename) -+ input_file = open(filename, 'rt', encoding='utf-8') - self.load_properties_from_text(input_file.read()) - input_file.close() - --- -2.5.5 - diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.1.3.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb index 69e52fe4a0..b0e4784fe2 100644 --- a/meta-xfce/recipes-apps/menulibre/menulibre_2.1.3.bb +++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb @@ -4,21 +4,25 @@ SECTION = "x11/graphics" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "python3-distutils-extra-native intltool-native" +DEPENDS = " \ + python3-distutils-extra-native \ + intltool-native \ +" -inherit distutils3 gtk-icon-cache +inherit distutils3 gtk-icon-cache distro_features_check -SRC_URI = " \ - https://launchpad.net/menulibre/2.1/${PV}/+download/${PN}-${PV}.tar.gz \ - file://0001-add_launcher-Exit-early-if-no-row-is-selected.patch \ - file://0002-setup.py-avoid-usr-share-share-paths.patch \ - file://0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch \ -" -SRC_URI[md5sum] = "19d9d3337322eb5513454bb8cdfb739b" -SRC_URI[sha256sum] = "bdd69740119902f1b1f8c7831155f4428403792a0a6c4287bcbb395c4e71fb31" +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" +SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" + +do_compile() { +} do_install_append() { sed -i 's:${D}::g' ${D}${datadir}/applications/menulibre.desktop + sed -i 's:share/share:share:g' ${D}${PYTHON_SITEPACKAGES_DIR}/menulibre_lib/menulibreconfig.py } FILES_${PN} += " \ @@ -29,6 +33,7 @@ FILES_${PN} += " \ RDEPENDS_${PN} += " \ gtk+3 \ + gtksourceview3 \ python3-pygobject \ gnome-menus3 \ python3-unixadmin \ diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index e275af0314..a27c8f5531 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -12,7 +12,9 @@ SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814" PV = "0.5.3" S = "${WORKDIR}/git" -inherit xfce-git gettext pkgconfig autotools gtk-icon-cache +inherit xfce-git gettext pkgconfig autotools gtk-icon-cache distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" diff --git a/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch new file mode 100644 index 0000000000..e872249d52 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch @@ -0,0 +1,34 @@ +From fb1f83c04dd5262897b09e60fa8b39090d0d4619 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Thu, 12 Nov 2015 13:53:03 -0600 +Subject: [PATCH] fix Name/Comment fields + +Validate as a valid .desktop file per +http://standards.freedesktop.org/desktop-entry-spec/latest/ + +See also issue #2 + +Upstream-Status: Applied [1] + +[1] https://github.com/ncopa/xfce-polkit/commit/fb1f83c04dd5262897b09e60fa8b39090d0d4619 +--- + xfce-polkit.desktop.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xfce-polkit.desktop.in b/xfce-polkit.desktop.in +index 8575896..dd9f09c 100644 +--- a/xfce-polkit.desktop.in ++++ b/xfce-polkit.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application +-_Name=XFCE PolKit +-_Comment=Policykit Authentication Agent ++Name=XFCE PolKit ++Comment=Policykit Authentication Agent + Exec=@xfce_polkit_libexecdir@/xfce-polkit + Icon=gtk-dialog-authentication + NotShowIn=GNOME;KDE; +-- +2.14.3 + diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb index 1fb4a5be25..54bf7c7529 100644 --- a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb @@ -6,6 +6,9 @@ DEPENDS = "libxfce4ui polkit" inherit xfce-app -SRC_URI = "git://github.com/ncopa/${BPN}.git" +SRC_URI = " \ + git://github.com/ncopa/${BPN}.git \ + file://0001-fix-Name-Comment-fields.patch \ +" SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283" S = "${WORKDIR}/git" diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/0001-Add-a-configure-option-to-start-daemon-by-autostart-.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/0001-Add-a-configure-option-to-start-daemon-by-autostart-.patch deleted file mode 100644 index 7be66f55b4..0000000000 --- a/meta-xfce/recipes-apps/xfce4-notifyd/files/0001-Add-a-configure-option-to-start-daemon-by-autostart-.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 751ca1687edae351db7477b00b67a72b7fc55dee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 10 Nov 2017 10:29:28 +0100 -Subject: [PATCH] Add a configure option to start daemon by autostart instead - of dbus -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On sytems with multiple desktops installed, dbus service -'org.freedesktop.Notifications' may be defined by multiple instances. In my -case it is KDE-Plasma causing unpredictable results: On some environments -xfce4-notifyd is started on others not. - -To help distros/packagers a new configure option '--enable-dbus-start-daemon' -is introduced. It is desabled by default so no unexpected impact is to expect. - -It should be noted that the simplicity of this change is possible since recent -change: Daemon does not kill itself after being idle for certain time - see -commit d87a4a93b2ec4ab094f5a35ae818395f750f2891. - -Upstream-Status: Submitted [1] - -[1] https://bugzilla.xfce.org/show_bug.cgi?id=13989 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - Makefile.am | 13 +++++++++++++ - configure.ac | 8 ++++++++ - xfce4-notifyd/xfce4-notifyd.desktop.in | 6 ++++++ - 3 files changed, 27 insertions(+) - create mode 100644 xfce4-notifyd/xfce4-notifyd.desktop.in - -diff --git a/Makefile.am b/Makefile.am -index c81bdaa..3bd2d46 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -83,6 +83,7 @@ xfce4_notifyd_config_xfce4_notifyd_config_LDADD = \ - $(common_ldadd) \ - $(LIBNOTIFY_LIBS) - -+if USE_DBUS_START_DAEMON - servicedir = $(datadir)/dbus-1/services - service_in_files = xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in - service_DATA = $(service_in_files:.service.in=.service) -@@ -97,6 +98,15 @@ dist_service = \ - xfce4-notifyd/notify-dbus.xml \ - xfce4-notifyd/xfce-notify-marshal.list - distclean_service = $(service_DATA) $(systemd_user_DATA) -+else -+autostartdir = $(sysconfdir)/xdg/autostart -+autostart_in_files = xfce4-notifyd/xfce4-notifyd.desktop.in -+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -+ -+dist_autostart = \ -+ $(autostart_in_files) -+distclean_autostart = $(autostart_DATA) -+endif - - dist_man1_MANS = \ - xfce4-notifyd-config/xfce4-notifyd-config.1 -@@ -273,6 +283,9 @@ install-data-hook: - xfce4-notifyd/%.service: $(srcdir)/xfce4-notifyd/%.service.in Makefile - sed -e "s,\@notifydir\@,$(xfce4_notifyddir),g" < $< > $@ - -+xfce4-notifyd/%.desktop: $(srcdir)/xfce4-notifyd/%.desktop.in Makefile -+ sed -e "s,\@notifydir\@,$(xfce4_notifyddir),g" < $< > $@ -+ - distclean-local: - -rm -rf *.cache *~ - -diff --git a/configure.ac b/configure.ac -index 46a132c..a37da8c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -124,6 +124,14 @@ AS_IF([test "x$use_old_gsi_sig" = "xyes"], - AM_CONDITIONAL([USE_OLD_GET_SERVER_INFORMATION_SIGNATURE], - [test "x$use_old_gsi_sig" = "xyes"]) - -+dnl dbus start daemon -+AC_ARG_ENABLE([dbus-start-daemon], -+ [AS_HELP_STRING([--enable-dbus-start-daemon], -+ [Start daemon by dbus - if not set by autostart. (default=yes)])], -+ [use_dbus_start_daemon=$enableval], [use_dbus_start_daemon=yes]) -+AM_CONDITIONAL([USE_DBUS_START_DAEMON], -+ [test "x$use_dbus_start_daemon" = "xyes"]) -+ - dnl create #define for spec version - AC_DEFINE_UNQUOTED([NOTIFICATIONS_SPEC_VERSION], ["notifications_spec_version"], - [Set to the version of the freedesktop.org notifications spec we support]) -diff --git a/xfce4-notifyd/xfce4-notifyd.desktop.in b/xfce4-notifyd/xfce4-notifyd.desktop.in -new file mode 100644 -index 0000000..d1f76f9 ---- /dev/null -+++ b/xfce4-notifyd/xfce4-notifyd.desktop.in -@@ -0,0 +1,6 @@ -+[Desktop Entry] -+Type=Application -+Name=Xfce Notification Daemon -+Exec=@notifydir@/xfce4-notifyd -+Icon=xfce4-notifyd -+OnlyShowIn=XFCE; --- -2.9.5 - diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.0.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb index a39396fa98..54e702eede 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.0.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb @@ -15,9 +15,8 @@ DEPENDS = " \ inherit xfce-app -SRC_URI += "file://0001-Add-a-configure-option-to-start-daemon-by-autostart-.patch" -SRC_URI[md5sum] = "c2de09c30b06eaf2d3faaf3e509d656a" -SRC_URI[sha256sum] = "2771871f67effc0bb80f656cf4aa3cd71fe0ea0f4c04b5d8e97bb1752faf36c9" +SRC_URI[md5sum] = "ecb930ef6ae6e1f310a5afe5f638eff8" +SRC_URI[sha256sum] = "f6f28af47fdfb41db84bd003f0d76f5f4abf2137d1e27e9d378f063bb8f82356" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.2.bb index e449dceed0..ba77127e1e 100644 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.2.bb @@ -7,12 +7,12 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup- inherit xfce-app -SRC_URI[md5sum] = "75e1501418f904769e4fd25eff6a3946" -SRC_URI[sha256sum] = "e62b31d9cf06a7414a26400c2ebe7a2ae7c2b22aa60f997f25145ea9ebe6e0db" +SRC_URI[md5sum] = "901b2c1fb1dd30940c94aaea3e35c540" +SRC_URI[sha256sum] = "904f3a61417ace55a3b144187565335f8ad5e530ca23b397ce90ed61708c6091" do_compile_prepend() { mkdir -p lib - mkdir -p src + mkdir -p src panel-plugin } FILES_${PN} += " \ diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.6.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb index f42edb6725..7630abc6b9 100644 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.6.bb +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb @@ -8,5 +8,5 @@ inherit xfce-app FILES_${PN} += "${datadir}/xfce4 \ ${datadir}/gnome-control-center" -SRC_URI[md5sum] = "92f5a3366e30f5f8238d8250f730b6af" -SRC_URI[sha256sum] = "bc2a560409a0f0b666d1c557e991748b986ec27572a45ae88b0ee5a480d881d7" +SRC_URI[md5sum] = "f014d613438848b452f1f9eecbf7027d" +SRC_URI[sha256sum] = "dafa155177934fc7dce2d4efb33402f74b1a593a17ff17d2187a6429f599dfd6" diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index a25e2e621c..388659f20b 100644 --- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -3,13 +3,15 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native" -inherit xfce pkgconfig +inherit xfce pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" -EXTRA_OECONF = "-with-vala-api=0.38" +EXTRA_OECONF = "-with-vala-api=0.40" FILES_${PN} += "${datadir}/vala-*/vapi" diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch b/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch deleted file mode 100644 index d77ce4d25d..0000000000 --- a/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 7ee62ef0083844ab2fffcd106e3ee2e5f29b2a91 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Jul 2017 18:53:56 -0700 -Subject: [PATCH] Rename use of stdout and stderr - -Since it shadow the standard definitions especially -seen on musl where libc defines these as macros they -cause all short of compilation errors on musl, using -a leading underscore makes it unique - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - imsettings-daemon/imsettings-proc.c | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c -index 915e78b..b78fcff 100644 ---- a/imsettings-daemon/imsettings-proc.c -+++ b/imsettings-daemon/imsettings-proc.c -@@ -39,8 +39,8 @@ - #define MAXRESTART 3 - - typedef struct _IMSettingsProcInfo { -- GIOChannel *stdout; -- GIOChannel *stderr; -+ GIOChannel *_stdout; -+ GIOChannel *_stderr; - GPid pid; - GTimeVal started_time; - guint id; -@@ -368,12 +368,12 @@ _start_process(IMSettingsProc *proc, - &ofd, &efd, - error)) { - pinfo->pid = pid; -- pinfo->stdout = g_io_channel_unix_new(ofd); -- pinfo->stderr = g_io_channel_unix_new(efd); -- g_io_channel_set_close_on_unref(pinfo->stdout, TRUE); -- g_io_channel_set_close_on_unref(pinfo->stderr, TRUE); -- pinfo->oid = g_io_add_watch(pinfo->stdout, G_IO_IN, _log_write_cb, proc); -- pinfo->eid = g_io_add_watch(pinfo->stderr, G_IO_IN, _log_write_cb, proc); -+ pinfo->_stdout = g_io_channel_unix_new(ofd); -+ pinfo->_stderr = g_io_channel_unix_new(efd); -+ g_io_channel_set_close_on_unref(pinfo->_stdout, TRUE); -+ g_io_channel_set_close_on_unref(pinfo->_stderr, TRUE); -+ pinfo->oid = g_io_add_watch(pinfo->_stdout, G_IO_IN, _log_write_cb, proc); -+ pinfo->eid = g_io_add_watch(pinfo->_stderr, G_IO_IN, _log_write_cb, proc); - g_get_current_time(&pinfo->started_time); - pinfo->id = g_child_watch_add(pid, _watch_im_status_cb, proc); - -@@ -521,13 +521,13 @@ imsettings_proc_get_property(GObject *object, - static void - imsettings_proc_info_finalize(IMSettingsProcInfo *pinfo) - { -- if (pinfo->stdout) { -- g_io_channel_unref(pinfo->stdout); -- pinfo->stdout = NULL; -+ if (pinfo->_stdout) { -+ g_io_channel_unref(pinfo->_stdout); -+ pinfo->_stdout = NULL; - } -- if (pinfo->stderr) { -- g_io_channel_unref(pinfo->stderr); -- pinfo->stderr = NULL; -+ if (pinfo->_stderr) { -+ g_io_channel_unref(pinfo->_stderr); -+ pinfo->_stderr = NULL; - } - if (pinfo->oid > 0) { - g_source_remove(pinfo->oid); --- -2.13.2 - diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch b/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch deleted file mode 100644 index d42358d690..0000000000 --- a/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch +++ /dev/null @@ -1,18 +0,0 @@ -gtk+ is required by linnotify. So make sure gtk be linked before libnotify - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac ---- imsettings-1.6.7.orig/configure.ac 2013-11-26 16:09:09.000000000 +0800 -+++ imsettings-1.6.7/configure.ac 2014-12-30 11:27:44.370003209 +0800 -@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify, - has_old_libnotify=yes - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) - AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify]) -- IMDAEMON_CFLAGS="$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS" -- IMDAEMON_LIBS="$GTK_LIBS $LIBNOTIFY_OLD_LIBS"],[ -+ IMDAEMON_CFLAGS="$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS" -+ IMDAEMON_LIBS="$LIBNOTIFY_OLD_LIBS $GTK_LIBS"],[ - has_old_libnotify=no - IMDAEMON_CFLAGS="$LIBNOTIFY_CFLAGS" - IMDAEMON_LIBS="$LIBNOTIFY_LIBS"]) diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch deleted file mode 100644 index d5ac87dc06..0000000000 --- a/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch +++ /dev/null @@ -1,19 +0,0 @@ -multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf. -It will cause configure error as follow. - - aclocal: error: non-option arguments are not accepted: '\'. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -diff -Nurp imsettings-1.7.1.orig/Makefile.am imsettings-1.7.1/Makefile.am ---- imsettings-1.7.1.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900 -+++ imsettings-1.7.1/Makefile.am 2015-06-24 14:15:32.070000007 +0900 -@@ -1,7 +1,7 @@ - NULL = - SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs - --ACLOCAL_AMFLAGS = -Im4macros -+ACLOCAL_AMFLAGS = -I m4macros $(NULL) - - CONFIGURE_DEPENDENCIES = \ - requires \ diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb index 7a4ce05bff..8f622bf6f8 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb @@ -7,16 +7,15 @@ This package contains the core DBus services and some utilities." HOMEPAGE = "http://code.google.com/p/imsettings/" SECTION = "Applications/System" -inherit autotools gtk-doc gobject-introspection +inherit autotools gtk-doc gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ - file://gtk-is-required-by-notify.patch \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ - file://0001-Rename-use-of-stdout-and-stderr.patch \ " -SRC_URI[md5sum] = "8153b0583a9f47d8a62af1f92fb9d3bf" -SRC_URI[sha256sum] = "41addf0458f760212b6b6100835066e16deb3a8a50eb005a0fc17fbac0a2ae66" +SRC_URI[md5sum] = "c6c65a2b2654fe9dfe9ab2e8b80c079a" +SRC_URI[sha256sum] = "196d3a74cef254ff812c32682d1818d740e36a68b976fef9e99748d23a71a71a" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch index 2b5eda0d13..2b5eda0d13 100644 --- a/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch +++ b/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch index 7f9fdf3971..7f9fdf3971 100644 --- a/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch +++ b/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch diff --git a/meta-oe/recipes-gnome/libunique/libunique/build.patch b/meta-xfce/recipes-extended/libunique/libunique/build.patch index 46a5c62e4f..46a5c62e4f 100644 --- a/meta-oe/recipes-gnome/libunique/libunique/build.patch +++ b/meta-xfce/recipes-extended/libunique/libunique/build.patch diff --git a/meta-oe/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch index d75de93fc2..d75de93fc2 100644 --- a/meta-oe/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch +++ b/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch diff --git a/meta-oe/recipes-gnome/libunique/libunique/noconst.patch b/meta-xfce/recipes-extended/libunique/libunique/noconst.patch index 2cc03473c5..2cc03473c5 100644 --- a/meta-oe/recipes-gnome/libunique/libunique/noconst.patch +++ b/meta-xfce/recipes-extended/libunique/libunique/noconst.patch diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb index 9133cccb11..49ed07ad97 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb @@ -25,6 +25,6 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit autotools pkgconfig gobject-introspection distro_features_check +inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb b/meta-xfce/recipes-multimedia/parole/parole_1.0.1.bb index 824611abe4..05d92ffd4b 100644 --- a/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb +++ b/meta-xfce/recipes-multimedia/parole/parole_1.0.1.bb @@ -19,8 +19,8 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "361e3059f1263c76a3711db2c7c1a97b" -SRC_URI[sha256sum] = "4b216f5200490f8d2a9bf1b3fcd9a8b20834c95249bf13b9170c82e1fcbd80f4" +SRC_URI[md5sum] = "46fe86bbe0c4aa02c53244d66e62e90c" +SRC_URI[sha256sum] = "8ad2931fdb35415cc3d7551b5f2207bfaa1aba15545accbacbb4984cdabd7099" RDEPENDS_${PN} += "gstreamer1.0-plugins-good" diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb index 96bdf0e530..f683f53594 100644 --- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb +++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit xfce-panel-plugin -DEPENDS += "xfconf xproto libxtst" +DEPENDS += "xfconf xorgproto libxtst" SRC_URI[md5sum] = "9169140af7c9d3fddd8a5c9e0efb5a61" SRC_URI[sha256sum] = "cf2b45e327e67cc187dcb99a6ef6d95570463045accd24540e17172f005189b3" diff --git a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb index 32d6edfb48..cab3ea754c 100644 --- a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb +++ b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin -# DEPENDS += "xfconf xproto libxtst" +# DEPENDS += "xfconf xorgproto libxtst" SRC_URI[md5sum] = "c5b86cbc1c54ee7c1d2e95a4502fed8e" SRC_URI[sha256sum] = "35d4c6c56dd6468c0e5afe66f657c1526f2d830a577105a51da43657651832e3" diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.4.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb index 32032a26a4..b423707648 100644 --- a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.4.bb +++ b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "pulseaudio x11" DEPENDS += "pulseaudio" -SRC_URI[md5sum] = "05633b8776dd3dcd4cda8580613644c3" -SRC_URI[sha256sum] = "43fa39400eccab1f3980064f42dde76f5cf4546a6ea0a5dc5c4c5b9ed2a01220" +SRC_URI[md5sum] = "7df7280c19c2c8b8c5bc4f4f2136d1dd" +SRC_URI[sha256sum] = "6ca88314dbac3e24c0e1bfc593fad6edb66319766be62e8256c81b0314f049f0" PACKAGECONFIG ??= "" PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch deleted file mode 100644 index 3f0bb05af4..0000000000 --- a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6b786e1c161026ab5486ac218891a85db65bf3ba Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 22 Mar 2017 15:28:24 -0700 -Subject: [PATCH] Specify string format explicitly - -Avoids below errors when compiling with -Wformat-security - -error: format string is not a string literal (potentially insecure) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/xfcetimer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xfcetimer.c b/src/xfcetimer.c -index 601772f..4b89682 100644 ---- a/src/xfcetimer.c -+++ b/src/xfcetimer.c -@@ -190,7 +190,7 @@ static gboolean update_function (gpointer data){ - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, -- GTK_BUTTONS_NONE, dialog_message); -+ GTK_BUTTONS_NONE, "%s", dialog_message); - - gtk_window_set_title ((GtkWindow *) dialog, dialog_title); - --- -2.12.0 - diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb index 9615192858..2ddc6f67cd 100644 --- a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb @@ -6,7 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin -SRC_URI += "file://0001-Specify-string-format-explicitly.patch" - -SRC_URI[md5sum] = "3be2a4ccfb2af20441b1d25c2cea5f28" -SRC_URI[sha256sum] = "39d7d21f099bc4219f6a6156142f0bbb8374986ee1970a9c0c8dc138b87f867c" +SRC_URI[md5sum] = "32e6a14e80bf9a93db2f2b3bfd7de920" +SRC_URI[sha256sum] = "2e4e5343e39926230cc981d5fe56cd58a2f3817d2e9b6089b5673a2e39bf7e9b" diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.4.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.7.bb index 4a331c5f65..f0780c701e 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.4.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "5aeff066c38fda9aea2a2a3d8ab6dc9e" -SRC_URI[sha256sum] = "ffdf2d5d4e0eeffc96d4642fdce8c55f26d3444cbd6c7b3d6f6cd7168ad4a6d5" +SRC_URI[md5sum] = "5cdaaf5799c3f976e8cee81ed24c7fe7" +SRC_URI[sha256sum] = "045c48bbe6fba62a46c2752a9eb3533f03bdd29dd23af29208622b79eb045e39" RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-xfce/recipes-support/vim/vim_%.bbappend b/meta-xfce/recipes-support/vim/vim_%.bbappend index 25403e6cb5..7b449630e9 100644 --- a/meta-xfce/recipes-support/vim/vim_%.bbappend +++ b/meta-xfce/recipes-support/vim/vim_%.bbappend @@ -1,6 +1 @@ -do_install_append() { - # The mouse being autoenabled is just annoying in xfce4-terminal (mouse - # drag make vim go into visual mode and there is no right click menu), - # delete the block. - sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc -} +require ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${BPN}_xfce.inc', '', d)} diff --git a/meta-xfce/recipes-support/vim/vim_xfce.inc b/meta-xfce/recipes-support/vim/vim_xfce.inc new file mode 100644 index 0000000000..25403e6cb5 --- /dev/null +++ b/meta-xfce/recipes-support/vim/vim_xfce.inc @@ -0,0 +1,6 @@ +do_install_append() { + # The mouse being autoenabled is just annoying in xfce4-terminal (mouse + # drag make vim go into visual mode and there is no right click menu), + # delete the block. + sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc +} diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch index ef27e423b3..89cc1f3874 100644 --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch +++ b/meta-xfce/recipes-xfce/exo/exo/configure.patch @@ -1,6 +1,20 @@ ---- a/configure.ac 2007-12-02 10:37:06.000000000 -0200 -+++ b/configure.ac 2008-06-05 17:21:42.000000000 -0300 -@@ -127,22 +127,24 @@ +From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001 +From: Andreas Mueller <schnitzeltony@gmx.de> +Date: Mon, 1 Aug 2011 17:16:29 +0200 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +--- + configure.ac | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0de5ceb..3f92d1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,22 +143,24 @@ AC_FUNC_MMAP() dnl *************************************** dnl *** Check for strftime() extensions *** dnl *************************************** diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch index ac8bca5f3f..348e147cf9 100644 --- a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch +++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -1,22 +1,24 @@ -From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001 +From 9231a2d5b9c5406f33aef3ab4de2dbec9b08ed13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 18 May 2012 21:13:00 +0200 Subject: [PATCH] Do not run tests at build time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Not-Applicable + +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- - Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 0ab3853..3e72391 100644 +index 226e79d..62ad18d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -8,8 +8,7 @@ SUBDIRS = \ +@@ -9,8 +9,7 @@ SUBDIRS = \ docs \ icons \ pixmaps \ @@ -24,8 +26,5 @@ index 0ab3853..3e72391 100644 - tests + po - AUTOMAKE_OPTIONS = \ - 1.9 \ --- -1.7.4.4 - + distclean-local: + rm -rf *.cache *~ diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 99318d5aa1..0764775818 100644 --- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -10,9 +10,10 @@ exo-csource creates c-header files from glade resource output files. When building xfce-packages from git instead of tarball this exo-csource-native is required. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- Makefile.am | 10 +--------- configure.ac | 22 ---------------------- @@ -40,7 +41,7 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index ba5395d..2605067 100644 +index 3f92d1b..0d4cc38 100644 --- a/configure.ac +++ b/configure.ac @@ -116,15 +116,6 @@ AC_PROG_CC() @@ -65,9 +66,9 @@ index ba5395d..2605067 100644 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) --XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) +-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) @@ -80,5 +81,5 @@ index ba5395d..2605067 100644 dnl ************************* dnl *** Check for gtk-doc *** -- -2.9.4 +2.14.3 diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb b/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb index d5508c0a54..d256b5769b 100644 --- a/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb +++ b/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb @@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "2e560edfa8ddf77e21c4787a6f600171" -SRC_URI[sha256sum] = "8e8629f33783eba1ce6d092a42c28217458a0cc3d1ad7474097b9187054955c1" +SRC_URI[md5sum] = "724afcca224f5fb22b510926d2740e52" +SRC_URI[sha256sum] = "64b88271a37d0ec7dca062c7bc61ca323116f7855092ac39698c421a2f30a18f" PACKAGES =+ "exo-csource" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index b8c9178839..6d107b1b61 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) @@ -17,8 +18,8 @@ diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-priv index 723a10d..e6502f3 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -66,4 +66,8 @@ - <property name="<Control>F12" type="string" value="workspace_12_key"/> +@@ -75,4 +75,8 @@ + <property name="<Primary>F12" type="string" value="workspace_12_key"/> </property> </property> + <property name="providers" type="array"> diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index cc231b4bd9..b73c9ee16c 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PR = "r10" -inherit packagegroup +inherit packagegroup distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # mandatory RDEPENDS_${PN} = " \ diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.6.13.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb index df7c46cec0..170e250705 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_1.6.13.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb @@ -9,8 +9,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "3e51987757d718ee7f27d0a0447b07fa" -SRC_URI[sha256sum] = "a2900acfa92f965aff86cd7728d88a3836b3d21fb85d3355a8c5119c9975f93f" +SRC_URI[md5sum] = "8fea2af69c3acbb273fd1a177d3d8e47" +SRC_URI[sha256sum] = "e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d" S = "${WORKDIR}/Thunar-${PV}/" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb index 75bcdd7169..9cc9a4bbce 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck" -inherit xfce gtk-doc distro_features_check +inherit xfce gtk-doc distro_features_check gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" @@ -39,5 +39,6 @@ FILES_${PN}-gtk3 = " \ ${libdir}/libxfce4panel-2.0${SOLIBS} \ ${libdir}/xfce4/panel/wrapper-2.0 \ " -FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ +FILES_${PN}-dbg += " \ + ${libdir}/xfce4/panel/plugins/.debug \ " diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index b98d8a7999..bf9bd3102e 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -13,12 +13,12 @@ REQUIRED_DISTRO_FEATURES = "x11" # + minor bugfixes - sent mainline but no response # + option to hide mousepointer for a specific (touch) input device - sent mainline but no response SRC_URI = " \ - git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.1 \ + git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.3 \ file://0001-xsettings.xml-Set-default-themes.patch \ " -SRCREV = "0766cf81daa9d41d0d0fed2fb73a8a26709a3bca" +SRCREV = "b701ac8b66b83c17469dd5009da51eeb59eba442" S = "${WORKDIR}/git" -PV = "4.12.1+git${SRCPV}" +PV = "4.12.3+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" |