upgrade 7 recipes
cover upgrade 7 recipes
The following changes since commit e5e89cfb7bc2231ac4fcc16f4cb4f74d806136c4:
pulseaudio: improve glibc 2.27 patch (2018-01-30 12:53:16 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/upgrade-20180131
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-20180131
Hongxu Jia (7):
help2man-native: 1.47.4 -> 1.47.5
pigz: 2.3.4 -> 2.4
ncurses: 6.0+20170715 -> 6.0+20171125
gpgme: 1.9.0 -> 1.10.0
ghostscript: 9.21 -> 9.22
apr-util: 1.6.0 -> 1.6.1
apr: 1.6.2 -> 1.6.3
...-2017-13729-CVE-2017-13728-CVE-2017-13731.patch | 541 ---------------------
...ses_6.0+20170715.bb => ncurses_6.0+20171125.bb} | 3 +-
...-native_1.47.4.bb => help2man-native_1.47.5.bb} | 4 +-
.../0001-contrib.mak-fix-for-parallel-build.patch} | 28 +-
...base-gendev.c-fix-for-Werror-return-type.patch} | 8 +-
...nfigure.ac-do-not-check-local-png-source.patch} | 10 +-
.../0004-avoid-host-contamination.patch} | 18 +-
...allow-directories-to-be-created-more-tha.patch} | 16 +-
.../0006-prevent-recompiling.patch} | 74 ++-
.../0007-genarch.patch} | 34 +-
.../0008-cups-no-gcrypt.patch} | 14 +-
...script-native-fix-disable-system-libtiff.patch} | 21 +-
...-add-a-preprocessor-define-to-allow-fope.patch} | 16 +-
.../ghostscript/ghostscript/CVE-2016-7977.patch | 33 --
.../ghostscript/ghostscript/CVE-2017-11714.patch | 61 ---
.../ghostscript/ghostscript/CVE-2017-5951.patch | 44 --
.../ghostscript/ghostscript/CVE-2017-7207.patch | 39 --
.../ghostscript/ghostscript/CVE-2017-7975.patch | 37 --
.../ghostscript/ghostscript/CVE-2017-9216.patch | 36 --
.../ghostscript/ghostscript/CVE-2017-9611.patch | 34 --
.../ghostscript/ghostscript/CVE-2017-9612.patch | 35 --
.../ghostscript/ghostscript/CVE-2017-9726.patch | 33 --
.../ghostscript/ghostscript/CVE-2017-9727.patch | 35 --
.../ghostscript/ghostscript/CVE-2017-9739.patch | 37 --
.../ghostscript/ghostscript/CVE-2017-9835.patch | 125 -----
.../{ghostscript_9.21.bb => ghostscript_9.22.bb} | 54 +-
.../pigz/{pigz_2.3.4.bb => pigz_2.4.bb} | 6 +-
.../apr/{apr-util_1.6.0.bb => apr-util_1.6.1.bb} | 6 +-
...gure_fixes.patch => 0001-configure-fixes.patch} | 28 +-
meta/recipes-support/apr/apr/0002-cleanup.patch | 59 +++
.../apr/{configfix.patch => 0003-configfix.patch} | 27 +-
...4-Makefile.in-fix-cross-compiling-failed.patch} | 13 +-
...> 0005-Fix-packet-discards-HTTP-redirect.patch} | 15 +-
...-fix-LTFLAGS-to-make-it-work-with-ccache.patch} | 10 +-
...t-size-doesn-t-match-in-glibc-when-cross.patch} | 16 +-
...ink-libapr-against-phtread-to-make-gold-.patch} | 12 +-
meta/recipes-support/apr/apr/cleanup.patch | 43 --
.../apr/{apr_1.6.2.bb => apr_1.6.3.bb} | 23 +-
.../gpgme/gpgme/0001-pkgconfig.patch | 10 +-
...python-gpg-error-config-should-not-be-use.patch | 66 +--
.../0003-Correctly-install-python-modules.patch | 27 +-
.../gpgme/gpgme/0004-python-import.patch | 6 +-
...g-skip-all-lib-or-usr-lib-directories-in-.patch | 6 +-
.../gpgme/gpgme/0006-fix-build-path-issue.patch | 38 ++
.../gpgme/{gpgme_1.9.0.bb => gpgme_1.10.0.bb} | 12 +-
45 files changed, 419 insertions(+), 1394 deletions(-)
delete mode 100644 meta/recipes-core/ncurses/files/CVE-2017-13732-CVE-2017-13734-CVE-2017-13730-CVE-2017-13729-CVE-2017-13728-CVE-2017-13731.patch
rename meta/recipes-core/ncurses/{ncurses_6.0+20170715.bb => ncurses_6.0+20171125.bb} (66%)
rename meta/recipes-devtools/help2man/{help2man-native_1.47.4.bb => help2man-native_1.47.5.bb} (79%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.15-parallel-make.patch => files/0001-contrib.mak-fix-for-parallel-build.patch} (55%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.16-Werror-return-type.patch => files/0002-base-gendev.c-fix-for-Werror-return-type.patch} (79%)
rename meta/recipes-extended/ghostscript/files/{do-not-check-local-libpng-source.patch => 0003-configure.ac-do-not-check-local-png-source.patch} (81%)
rename meta/recipes-extended/ghostscript/{ghostscript/avoid-host-contamination.patch => files/0004-avoid-host-contamination.patch} (61%)
rename meta/recipes-extended/ghostscript/{ghostscript/mkdir-p.patch => files/0005-ghostscript-allow-directories-to-be-created-more-tha.patch} (80%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.21-prevent_recompiling.patch => files/0006-prevent-recompiling.patch} (51%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.02-genarch.patch => files/0007-genarch.patch} (41%)
rename meta/recipes-extended/ghostscript/{ghostscript/cups-no-gcrypt.patch => files/0008-cups-no-gcrypt.patch} (67%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch => files/0009-ghostscript-native-fix-disable-system-libtiff.patch} (66%)
rename meta/recipes-extended/ghostscript/{ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch => files/0010-base-genht.c-add-a-preprocessor-define-to-allow-fope.patch} (65%)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch
rename meta/recipes-extended/ghostscript/{ghostscript_9.21.bb => ghostscript_9.22.bb} (66%)
rename meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} (86%)
rename meta/recipes-support/apr/{apr-util_1.6.0.bb => apr-util_1.6.1.bb} (95%)
rename meta/recipes-support/apr/apr/{configure_fixes.patch => 0001-configure-fixes.patch} (69%)
create mode 100644 meta/recipes-support/apr/apr/0002-cleanup.patch
rename meta/recipes-support/apr/apr/{configfix.patch => 0003-configfix.patch} (75%)
rename meta/recipes-support/apr/apr/{upgrade-and-fix-1.5.1.patch => 0004-Makefile.in-fix-cross-compiling-failed.patch} (81%)
rename meta/recipes-support/apr/apr/{Fix-packet-discards-HTTP-redirect.patch => 0005-Fix-packet-discards-HTTP-redirect.patch} (71%)
rename meta/recipes-support/apr/apr/{configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch => 0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch} (81%)
rename meta/recipes-support/apr/apr/{0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch => 0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch} (85%)
rename meta/recipes-support/apr/apr/{0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch => 0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch} (90%)
delete mode 100644 meta/recipes-support/apr/apr/cleanup.patch
rename meta/recipes-support/apr/{apr_1.6.2.bb => apr_1.6.3.bb} (81%)
create mode 100644 meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
rename meta/recipes-support/gpgme/{gpgme_1.9.0.bb => gpgme_1.10.0.bb} (88%)Signature · 1 line
2.8.1
PATCH 1/7 help2man-native: 1.47.4 -> 1.47.5
---
.../help2man/{help2man-native_1.47.4.bb => help2man-native_1.47.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/help2man/{help2man-native_1.47.4.bb => help2man-native_1.47.5.bb} (79%)meta/recipes-devtools/help2man/help2man-native_1.47.5.bb renamed from meta/recipes-devtools/help2man/help2man-native_1.47.4.bb +2 -2
@@ -6,8 +6,8 @@ DEPENDS = "autoconf-native automake-native" SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "544aca496a7d89de3e5d99e56a2f03d3" -SRC_URI[sha256sum] = "d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753" +SRC_URI[md5sum] = "1c886063c9e0ab463906de804596aa2f" +SRC_URI[sha256sum] = "7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1" inherit autotools native
Signature · 1 line
2.8.1
PATCH 2/7 pigz: 2.3.4 -> 2.4
In reply to Hongxu Jia---
meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} (86%)meta/recipes-extended/pigz/pigz_2.4.bb renamed from meta/recipes-extended/pigz/pigz_2.3.4.bb +3 -3
@@ -6,13 +6,13 @@ Adler, and uses the zlib and pthread libraries." HOMEPAGE = "http://zlib.net/pigz/" SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" PROVIDES_class-native += "gzip-native" SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" -SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" +SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" +SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
Signature · 1 line
2.8.1
Re: [PATCH 2/7] pigz: 2.3.4 -> 2.4
meta/recipes-extended/pigz/pigz_2.4.bb Adler, and uses the zlib and pthread libraries." · line 9
Quoted 2 lines · Hongxu Jia
meta/recipes-extended/pigz/pigz_2.4.bb renamed from meta/recipes-extended/pigz/pigz_2.3.4.bb +1
-1-LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21"
Please explain what changed here?
Alex
Re: [PATCH 2/7] pigz: 2.3.4 -> 2.4
Quoted 8 lines · Alexander Kanavin
Quoted 4 lines · Hongxu Jia
-LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21"
Please explain what changed here?
No change, only version bump up
https://github.com/madler/pigz/commit/fe822cb435622c43f491013da77b127e9fe851a9
commit fe822cb435622c43f491013da77b127e9fe851a9
Author: Mark Adler <[email protected]>
Date: Tue Dec 26 20:53:01 2017 -0800
pigz version 2.4
pigz.c +0 -0
@@ -1,6 +1,6 @@
/* pigz.c -- parallel implementation of gzip
* Copyright (C) 2007-2017 Mark Adler
- * Version 2.3.5 xx Dec 2017 Mark Adler
+ * Version 2.4 26 Dec 2017 Mark Adler
//Hongxu
Quoted 1 line
Alex
Re: [PATCH 2/7] pigz: 2.3.4 -> 2.4
Quoted 5 lines · Hongxu Jia
Quoted 4 lines · Alexander Kanavin
Quoted 3 lines · Hongxu Jia
-LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
+LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21"
Please explain what changed here?
No change, only version bump up
You need to mention this in the commit message.
I still wonder why patchtest won't tell that anymore; we changed it to look for a tag, and somehow that isn't working :(
Alex
PATCH v2 1/1 pigz: 2.3.4 -> 2.4
- Update the checksum of LIC_FILES_CHKSUM, license is no change, only version bump up.
https://github.com/madler/pigz/commit/fe822cb435622c43f491013da77b127e9fe851a9
---
meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} (86%)meta/recipes-extended/pigz/pigz_2.4.bb renamed from meta/recipes-extended/pigz/pigz_2.3.4.bb +3 -3
@@ -6,13 +6,13 @@ Adler, and uses the zlib and pthread libraries." HOMEPAGE = "http://zlib.net/pigz/" SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" PROVIDES_class-native += "gzip-native" SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" -SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" +SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" +SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
Signature · 1 line
2.8.1
Re: [PATCH 2/7] pigz: 2.3.4 -> 2.4
In reply to Alexander KanavinQuoted 1 line · Alexander Kanavin
You need to mention this in the commit message.
Also explain why the md5sum for LIC_FILES_CHKSUM changed in the commit log.
../Randy
Quoted 4 lines
I still wonder why patchtest won't tell that anymore; we changed it to look for a tag, and somehow that isn't working :(
Alex
Signature · 2 lines
# Randy MacLeod. WR Linux # Wind River an Intel Company
PATCH v3 1/1 pigz: 2.3.4 -> 2.4
License-checksum-change: license is no change, only version bump up.
https://github.com/madler/pigz/commit/fe822cb435622c43f491013da77b127e9fe851a9
---
meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} (86%)meta/recipes-extended/pigz/pigz_2.4.bb renamed from meta/recipes-extended/pigz/pigz_2.3.4.bb +3 -3
@@ -6,13 +6,13 @@ Adler, and uses the zlib and pthread libraries." HOMEPAGE = "http://zlib.net/pigz/" SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" PROVIDES_class-native += "gzip-native" SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" -SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" +SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" +SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
Signature · 1 line
2.8.1
Re: [PATCH V3] pigz: 2.3.4 -> 2.4
Quoted 3 lines · Hongxu Jia
License-checksum-change: license is no change, only version bump up.
https://github.com/madler/pigz/commit/fe822cb435622c43f491013da77b127e9fe851a9
There as a trivial space removed so say so in the comment.
commit 5d5d268c26d5b82b7346df4707026d8ac2dbb5c2
Author: Mark Adler <[email protected]> Date: Sun Dec 24 22:27:38 2017 -0800
Pointless formatting changes.
Use // comments througout, improve comments style, move opening braces to function definition lines.
pigz.c +1 -1
@@ -5,7 +5,7 @@/* This software is provided 'as-is', without any express or implied -warranty. In no event will the author be held liable for any damages +warranty. In no event will the author be held liable for any damages
...
$ git tag --contains 5d5d268c v2.4
../Randy
Quoted 32 lines
Signed-off-by Hongxu Jia <[email protected]>--- meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)rename meta/recipes-extended/pigz/{pigz_2.3.4.bb => pigz_2.4.bb} (86%)
meta/recipes-extended/pigz/pigz_2.4.bb renamed from meta/recipes-extended/pigz/pigz_2.3.4.bb +3
-3@@ -6,13 +6,13 @@ Adler, and uses the zlib and pthread libraries." HOMEPAGE = "http://zlib.net/pigz/" SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" PROVIDES_class-native += "gzip-native" SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" -SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" +SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" +SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
Signature · 2 lines
# Randy MacLeod. WR Linux # Wind River an Intel Company
PATCH 3/7 ncurses: 6.0+20170715 -> 6.0+20171125
In reply to Hongxu Jia- Drop backported CVE fix
---
...-2017-13729-CVE-2017-13728-CVE-2017-13731.patch | 541 ---------------------
...ses_6.0+20170715.bb => ncurses_6.0+20171125.bb} | 3 +-
2 files changed, 1 insertion(+), 543 deletions(-)
delete mode 100644 meta/recipes-core/ncurses/files/CVE-2017-13732-CVE-2017-13734-CVE-2017-13730-CVE-2017-13729-CVE-2017-13728-CVE-2017-13731.patch
rename meta/recipes-core/ncurses/{ncurses_6.0+20170715.bb => ncurses_6.0+20171125.bb} (66%)meta/recipes-core/ncurses/files/CVE-2017-13732-CVE-2017-13734-CVE-2017-13730-CVE-2017-13729-CVE-2017-13728-CVE-2017-13731.patch deleted +0 -541
@@ -1,541 +0,0 @@ -From 4bf72cb8f1d3aa5f33c31eb817a5f0338f4aaf6f Mon Sep 17 00:00:00 2001 -From: Ovidiu Panait <[email protected]> -Date: Wed, 20 Sep 2017 05:02:00 +0000 -Subject: [PATCH] Import upstream patch 20170826 - -20170826 - + fixes for "iterm2" (report by Leonardo Brondani Schenkel) -TD - + corrected a warning from tic about keys which are the same, to skip - over missing/cancelled values. - + add check in tic for unnecessary use of "2" to denote a shifted - special key. - + improve checks in trim_sgr0, comp_parse.c and parse_entry.c, for - cancelled string capabilities. - + add check in _nc_parse_entry() for invalid entry name, setting the - name to "invalid" to avoid problems storing entries. - + add/improve checks in tic's parser to address invalid input - + add a check in comp_scan.c to handle the special case where a - nontext file ending with a NUL rather than newline is given to tic - as input (Redhat #1484274). - + allow for cancelled capabilities in _nc_save_str (Redhat #1484276). - + add validity checks for "use=" target in _nc_parse_entry (Redhat - #1484284). - + check for invalid strings in postprocess_termcap (Redhat #1484285) - + reset secondary pointers on EOF in next_char() (Redhat #1484287). - + guard _nc_safe_strcpy() and _nc_safe_strcat() against calls using - cancelled strings (Redhat #1484291). - + correct typo in curs_memleaks.3x (Sven Joachim). - + improve test/configure checks for some curses variants not based on - X/Open Curses. - + add options for test/configure to disable checks for form, menu and - panel libraries. - -Upstream-Status: Backport -CVE: CVE-2017-13732, CVE-2017-13734, CVE-2017-13730, CVE-2017-13729, CVE-2017-13728, CVE-2017-13731 - - -Author: Sven Joachim <[email protected]> -Signed-off-by: Ovidiu Panait <[email protected]> ---- - dist.mk | 4 +- - include/ncurses_defs | 4 +- - ncurses/tinfo/alloc_entry.c | 4 +- - ncurses/tinfo/comp_parse.c | 10 ++--- - ncurses/tinfo/comp_scan.c | 6 ++- - ncurses/tinfo/parse_entry.c | 91 ++++++++++++++++++++++++++++++--------------- - ncurses/tinfo/strings.c | 9 +++-- - ncurses/tinfo/trim_sgr0.c | 4 +- - progs/tic.c | 75 ++++++++++++++++++++++++++++++++++++- - 9 files changed, 157 insertions(+), 50 deletions(-) - -diff --git a/dist.mk b/dist.mk -index 9af2699..2c70472 100644 ---- a/dist.mk -+++ b/dist.mk -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1172 2017/07/13 00:15:27 tom Exp $ -+# $Id: dist.mk,v 1.1179 2017/08/20 15:33:41 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -37,7 +37,7 @@ SHELL = /bin/sh - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 6 - NCURSES_MINOR = 0 --NCURSES_PATCH = 20170715 -+NCURSES_PATCH = 20170826 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -diff --git a/include/ncurses_defs b/include/ncurses_defs -index e6611b7..d237db1 100644 ---- a/include/ncurses_defs -+++ b/include/ncurses_defs -@@ -1,4 +1,4 @@ --# $Id: ncurses_defs,v 1.73 2017/06/24 14:20:57 tom Exp $ -+# $Id: ncurses_defs,v 1.75 2017/08/20 16:50:04 tom Exp $ - ############################################################################## - # Copyright (c) 2000-2016,2017 Free Software Foundation, Inc. # - # # -@@ -50,7 +50,9 @@ HAVE_BSD_STRING_H - HAVE_BTOWC - HAVE_BUILTIN_H - HAVE_CHGAT 1 -+HAVE_COLOR_CONTENT 1 - HAVE_COLOR_SET 1 -+HAVE_CURSCR 1 - HAVE_DIRENT_H - HAVE_ERRNO - HAVE_FCNTL_H -diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c -index 5de09f1..09374d6 100644 ---- a/ncurses/tinfo/alloc_entry.c -+++ b/ncurses/tinfo/alloc_entry.c -@@ -47,7 +47,7 @@ - - #include <tic.h> - --MODULE_ID("$Id: alloc_entry.c,v 1.60 2017/06/27 23:48:55 tom Exp $") -+MODULE_ID("$Id: alloc_entry.c,v 1.61 2017/08/25 09:09:08 tom Exp $") - - #define ABSENT_OFFSET -1 - #define CANCELLED_OFFSET -2 -@@ -98,7 +98,7 @@ _nc_save_str(const char *const string) - size_t old_next_free = next_free; - size_t len; - -- if (string == 0) -+ if (!VALID_STRING(string)) - return _nc_save_str(""); - len = strlen(string) + 1; - -diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c -index 34e6216..580d4df 100644 ---- a/ncurses/tinfo/comp_parse.c -+++ b/ncurses/tinfo/comp_parse.c -@@ -47,7 +47,7 @@ - - #include <tic.h> - --MODULE_ID("$Id: comp_parse.c,v 1.96 2017/04/15 15:36:58 tom Exp $") -+MODULE_ID("$Id: comp_parse.c,v 1.99 2017/08/26 16:15:50 tom Exp $") - - static void sanity_check2(TERMTYPE2 *, bool); - NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2; -@@ -510,9 +510,9 @@ static void - fixup_acsc(TERMTYPE2 *tp, int literal) - { - if (!literal) { -- if (acs_chars == 0 -- && enter_alt_charset_mode != 0 -- && exit_alt_charset_mode != 0) -+ if (acs_chars == ABSENT_STRING -+ && PRESENT(enter_alt_charset_mode) -+ && PRESENT(exit_alt_charset_mode)) - acs_chars = strdup(VT_ACSC); - } - } -@@ -568,9 +568,7 @@ sanity_check2(TERMTYPE2 *tp, bool literal) - PAIRED(enter_xon_mode, exit_xon_mode); - PAIRED(enter_am_mode, exit_am_mode); - ANDMISSING(label_off, label_on); --#ifdef remove_clock - PAIRED(display_clock, remove_clock); --#endif - ANDMISSING(set_color_pair, initialize_pair); - } - -diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c -index 40d7f6a..b207257 100644 ---- a/ncurses/tinfo/comp_scan.c -+++ b/ncurses/tinfo/comp_scan.c -@@ -50,7 +50,7 @@ - #include <ctype.h> - #include <tic.h> - --MODULE_ID("$Id: comp_scan.c,v 1.106 2017/04/22 11:41:12 tom Exp $") -+MODULE_ID("$Id: comp_scan.c,v 1.108 2017/08/25 22:57:21 tom Exp $") - - /* - * Maximum length of string capability we'll accept before raising an error. -@@ -168,6 +168,8 @@ next_char(void) - if (result != 0) { - FreeAndNull(result); - FreeAndNull(pushname); -+ bufptr = 0; -+ bufstart = 0; - allocated = 0; - } - /* -@@ -222,6 +224,8 @@ next_char(void) - } - if ((bufptr = bufstart) != 0) { - used = strlen(bufptr); -+ if (used == 0) -+ return (EOF); - while (iswhite(*bufptr)) { - if (*bufptr == '\t') { - _nc_curr_col = (_nc_curr_col | 7) + 1; -diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c -index 3fa2f25..bbbfcb2 100644 ---- a/ncurses/tinfo/parse_entry.c -+++ b/ncurses/tinfo/parse_entry.c -@@ -47,7 +47,7 @@ - #include <ctype.h> - #include <tic.h> - --MODULE_ID("$Id: parse_entry.c,v 1.86 2017/06/28 00:53:12 tom Exp $") -+MODULE_ID("$Id: parse_entry.c,v 1.91 2017/08/26 16:13:34 tom Exp $") - - #ifdef LINT - static short const parametrized[] = -@@ -180,6 +180,20 @@ _nc_extend_names(ENTRY * entryp, char *name, int token_type) - } - #endif /* NCURSES_XNAMES */ - -+static bool -+valid_entryname(const char *name) -+{ -+ bool result = TRUE; -+ int ch; -+ while ((ch = UChar(*name++)) != '\0') { -+ if (ch <= ' ' || ch > '~' || ch == '/') { -+ result = FALSE; -+ break; -+ } -+ } -+ return result; -+} -+ - /* - * int - * _nc_parse_entry(entry, literal, silent) -@@ -211,6 +225,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) - int token_type; - struct name_table_entry const *entry_ptr; - char *ptr, *base; -+ const char *name; - bool bad_tc_usage = FALSE; - - token_type = _nc_get_token(silent); -@@ -261,7 +276,12 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) - * results in the terminal type getting prematurely set to correspond - * to that of the next entry. - */ -- _nc_set_type(_nc_first_name(entryp->tterm.term_names)); -+ name = _nc_first_name(entryp->tterm.term_names); -+ if (!valid_entryname(name)) { -+ _nc_warning("invalid entry name \"%s\"", name); -+ name = "invalid"; -+ } -+ _nc_set_type(name); - - /* check for overly-long names and aliases */ - for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != 0; -@@ -283,13 +303,24 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) - bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0); - bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0); - if (is_use || is_tc) { -+ if (!VALID_STRING(_nc_curr_token.tk_valstring) -+ || _nc_curr_token.tk_valstring[0] == '\0') { -+ _nc_warning("missing name for use-clause"); -+ continue; -+ } else if (!valid_entryname(_nc_curr_token.tk_valstring)) { -+ _nc_warning("invalid name for use-clause \"%s\"", -+ _nc_curr_token.tk_valstring); -+ continue; -+ } else if (entryp->nuses >= MAX_USES) { -+ _nc_warning("too many use-clauses, ignored \"%s\"", -+ _nc_curr_token.tk_valstring); -+ continue; -+ } - entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); - entryp->uses[entryp->nuses].line = _nc_curr_line; -- if (VALID_STRING(entryp->uses[entryp->nuses].name)) { -- entryp->nuses++; -- if (entryp->nuses > 1 && is_tc) { -- BAD_TC_USAGE -- } -+ entryp->nuses++; -+ if (entryp->nuses > 1 && is_tc) { -+ BAD_TC_USAGE - } - } else { - /* normal token lookup */ -@@ -641,13 +672,6 @@ static const char C_BS[] = "\b"; - static const char C_HT[] = "\t"; - - /* -- * Note that WANTED and PRESENT are not simple inverses! If a capability -- * has been explicitly cancelled, it's not considered WANTED. -- */ --#define WANTED(s) ((s) == ABSENT_STRING) --#define PRESENT(s) (((s) != ABSENT_STRING) && ((s) != CANCELLED_STRING)) -- --/* - * This bit of legerdemain turns all the terminfo variable names into - * references to locations in the arrays Booleans, Numbers, and Strings --- - * precisely what's needed. -@@ -672,10 +696,10 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) - - /* if there was a tc entry, assume we picked up defaults via that */ - if (!has_base) { -- if (WANTED(init_3string) && termcap_init2) -+ if (WANTED(init_3string) && PRESENT(termcap_init2)) - init_3string = _nc_save_str(termcap_init2); - -- if (WANTED(reset_2string) && termcap_reset) -+ if (WANTED(reset_2string) && PRESENT(termcap_reset)) - reset_2string = _nc_save_str(termcap_reset); - - if (WANTED(carriage_return)) { -@@ -790,7 +814,7 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) - if (init_tabs != 8 && init_tabs != ABSENT_NUMERIC) - _nc_warning("hardware tabs with a width other than 8: %d", init_tabs); - else { -- if (tab && _nc_capcmp(tab, C_HT)) -+ if (PRESENT(tab) && _nc_capcmp(tab, C_HT)) - _nc_warning("hardware tabs with a non-^I tab string %s", - _nc_visbuf(tab)); - else { -@@ -867,17 +891,22 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) - * The magic moment -- copy the mapped key string over, - * stripping out padding. - */ -- for (dp = buf2, bp = tp->Strings[from_ptr->nte_index]; *bp; bp++) { -- if (bp[0] == '$' && bp[1] == '<') { -- while (*bp && *bp != '>') { -- ++bp; -- } -- } else -- *dp++ = *bp; -- } -- *dp = '\0'; -+ bp = tp->Strings[from_ptr->nte_index]; -+ if (VALID_STRING(bp)) { -+ for (dp = buf2; *bp; bp++) { -+ if (bp[0] == '$' && bp[1] == '<') { -+ while (*bp && *bp != '>') { -+ ++bp; -+ } -+ } else -+ *dp++ = *bp; -+ } -+ *dp = '\0'; - -- tp->Strings[to_ptr->nte_index] = _nc_save_str(buf2); -+ tp->Strings[to_ptr->nte_index] = _nc_save_str(buf2); -+ } else { -+ tp->Strings[to_ptr->nte_index] = bp; -+ } - } - - /* -@@ -886,7 +915,7 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) - * got mapped to kich1 and im to kIC to avoid a collision. - * If the description has im but not ic, hack kIC back to kich1. - */ -- if (foundim && WANTED(key_ic) && key_sic) { -+ if (foundim && WANTED(key_ic) && PRESENT(key_sic)) { - key_ic = key_sic; - key_sic = ABSENT_STRING; - } -@@ -938,9 +967,9 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) - acs_chars = _nc_save_str(buf2); - _nc_warning("acsc string synthesized from XENIX capabilities"); - } -- } else if (acs_chars == 0 -- && enter_alt_charset_mode != 0 -- && exit_alt_charset_mode != 0) { -+ } else if (acs_chars == ABSENT_STRING -+ && PRESENT(enter_alt_charset_mode) -+ && PRESENT(exit_alt_charset_mode)) { - acs_chars = _nc_save_str(VT_ACSC); - } - } -diff --git a/ncurses/tinfo/strings.c b/ncurses/tinfo/strings.c -index 393d8e7..10ec6c8 100644 ---- a/ncurses/tinfo/strings.c -+++ b/ncurses/tinfo/strings.c -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 2000-2007,2012 Free Software Foundation, Inc. * -+ * Copyright (c) 2000-2012,2017 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * -@@ -35,8 +35,9 @@ - **/ - - #include <curses.priv.h> -+#include <tic.h> - --MODULE_ID("$Id: strings.c,v 1.8 2012/02/22 22:34:31 tom Exp $") -+MODULE_ID("$Id: strings.c,v 1.9 2017/08/26 13:16:11 tom Exp $") - - /**************************************************************************** - * Useful string functions (especially for mvcur) -@@ -105,7 +106,7 @@ _nc_str_copy(string_desc * dst, string_desc * src) - NCURSES_EXPORT(bool) - _nc_safe_strcat(string_desc * dst, const char *src) - { -- if (src != 0) { -+ if (PRESENT(src)) { - size_t len = strlen(src); - - if (len < dst->s_size) { -@@ -126,7 +127,7 @@ _nc_safe_strcat(string_desc * dst, const char *src) - NCURSES_EXPORT(bool) - _nc_safe_strcpy(string_desc * dst, const char *src) - { -- if (src != 0) { -+ if (PRESENT(src)) { - size_t len = strlen(src); - - if (len < dst->s_size) { -diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c -index 4cbcb65..4d92d15 100644 ---- a/ncurses/tinfo/trim_sgr0.c -+++ b/ncurses/tinfo/trim_sgr0.c -@@ -36,7 +36,7 @@ - - #include <tic.h> - --MODULE_ID("$Id: trim_sgr0.c,v 1.16 2017/04/05 22:33:07 tom Exp $") -+MODULE_ID("$Id: trim_sgr0.c,v 1.17 2017/08/26 14:54:16 tom Exp $") - - #undef CUR - #define CUR tp-> -@@ -263,7 +263,7 @@ _nc_trim_sgr0(TERMTYPE2 *tp) - /* - * If rmacs is a substring of sgr(0), remove that chunk. - */ -- if (exit_alt_charset_mode != 0) { -+ if (PRESENT(exit_alt_charset_mode)) { - TR(TRACE_DATABASE, ("scan for rmacs %s", _nc_visbuf(exit_alt_charset_mode))); - j = strlen(off); - k = strlen(exit_alt_charset_mode); -diff --git a/progs/tic.c b/progs/tic.c -index c5d78e5..6dd4678 100644 ---- a/progs/tic.c -+++ b/progs/tic.c -@@ -48,7 +48,7 @@ - #include <parametrized.h> - #include <transform.h> - --MODULE_ID("$Id: tic.c,v 1.233 2017/07/15 17:40:19 tom Exp $") -+MODULE_ID("$Id: tic.c,v 1.243 2017/08/26 20:56:55 tom Exp $") - - #define STDIN_NAME "<stdin>" - -@@ -62,6 +62,10 @@ static bool showsummary = FALSE; - static char **namelst = 0; - static const char *to_remove; - -+#if NCURSES_XNAMES -+static bool using_extensions = FALSE; -+#endif -+ - static void (*save_check_termtype) (TERMTYPE2 *, bool); - static void check_termtype(TERMTYPE2 *tt, bool); - -@@ -850,6 +854,7 @@ main(int argc, char *argv[]) - /* FALLTHRU */ - case 'x': - use_extended_names(TRUE); -+ using_extensions = TRUE; - break; - #endif - default: -@@ -2405,10 +2410,17 @@ check_conflict(TERMTYPE2 *tp) - const char *a = given[j].value; - bool first = TRUE; - -+ if (!VALID_STRING(a)) -+ continue; -+ - for (k = j + 1; given[k].keycode; k++) { - const char *b = given[k].value; -+ -+ if (!VALID_STRING(b)) -+ continue; - if (check[k]) - continue; -+ - if (!_nc_capcmp(a, b)) { - check[j] = 1; - check[k] = 1; -@@ -2431,6 +2443,67 @@ check_conflict(TERMTYPE2 *tp) - if (!first) - fprintf(stderr, "\n"); - } -+#if NCURSES_XNAMES -+ if (using_extensions) { -+ /* *INDENT-OFF* */ -+ static struct { -+ const char *xcurses; -+ const char *shifted; -+ } table[] = { -+ { "kDC", NULL }, -+ { "kDN", "kind" }, -+ { "kEND", NULL }, -+ { "kHOM", NULL }, -+ { "kLFT", NULL }, -+ { "kNXT", NULL }, -+ { "kPRV", NULL }, -+ { "kRIT", NULL }, -+ { "kUP", "kri" }, -+ { NULL, NULL }, -+ }; -+ /* *INDENT-ON* */ -+ -+ /* -+ * SVr4 curses defines the "xcurses" names listed above except for -+ * the special cases in the "shifted" column. When using these -+ * names for xterm's extensions, that was confusing, and resulted -+ * in adding extended capabilities with "2" (shift) suffix. This -+ * check warns about unnecessary use of extensions for this quirk. -+ */ -+ for (j = 0; given[j].keycode; ++j) { -+ const char *find = given[j].name; -+ int value; -+ char ch; -+ -+ if (!VALID_STRING(given[j].value)) -+ continue; -+ -+ for (k = 0; table[k].xcurses; ++k) { -+ const char *test = table[k].xcurses; -+ size_t size = strlen(test); -+ -+ if (!strncmp(find, test, size) && strcmp(find, test)) { -+ switch (sscanf(find + size, "%d%c", &value, &ch)) { -+ case 1: -+ if (value == 2) { -+ _nc_warning("expected '%s' rather than '%s'", -+ (table[k].shifted -+ ? table[k].shifted -+ : test), find); -+ } else if (value < 2 || value > 15) { -+ _nc_warning("expected numeric 2..15 '%s'", find); -+ } -+ break; -+ default: -+ _nc_warning("expected numeric suffix for '%s'", find); -+ break; -+ } -+ break; -+ } -+ } -+ } -+ } -+#endif - free(given); - free(check); - } --- -2.10.2 -
meta/recipes-core/ncurses/ncurses_6.0+20171125.bb renamed from meta/recipes-core/ncurses/ncurses_6.0+20170715.bb +1 -2
@@ -3,10 +3,9 @@ require ncurses.inc SRC_URI += "file://0001-tic-hang.patch \ file://0002-configure-reproducible.patch \ file://config.cache \ - file://CVE-2017-13732-CVE-2017-13734-CVE-2017-13730-CVE-2017-13729-CVE-2017-13728-CVE-2017-13731.patch \ " # commit id corresponds to the revision in package version -SRCREV = "52681a6a1a18b4d6eb1a716512d0dd827bd71c87" +SRCREV = "5d849e836052459901cfe0b85a0b2939ff8d2b2a" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
Signature · 1 line
2.8.1
PATCH 4/7 gpgme: 1.9.0 -> 1.10.0
In reply to Hongxu Jia1. Disable test at build time to workaround corss-compile
2. Rework patch 0002, since the following commit of upstream.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=7309ce6f5f7c86570953a141965d4f54cd9ad9a0
3. Add patch 0006 to fix build path issue to improve reproducibility
---
.../gpgme/gpgme/0001-pkgconfig.patch | 10 ++--
...python-gpg-error-config-should-not-be-use.patch | 66 +++++++++-------------
.../0003-Correctly-install-python-modules.patch | 27 +++++----
.../gpgme/gpgme/0004-python-import.patch | 6 +-
...g-skip-all-lib-or-usr-lib-directories-in-.patch | 6 +-
.../gpgme/gpgme/0006-fix-build-path-issue.patch | 38 +++++++++++++
.../gpgme/{gpgme_1.9.0.bb => gpgme_1.10.0.bb} | 12 +++-
7 files changed, 99 insertions(+), 66 deletions(-)
create mode 100644 meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
rename meta/recipes-support/gpgme/{gpgme_1.9.0.bb => gpgme_1.10.0.bb} (88%)meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +5 -5
@@ -1,7 +1,7 @@ -From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 +From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 16 Aug 2017 02:00:08 -0400 -Subject: [PATCH 1/5] pkgconfig +Subject: [PATCH 1/4] pkgconfig Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling.
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <[email protected]> create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 0dac6ce..6a9e507 100644 +index 6ea4bcd..2a0d528 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -299,5 +299,5 @@ index 0000000..b69539f +Requires: libassuan gpg-error \ No newline at end of file -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +26 -40
90 lines not on this page · raw message
meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +15 -12
@@ -1,7 +1,7 @@ -From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 16 Aug 2017 02:05:34 -0400 -Subject: [PATCH 3/5] Correctly install python modules +From 93aae34ee70b8d50b31a19a65d6ac8290cb148ae Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 15:28:49 +0800 +Subject: [PATCH 2/4] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]>
@@ -9,22 +9,25 @@ Signed-off-by: Alexander Kanavin <[email protected]> Rebase to 1.9.0 Signed-off-by: Hongxu Jia <[email protected]> + +Rebase to 1.10.0 +Signed-off-by: Hongxu Jia <[email protected]> --- lang/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index d91ead9..67f7cdc 100644 +index 8d74cbd..ce4f0a5 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -106,6 +106,7 @@ install-exec-local: - cd python$${VERSION}-gpg ; \ - $$PYTHON setup.py install \ - --prefix $(DESTDIR)$(prefix) \ +@@ -91,6 +91,7 @@ install-exec-local: + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ + --prefix "$(DESTDIR)$(prefix)" \ + --install-lib=$(DESTDIR)${pythondir} \ - --record files.txt \ --verbose ; \ - cat files.txt >> ../install_files.txt ; \ + done + -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0004-python-import.patch +3 -3
@@ -1,7 +1,7 @@ -From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001 +From 32ecc3f058307060e40af86127cd226248a73c41 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 16 Aug 2017 02:06:45 -0400 -Subject: [PATCH 4/5] python import +Subject: [PATCH 3/4] python import Don't check for output on stderr to know if an import worked, host inputrc and sysroot readline can cause warnings on stderr.
@@ -30,5 +30,5 @@ index b990d5b..318b089 100644 else AC_MSG_RESULT([no]) -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +3 -3
@@ -1,7 +1,7 @@ -From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001 +From 6dcedc4dd055af902719b1a1cb10daa935a27f58 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 13 Apr 2017 16:40:27 +0300 -Subject: [PATCH 5/5] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH 4/4] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other
@@ -27,5 +27,5 @@ index a4d152e..8342865 100644 ;; -L*|-l*) -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 180a5669e4a13a550b1b0dcef1689b6c0470fe54 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Wed, 31 Jan 2018 11:01:09 +0800 +Subject: [PATCH] fix build path issue + +Get the "--root" directory supplied to the "install" command, +and use it as a prefix to strip off the purported filename +encoded in bytecode files. + +Since --root added, we need to tweak --prefix and --install-lib +to use relative path. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <[email protected]> +--- + lang/python/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index ce4f0a5..5a468f1 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -90,8 +90,9 @@ install-exec-local: + build \ + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ +- --prefix "$(DESTDIR)$(prefix)" \ +- --install-lib=$(DESTDIR)${pythondir} \ ++ --root=${DESTDIR} \ ++ --prefix "$(prefix)" \ ++ --install-lib=${pythondir} \ + --verbose ; \ + done + +-- +1.8.3.1 +
meta/recipes-support/gpgme/gpgme_1.10.0.bb renamed from meta/recipes-support/gpgme/gpgme_1.9.0.bb +9 -3
@@ -16,10 +16,11 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0003-Correctly-install-python-modules.patch \ file://0004-python-import.patch \ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ + file://0006-fix-build-path-issue.patch \ " -SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3" -SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" +SRC_URI[md5sum] = "78b1533c593478982ee2fc548260c563" +SRC_URI[sha256sum] = "1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++"
@@ -49,7 +50,12 @@ LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" -EXTRA_OECONF += '--enable-languages="${LANGUAGES}"' +EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ + --disable-gpgconf-test \ + --disable-gpg-test \ + --disable-gpgsm-test \ + --disable-g13-test \ +' inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT}
Signature · 1 line
2.8.1
Re: [PATCH 4/7] gpgme: 1.9.0 -> 1.10.0
Quoted 2 lines · Hongxu Jia
1. Disable test at build time to workaround corss-compile
Looks like more tests need to be disabled:
| Making all in tests
| make[4]: Entering directory '/data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/lang/python/tests' | echo no-force-v3-sigs > ./gpg.conf
| echo pinentry-program /data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/../gpgme-1.10.0/tests/gpg/pinentry
Quoted 1 line
gpg-agent.conf
| gpgconf --kill all | echo ignore-invalid-option agent-program >> ./gpg.conf | /bin/bash: gpgconf: command not found | Makefile:611: recipe for target 'private-keys-v1.d/gpg-sample.stamp' failed | make[4]: [private-keys-v1.d/gpg-sample.stamp] Error 127 (ignored) | /data/poky-tmp/master/hosttools/mkdir -p ./private-keys-v1.d | echo "agent-program `which gpg-agent`|--debug-quick-random" >> ./gpg.conf | for k in
../../../../gpgme-1.10.0/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD ../../../../gpgme-1.10.0/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66 ../../../../gpgme-1.10.0/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD ../../../../gpgme-1.10.0/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F ../../../../gpgme-1.10.0/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C; do \
| cp $k
private-keys-v1.d/${k#../../../../gpgme-1.10.0/tests/gpg/}.key; \
| done | echo x > ./private-keys-v1.d/gpg-sample.stamp | gpg --batch --no-permission-warning \ | --import ../../../../gpgme-1.10.0/tests/gpg/pubdemo.asc | gpg: keybox
'/data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/lang/python/tests/pubring.kbx' created
| gpg:
/data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/lang/python/tests/trustdb.gpg:
trustdb created
| gpg: key 2D727CC768697734: public key "Alfa Test (demo key) <
[email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or
directory
| gpg: can't connect to the agent: No such file or directory | gpg: key FE180B1DA9E3B0B2: public key "Bob (demo key)" imported | gpg: failed to start agent '|--debug-quick-random': No such file or
directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 413F4AF31AFDAB6C: public key "Charlie Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key EBA9F240EB9DC9E6: public key "Delta Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 318C1FAEFAEF6D1B: public key "Echelon (demo key)" imported | gpg: failed to start agent '|--debug-quick-random': No such file or
directory
| gpg: can't connect to the agent: No such file or directory | gpg: key D4BF57F37372E243: public key "Foxtrot Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 168410A48FC282E6: public key "Golf Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 13DB965534C6E3F1: public key "Hotel Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 1FE8FC6F04259677: public key "India Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 0C820C71D2699313: public key "Juliet Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key AD1B0FAD43C2D0C7: public key "Kilo Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 37CAB51FB79103F8: public key "Lima Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key BE794852BE5CF886: public key "Mallory (demo key)" imported | gpg: failed to start agent '|--debug-quick-random': No such file or
directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 25B00FD430CEC684: public key "November Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 5F6356BA6D9732AC: public key "Oscar Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 5D15E01D3FF13206: public key "Papa test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 1C67EC133C661C84: public key "Quebec Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 3BDBEDB1777FBED3: public key "Romeo Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key A5E67F7FA3AE3EA1: public key "Sierra Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 58CB9A4C85A81F38: public key "Tango Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key A94C0F75653244D6: public key "Uniform Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 47AF4B6961F04784: public key "Victor Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key DEF0F7B8EC67DBDE: public key "Whisky Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 8979A6C5567FB34A: public key "XRay Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 9EEF34CD4B11B25F: public key "Yankee Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: key 6BC4778054ACD246: public key "Zulu Test (demo key) < [email protected]>" imported
| gpg: failed to start agent '|--debug-quick-random': No such file or directory
| gpg: can't connect to the agent: No such file or directory | gpg: Total number processed: 26 | gpg: imported: 26 | Makefile:620: recipe for target 'pubring-stamp' failed
Ross
Re: [PATCH 4/7] gpgme: 1.9.0 -> 1.10.0
Quoted 7 lines · Ross
On 31 January 2018 at 07:48, Hongxu Jia <[email protected] <mailto:[email protected]>> wrote:
1. Disable test at build time to workaround corss-compile
Looks like more tests need to be disabled:
Quoted 8 lines
| Making all in tests | make[4]: Entering directory '/data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/lang/python/tests' | echo no-force-v3-sigs > ./gpg.conf | echo pinentry-program /data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/../gpgme-1.10.0/tests/gpg/pinentryQuoted 1 line
gpg-agent.conf
| gpgconf --kill all | echo ignore-invalid-option agent-program >> ./gpg.conf | /bin/bash: gpgconf: command not found
....
I think this set of failures in particular can be fixed by adding gnupg-native to dependencies (which is better than creating yet another 'Inappropriate' patch that we have to carry forever).
I'd be however interested to see the successful build log from the submitter because I'm bit puzzled how it could succeed (probably host gpg was used, but I want to see details).
Alex
Re: [PATCH 4/7] gpgme: 1.9.0 -> 1.10.0
Quoted 15 lines · Alexander Kanavin
Quoted 7 lines · Ross
On 31 January 2018 at 07:48, Hongxu Jia <[email protected] <mailto:[email protected]>> wrote:
1. Disable test at build time to workaround corss-compile
Looks like more tests need to be disabled:
Quoted 7 lines
| Making all in tests | make[4]: Entering directory '/data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/lang/python/tests' | echo no-force-v3-sigs > ./gpg.conf | echo pinentry-program /data/poky-tmp/master/work/corei7-64-poky-linux/gpgme/1.10.0-r0/build/../gpgme-1.10.0/tests/gpg/pinentry >gpg-agent.conf | gpgconf --kill all | echo ignore-invalid-option agent-program >> ./gpg.conf | /bin/bash: gpgconf: command not found
Quoted 4 lines
....
I think this set of failures in particular can be fixed by adding gnupg-native to dependencies (which is better than creating yet another 'Inappropriate' patch that we have to carry forever).
I've tried to add gnupg-native before disable it, but still failure.
//Hongxu
Quoted 4 lines
I'd be however interested to see the successful build log from the submitter because I'm bit puzzled how it could succeed (probably host gpg was used, but I want to see details).
Alex
PATCH v2 1/1 gpgme: 1.9.0 -> 1.10.0
In reply to Burton, Ross1. Disable test at build time to workaround corss-compile Add 0007 to add option to disable python test and submit it to upstream
2. Rework patch 0002, since the following commit of upstream.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=7309ce6f5f7c86570953a141965d4f54cd9ad9a0
3. Add patch 0006 to fix build path issue to improve reproducibility and submit it to upstream
---
.../gpgme/gpgme/0001-pkgconfig.patch | 10 +--
...python-gpg-error-config-should-not-be-use.patch | 66 ++++++++----------
.../0003-Correctly-install-python-modules.patch | 27 ++++----
.../gpgme/gpgme/0004-python-import.patch | 6 +-
...g-skip-all-lib-or-usr-lib-directories-in-.patch | 6 +-
.../gpgme/gpgme/0006-fix-build-path-issue.patch | 37 ++++++++++
.../0007-qt-python-Add-variables-to-tests.patch | 78 ++++++++++++++++++++++
.../gpgme/{gpgme_1.9.0.bb => gpgme_1.10.0.bb} | 15 ++++-
8 files changed, 179 insertions(+), 66 deletions(-)
create mode 100644 meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
create mode 100644 meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
rename meta/recipes-support/gpgme/{gpgme_1.9.0.bb => gpgme_1.10.0.bb} (84%)meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +5 -5
@@ -1,7 +1,7 @@ -From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 +From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 16 Aug 2017 02:00:08 -0400 -Subject: [PATCH 1/5] pkgconfig +Subject: [PATCH 1/4] pkgconfig Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling.
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <[email protected]> create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 0dac6ce..6a9e507 100644 +index 6ea4bcd..2a0d528 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -299,5 +299,5 @@ index 0000000..b69539f +Requires: libassuan gpg-error \ No newline at end of file -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +26 -40
90 lines not on this page · raw message
meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +15 -12
@@ -1,7 +1,7 @@ -From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 16 Aug 2017 02:05:34 -0400 -Subject: [PATCH 3/5] Correctly install python modules +From 93aae34ee70b8d50b31a19a65d6ac8290cb148ae Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 15:28:49 +0800 +Subject: [PATCH 2/4] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]>
@@ -9,22 +9,25 @@ Signed-off-by: Alexander Kanavin <[email protected]> Rebase to 1.9.0 Signed-off-by: Hongxu Jia <[email protected]> + +Rebase to 1.10.0 +Signed-off-by: Hongxu Jia <[email protected]> --- lang/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index d91ead9..67f7cdc 100644 +index 8d74cbd..ce4f0a5 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -106,6 +106,7 @@ install-exec-local: - cd python$${VERSION}-gpg ; \ - $$PYTHON setup.py install \ - --prefix $(DESTDIR)$(prefix) \ +@@ -91,6 +91,7 @@ install-exec-local: + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ + --prefix "$(DESTDIR)$(prefix)" \ + --install-lib=$(DESTDIR)${pythondir} \ - --record files.txt \ --verbose ; \ - cat files.txt >> ../install_files.txt ; \ + done + -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0004-python-import.patch +3 -3
@@ -1,7 +1,7 @@ -From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001 +From 32ecc3f058307060e40af86127cd226248a73c41 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 16 Aug 2017 02:06:45 -0400 -Subject: [PATCH 4/5] python import +Subject: [PATCH 3/4] python import Don't check for output on stderr to know if an import worked, host inputrc and sysroot readline can cause warnings on stderr.
@@ -30,5 +30,5 @@ index b990d5b..318b089 100644 else AC_MSG_RESULT([no]) -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +3 -3
@@ -1,7 +1,7 @@ -From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001 +From 6dcedc4dd055af902719b1a1cb10daa935a27f58 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 13 Apr 2017 16:40:27 +0300 -Subject: [PATCH 5/5] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH 4/4] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other
@@ -27,5 +27,5 @@ index a4d152e..8342865 100644 ;; -L*|-l*) -- -2.8.1 +1.8.3.1
meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 180a5669e4a13a550b1b0dcef1689b6c0470fe54 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Wed, 31 Jan 2018 11:01:09 +0800 +Subject: [PATCH] fix build path issue + +Get the "--root" directory supplied to the "install" command, +and use it as a prefix to strip off the purported filename +encoded in bytecode files. + +Since --root added, we need to tweak --prefix and --install-lib +to use relative path. + +Upstream-Status: Submitted [[email protected]] +Signed-off-by: Hongxu Jia <[email protected]> +--- + lang/python/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index ce4f0a5..5a468f1 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -90,8 +90,9 @@ install-exec-local: + build \ + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ +- --prefix "$(DESTDIR)$(prefix)" \ +- --install-lib=$(DESTDIR)${pythondir} \ ++ --root=${DESTDIR} \ ++ --prefix "$(prefix)" \ ++ --install-lib=${pythondir} \ + --verbose ; \ + done + +-- +1.8.3.1 +
meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch new file +78 -0
78 lines not on this page · raw message
meta/recipes-support/gpgme/gpgme_1.10.0.bb renamed from meta/recipes-support/gpgme/gpgme_1.9.0.bb +12 -3
@@ -16,10 +16,12 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0003-Correctly-install-python-modules.patch \ file://0004-python-import.patch \ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ + file://0006-fix-build-path-issue.patch \ + file://0007-qt-python-Add-variables-to-tests.patch \ " -SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3" -SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" +SRC_URI[md5sum] = "78b1533c593478982ee2fc548260c563" +SRC_URI[sha256sum] = "1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++"
@@ -49,7 +51,14 @@ LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" -EXTRA_OECONF += '--enable-languages="${LANGUAGES}"' +EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ + --disable-gpgconf-test \ + --disable-gpg-test \ + --disable-gpgsm-test \ + --disable-g13-test \ + --disable-lang-qt-test \ + --disable-lang-python-test \ +' inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT}
Signature · 1 line
2.8.1
PATCH 5/7 ghostscript: 9.21 -> 9.22
In reply to Hongxu Jia1. Rebase patches 0001 ~ 0010
2. Drop backported CVE fixes:
- CVE-2016-7977.patch
- CVE-2017-7207.patch
- CVE-2017-5951.patch
- CVE-2017-7975.patch
- CVE-2017-9216.patch
- CVE-2017-9611.patch
- CVE-2017-9612.patch
- CVE-2017-9739.patch
- CVE-2017-9726.patch
- CVE-2017-9727.patch
- CVE-2017-9835.patch
- CVE-2017-11714.patch
3. Clean up PACKAGECONFIG
4. Add packps to support `Auto-generate opdfread.h'
http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=59c7840aea41253d274d9037b637e60c38359f9f
---
.../0001-contrib.mak-fix-for-parallel-build.patch} | 28 +++--
...base-gendev.c-fix-for-Werror-return-type.patch} | 8 +-
...nfigure.ac-do-not-check-local-png-source.patch} | 10 +-
.../0004-avoid-host-contamination.patch} | 18 ++-
...allow-directories-to-be-created-more-tha.patch} | 16 ++-
.../0006-prevent-recompiling.patch} | 74 +++++-------
.../0007-genarch.patch} | 34 ++++--
.../0008-cups-no-gcrypt.patch} | 14 ++-
...script-native-fix-disable-system-libtiff.patch} | 21 +++-
...-add-a-preprocessor-define-to-allow-fope.patch} | 16 ++-
.../ghostscript/ghostscript/CVE-2016-7977.patch | 33 ------
.../ghostscript/ghostscript/CVE-2017-11714.patch | 61 ----------
.../ghostscript/ghostscript/CVE-2017-5951.patch | 44 --------
.../ghostscript/ghostscript/CVE-2017-7207.patch | 39 -------
.../ghostscript/ghostscript/CVE-2017-7975.patch | 37 ------
.../ghostscript/ghostscript/CVE-2017-9216.patch | 36 ------
.../ghostscript/ghostscript/CVE-2017-9611.patch | 34 ------
.../ghostscript/ghostscript/CVE-2017-9612.patch | 35 ------
.../ghostscript/ghostscript/CVE-2017-9726.patch | 33 ------
.../ghostscript/ghostscript/CVE-2017-9727.patch | 35 ------
.../ghostscript/ghostscript/CVE-2017-9739.patch | 37 ------
.../ghostscript/ghostscript/CVE-2017-9835.patch | 125 ---------------------
.../{ghostscript_9.21.bb => ghostscript_9.22.bb} | 54 +++------
23 files changed, 159 insertions(+), 683 deletions(-)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.15-parallel-make.patch => files/0001-contrib.mak-fix-for-parallel-build.patch} (55%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.16-Werror-return-type.patch => files/0002-base-gendev.c-fix-for-Werror-return-type.patch} (79%)
rename meta/recipes-extended/ghostscript/files/{do-not-check-local-libpng-source.patch => 0003-configure.ac-do-not-check-local-png-source.patch} (81%)
rename meta/recipes-extended/ghostscript/{ghostscript/avoid-host-contamination.patch => files/0004-avoid-host-contamination.patch} (61%)
rename meta/recipes-extended/ghostscript/{ghostscript/mkdir-p.patch => files/0005-ghostscript-allow-directories-to-be-created-more-tha.patch} (80%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.21-prevent_recompiling.patch => files/0006-prevent-recompiling.patch} (51%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.02-genarch.patch => files/0007-genarch.patch} (41%)
rename meta/recipes-extended/ghostscript/{ghostscript/cups-no-gcrypt.patch => files/0008-cups-no-gcrypt.patch} (67%)
rename meta/recipes-extended/ghostscript/{ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch => files/0009-ghostscript-native-fix-disable-system-libtiff.patch} (66%)
rename meta/recipes-extended/ghostscript/{ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch => files/0010-base-genht.c-add-a-preprocessor-define-to-allow-fope.patch} (65%)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch
rename meta/recipes-extended/ghostscript/{ghostscript_9.21.bb => ghostscript_9.22.bb} (66%)meta/recipes-extended/ghostscript/files/0001-contrib.mak-fix-for-parallel-build.patch renamed from meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch +13 -15
@@ -1,25 +1,23 @@ -From 14937d9247330065359ca0fb648c28dfa5c3b224 Mon Sep 17 00:00:00 2001 -From: Huang Qiyu <[email protected]> -Date: Tue, 13 Dec 2016 18:16:41 +0900 -Subject: [PATCH] ghostscript-9.15-parallel-make +From 706a24153665cd014baa2d3a5496cbf03ecf9ec0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:01:17 +0800 +Subject: [PATCH 01/10] contrib.mak: fix for parallel build -From 767bdf8a412b0cce2b734998e9b7e55abeaf932c Mon Sep 17 00:00:00 2001 -From: Huang Qiyu <[email protected]> -Date: Tue, 13 Dec 2016 17:55:54 +0900 -Subject: [PATCH] Robert Yang <[email protected]> Date: Fri, 30 Jan -2015 00:40:22 -0800 Subject: [PATCH] contrib.mak: fix for parallel build - -Signed-off-by: Huang Qiyu <[email protected]> Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> + +Rebase to 9.22 +Signed-off-by: Hongxu Jia <[email protected]> --- contrib/contrib.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index 55415b3..0b6b5ae 100644 +index f5a2fa4..4999752 100644 --- a/contrib/contrib.mak +++ b/contrib/contrib.mak -@@ -1099,6 +1099,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \ +@@ -1067,6 +1067,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \ $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c extra-dmprt-install: install-libdata
@@ -27,7 +25,7 @@ index 55415b3..0b6b5ae 100644 $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 -@@ -1267,6 +1268,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ +@@ -1235,6 +1236,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ ### ----------------- Additional .upp files ---------------- ### extra-upp-install: install-libdata
@@ -36,5 +34,5 @@ index 55415b3..0b6b5ae 100644 $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ done -- -2.7.4 +1.8.3.1
meta/recipes-extended/ghostscript/files/0002-base-gendev.c-fix-for-Werror-return-type.patch renamed from meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch +4 -4
@@ -1,7 +1,7 @@ -From 5d5c83c89be0cff29dde2267fa168e6f7146be8c Mon Sep 17 00:00:00 2001 +From 77c2e8458133f95ac15b589f4a6e1ae581208bd7 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Mon, 4 May 2015 22:31:48 -0700 -Subject: [PATCH] base/gendev.c: fix for -Werror=return-type +Subject: [PATCH 02/10] base/gendev.c: fix for -Werror=return-type Fixed: base/gendev.c:80:1: error: return type defaults to 'int' [-Werror=return-type]
@@ -10,7 +10,7 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> --- - base/gendev.c | 1 + + base/gendev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/gendev.c b/base/gendev.c
@@ -26,5 +26,5 @@ index 68a745f..8058b5a 100644 { config conf; -- -1.7.9.5 +1.8.3.1
meta/recipes-extended/ghostscript/files/0003-configure.ac-do-not-check-local-png-source.patch renamed from meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +5 -5
@@ -1,7 +1,7 @@ -From 5ef8b85bc98f3bd9a15d5f47e24d3e23ae27c265 Mon Sep 17 00:00:00 2001 +From 52885dd446d3a1c014a59b5d55c9a6a11674fe6d Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Mon, 18 Jan 2016 01:00:30 -0500 -Subject: [PATCH] configure.ac: do not check local png source +Subject: [PATCH 03/10] configure.ac: do not check local png source In oe-core, it did not need to compile local libpng source in ghostscript, so do not check local png
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index bf6d3f5..01df03f 100644 +index d0f62d7..44a1ed8 100644 --- a/configure.ac +++ b/configure.ac -@@ -930,11 +930,11 @@ AC_SUBST(ZLIBDIR) +@@ -1103,11 +1103,11 @@ AC_SUBST(ZLIBDIR) AC_SUBST(FT_SYS_ZLIB) dnl png for the png output device; it also requires zlib
@@ -34,5 +34,5 @@ index bf6d3f5..01df03f 100644 SHARE_LIBPNG=0 LIBPNGDIR=$srcdir/libpng -- -2.8.1 +1.8.3.1
meta/recipes-extended/ghostscript/files/0004-avoid-host-contamination.patch renamed from meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +16 -2
@@ -1,14 +1,25 @@ +From 3ffb613395bf1a630aad1e724d8c240a0f1776ea Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:04:05 +0800 +Subject: [PATCH 04/10] avoid host contamination + Remove hardcode path refer to host to avoid host contamination. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Kai Kang <[email protected]> + +Rebase to 9.22 +Signed-off-by: Hongxu Jia <[email protected]> --- + devices/devs.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/devices/devs.mak b/devices/devs.mak -index 3070d2e..df663f0 100644 +index 2f00b32..37f9dde 100644 --- a/devices/devs.mak +++ b/devices/devs.mak -@@ -546,7 +546,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ +@@ -392,7 +392,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
@@ -17,3 +28,6 @@ index 3070d2e..df663f0 100644 ###### --------------- Memory-buffered printer devices --------------- ###### +-- +1.8.3.1 +
meta/recipes-extended/ghostscript/files/0005-ghostscript-allow-directories-to-be-created-more-tha.patch renamed from meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch +15 -1
@@ -1,4 +1,8 @@ -ghostscript: allow directories to be created more than once +From dcc512b4a12a4251ee6fffe6864e8c85ca7ca39c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:05:33 +0800 +Subject: [PATCH 05/10] ghostscript: allow directories to be created more than + once When doing parallel builds, we might try to create directories more than once. This should not cause an error.
@@ -7,7 +11,14 @@ Upstream-Status: Pending Signed-off-by: Joe Slater <[email protected]> +Rebase to 9.22 +Signed-off-by: Hongxu Jia <[email protected]> +--- + base/unix-end.mak | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) +diff --git a/base/unix-end.mak b/base/unix-end.mak +index 689229f..6100eec 100644 --- a/base/unix-end.mak +++ b/base/unix-end.mak @@ -17,15 +17,14 @@
@@ -34,3 +45,6 @@ Signed-off-by: Joe Slater <[email protected]> gs: .gssubtarget $(UNIX_END_MAK) +-- +1.8.3.1 +
meta/recipes-extended/ghostscript/files/0006-prevent-recompiling.patch renamed from meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch +30 -44
108 lines not on this page · raw message
meta/recipes-extended/ghostscript/files/0007-genarch.patch renamed from meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch +22 -12
@@ -1,22 +1,29 @@ -Import patch from windriver linux for cross compilation, and split patches -into oe way under different directories such as i586, powerpc etc according -to Richard's opinion. +From 7026d9863ffd3ecc3fd1670a9b574e2bd1b5bff1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:13:09 +0800 +Subject: [PATCH 07/10] genarch + +Import patch from windriver linux for cross compilation, and split +patches into oe way under different directories such as i586, +powerpc etc according to Richard's opinion. Upstream-Status: Pending Signed-off-by: Kang Kai <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> -# Author: Chi Xu <[email protected]> -# Date: Feb 26 2010 -# Summary: Generate arch.h for ppc32 -# +Rebase to 9.22 +Signed-off-by: Hongxu Jia <[email protected]> +--- + base/lib.mak | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak ---- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800 -+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800 -@@ -67,8 +67,8 @@ - stdpre_h=$(GLSRC)stdpre.h $(stdpn_h) +diff --git a/base/lib.mak b/base/lib.mak +index ee0247f..22e1257 100644 +--- a/base/lib.mak ++++ b/base/lib.mak +@@ -86,8 +86,8 @@ arch_h=$(GLGEN)arch.h + stdpre_h=$(GLSRC)stdpre.h stdint__h=$(GLSRC)stdint_.h $(std_h) -$(GLGEN)arch.h : $(GENARCH_XE)
@@ -26,3 +33,6 @@ diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak # Platform interfaces +-- +1.8.3.1 +
meta/recipes-extended/ghostscript/files/0008-cups-no-gcrypt.patch renamed from meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch +10 -4
@@ -1,6 +1,12 @@ -Subject: [PATCH] Don't build-depend on libgcrypt, as nothing is used from it +From 861553fc2422b7b84bd322c4f9d911d8e61e830b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:15:53 +0800 +Subject: [PATCH 08/10] cups no gcrypt -Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch +Don't build-depend on libgcrypt, as nothing is used from it + +Backported from +http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch This addresses the cryto dependency seen during build.
@@ -8,7 +14,7 @@ Upstream-Status: Backport Signed-off-by: Jackie Huang <[email protected]> -Rebase the patch to ghostscript-9.15 +Rebase to 9.22 Signed-off-by: Hongxu Jia <[email protected]> --- cups/libs/cups/http-private.h | 1 -
@@ -27,5 +33,5 @@ index 99a85c3..a674852 100644 # include <CoreFoundation/CoreFoundation.h> # include <Security/Security.h> -- -1.9.1 +1.8.3.1
meta/recipes-extended/ghostscript/files/0009-ghostscript-native-fix-disable-system-libtiff.patch renamed from meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch +16 -5
@@ -1,19 +1,27 @@ -ghostscript-native:fix disable-system-libtiff +From 218f1590de04f88b53147ad42cb45b04e5566c06 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:33:28 +0800 +Subject: [PATCH 09/10] ghostscript-native:fix disable-system-libtiff Modify configure to add the check to make sure ghostscrip could work while system-libtiff is disabled. +Upstream-Status: Pending + Signed-off-by: Hongxu Jia <[email protected]> Updated to apply to ghostscript 9.21. - Signed-off-by: Joe Slater <[email protected]> -Upstream-Status: Pending - - +Rebase to 9.22 +Signed-off-by: Hongxu Jia <[email protected]> +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) +diff --git a/configure.ac b/configure.ac +index 44a1ed8..ad0db94 100644 --- a/configure.ac +++ b/configure.ac @@ -1259,6 +1259,7 @@ case "x$with_system_libtiff" in
@@ -35,3 +43,6 @@ Upstream-Status: Pending fi AC_SUBST(SHARE_LIBTIFF) +-- +1.8.3.1 +
meta/recipes-extended/ghostscript/files/0010-base-genht.c-add-a-preprocessor-define-to-allow-fope.patch renamed from meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch +12 -4
@@ -1,4 +1,8 @@ -base/genht.c: add a preprocessor define to allow fopen calling +From 8574add6c9818df75e3e205f2ad9e2b3fa4566d4 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 14:36:11 +0800 +Subject: [PATCH 10/10] base/genht.c: add a preprocessor define to allow fopen + calling The commit in upstream: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643
@@ -7,17 +11,21 @@ Replace all fopen calls with gp_fopen and add a preprocessor define so that any unintential calls directly to fopen will cause an error. Only exceptions are those in the platform specific code, and mkromfs.c. -This patch add a preprocessor define to allow fopen calling in base/genht.c. +This patch add a preprocessor define to allow fopen calling in +base/genht.c. Upstream-Status: Pending Signed-off-by: Hongxu Jia <[email protected]> + +Rebase to 9.22 +Signed-off-by: Hongxu Jia <[email protected]> --- base/genht.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/genht.c b/base/genht.c -index 4b04085..cc82fff 100644 +index 606a704..9970e66 100644 --- a/base/genht.c +++ b/base/genht.c @@ -16,6 +16,10 @@
@@ -32,5 +40,5 @@ index 4b04085..cc82fff 100644 #include "string_.h" #include "gscdefs.h" -- -1.8.1.2 +1.8.3.1
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 8abd22010eb4db0fb1b10e430d5f5d83e015ef70 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Mon, 3 Oct 2016 01:46:28 +0100 -Subject: [PATCH] Bug 697169: Be rigorous with SAFER permissions - -Once we've opened our input file from the command line, enforce the SAFER -rules. - -Upstream-Status: Backport -CVE: CVE-2016-7977 - -Signed-off-by: Catalin Enache <[email protected]> ---- - psi/zfile.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/psi/zfile.c b/psi/zfile.c -index b6caea2..2c6c958 100644 ---- a/psi/zfile.c -+++ b/psi/zfile.c -@@ -1081,6 +1081,9 @@ lib_file_open(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx - gs_main_instance *minst = get_minst_from_memory(mem); - int code; - -+ if (i_ctx_p && starting_arg_file) -+ i_ctx_p->starting_arg_file = false; -+ - /* when starting arg files (@ files) iodev_default is not yet set */ - if (iodev == 0) - iodev = (gx_io_device *)gx_io_device_table[0]; --- -2.10.2 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch deleted +0 -61
61 lines not on this page · raw message
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 0e88bee1304993668fede72498d656a2dd33a35e Mon Sep 17 00:00:00 2001 -From: Ken Sharp <[email protected]> -Date: Mon, 20 Mar 2017 09:34:11 +0000 -Subject: [PATCH] Ensure a device has raster memory, before trying to read it. - -Bug #697676 "Null pointer dereference in mem_get_bits_rectangle()" - -This is only possible by abusing/mis-using Ghostscript-specific -language extensions, so cannot happen in a general PostScript program. - -Nevertheless, Ghostscript should not crash. So this commit checks the -memory device to see if raster memory has been allocated, before trying -to read from it. - -Upstream-Status: Backport -CVE: CVE-2017-7207 - -Author: Ken Sharp <[email protected]> -Signed-off-by: Catalin Enache <[email protected]> ---- - base/gdevmem.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/base/gdevmem.c b/base/gdevmem.c -index 41108ba..183f96d 100644 ---- a/base/gdevmem.c -+++ b/base/gdevmem.c -@@ -605,6 +605,8 @@ mem_get_bits_rectangle(gx_device * dev, const gs_int_rect * prect, - GB_PACKING_CHUNKY | GB_COLORS_NATIVE | GB_ALPHA_NONE; - return_error(gs_error_rangecheck); - } -+ if (mdev->line_ptrs == 0x00) -+ return_error(gs_error_rangecheck); - if ((w <= 0) | (h <= 0)) { - if ((w | h) < 0) - return_error(gs_error_rangecheck); --- -2.10.2 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From b39be1019b4acc1aa50c6026463c543332e95a31 Mon Sep 17 00:00:00 2001 -From: Catalin Enache <[email protected]> -Date: Mon, 8 May 2017 16:18:14 +0300 - -Subject: [PATCH] Bug 697693: Prevent SEGV due to integer overflow. - -While building a Huffman table, the start and end points were susceptible -to integer overflow. - -Thank you to Jiaqi for finding this issue and suggesting a patch. - -Upstream-Status: Backport -CVE: CVE-2017-7975 - -Signed-off-by: Catalin Enache <[email protected]> - -Contents of this patch were extracted from a larger patch which addressed -two CVE's. The context (location of {) was also modified to apply to -ghostscript 9.21. - -Signed-off-by: Joe Slater <[email protected]> - - ---- a/jbig2dec/jbig2_huffman.c -+++ b/jbig2dec/jbig2_huffman.c -@@ -421,8 +421,8 @@ jbig2_build_huffman_table(Jbig2Ctx *ctx, - - if (PREFLEN == CURLEN) { - int RANGELEN = lines[CURTEMP].RANGELEN; -- int start_j = CURCODE << shift; -- int end_j = (CURCODE + 1) << shift; -+ uint32_t start_j = CURCODE << shift; -+ uint32_t end_j = (CURCODE + 1) << shift; - byte eflags = 0; - - if (end_j > max_j) { -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 3ebffb1d96ba0cacec23016eccb4047dab365853 Mon Sep 17 00:00:00 2001 -From: Shailesh Mistry <[email protected]> -Date: Wed, 24 May 2017 19:29:57 +0100 -Subject: [PATCH] Bug 697934: Fix SEGV due to error code being ignored. - -The return code from jbig2_decode_text_region was being ignored so the -code continued to try and parse the invalid file using incomplete/empty -structures. - -Upstream-Status: Backport -CVE: CVE-2017-9216 - -Signed-off-by: Catalin Enache <[email protected]> ---- - jbig2dec/jbig2_symbol_dict.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/jbig2dec/jbig2_symbol_dict.c b/jbig2dec/jbig2_symbol_dict.c -index 3cc1731..672425d 100644 ---- a/jbig2dec/jbig2_symbol_dict.c -+++ b/jbig2dec/jbig2_symbol_dict.c -@@ -493,8 +493,10 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx, - } - - /* multiple symbols are handled as a text region */ -- jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts, -+ code = jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts, - n_refagg_dicts, image, data, size, GR_stats, as, ws); -+ if (code < 0) -+ goto cleanup4; - - SDNEWSYMS->glyphs[NSYMSDECODED] = image; - refagg_dicts[0]->glyphs[params->SDNUMINSYMS + NSYMSDECODED] = jbig2_image_clone(ctx, SDNEWSYMS->glyphs[NSYMSDECODED]); --- -2.10.2 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From c7c55972758a93350882c32147801a3485b010fe Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Mon, 12 Jun 2017 13:08:40 +0100 -Subject: [PATCH] Bug 698024: bounds check zone pointer in Ins_MIRP() - ---- - base/ttinterp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- end of original header - -CVE: CVE-2017-9611 - -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Joe Slater <[email protected]> - -diff --git a/base/ttinterp.c b/base/ttinterp.c -index e56aec6..f6a6d95 100644 ---- a/base/ttinterp.c -+++ b/base/ttinterp.c -@@ -3858,7 +3858,8 @@ static int nInstrCount=0; - /* XXX: UNDOCUMENTED! cvt[-1] = 0 always */ - - if ( BOUNDS( args[0], CUR.zp1.n_points ) || -- BOUNDS( args[1]+1, CUR.cvtSize+1 ) ) -+ BOUNDS( args[1]+1, CUR.cvtSize+1 ) || -+ BOUNDS(CUR.GS.rp0, CUR.zp0.n_points) ) - { - CUR.error = TT_Err_Invalid_Reference; - return; --- -1.7.9.5 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 98f6da60b9d463c617e631fc254cf6d66f2e8e3c Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Mon, 12 Jun 2017 13:15:17 +0100 -Subject: [PATCH] Bug 698026: bounds check zone pointers in Ins_IP() - ---- - base/ttinterp.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- end of original header - -CVE: CVE-2017-9612 - -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Joe Slater <[email protected]> - -diff --git a/base/ttinterp.c b/base/ttinterp.c -index f6a6d95..e7c9d68 100644 ---- a/base/ttinterp.c -+++ b/base/ttinterp.c -@@ -4129,7 +4129,9 @@ static int nInstrCount=0; - Int point; - (void)args; - -- if ( CUR.top < CUR.GS.loop ) -+ if ( CUR.top < CUR.GS.loop || -+ BOUNDS(CUR.GS.rp1, CUR.zp0.n_points) || -+ BOUNDS(CUR.GS.rp2, CUR.zp1.n_points)) - { - CUR.error = TT_Err_Invalid_Reference; - return; --- -1.7.9.5 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 7755e67116e8973ee0e3b22d653df026a84fa01b Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Thu, 15 Jun 2017 08:58:31 +0100 -Subject: [PATCH] Bug 698055: bounds check zone pointer in Ins_MDRP - ---- - base/ttinterp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- end of original header - -CVE: CVE-2017-9726 - -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Joe Slater <[email protected]> -diff --git a/base/ttinterp.c b/base/ttinterp.c -index e7c9d68..af457e8 100644 ---- a/base/ttinterp.c -+++ b/base/ttinterp.c -@@ -3770,7 +3770,8 @@ static int nInstrCount=0; - - point = (Int)args[0]; - -- if ( BOUNDS( args[0], CUR.zp1.n_points ) ) -+ if ( BOUNDS( args[0], CUR.zp1.n_points ) || -+ BOUNDS( CUR.GS.rp0, CUR.zp0.n_points) ) - { - /* Current version of FreeType silently ignores this out of bounds error - * and drops the instruction, see bug #691121 --- -1.7.9.5 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 937ccd17ac65935633b2ebc06cb7089b91e17e6b Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Thu, 15 Jun 2017 09:05:20 +0100 -Subject: [PATCH] Bug 698056: make bounds check in gx_ttfReader__Read more - robust - ---- - base/gxttfb.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- end of original header - -CVE: CVE-2017-9727 - -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Joe Slater <[email protected]> - -diff --git a/base/gxttfb.c b/base/gxttfb.c -index 0e9a444..e1561af 100644 ---- a/base/gxttfb.c -+++ b/base/gxttfb.c -@@ -79,7 +79,8 @@ static void gx_ttfReader__Read(ttfReader *self, void *p, int n) - if (!r->error) { - if (r->extra_glyph_index != -1) { - q = r->glyph_data.bits.data + r->pos; -- r->error = (r->glyph_data.bits.size - r->pos < n ? -+ r->error = ((r->pos >= r->glyph_data.bits.size || -+ r->glyph_data.bits.size - r->pos < n) ? - gs_note_error(gs_error_invalidfont) : 0); - if (r->error == 0) - memcpy(p, q, n); --- -1.7.9.5 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From c501a58f8d5650c8ba21d447c0d6f07eafcb0f15 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <[email protected]> -Date: Fri, 16 Jun 2017 08:29:25 +0100 -Subject: [PATCH] Bug 698063: Bounds check Ins_JMPR - ---- - base/ttinterp.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- end of original header - -CVE: CVE-2017-9739 - -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Joe Slater <[email protected]> - -diff --git a/base/ttinterp.c b/base/ttinterp.c -index af457e8..adf3f0c 100644 ---- a/base/ttinterp.c -+++ b/base/ttinterp.c -@@ -1794,6 +1794,12 @@ static int nInstrCount=0; - - static void Ins_JMPR( INS_ARG ) - { -+ if ( BOUNDS(CUR.IP + args[0], CUR.codeSize ) ) -+ { -+ CUR.error = TT_Err_Invalid_Reference; -+ return; -+ } -+ - CUR.IP += (Int)(args[0]); - CUR.step_ins = FALSE; - --- -1.7.9.5 -
meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch deleted +0 -125
125 lines not on this page · raw message
meta/recipes-extended/ghostscript/ghostscript_9.22.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.21.bb +16 -38
87 lines not on this page · raw message
Signature · 1 line
2.8.1
PATCH 6/7 apr-util: 1.6.0 -> 1.6.1
In reply to Hongxu Jia---
meta/recipes-support/apr/{apr-util_1.6.0.bb => apr-util_1.6.1.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-support/apr/{apr-util_1.6.0.bb => apr-util_1.6.1.bb} (95%)meta/recipes-support/apr/apr-util_1.6.1.bb renamed from meta/recipes-support/apr/apr-util_1.6.0.bb +2 -4
@@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "3b03dbff60728a4f4c33f5d929e8b35a" -SRC_URI[sha256sum] = "483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389" +SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" +SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \
@@ -29,8 +29,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ inherit autotools lib_package binconfig -PR = "r1" - OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" do_configure_append() {
Signature · 1 line
2.8.1
PATCH 7/7 apr: 1.6.2 -> 1.6.3
In reply to Hongxu Jia- Rebase patches 0001 ~ 0008
- Fix build path issue to improve reproducibility
---
...gure_fixes.patch => 0001-configure-fixes.patch} | 28 +++++++---
meta/recipes-support/apr/apr/0002-cleanup.patch | 59 ++++++++++++++++++++++
.../apr/{configfix.patch => 0003-configfix.patch} | 27 +++++++---
...4-Makefile.in-fix-cross-compiling-failed.patch} | 13 +++--
...> 0005-Fix-packet-discards-HTTP-redirect.patch} | 15 ++++--
...-fix-LTFLAGS-to-make-it-work-with-ccache.patch} | 10 ++--
...t-size-doesn-t-match-in-glibc-when-cross.patch} | 16 +++---
...ink-libapr-against-phtread-to-make-gold-.patch} | 12 ++---
meta/recipes-support/apr/apr/cleanup.patch | 43 ----------------
.../apr/{apr_1.6.2.bb => apr_1.6.3.bb} | 23 +++++----
10 files changed, 153 insertions(+), 93 deletions(-)
rename meta/recipes-support/apr/apr/{configure_fixes.patch => 0001-configure-fixes.patch} (69%)
create mode 100644 meta/recipes-support/apr/apr/0002-cleanup.patch
rename meta/recipes-support/apr/apr/{configfix.patch => 0003-configfix.patch} (75%)
rename meta/recipes-support/apr/apr/{upgrade-and-fix-1.5.1.patch => 0004-Makefile.in-fix-cross-compiling-failed.patch} (81%)
rename meta/recipes-support/apr/apr/{Fix-packet-discards-HTTP-redirect.patch => 0005-Fix-packet-discards-HTTP-redirect.patch} (71%)
rename meta/recipes-support/apr/apr/{configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch => 0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch} (81%)
rename meta/recipes-support/apr/apr/{0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch => 0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch} (85%)
rename meta/recipes-support/apr/apr/{0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch => 0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch} (90%)
delete mode 100644 meta/recipes-support/apr/apr/cleanup.patch
rename meta/recipes-support/apr/{apr_1.6.2.bb => apr_1.6.3.bb} (81%)meta/recipes-support/apr/apr/0001-configure-fixes.patch renamed from meta/recipes-support/apr/apr/configure_fixes.patch +21 -7
@@ -1,11 +1,22 @@ +From ed491771f5a8976f9f05253f5f68b4cb5ac9b05f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:33:51 +0800 +Subject: [PATCH 1/8] configure fixes + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/configure.in -=================================================================== ---- apr-1.3.3.orig/configure.in -+++ apr-1.3.3/configure.in -@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm - create_area]) +Rebase to 1.6.3 +Signed-off-by: Hongxu Jia <[email protected]> +--- + configure.in | 48 ++++++++---------------------------------------- + 1 file changed, 8 insertions(+), 40 deletions(-) + +diff --git a/configure.in b/configure.in +index 719f331..470c99a 100644 +--- a/configure.in ++++ b/configure.in +@@ -1167,39 +1167,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ + create_area mprotect]) APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) -AC_CHECK_FILE(/dev/zero)
@@ -44,7 +55,7 @@ Index: apr-1.3.3/configure.in # Now we determine which one is our anonymous shmem preference. haveshmgetanon="0" -@@ -1518,13 +1485,14 @@ else +@@ -1976,13 +1943,14 @@ else bigendian=0 fi
@@ -66,3 +77,6 @@ Index: apr-1.3.3/configure.in AC_SUBST(voidp_size) AC_SUBST(short_value) +-- +1.8.3.1 +
meta/recipes-support/apr/apr/0002-cleanup.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-support/apr/apr/0003-configfix.patch renamed from meta/recipes-support/apr/apr/configfix.patch +21 -6
@@ -1,10 +1,22 @@ +From 70a98680045ce31b34dae191b980470e4988bf7f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:39:06 +0800 +Subject: [PATCH 3/8] configfix + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/apr-config.in -=================================================================== ---- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 -+++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 -@@ -152,14 +152,7 @@ +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <[email protected]> +--- + apr-config.in | 26 ++------------------------ + 1 file changed, 2 insertions(+), 24 deletions(-) + +diff --git a/apr-config.in b/apr-config.in +index 84b4073..bbbf651 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -152,14 +152,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes)
@@ -19,7 +31,7 @@ Index: apr-1.3.3/apr-config.in ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +167,14 @@ +@@ -181,29 +174,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld)
@@ -51,3 +63,6 @@ Index: apr-1.3.3/apr-config.in ;; --shlib-path-var) echo "$SHLIBPATH_VAR" +-- +1.8.3.1 +
meta/recipes-support/apr/apr/0004-Makefile.in-fix-cross-compiling-failed.patch renamed from meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +10 -3
@@ -1,4 +1,7 @@ -Makefile.in: fix cross compiling failed +From 5b10d55396904982097e1da4c395fdeccb9d0d6a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:41:13 +0800 +Subject: [PATCH 4/8] Makefile.in: fix cross compiling failed The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we
@@ -10,13 +13,14 @@ do_install time. Upstream-Status: Inappropriate [oe specific] +Rebase to 1.6.3 Signed-off-by: Hongxu Jia <[email protected]> --- Makefile.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a2a5194..5fe028f 100644 +index 5fb760e..f9e4445 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
@@ -27,7 +31,7 @@ index a2a5194..5fe028f 100644 include/private/apr_escape_test_char.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ -@@ -129,13 +128,8 @@ check: $(TARGET_LIB) +@@ -131,13 +130,8 @@ check: $(TARGET_LIB) etags: etags `find . -name '*.[ch]'`
@@ -43,3 +47,6 @@ index a2a5194..5fe028f 100644 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ $(APR_MKDIR) include/private +-- +1.8.3.1 +
meta/recipes-support/apr/apr/0005-Fix-packet-discards-HTTP-redirect.patch renamed from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +11 -4
@@ -1,4 +1,7 @@ -Fix packet discards HTTP redirect. +From 78a148715444bdeb1363f0d1182901512146a439 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:43:34 +0800 +Subject: [PATCH 5/8] Fix packet discards HTTP redirect. Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then
@@ -8,12 +11,16 @@ Upstream-Status: Pending Signed-off-by: Noriaki Yoshitane <[email protected]> Signed-off-by: Li Wang <[email protected]> + +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <[email protected]> --- - network_io/unix/sendrecv.c | 4 ++++ + network_io/unix/sendrecv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c -index c133a26..e8faf15 100644 +index 4c0e0a6..1bdafba 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
@@ -28,5 +35,5 @@ index c133a26..e8faf15 100644 *len = 0; return arv; -- -1.7.9.5 +1.8.3.1
meta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch renamed from meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +5 -5
@@ -1,7 +1,7 @@ -From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 +From 9620df513b237c4839e3e6d6459d6363e21d48be Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 19 Nov 2015 18:25:38 -0800 -Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache +Subject: [PATCH 6/8] configure.in: fix LTFLAGS to make it work with ccache When ccache is enabled, libtool requires --tag=CC when use ccache, otherwise when building apr-util with ccache enabled:
@@ -15,11 +15,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 5a4a988..9d57ae6 100644 +index 470c99a..d215d98 100644 --- a/configure.in +++ b/configure.in @@ -246,7 +246,7 @@ case $host in
@@ -32,5 +32,5 @@ index 5a4a988..9d57ae6 100644 if test "$experimental_libtool" = "yes"; then # Use a custom-made libtool replacement -- -1.7.9.5 +1.8.3.1
meta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch renamed from meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +8 -8
@@ -1,7 +1,7 @@ -From f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001 +From 5252a5b8b47eaba3c05e69c43c8cea6b1b8acbc9 Mon Sep 17 00:00:00 2001 From: Dengke Du <[email protected]> Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross +Subject: [PATCH 7/8] apr: fix off_t size doesn't match in glibc when cross compiling In configure.in, it contains the following:
@@ -34,10 +34,10 @@ Upstream-Status: Pending 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index 9d57ae6..5b19940 100644 +index d215d98..3c579f5 100644 --- a/configure.in +++ b/configure.in -@@ -1681,7 +1681,7 @@ else +@@ -1733,7 +1733,7 @@ else socklen_t_value="int" fi
@@ -46,7 +46,7 @@ index 9d57ae6..5b19940 100644 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) +@@ -1802,7 +1802,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
@@ -55,7 +55,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_ssize_t]) if test -n "$ssize_t_fmt"; then -@@ -1767,7 +1767,7 @@ fi +@@ -1819,7 +1819,7 @@ fi ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
@@ -64,7 +64,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_size_t]) if test -n "$size_t_fmt"; then -@@ -1784,7 +1784,7 @@ fi +@@ -1836,7 +1836,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
@@ -74,5 +74,5 @@ index 9d57ae6..5b19940 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS -- -2.7.4 +1.8.3.1
meta/recipes-support/apr/apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch renamed from meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch +6 -6
@@ -1,8 +1,8 @@ -From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001 +From 922795e34289877ed2610f7bb44e044bcfb73cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 3 Mar 2017 22:24:17 +0100 -Subject: [PATCH] explicitly link libapr against phtread to make gold happy on - test +Subject: [PATCH 8/8] explicitly link libapr against phtread to make gold happy + on test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -34,10 +34,10 @@ Signed-off-by: Andreas Müller <[email protected]> 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in -index 5b19940..cdf4d58 100644 +index 3c579f5..06afb62 100644 --- a/configure.in +++ b/configure.in -@@ -766,6 +766,7 @@ else +@@ -781,6 +781,7 @@ else APR_PTHREADS_CHECK_RESTORE ] ) fi if test "$pthreadh" = "1"; then
@@ -46,5 +46,5 @@ index 5b19940..cdf4d58 100644 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG APR_CHECK_PTHREAD_RECURSIVE_MUTEX -- -2.9.3 +1.8.3.1
meta/recipes-support/apr/apr/cleanup.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-support/apr/apr_1.6.3.bb renamed from meta/recipes-support/apr/apr_1.6.2.bb +12 -11
@@ -10,19 +10,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ - file://configure_fixes.patch \ - file://cleanup.patch \ - file://configfix.patch \ file://run-ptest \ - file://upgrade-and-fix-1.5.1.patch \ - file://Fix-packet-discards-HTTP-redirect.patch \ - file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ - file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ + file://0001-configure-fixes.patch \ + file://0002-cleanup.patch \ + file://0003-configfix.patch \ + file://0004-Makefile.in-fix-cross-compiling-failed.patch \ + file://0005-Fix-packet-discards-HTTP-redirect.patch \ + file://0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ + file://0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ + file://0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ " -SRC_URI[md5sum] = "e81a851967c79b5ce9bfbc909e4bf735" -SRC_URI[sha256sum] = "09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd" +SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" +SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172" inherit autotools-brokensep lib_package binconfig multilib_header ptest
@@ -69,7 +69,8 @@ do_install_append() { } do_install_append_class-target() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk + sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk sed -i -e 's,${STAGING_DIR_HOST},,g' \ -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config
Signature · 1 line
2.8.1
Re: [PATCH 7/7] apr: 1.6.2 -> 1.6.3
We're carrying a lot of patches here, and I'm not convinced that they are all inappropriate. Would you be willing to see what of those are upstreamable?
Ross
Quoted 598 lines · Hongxu Jia
- Rebase patches 0001 ~ 0008
- Fix build path issue to improve reproducibility
Signed-off-by Hongxu Jia <[email protected]>--- ...gure_fixes.patch => 0001-configure-fixes.patch} | 28 +++++++--- meta/recipes-support/apr/apr/0002-cleanup.patch | 59 ++++++++++++++++++++++ .../apr/{configfix.patch => 0003-configfix.patch} | 27 +++++++--- ...4-Makefile.in-fix-cross-compiling-failed.patch} | 13 +++-- ...> 0005-Fix-packet-discards-HTTP-redirect.patch} | 15 ++++-- ...-fix-LTFLAGS-to-make-it-work-with-ccache.patch} | 10 ++-- ...t-size-doesn-t-match-in-glibc-when-cross.patch} | 16 +++--- ...ink-libapr-against-phtread-to-make-gold-.patch} | 12 ++--- meta/recipes-support/apr/apr/cleanup.patch | 43 ---------------- .../apr/{apr_1.6.2.bb => apr_1.6.3.bb} | 23 +++++---- 10 files changed, 153 insertions(+), 93 deletions(-) rename meta/recipes-support/apr/apr/{configure_fixes.patch => 0001-configure-fixes.patch} (69%) create mode 100644 meta/recipes-support/apr/apr/0002-cleanup.patch rename meta/recipes-support/apr/apr/{configfix.patch => 0003-configfix.patch} (75%) rename meta/recipes-support/apr/apr/{upgrade-and-fix-1.5.1.patch => 0004-Makefile.in-fix-cross-compiling-failed.patch} (81%) rename meta/recipes-support/apr/apr/{Fix-packet-discards-HTTP-redirect.patch => 0005-Fix-packet-discards-HTTP-redirect.patch} (71%) rename meta/recipes-support/apr/apr/{configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch => 0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch} (81%) rename meta/recipes-support/apr/apr/{0001-apr-fix-off_t-size-doesn- t-match-in-glibc-when-cross.patch => 0007-apr-fix-off_t-size-doesn- t-match-in-glibc-when-cross.patch} (85%) rename meta/recipes-support/apr/apr/{0002-explicitly-link-libapr- against-phtread-to-make-gold-.patch => 0008-explicitly-link-libapr- against-phtread-to-make-gold-.patch} (90%) delete mode 100644 meta/recipes-support/apr/apr/cleanup.patch rename meta/recipes-support/apr/{apr_1.6.2.bb => apr_1.6.3.bb} (81%)meta/recipes-support/apr/apr/0001-configure-fixes.patch renamed from meta/recipes-support/apr/apr/configure_fixes.patch +17
-6@@ -1,11 +1,22 @@ +From ed491771f5a8976f9f05253f5f68b4cb5ac9b05f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:33:51 +0800 +Subject: [PATCH 1/8] configure fixes + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/configure.in -=================================================================== ---- apr-1.3.3.orig/configure.in -+++ apr-1.3.3/configure.in -@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm - create_area]) +Rebase to 1.6.3 +Signed-off-by: Hongxu Jia <[email protected]> +--- + configure.in | 48 ++++++++---------------------------------------- + 1 file changed, 8 insertions(+), 40 deletions(-) + +diff --git a/configure.in b/configure.in +index 719f331..470c99a 100644 +--- a/configure.in ++++ b/configure.in +@@ -1167,39 +1167,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ + create_area mprotect]) APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)-AC_CHECK_FILE(/dev/zero)
meta/recipes-support/apr/apr/0001-configure-fixes.patch renamed from meta/recipes-support/apr/apr/configure_fixes.patch +4
-1@@ -44,7 +55,7 @@ Index: apr-1.3.3/configure.in # Now we determine which one is our anonymous shmem preference. haveshmgetanon="0" -@@ -1518,13 +1485,14 @@ else +@@ -1976,13 +1943,14 @@ else bigendian=0 fi@@ -66,3 +77,6 @@ Index: apr-1.3.3/configure.in AC_SUBST(voidp_size) AC_SUBST(short_value) +-- +1.8.3.1 +meta/recipes-support/apr/apr/0002-cleanup.patch new file +29
-0@@ -0,0 +1,59 @@ +From 286ff5f96c7d3ff2210d0f1b43c670b9deea07ec Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:36:32 +0800 +Subject: [PATCH 2/8] cleanup + +Upstream-Status: Inappropriate [configuration] + +Rebase to 1.6.3 +Signed-off-by: Hongxu Jia <[email protected]> +--- + build/buildcheck.sh | 35 +---------------------------------- + 1 file changed, 1 insertion(+), 34 deletions(-) + +diff --git a/build/buildcheck.sh b/build/buildcheck.sh +index ab5df44..b7e719a 100755 +--- a/build/buildcheck.sh ++++ b/build/buildcheck.sh +@@ -34,37 +34,4 @@ else + fi + fi + +-# Sample libtool --version outputs: +-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) +-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a +-# output is multiline from 1.5 onwards +- +-# Require libtool 1.4 or newer +-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-lt_pversion=`$libtool --version 2>/dev/null|sed -e's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+-if test -z "$lt_pversion"; then +- echo "buildconf: libtool not found." +- echo " You need libtool version 1.4 or newer installed" +- echo " to build APR from SVN." +- res=1 +-else +- lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` +- IFS=.; set $lt_version; IFS=' ' +- lt_status="good" +- if test "$1" = "1"; then +- if test "$2" -lt "4"; then +- lt_status="bad" +- fi +- fi +- if test $lt_status = "good"; then +- echo "buildconf: libtool version $lt_pversion (ok)" +- else +- echo "buildconf: libtool version $lt_pversion found." +- echo " You need libtool version 1.4 or newer installed" +- echo " to build APR from SVN." +- res=1 +- fi +-fi +- +-exit $res +-++exit 0
+--
+1.8.3.1meta/recipes-support/apr/apr/0002-cleanup.patch new file +1
-0+meta/recipes-support/apr/apr/0003-configfix.patch renamed from meta/recipes-support/apr/apr/configfix.patch +22
-6@@ -1,10 +1,22 @@ +From 70a98680045ce31b34dae191b980470e4988bf7f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:39:06 +0800 +Subject: [PATCH 3/8] configfix + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/apr-config.in -=================================================================== ---- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 -+++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 -@@ -152,14 +152,7 @@ +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <[email protected]> +--- + apr-config.in | 26 ++------------------------ + 1 file changed, 2 insertions(+), 24 deletions(-) + +diff --git a/apr-config.in b/apr-config.in +index 84b4073..bbbf651 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -152,14 +152,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes)@@ -19,7 +31,7 @@ Index: apr-1.3.3/apr-config.in ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +167,14 @@ +@@ -181,29 +174,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld)@@ -51,3 +63,6 @@ Index: apr-1.3.3/apr-config.in ;; --shlib-path-var) echo "$SHLIBPATH_VAR" +-- +1.8.3.1 +meta/recipes-support/apr/apr/0004-Makefile.in-fix- renamed from meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +0
-0cross-compiling-failed.patch
similarity index 81%
rename frommeta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patchrename to meta/recipes-support/apr/apr/0004-Makefile.in-fix-cross- compiling-failed.patch
index 16499f5..b4517dd 100644meta/recipes-support/apr/apr/0004-Makefile.in-fix- renamed from meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +0
-0cross-compiling-failed.patch
meta/recipes-support/apr/apr/0004-Makefile.in-fix- renamed from meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +10
-3@@ -1,4 +1,7 @@ -Makefile.in: fix cross compiling failed +From 5b10d55396904982097e1da4c395fdeccb9d0d6a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:41:13 +0800 +Subject: [PATCH 4/8] Makefile.in: fix cross compiling failed The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we@@ -10,13 +13,14 @@ do_install time. Upstream-Status: Inappropriate [oe specific] +Rebase to 1.6.3 Signed-off-by: Hongxu Jia <[email protected]> --- Makefile.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a2a5194..5fe028f 100644 +index 5fb760e..f9e4445 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@@@ -27,7 +31,7 @@ index a2a5194..5fe028f 100644 include/private/apr_escape_test_char.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ -@@ -129,13 +128,8 @@ check: $(TARGET_LIB) +@@ -131,13 +130,8 @@ check: $(TARGET_LIB) etags: etags `find . -name '*.[ch]'`@@ -43,3 +47,6 @@ index a2a5194..5fe028f 100644 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ $(APR_MKDIR) include/private +-- +1.8.3.1 +meta/recipes-support/apr/apr/0005-Fix-packet-discards- renamed from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +0
-0HTTP-redirect.patch
similarity index 71%
rename from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP- redirect.patch
rename to meta/recipes-support/apr/apr/0005-Fix-packet-discards-HTTP- redirect.patch
index 6805b8b..2167da5 100644meta/recipes-support/apr/apr/0005-Fix-packet-discards- renamed from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +0
-0HTTP-redirect.patch
meta/recipes-support/apr/apr/0005-Fix-packet-discards- renamed from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +10
-3@@ -1,4 +1,7 @@ -Fix packet discards HTTP redirect. +From 78a148715444bdeb1363f0d1182901512146a439 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 30 Jan 2018 09:43:34 +0800 +Subject: [PATCH 5/8] Fix packet discards HTTP redirect. Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then@@ -8,12 +11,16 @@ Upstream-Status: Pending Signed-off-by: Noriaki Yoshitane <[email protected]> Signed-off-by: Li Wang <[email protected]> + +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <[email protected]> --- - network_io/unix/sendrecv.c | 4 ++++ + network_io/unix/sendrecv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c -index c133a26..e8faf15 100644 +index 4c0e0a6..1bdafba 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char*buf,
apr_size_t*len)meta/recipes-support/apr/apr/0005-Fix-packet-discards- renamed from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +1
-1@@ -28,5 +35,5 @@ index c133a26..e8faf15 100644 *len = 0; return arv; -- -1.7.9.5 +1.8.3.1(quoted diff) +0
-0to-make-it-work-with-ccache.patch b/meta/recipes-support/apr/
apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patchsimilarity index 81%
rename from meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to- make-it-work-with-ccache.patch
rename to meta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS- to-make-it-work-with-ccache.patch
index 7521eeb..b8714b1 100644
--- a/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS- to-make-it-work-with-ccache.patch
+++ b/meta/recipes-support/apr/apr/0006-configure.in-fix- LTFLAGS-to-make-it-work-with-ccache.patchmeta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch renamed from meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +2
-2@@ -1,7 +1,7 @@ -From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 +From 9620df513b237c4839e3e6d6459d6363e21d48be Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 19 Nov 2015 18:25:38 -0800 -Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache +Subject: [PATCH 6/8] configure.in: fix LTFLAGS to make it work withccache
When ccache is enabled, libtool requires --tag=CC when use ccache, otherwise when building apr-util with ccache enabled:
meta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch renamed from meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +3
-3@@ -15,11 +15,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 5a4a988..9d57ae6 100644 +index 470c99a..d215d98 100644 --- a/configure.in +++ b/configure.in @@ -246,7 +246,7 @@ case $host in@@ -32,5 +32,5 @@ index 5a4a988..9d57ae6 100644 if test "$experimental_libtool" = "yes"; then # Use a custom-made libtool replacement -- -1.7.9.5 +1.8.3.1(quoted diff) +0
-0doesn-t-match-in-glibc-when-cross.patch b/meta/recipes-support/apr/
apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patchsimilarity index 85%
rename from meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn- t-match-in-glibc-when-cross.patch
rename to meta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn- t-match-in-glibc-when-cross.patch
index c5e92ac..f93da0d 100644
--- a/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size- doesn-t-match-in-glibc-when-cross.patch
+++ b/meta/recipes-support/apr/apr/0007-apr-fix-off_t-size- doesn-t-match-in-glibc-when-cross.patchmeta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch renamed from meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +5
-5@@ -1,7 +1,7 @@ -From f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001 +From 5252a5b8b47eaba3c05e69c43c8cea6b1b8acbc9 Mon Sep 17 00:00:00 2001 From: Dengke Du <[email protected]> Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross +Subject: [PATCH 7/8] apr: fix off_t size doesn't match in glibc when cross compiling In configure.in, it contains the following:@@ -34,10 +34,10 @@ Upstream-Status: Pending 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index 9d57ae6..5b19940 100644 +index d215d98..3c579f5 100644 --- a/configure.in +++ b/configure.in -@@ -1681,7 +1681,7 @@ else +@@ -1733,7 +1733,7 @@ else socklen_t_value="int" fi@@ -46,7 +46,7 @@ index 9d57ae6..5b19940 100644 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) +@@ -1802,7 +1802,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])meta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch renamed from meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +3
-3@@ -55,7 +55,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_ssize_t]) if test -n "$ssize_t_fmt"; then -@@ -1767,7 +1767,7 @@ fi +@@ -1819,7 +1819,7 @@ fi ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""@@ -64,7 +64,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_size_t]) if test -n "$size_t_fmt"; then -@@ -1784,7 +1784,7 @@ fi +@@ -1836,7 +1836,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""@@ -74,5 +74,5 @@ index 9d57ae6..5b19940 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS -- -2.7.4 +1.8.3.1(quoted diff) +0
-0libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/
apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patchsimilarity index 90%
rename from meta/recipes-support/apr/apr/0002-explicitly-link-libapr- against-phtread-to-make-gold-.patch
rename to meta/recipes-support/apr/apr/0008-explicitly-link-libapr- against-phtread-to-make-gold-.patch
index 7d0dddc..e7c0c8e 100644
--- a/meta/recipes-support/apr/apr/0002-explicitly-link- libapr-against-phtread-to-make-gold-.patch
+++ b/meta/recipes-support/apr/apr/0008-explicitly-link- libapr-against-phtread-to-make-gold-.patchmeta/recipes-support/apr/apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch renamed from meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch +1
-2@@ -1,8 +1,8 @@ -From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001 +From 922795e34289877ed2610f7bb44e044bcfb73cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 3 Mar 2017 22:24:17 +0100 -Subject: [PATCH] explicitly link libapr against phtread to make goldhappy on
- test
+Subject: [PATCH 8/8] explicitly link libapr against phtread to make gold happy
+ on test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit(quoted diff) +0
-0@@ -34,10 +34,10 @@ Signed-off-by: Andreas Müller <1 file changed, 1 insertion(+)diff --git a/configure.in b/configure.in
meta/recipes-support/apr/apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch renamed from meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch +3
-3-index 5b19940..cdf4d58 100644 +index 3c579f5..06afb62 100644 --- a/configure.in +++ b/configure.in -@@ -766,6 +766,7 @@ else +@@ -781,6 +781,7 @@ else APR_PTHREADS_CHECK_RESTORE ] ) fi if test "$pthreadh" = "1"; then@@ -46,5 +46,5 @@ index 5b19940..cdf4d58 100644 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG APR_CHECK_PTHREAD_RECURSIVE_MUTEX -- -2.9.3 +1.8.3.1meta/recipes-support/apr/apr/cleanup.patch deleted +1
-18@@ -1,43 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: apr-1.4.2/build/buildcheck.sh -=================================================================== ---- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800 -+++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800 -@@ -32,35 +32,4 @@ - echo "buildconf: autoconf version $ac_version (ok)" - fi - --# Sample libtool --version outputs: --# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) --# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a --# output is multiline from 1.5 onwards -- --# Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` --lt_pversion=`$libtool --version 2>/dev/null|sed -e's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
--if test -z "$lt_pversion"; then
--echo "buildconf: libtool not found."
--echo " You need libtool version 1.4 or newer installed"
--echo " to build APR from SVN."
--exit 1
--fi
--lt_version=echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'--IFS=.; set $lt_version; IFS=' ' --lt_status="good"
--if test "$1" = "1"; then
-- if test "$2" -lt "4"; then
-- lt_status="bad"
-- fi
--fi
--if test $lt_status = "good"; then
-- echo "buildconf: libtool version $lt_pversion (ok)"
-- exit 0
--fi
--
--echo "buildconf: libtool version $lt_pversion found."
--echo " You need libtool version 1.4 or newer installed"
--echo " to build APR from SVN."
--
--exit 1
-+exit 0meta/recipes-support/apr/apr_1.6.3.bb renamed from meta/recipes-support/apr/apr_1.6.2.bb +8
-8@@ -10,19 +10,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5= 4dfd4cd216828c8cae5de5a12f3844c8 \ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ - file://configure_fixes.patch \ - file://cleanup.patch \ - file://configfix.patch \ file://run-ptest \ - file://upgrade-and-fix-1.5.1.patch \ - file://Fix-packet-discards-HTTP-redirect.patch \ - file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ - file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ + file://0001-configure-fixes.patch \ + file://0002-cleanup.patch \ + file://0003-configfix.patch \ + file://0004-Makefile.in-fix-cross-compiling-failed.patch \ + file://0005-Fix-packet-discards-HTTP-redirect.patch \ + file://0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ + file://0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ + file://0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch \"
meta/recipes-support/apr/apr_1.6.3.bb renamed from meta/recipes-support/apr/apr_1.6.2.bb +0
-2-SRC_URI[md5sum] = "e81a851967c79b5ce9bfbc909e4bf735" -SRC_URI[sha256sum] = "09109cea377bab0028bba19a92b5b0
e89603df9eab05c0f7dbd4dd83d48dcebd"meta/recipes-support/apr/apr_1.6.3.bb renamed from meta/recipes-support/apr/apr_1.6.2.bb +2
-0+SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" +SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2
b6af3962f93e6d570a9bd4d85e95993172"inherit autotools-brokensep
lib_packagebinconfigmultilib_headerptestmeta/recipes-support/apr/apr_1.6.3.bb renamed from meta/recipes-support/apr/apr_1.6.2.bb +0
-1@@ -69,7 +69,8 @@ do_install_append() { } do_install_append_class-target() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
meta/recipes-support/apr/apr_1.6.3.bb renamed from meta/recipes-support/apr/apr_1.6.2.bb +2
-0+ sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
sed -i -e 's,${STAGING_DIR_HOST},,g' \ -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g'${D}${bindir}/apr-1-config
--
2.8.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 7/7] apr: 1.6.2 -> 1.6.3
Quoted 2 lines · Ross
We're carrying a lot of patches here, and I'm not convinced that they are all inappropriate. Would you be willing to see what of those are upstreamable?
It's a long story for these patches, it's hard to trace the history from git.
I will choose an alternate fix to replace the inappropriate patches.
V2 incoming
//Hongxu
Quoted 667 lines
Ross
On 31 January 2018 at 07:48, Hongxu Jia <[email protected] <mailto:[email protected]>> wrote:
- Rebase patches 0001 ~ 0008 - Fix build path issue to improve reproducibility Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> --- ...gure_fixes.patch => 0001-configure-fixes.patch} | 28 +++++++--- meta/recipes-support/apr/apr/0002-cleanup.patch | 59 ++++++++++++++++++++++ .../apr/{configfix.patch => 0003-configfix.patch} | 27 +++++++--- ...4-Makefile.in-fix-cross-compiling-failed.patch} | 13 +++-- ...> 0005-Fix-packet-discards-HTTP-redirect.patch} | 15 ++++-- ...-fix-LTFLAGS-to-make-it-work-with-ccache.patch} | 10 ++-- ...t-size-doesn-t-match-in-glibc-when-cross.patch} | 16 +++--- ...ink-libapr-against-phtread-to-make-gold-.patch} | 12 ++--- meta/recipes-support/apr/apr/cleanup.patch | 43 ---------------- .../apr/{apr_1.6.2.bb <http://apr_1.6.2.bb> => apr_1.6.3.bb <http://apr_1.6.3.bb>} | 23 +++++---- 10 files changed, 153 insertions(+), 93 deletions(-) rename meta/recipes-support/apr/apr/{configure_fixes.patch => 0001-configure-fixes.patch} (69%) create mode 100644 meta/recipes-support/apr/apr/0002-cleanup.patch rename meta/recipes-support/apr/apr/{configfix.patch => 0003-configfix.patch} (75%) rename meta/recipes-support/apr/apr/{upgrade-and-fix-1.5.1.patch => 0004-Makefile.in-fix-cross-compiling-failed.patch} (81%) rename meta/recipes-support/apr/apr/{Fix-packet-discards-HTTP-redirect.patch => 0005-Fix-packet-discards-HTTP-redirect.patch} (71%) rename meta/recipes-support/apr/apr/{configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch => 0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch} (81%) rename meta/recipes-support/apr/apr/{0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch => 0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch} (85%) rename meta/recipes-support/apr/apr/{0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch => 0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch} (90%) delete mode 100644 meta/recipes-support/apr/apr/cleanup.patch rename meta/recipes-support/apr/{apr_1.6.2.bb <http://apr_1.6.2.bb> => apr_1.6.3.bb <http://apr_1.6.3.bb>} (81%) diff --git a/meta/recipes-support/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/0001-configure-fixes.patch similarity index 69% rename from meta/recipes-support/apr/apr/configure_fixes.patch rename to meta/recipes-support/apr/apr/0001-configure-fixes.patch index 0514000..374bb65 100644 --- a/meta/recipes-support/apr/apr/configure_fixes.patch +++ b/meta/recipes-support/apr/apr/0001-configure-fixes.patch @@ -1,11 +1,22 @@ +From ed491771f5a8976f9f05253f5f68b4cb5ac9b05f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected] <mailto:[email protected]>> +Date: Tue, 30 Jan 2018 09:33:51 +0800 +Subject: [PATCH 1/8] configure fixes + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/configure.in <http://configure.in> -=================================================================== ---- apr-1.3.3.orig/configure.in <http://configure.in> -+++ apr-1.3.3/configure.in <http://configure.in> -@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm - create_area]) +Rebase to 1.6.3 +Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> +--- + configure.in <http://configure.in> | 48 ++++++++---------------------------------------- + 1 file changed, 8 insertions(+), 40 deletions(-) + +diff --git a/configure.in <http://configure.in> b/configure.in <http://configure.in> +index 719f331..470c99a 100644 +--- a/configure.in <http://configure.in> ++++ b/configure.in <http://configure.in> +@@ -1167,39 +1167,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ + create_area mprotect]) APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) -AC_CHECK_FILE(/dev/zero) @@ -44,7 +55,7 @@ Index: apr-1.3.3/configure.in <http://configure.in> # Now we determine which one is our anonymous shmem preference. haveshmgetanon="0" -@@ -1518,13 +1485,14 @@ else +@@ -1976,13 +1943,14 @@ else bigendian=0 fi @@ -66,3 +77,6 @@ Index: apr-1.3.3/configure.in <http://configure.in> AC_SUBST(voidp_size) AC_SUBST(short_value) +-- +1.8.3.1 + diff --git a/meta/recipes-support/apr/apr/0002-cleanup.patch b/meta/recipes-support/apr/apr/0002-cleanup.patch new file mode 100644 index 0000000..1dc97e3 --- /dev/null +++ b/meta/recipes-support/apr/apr/0002-cleanup.patch @@ -0,0 +1,59 @@ +From 286ff5f96c7d3ff2210d0f1b43c670b9deea07ec Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected] <mailto:[email protected]>> +Date: Tue, 30 Jan 2018 09:36:32 +0800 +Subject: [PATCH 2/8] cleanup + +Upstream-Status: Inappropriate [configuration] + +Rebase to 1.6.3 +Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> +--- + build/buildcheck.sh | 35 +---------------------------------- + 1 file changed, 1 insertion(+), 34 deletions(-) + +diff --git a/build/buildcheck.sh b/build/buildcheck.sh +index ab5df44..b7e719a 100755 +--- a/build/buildcheck.sh ++++ b/build/buildcheck.sh +@@ -34,37 +34,4 @@ else + fi + fi + +-# Sample libtool --version outputs: +-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) +-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a +-# output is multiline from 1.5 onwards +- +-# Require libtool 1.4 or newer +-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +-if test -z "$lt_pversion"; then +- echo "buildconf: libtool not found." +- echo " You need libtool version 1.4 or newer installed" +- echo " to build APR from SVN." +- res=1 +-else +- lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` +- IFS=.; set $lt_version; IFS=' ' +- lt_status="good" +- if test "$1" = "1"; then +- if test "$2" -lt "4"; then +- lt_status="bad" +- fi +- fi +- if test $lt_status = "good"; then +- echo "buildconf: libtool version $lt_pversion (ok)" +- else +- echo "buildconf: libtool version $lt_pversion found." +- echo " You need libtool version 1.4 or newer installed" +- echo " to build APR from SVN." +- res=1 +- fi +-fi +- +-exit $res +- ++exit 0 +-- +1.8.3.1 + diff --git a/meta/recipes-support/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/0003-configfix.patch similarity index 75% rename from meta/recipes-support/apr/apr/configfix.patch rename to meta/recipes-support/apr/apr/0003-configfix.patch index 605c4f6..30194a7 100644 --- a/meta/recipes-support/apr/apr/configfix.patch +++ b/meta/recipes-support/apr/apr/0003-configfix.patch @@ -1,10 +1,22 @@ +From 70a98680045ce31b34dae191b980470e4988bf7f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected] <mailto:[email protected]>> +Date: Tue, 30 Jan 2018 09:39:06 +0800 +Subject: [PATCH 3/8] configfix + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/apr-config.in <http://apr-config.in> -=================================================================== ---- apr-1.3.3.orig/apr-config.in <http://apr-config.in> 2009-01-12 15:16:31.000000000 +0000 -+++ apr-1.3.3/apr-config.in <http://apr-config.in> 2009-01-12 15:19:25.000000000 +0000 -@@ -152,14 +152,7 @@ +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> +--- + apr-config.in <http://apr-config.in> | 26 ++------------------------ + 1 file changed, 2 insertions(+), 24 deletions(-) + +diff --git a/apr-config.in <http://apr-config.in> b/apr-config.in <http://apr-config.in> +index 84b4073..bbbf651 100644 +--- a/apr-config.in <http://apr-config.in> ++++ b/apr-config.in <http://apr-config.in> +@@ -152,14 +152,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes) @@ -19,7 +31,7 @@ Index: apr-1.3.3/apr-config.in <http://apr-config.in> ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +167,14 @@ +@@ -181,29 +174,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld) @@ -51,3 +63,6 @@ Index: apr-1.3.3/apr-config.in <http://apr-config.in> ;; --shlib-path-var) echo "$SHLIBPATH_VAR" +-- +1.8.3.1 + diff --git a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/meta/recipes-support/apr/apr/0004-Makefile.in-fix-cross-compiling-failed.patch similarity index 81% rename from meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch rename to meta/recipes-support/apr/apr/0004-Makefile.in-fix-cross-compiling-failed.patch index 16499f5..b4517dd 100644 --- a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +++ b/meta/recipes-support/apr/apr/0004-Makefile.in-fix-cross-compiling-failed.patch @@ -1,4 +1,7 @@ -Makefile.in: fix cross compiling failed +From 5b10d55396904982097e1da4c395fdeccb9d0d6a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected] <mailto:[email protected]>> +Date: Tue, 30 Jan 2018 09:41:13 +0800 +Subject: [PATCH 4/8] Makefile.in: fix cross compiling failed The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we @@ -10,13 +13,14 @@ do_install time. Upstream-Status: Inappropriate [oe specific] +Rebase to 1.6.3 Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> --- Makefile.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a2a5194..5fe028f 100644 +index 5fb760e..f9e4445 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@ @@ -27,7 +31,7 @@ index a2a5194..5fe028f 100644 include/private/apr_escape_test_char.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ -@@ -129,13 +128,8 @@ check: $(TARGET_LIB) +@@ -131,13 +130,8 @@ check: $(TARGET_LIB) etags: etags `find . -name '*.[ch]'` @@ -43,3 +47,6 @@ index a2a5194..5fe028f 100644 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ $(APR_MKDIR) include/private +-- +1.8.3.1 + diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/0005-Fix-packet-discards-HTTP-redirect.patch similarity index 71% rename from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch rename to meta/recipes-support/apr/apr/0005-Fix-packet-discards-HTTP-redirect.patch index 6805b8b..2167da5 100644 --- a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +++ b/meta/recipes-support/apr/apr/0005-Fix-packet-discards-HTTP-redirect.patch @@ -1,4 +1,7 @@ -Fix packet discards HTTP redirect. +From 78a148715444bdeb1363f0d1182901512146a439 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected] <mailto:[email protected]>> +Date: Tue, 30 Jan 2018 09:43:34 +0800 +Subject: [PATCH 5/8] Fix packet discards HTTP redirect. Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then @@ -8,12 +11,16 @@ Upstream-Status: Pending Signed-off-by: Noriaki Yoshitane <[email protected] <mailto:[email protected]>> Signed-off-by: Li Wang <[email protected] <mailto:[email protected]>> + +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <[email protected] <mailto:[email protected]>> --- - network_io/unix/sendrecv.c | 4 ++++ + network_io/unix/sendrecv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c -index c133a26..e8faf15 100644 +index 4c0e0a6..1bdafba 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) @@ -28,5 +35,5 @@ index c133a26..e8faf15 100644 *len = 0; return arv; -- -1.7.9.5 +1.8.3.1 diff --git a/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/meta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch similarity index 81% rename from meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch rename to meta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch index 7521eeb..b8714b1 100644 --- a/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +++ b/meta/recipes-support/apr/apr/0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch @@ -1,7 +1,7 @@ -From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 +From 9620df513b237c4839e3e6d6459d6363e21d48be Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected] <mailto:[email protected]>> Date: Thu, 19 Nov 2015 18:25:38 -0800 -Subject: [PATCH] configure.in <http://configure.in>: fix LTFLAGS to make it work with ccache +Subject: [PATCH 6/8] configure.in <http://configure.in>: fix LTFLAGS to make it work with ccache When ccache is enabled, libtool requires --tag=CC when use ccache, otherwise when building apr-util with ccache enabled: @@ -15,11 +15,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected] <mailto:[email protected]>> --- - configure.in <http://configure.in> | 2 +- + configure.in <http://configure.in> | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in <http://configure.in> b/configure.in <http://configure.in> -index 5a4a988..9d57ae6 100644 +index 470c99a..d215d98 100644 --- a/configure.in <http://configure.in> +++ b/configure.in <http://configure.in> @@ -246,7 +246,7 @@ case $host in @@ -32,5 +32,5 @@ index 5a4a988..9d57ae6 100644 if test "$experimental_libtool" = "yes"; then # Use a custom-made libtool replacement -- -1.7.9.5 +1.8.3.1 diff --git a/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/meta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch similarity index 85% rename from meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch rename to meta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch index c5e92ac..f93da0d 100644 --- a/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ b/meta/recipes-support/apr/apr/0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch @@ -1,7 +1,7 @@ -From f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001 +From 5252a5b8b47eaba3c05e69c43c8cea6b1b8acbc9 Mon Sep 17 00:00:00 2001 From: Dengke Du <[email protected] <mailto:[email protected]>> Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross +Subject: [PATCH 7/8] apr: fix off_t size doesn't match in glibc when cross compiling In configure.in <http://configure.in>, it contains the following: @@ -34,10 +34,10 @@ Upstream-Status: Pending 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in <http://configure.in> b/configure.in <http://configure.in> -index 9d57ae6..5b19940 100644 +index d215d98..3c579f5 100644 --- a/configure.in <http://configure.in> +++ b/configure.in <http://configure.in> -@@ -1681,7 +1681,7 @@ else +@@ -1733,7 +1733,7 @@ else socklen_t_value="int" fi @@ -46,7 +46,7 @@ index 9d57ae6..5b19940 100644 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) +@@ -1802,7 +1802,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) @@ -55,7 +55,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_ssize_t]) if test -n "$ssize_t_fmt"; then -@@ -1767,7 +1767,7 @@ fi +@@ -1819,7 +1819,7 @@ fi ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" @@ -64,7 +64,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_size_t]) if test -n "$size_t_fmt"; then -@@ -1784,7 +1784,7 @@ fi +@@ -1836,7 +1836,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" @@ -74,5 +74,5 @@ index 9d57ae6..5b19940 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS -- -2.7.4 +1.8.3.1 diff --git a/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch similarity index 90% rename from meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch rename to meta/recipes-support/apr/apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch index 7d0dddc..e7c0c8e 100644 --- a/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ b/meta/recipes-support/apr/apr/0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch @@ -1,8 +1,8 @@ -From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001 +From 922795e34289877ed2610f7bb44e044bcfb73cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected] <mailto:[email protected]>> Date: Fri, 3 Mar 2017 22:24:17 +0100 -Subject: [PATCH] explicitly link libapr against phtread to make gold happy on - test +Subject: [PATCH 8/8] explicitly link libapr against phtread to make gold happy + on test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -34,10 +34,10 @@ Signed-off-by: Andreas Müller <[email protected] <mailto:[email protected]>> 1 file changed, 1 insertion(+) diff --git a/configure.in <http://configure.in> b/configure.in <http://configure.in> -index 5b19940..cdf4d58 100644 +index 3c579f5..06afb62 100644 --- a/configure.in <http://configure.in> +++ b/configure.in <http://configure.in> -@@ -766,6 +766,7 @@ else +@@ -781,6 +781,7 @@ else APR_PTHREADS_CHECK_RESTORE ] ) fi if test "$pthreadh" = "1"; then @@ -46,5 +46,5 @@ index 5b19940..cdf4d58 100644 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG APR_CHECK_PTHREAD_RECURSIVE_MUTEX -- -2.9.3 +1.8.3.1 diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch deleted file mode 100644 index b6784e0..0000000 --- a/meta/recipes-support/apr/apr/cleanup.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: apr-1.4.2/build/buildcheck.sh -=================================================================== ---- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800 -+++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800 -@@ -32,35 +32,4 @@ - echo "buildconf: autoconf version $ac_version (ok)" - fi - --# Sample libtool --version outputs: --# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) --# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a --# output is multiline from 1.5 onwards -- --# Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` --lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` --if test -z "$lt_pversion"; then --echo "buildconf: libtool not found." --echo " You need libtool version 1.4 or newer installed" --echo " to build APR from SVN." --exit 1 --fi --lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` --IFS=.; set $lt_version; IFS=' ' --lt_status="good" --if test "$1" = "1"; then -- if test "$2" -lt "4"; then -- lt_status="bad" -- fi --fi --if test $lt_status = "good"; then -- echo "buildconf: libtool version $lt_pversion (ok)" -- exit 0 --fi -- --echo "buildconf: libtool version $lt_pversion found." --echo " You need libtool version 1.4 or newer installed" --echo " to build APR from SVN." -- --exit 1 -+exit 0 diff --git a/meta/recipes-support/apr/apr_1.6.2.bb <http://apr_1.6.2.bb> b/meta/recipes-support/apr/apr_1.6.3.bb <http://apr_1.6.3.bb> similarity index 81% rename from meta/recipes-support/apr/apr_1.6.2.bb <http://apr_1.6.2.bb> rename to meta/recipes-support/apr/apr_1.6.3.bb <http://apr_1.6.3.bb> index e2eed53..1bc4759 100644 --- a/meta/recipes-support/apr/apr_1.6.2.bb <http://apr_1.6.2.bb> +++ b/meta/recipes-support/apr/apr_1.6.3.bb <http://apr_1.6.3.bb> @@ -10,19 +10,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ - file://configure_fixes.patch \ - file://cleanup.patch \ - file://configfix.patch \ file://run-ptest \ - file://upgrade-and-fix-1.5.1.patch \ - file://Fix-packet-discards-HTTP-redirect.patch \ - file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ - file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ + file://0001-configure-fixes.patch \ + file://0002-cleanup.patch \ + file://0003-configfix.patch \ + file://0004-Makefile.in-fix-cross-compiling-failed.patch \ + file://0005-Fix-packet-discards-HTTP-redirect.patch \ + file://0006-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ + file://0007-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ + file://0008-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ " -SRC_URI[md5sum] = "e81a851967c79b5ce9bfbc909e4bf735" -SRC_URI[sha256sum] = "09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd" +SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" +SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172" inherit autotools-brokensep lib_package binconfig multilib_header ptest @@ -69,7 +69,8 @@ do_install_append() { } do_install_append_class-target() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk <http://apr_rules.mk> + sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk <http://apr_rules.mk> sed -i -e 's,${STAGING_DIR_HOST},,g' \ -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list [email protected] <mailto:[email protected]> http://lists.openembedded.org/mailman/listinfo/openembedded-core <http://lists.openembedded.org/mailman/listinfo/openembedded-core>