Skip to contentSkip to conversation

Upgrade 9 recipes and 1 fix

PATCH In review Hongxu Jia 3 participants 21 messages May 12, 2019 – Jun 3, 2019

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover Upgrade 9 recipes and 1 fix

The following changes since commit 244f2e5fb545dd40d020811799a6022e14468eeb:

icu: Added armeb support. (2019-05-09 16:31:06 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20190510
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20190510

Hongxu Jia (10):
apr: upgrade 1.6.5 -> 1.7.0
man-pages: upgrade 4.16 -> 5.01
man-db: upgrade 2.8.4 -> 2.8.5
bash: upgrade 4.4.18 -> 5.0
ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX
gpgme: upgrade 1.12.0 -> 1.13.0
subversion: upgrade 1.11.1 -> 1.12.0
groff: upgrade 1.22.3 -> 1.22.4
libxml2: upgrade 2.9.8 -> 2.9.9
ghostscript: 9.26 -> 9.27

 ...1-Fix-infinite-loop-in-LZMA-decompression.patch |  55 --
 .../libxml/libxml2/fix-CVE-2017-8872.patch         |  65 ---
 .../libxml/libxml2/fix-CVE-2018-14404.patch        |  45 --
 .../libxml/libxml2/fix-execution-of-ptests.patch   |  24 +-
 .../recipes-core/libxml/libxml2/libxml-64bit.patch |  24 +-
 .../libxml/libxml2/libxml-m4-use-pkgconfig.patch   |  16 +-
 .../libxml/libxml2/python-sitepackages-dir.patch   |  13 +-
 meta/recipes-core/libxml/libxml2/runtest.patch     | 204 +++----
 .../libxml/{libxml2_2.9.8.bb => libxml2_2.9.9.bb}  |   7 +-
 meta/recipes-core/ncurses/ncurses_6.1+20181013.bb  |   2 +-
 .../subversion/subversion/disable_macos.patch      |  45 +-
 .../subversion/subversion/serfmacro.patch          |  27 +-
 .../subversion-1.12.0-apr_1.7.0_fix-1.patch        | 107 ++++
 .../{subversion_1.11.1.bb => subversion_1.12.0.bb} |   7 +-
 ...1-help-fix-printf-format-security-warning.patch |  35 --
 meta/recipes-extended/bash/bash/build-tests.patch  |   7 +-
 meta/recipes-extended/bash/bash/execute_cmd.patch  |  19 +-
 meta/recipes-extended/bash/bash/pathexp-dep.patch  |  13 -
 meta/recipes-extended/bash/bash_4.4.18.bb          |  41 --
 meta/recipes-extended/bash/bash_5.0.bb             |  45 ++
 .../ghostscript/CVE-2019-3835-0001.patch           |  99 ----
 .../ghostscript/CVE-2019-3835-0002.patch           |  71 ---
 .../ghostscript/CVE-2019-3835-0003.patch           | 295 ----------
 .../ghostscript/CVE-2019-3835-0004.patch           | 167 ------
 .../ghostscript/CVE-2019-3838-0001.patch           |  34 --
 .../ghostscript/CVE-2019-3838-0002.patch           |  30 --
 .../ghostscript/CVE-2019-6116-0001.patch           | 177 ------
 .../ghostscript/CVE-2019-6116-0002.patch           | 442 ---------------
 .../ghostscript/CVE-2019-6116-0003.patch           |  32 --
 .../ghostscript/CVE-2019-6116-0004.patch           | 136 -----
 .../ghostscript/CVE-2019-6116-0005.patch           | 250 ---------
 .../ghostscript/CVE-2019-6116-0006.patch           | 596 ---------------------
 .../ghostscript/CVE-2019-6116-0007.patch           | 346 ------------
 .../ghostscript/ghostscript-9.02-genarch.patch     |  14 +-
 .../{ghostscript_9.26.bb => ghostscript_9.27.bb}   |  19 +-
 .../groff/files/0001-fix-shebang-for-taget.patch   |  31 ++
 .../0001-replace-perl-w-with-use-warnings.patch    |  34 +-
 .../groff/files/0001-support-musl.patch            |  46 ++
 .../groff-not-search-fonts-on-build-host.patch     |  20 +-
 ...need_charset_alias-when-building-for-musl.patch |  30 --
 ...off-1.22.2-correct-man.local-install-path.patch |  34 --
 .../groff/{groff_1.22.3.bb => groff_1.22.4.bb}     |  36 +-
 .../man-db/{man-db_2.8.4.bb => man-db_2.8.5.bb}    |   9 +-
 .../{man-pages_4.16.bb => man-pages_5.01.bb}       |   4 +-
 ..._t-size-doesn-t-match-in-glibc-when-cross.patch |  26 +-
 .../apr/{apr_1.6.5.bb => apr_1.7.0.bb}             |   4 +-
 ...d-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch | 134 +++++
 .../gpgme/gpgme/0001-pkgconfig.patch               |  72 ++-
 ...python-gpg-error-config-should-not-be-use.patch |  33 +-
 .../gpgme/0008-do-not-auto-check-var-PYTHON.patch  |  36 ++
 .../gpgme/{gpgme_1.12.0.bb => gpgme_1.13.0.bb}     |  12 +-
 51 files changed, 763 insertions(+), 3307 deletions(-)
 delete mode 100644 meta/recipes-core/libxml/libxml2/0001-Fix-infinite-loop-in-LZMA-decompression.patch
 delete mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
 delete mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2018-14404.patch
 rename meta/recipes-core/libxml/{libxml2_2.9.8.bb => libxml2_2.9.9.bb} (93%)
 create mode 100644 meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
 rename meta/recipes-devtools/subversion/{subversion_1.11.1.bb => subversion_1.12.0.bb} (92%)
 delete mode 100644 meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
 delete mode 100644 meta/recipes-extended/bash/bash/pathexp-dep.patch
 delete mode 100644 meta/recipes-extended/bash/bash_4.4.18.bb
 create mode 100644 meta/recipes-extended/bash/bash_5.0.bb
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0001.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0002.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0003.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0004.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3838-0001.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3838-0002.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0001.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0002.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0003.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0004.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0005.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0006.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0007.patch
 rename meta/recipes-extended/ghostscript/{ghostscript_9.26.bb => ghostscript_9.27.bb} (85%)
 create mode 100644 meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
 rename meta/recipes-extended/groff/{groff-1.22.3 => files}/0001-replace-perl-w-with-use-warnings.patch (76%)
 create mode 100644 meta/recipes-extended/groff/files/0001-support-musl.patch
 rename meta/recipes-extended/groff/{groff-1.22.3 => files}/groff-not-search-fonts-on-build-host.patch (42%)
 delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
 rename meta/recipes-extended/groff/{groff_1.22.3.bb => groff_1.22.4.bb} (62%)
 rename meta/recipes-extended/man-db/{man-db_2.8.4.bb => man-db_2.8.5.bb} (86%)
 rename meta/recipes-extended/man-pages/{man-pages_4.16.bb => man-pages_5.01.bb} (87%)
 rename meta/recipes-support/apr/{apr_1.6.5.bb => apr_1.7.0.bb} (96%)
 create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
 create mode 100644 meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
 rename meta/recipes-support/gpgme/{gpgme_1.12.0.bb => gpgme_1.13.0.bb} (88%)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/10 apr: upgrade 1.6.5 -> 1.7.0

---
 ..._t-size-doesn-t-match-in-glibc-when-cross.patch | 26 ++++++++++------------
 .../apr/{apr_1.6.5.bb => apr_1.7.0.bb}             |  4 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)
 rename meta/recipes-support/apr/{apr_1.6.5.bb => apr_1.7.0.bb} (96%)
meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +12 -14
index 5f5e7ea..d1a2ebe 100644
@@ -1,7 +1,7 @@
-From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001
+From 49661ea3858cf8494926cccf57d3e8c6dcb47117 Mon Sep 17 00:00:00 2001
 From: Dengke Du <[email protected]>
 Date: Wed, 14 Dec 2016 18:13:08 +0800
-Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross
+Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross
  compiling
 
 In configure.in, it contains the following:
@@ -29,15 +29,16 @@ Change the above correspondingly.
 Signed-off-by: Dengke Du <[email protected]>
 
 Upstream-Status: Pending
+
 ---
  configure.in | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index 3b10422..a227e72 100644
+index 27b8539..fb408d1 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1769,7 +1769,7 @@ else
+@@ -1801,7 +1801,7 @@ else
      socklen_t_value="int"
  fi
  
@@ -46,25 +47,25 @@ index 3b10422..a227e72 100644
  
  if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
      pid_t_fmt='#define APR_PID_T_FMT "hd"'
-@@ -1838,7 +1838,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"])
+@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [
+ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
+ ])
  
 -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
 +AC_CHECK_SIZEOF(ssize_t)
  
+ dnl the else cases below should no longer occur;
  AC_MSG_CHECKING([which format to use for apr_ssize_t])
- if test -n "$ssize_t_fmt"; then
-@@ -1855,7 +1855,7 @@ fi
+@@ -1891,7 +1891,7 @@ fi
  
  ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
  
 -APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
 +AC_CHECK_SIZEOF(size_t)
  
+ # else cases below should no longer occur;
  AC_MSG_CHECKING([which format to use for apr_size_t])
- if test -n "$size_t_fmt"; then
-@@ -1872,7 +1872,7 @@ fi
+@@ -1909,7 +1909,7 @@ fi
  
  size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
  
@@ -73,6 +74,3 @@ index 3b10422..a227e72 100644
  
  if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
      # Enable LFS
--- 
-1.8.3.1
-
meta/recipes-support/apr/apr_1.7.0.bb renamed from meta/recipes-support/apr/apr_1.6.5.bb +2 -2
similarity index 96%
rename from meta/recipes-support/apr/apr_1.6.5.bb
rename to meta/recipes-support/apr/apr_1.7.0.bb
index 432e4ed..a58651d 100644
@@ -20,8 +20,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
            "
 
-SRC_URI[md5sum] = "ad4add8efdfe87330b88e5e788241775"
-SRC_URI[sha256sum] = "a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105"
+SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7"
+SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea"
 
 inherit autotools-brokensep lib_package binconfig multilib_header ptest
 
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/10 man-pages: upgrade 4.16 -> 5.01

In reply to Hongxu Jia
---
 .../man-pages/{man-pages_4.16.bb => man-pages_5.01.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_4.16.bb => man-pages_5.01.bb} (87%)
meta/recipes-extended/man-pages/man-pages_5.01.bb renamed from meta/recipes-extended/man-pages/man-pages_4.16.bb +2 -2
similarity index 87%
rename from meta/recipes-extended/man-pages/man-pages_4.16.bb
rename to meta/recipes-extended/man-pages/man-pages_5.01.bb
index 1f14c89..28525f4 100644
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "d1fb8ba312a1c15e0bfda911a98c5544"
-SRC_URI[sha256sum] = "d38b0460bf3f35c95faf7f8cf52dac1216d86a47866f5e5f2fda88c61da04960"
+SRC_URI[md5sum] = "38abead776a506109e128ab96bcbbe58"
+SRC_URI[sha256sum] = "070bef794c6826b3fb3965d1a2efdb46c25cb37c06c715987f88a50906cd5b6f"
 
 inherit manpages
 
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH 3/10 man-db: upgrade 2.8.4 -> 2.8.5

In reply to Hongxu Jia

Upstream shipped a systemd service in the following commit [bc52248 Ship a systemd timer for daily DB maintenance] Backward compatible, disable it by default

---
 .../recipes-extended/man-db/{man-db_2.8.4.bb => man-db_2.8.5.bb} | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/man-db/{man-db_2.8.4.bb => man-db_2.8.5.bb} (86%)
meta/recipes-extended/man-db/man-db_2.8.5.bb renamed from meta/recipes-extended/man-db/man-db_2.8.4.bb +6 -3
similarity index 86%
rename from meta/recipes-extended/man-db/man-db_2.8.4.bb
rename to meta/recipes-extended/man-db/man-db_2.8.5.bb
index aa36465..441e2f4 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
            file://99_mandb \
            file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[md5sum] = "ab41db551f500e4a595b11203b86c67a"
-SRC_URI[sha256sum] = "103c185f9d8269b9ee3b8a4cb27912b3aa393e952731ef96fedc880723472bc3"
+SRC_URI[md5sum] = "c5c6c3434be14a5527d43b5ad0f09a13"
+SRC_URI[sha256sum] = "b64d52747534f1fe873b2876eb7f01319985309d5d7da319d2bc52ba1e73f6c1"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
 RDEPENDS_${PN} += "base-passwd"
@@ -16,7 +16,7 @@ RDEPENDS_${PN} += "base-passwd"
 # | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
 USE_NLS_libc-musl = "no"
 
-inherit gettext pkgconfig autotools
+inherit gettext pkgconfig autotools systemd
 
 EXTRA_OECONF = "--with-pager=less"
 EXTRA_AUTORECONF += "-I ${S}/gl/m4"
@@ -54,3 +54,6 @@ def compress_pkg(d):
     return ""
 
 RDEPENDS_${PN} += "${@compress_pkg(d)}"
+
+SYSTEMD_SERVICE_${PN} = "man-db.timer man-db.service"
+SYSTEMD_AUTO_ENABLE ?= "disable"
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 4/10 bash: upgrade 4.4.18 -> 5.0

In reply to Hongxu Jia

- Rebase build-tests.patch and execute_cmd.patch to 5.0

- Drop 0001-help-fix-printf-format-security-warning.patch and pathexp-dep.patch, upstream has fixed them in commit [d233b48 bash-5.0 distribution sources and documentation]

---
 ...1-help-fix-printf-format-security-warning.patch | 35 -----------------
 meta/recipes-extended/bash/bash/build-tests.patch  |  7 +++-
 meta/recipes-extended/bash/bash/execute_cmd.patch  | 19 ++++++---
 meta/recipes-extended/bash/bash/pathexp-dep.patch  | 13 -------
 meta/recipes-extended/bash/bash_4.4.18.bb          | 41 --------------------
 meta/recipes-extended/bash/bash_5.0.bb             | 45 ++++++++++++++++++++++
 6 files changed, 64 insertions(+), 96 deletions(-)
 delete mode 100644 meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
 delete mode 100644 meta/recipes-extended/bash/bash/pathexp-dep.patch
 delete mode 100644 meta/recipes-extended/bash/bash_4.4.18.bb
 create mode 100644 meta/recipes-extended/bash/bash_5.0.bb
meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch deleted +0 -35
deleted file mode 100644
index 5405c84..0000000
@@ -1,35 +0,0 @@
-From e5837a42f8f48a6a721805ff8f7fcd32861d09ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]>
-Date: Tue, 26 Jul 2016 13:09:47 +0100
-Subject: [PATCH] help: fix printf() format security warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| ../../bash-4.3.30/builtins/../../bash-4.3.30/builtins/help.def: In function 'help_builtin':
-| ../../bash-4.3.30/builtins/../../bash-4.3.30/builtins/help.def:130:7: error: format not a string literal and no format arguments [-Werror=format-security]
-|        printf (ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
-|        ^~~~~~
-
-Signed-off-by: André Draszik <[email protected]>
----
-Upstream-Status: Pending
- builtins/help.def | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/builtins/help.def b/builtins/help.def
-index 1894f17..cf624c6 100644
---- a/builtins/help.def
-+++ b/builtins/help.def
-@@ -127,7 +127,7 @@ help_builtin (list)
- 
-   if (glob_pattern_p (list->word->word))
-     {
--      printf (ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
-+      printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
-       print_word_list (list, ", ");
-       printf ("'\n\n");
-     }
--- 
-2.8.1
-
meta/recipes-extended/bash/bash/build-tests.patch +5 -2
index 73a81b6..5f2dae9 100644
@@ -2,15 +2,18 @@ Add 'ptest' target to Makefile, to run tests without checking dependencies.
 
 Upstream-Status: Pending
 Signed-off-by: Anders Roxell <[email protected]>
+
+Rebase to 5.0
 Signed-off-by: Hongxu Jia <[email protected]>
 ---
  Makefile.in | 24 +++++++++++++++++++-----
  1 file changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
+index 5fcb44b..de1c255 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -848,20 +848,34 @@ maybe-clean:
+@@ -932,20 +932,34 @@ maybe-clean:
  	fi
  
  recho$(EXEEXT):		$(SUPPORT_SRC)recho.c
@@ -51,5 +54,5 @@ diff --git a/Makefile.in b/Makefile.in
  		PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
  
 -- 
-1.8.1.2
+2.7.4
 
meta/recipes-extended/bash/bash/execute_cmd.patch +14 -5
index 9970b4d..7a9e9a9 100644
@@ -1,10 +1,16 @@
 Upstream-Status: Inappropriate [embedded specific]
 
-Index: execute_cmd.c
-===================================================================
---- execute_cmd.c.orig
-+++ execute_cmd.c
-@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous,
+Rebase to 5.0
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ execute_cmd.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/execute_cmd.c b/execute_cmd.c
+index f1d74bf..31674b4 100644
+--- a/execute_cmd.c
++++ b/execute_cmd.c
+@@ -2567,7 +2567,11 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
    /* If the `lastpipe' option is set with shopt, and job control is not
       enabled, execute the last element of non-async pipelines in the
       current shell environment. */
@@ -17,3 +23,6 @@ Index: execute_cmd.c
      {
        lstdin = move_to_high_fd (0, 1, -1);
        if (lstdin > 0)
+-- 
+2.7.4
+
meta/recipes-extended/bash/bash/pathexp-dep.patch deleted +0 -13
deleted file mode 100644
index e05bbda..0000000
@@ -1,13 +0,0 @@
-pathexp includes libintl.h but doesn't depend on it, thus a build race can occur.
-
-Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503)
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/Makefile.in b/Makefile.in
-index c7b62bc0..241cbf12 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1281,2 +1281,3 @@ nojobs.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
- y.tab.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
-+pathexp.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
- pcomplete.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
meta/recipes-extended/bash/bash_4.4.18.bb deleted +0 -41

41 lines not on this page · raw message

meta/recipes-extended/bash/bash_5.0.bb new file +45 -0

45 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw

Re: [PATCH 04/10] bash: upgrade 4.4.18 -> 5.0

Quoted 17 lines · Hongxu Jia

...

 ...1-help-fix-printf-format-security-warning.patch | 35 -----------------
 meta/recipes-extended/bash/bash/build-tests.patch  |  7 +++-
 meta/recipes-extended/bash/bash/execute_cmd.patch  | 19 ++++++---
 meta/recipes-extended/bash/bash/pathexp-dep.patch  | 13 -------
 meta/recipes-extended/bash/bash_4.4.18.bb          | 41 --------------------
 meta/recipes-extended/bash/bash_5.0.bb             | 45 ++++++++++++++++++++++
 6 files changed, 64 insertions(+), 96 deletions(-)
 delete mode 100644 meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
 delete mode 100644 meta/recipes-extended/bash/bash/pathexp-dep.patch
 delete mode 100644 meta/recipes-extended/bash/bash_4.4.18.bb
 create mode 100644 meta/recipes-extended/bash/bash_5.0.bb

...

(quoted diff) +0 -4
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-019;apply=yes;striplevel=0;name=patch019 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-020;apply=yes;striplevel=0;name=patch020 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-021;apply=yes;striplevel=0;name=patch021 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-022;apply=yes;striplevel=0;name=patch022 \

Review

Quoted 10 lines
(quoted diff) +7 -1
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-023;apply=yes;striplevel=0;name=patch023 \
...
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-001;apply=yes;striplevel=0;name=patch001 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-002;apply=yes;striplevel=0;name=patch002 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-003;apply=yes;striplevel=0;name=patch003 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-004;apply=yes;striplevel=0;name=patch004 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \
...

Some "git add/rm" seems to be missing around these patches.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
author
#6 lore raw

Re: [PATCH 04/10] bash: upgrade 4.4.18 -> 5.0

Quoted 28 lines · Adrian Bunk
Quoted 17 lines · Hongxu Jia

...

  ...1-help-fix-printf-format-security-warning.patch | 35 -----------------
  meta/recipes-extended/bash/bash/build-tests.patch  |  7 +++-
  meta/recipes-extended/bash/bash/execute_cmd.patch  | 19 ++++++---
  meta/recipes-extended/bash/bash/pathexp-dep.patch  | 13 -------
  meta/recipes-extended/bash/bash_4.4.18.bb          | 41 --------------------
  meta/recipes-extended/bash/bash_5.0.bb             | 45 ++++++++++++++++++++++
  6 files changed, 64 insertions(+), 96 deletions(-)

delete mode 100644 meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch delete mode 100644 meta/recipes-extended/bash/bash/pathexp-dep.patch
delete mode 100644 meta/recipes-extended/bash/bash_4.4.18.bb
create mode 100644 meta/recipes-extended/bash/bash_5.0.bb
...

(quoted diff) +0 -4
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-019;apply=yes;striplevel=0;name=patch019 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-020;apply=yes;striplevel=0;name=patch020 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-021;apply=yes;striplevel=0;name=patch021 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-022;apply=yes;striplevel=0;name=patch022 \

Review

Quoted 10 lines
(quoted diff) +7 -1
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-023;apply=yes;striplevel=0;name=patch023 \
...
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-001;apply=yes;striplevel=0;name=patch001 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-002;apply=yes;striplevel=0;name=patch002 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-003;apply=yes;striplevel=0;name=patch003 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-004;apply=yes;striplevel=0;name=patch004 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \
...
Quoted 1 line

Some "git add/rm" seems to be missing around these patches.

Do you mean I miss the patches? They should be fetch from remote upstream.

Or do you mean git mv' rather than git add/rm'?

I use scripts/create-pull-request to generate patch, it uses `git format-patch  -M40' which

seems git add/rm' rather than git mv', and -M10'  will be git mv' here

//Hongxu

Quoted 3 lines

cu
Adrian

#7 lore raw

Re: [PATCH 04/10] bash: upgrade 4.4.18 -> 5.0

Quoted 29 lines · Hongxu Jia
Quoted 28 lines · Adrian Bunk
Quoted 27 lines · Hongxu Jia

...

  ...1-help-fix-printf-format-security-warning.patch | 35 -----------------
  meta/recipes-extended/bash/bash/build-tests.patch  |  7 +++-
  meta/recipes-extended/bash/bash/execute_cmd.patch  | 19 ++++++---
  meta/recipes-extended/bash/bash/pathexp-dep.patch  | 13 -------
  meta/recipes-extended/bash/bash_4.4.18.bb          | 41 --------------------
  meta/recipes-extended/bash/bash_5.0.bb             | 45 ++++++++++++++++++++++
  6 files changed, 64 insertions(+), 96 deletions(-)

delete mode 100644 meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch delete mode 100644 meta/recipes-extended/bash/bash/pathexp-dep.patch
delete mode 100644 meta/recipes-extended/bash/bash_4.4.18.bb
create mode 100644 meta/recipes-extended/bash/bash_5.0.bb
...

(quoted diff) +7 -5
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-019;apply=yes;striplevel=0;name=patch019 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-020;apply=yes;striplevel=0;name=patch020 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-021;apply=yes;striplevel=0;name=patch021 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-022;apply=yes;striplevel=0;name=patch022 \
-           ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-023;apply=yes;striplevel=0;name=patch023 \
...
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-001;apply=yes;striplevel=0;name=patch001 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-002;apply=yes;striplevel=0;name=patch002 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-003;apply=yes;striplevel=0;name=patch003 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-004;apply=yes;striplevel=0;name=patch004 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \
...
Quoted 4 lines
Quoted 1 line

Some "git add/rm" seems to be missing around these patches.

Do you mean I miss the patches? They should be fetch from remote upstream.
...

Sorry, I missed that.

Quoted 1 line

//Hongxu

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
author
#8 lore raw

PATCH 5/10 ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX

In reply to Hongxu Jia

The upstream git tag has a `upstream/' prefix, such as:

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

import re
pattern = "upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)" string = "upstream/6.1+20181013"
result = re.match(pattern, string) result['pver']

'6.1+20181013'

---
 meta/recipes-core/ncurses/ncurses_6.1+20181013.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ncurses/ncurses_6.1+20181013.bb +1 -1
index ef6ca98..928c477 100644
@@ -8,4 +8,4 @@ SRC_URI += "file://0001-tic-hang.patch \
 SRCREV = "7a97a7f937762ba342d5b2fd7cd090885a809835"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
+UPSTREAM_CHECK_GITTAGREGEX = "upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)"
Signature · 1 line
2.7.4
#9 lore raw

Re: [PATCH 05/10] ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX

Quoted 8 lines · Hongxu Jia

The upstream git tag has a `upstream/' prefix, such as:

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

import re
pattern = "upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)" string = "upstream/6.1+20181013"
result = re.match(pattern, string) result['pver']

'6.1+20181013'

Have you checked with devtool that this actually works?

Before this commit:

alexander@alexander-box:~/development/poky$ devtool check-upgrade-status
ncurses
INFO: ncurses                   6.1             6.1+20181013    Hongxu Jia <
[email protected]> 7a97a7f937762ba342d5b2fd7cd090885a809835

After the commit:

alexander@alexander-box:~/development/poky$ devtool check-upgrade-status
ncurses
INFO: ncurses                   6.1             UNKNOWN_BROKEN  Hongxu Jia <
[email protected]>

The code in bitbake/lib/bb/fetch2/git.py actually splits each tag with '/' as separator and takes only the last part for some reason, so those prefixes are never a part of the string that is matched against regex. I'll send a revert in a moment.

Alex

author
#10 lore raw

Re: [PATCH 05/10] ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX

Quoted 11 lines · Alexander Kanavin

On Sun, 12 May 2019 at 10:18, Hongxu Jia <[email protected] <mailto:[email protected]>> wrote:

    The upstream git tag has a `upstream/' prefix, such as:
    >>> import re
    >>> pattern = "upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)"
    >>> string = "upstream/6.1+20181013"
    >>> result = re.match(pattern, string)
    >>> result['pver']
    '6.1+20181013'
Quoted 2 lines

Have you checked with devtool that this actually works?

I am afraid no, I did not run devtool it before

Quoted 4 lines

Before this commit:

alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses                   6.1             6.1+20181013    Hongxu Jia <[email protected] <mailto:[email protected]>> 7a97a7f937762ba342d5b2fd7cd090885a809835

Then I know the script, and run it, I am afraid only revert is not sufficient.

The current ncurses version is 6.1+20181013' rather than 6.1', since upstream latest

version is `6.1+20181013', but auth email incorrect report ncurses should be upgraded

(that's why I try to fix UPSTREAM_CHECK_GITTAGREGEX, but it seems a wrong try)

Thanks to your mention of devtool, I know how auth works, and trace the root cause,

then I found in the following commit, it filters out `+' from git pv, but in ncurse case,

`+' is part of version

...

commit ab609c471d85be3248b789c8ab2813957cd97e29
Author: Alexander Kanavin <[email protected]> Date:   Mon Aug 3 19:29:54 2015 +0300

    recipeutils.py: allow all characters in regexes used to parse version strings

    Previously only numeric characters were matches and anything else was discarded, so 4.0-rc3, 2005e, 1.0.2a and similar versions got truncated.

meta/lib/oe/recipeutils.py +0 -0
index 9d45b42..cd74213 100644
@@ -638,7 +638,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type):

     sfx = ''

     if uri_type == 'git':
-        git_regex = re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)") +        git_regex = re.compile("(?P<pfx>v?)(?P<ver>[^\+]*)((?P<sfx>\+(git)?r?(AUTOINC\+))(?P<rev>.*))?") m = git_regex.match(pv)

         if m:

...

I believe the commit is to parse manually  PV in **_git.bb (such as `PV = "1.9.0+git${SRCPV}"' ),

which contains `+gitAUTOINC+' in PV, but the regrex is not suitable for ncurses version

//Hongxu

Quoted 10 lines

After the commit:

alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses                   6.1 UNKNOWN_BROKEN  Hongxu Jia <[email protected] <mailto:[email protected]>>

The code in bitbake/lib/bb/fetch2/git.py actually splits each tag with '/' as separator and takes only the last part for some reason, so those prefixes are never a part of the string that is matched against regex. I'll send a revert in a moment.

Alex

author
#11 lore raw

PATCH 6/10 gpgme: upgrade 1.12.0 -> 1.13.0

In reply to Hongxu Jia

- Revert gpgrt-config support which oe-core does not support it

- Rebase 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch and 0001-pkgconfig.patch

- Tweak LANGUAGES, since upstream auto check the version of python rather than specify option
[ff6ff61 python: Auto-check for all installed python versions.]

License-update: SPDX identifiers site and formats [8d91c0f Add SPDX identifiers to most source files] "s/LGPL-2.1+/LGPL-2.1-or-later/" "s#https://www.gnu.org/licenses#https://gnu.org/licenses#"

---
 ...d-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch | 134 +++++++++++++++++++++
 .../gpgme/gpgme/0001-pkgconfig.patch               |  72 +++++------
 ...python-gpg-error-config-should-not-be-use.patch |  33 +++--
 .../gpgme/0008-do-not-auto-check-var-PYTHON.patch  |  36 ++++++
 .../gpgme/{gpgme_1.12.0.bb => gpgme_1.13.0.bb}     |  12 +-
 5 files changed, 222 insertions(+), 65 deletions(-)
 create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
 create mode 100644 meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
 rename meta/recipes-support/gpgme/{gpgme_1.12.0.bb => gpgme_1.13.0.bb} (88%)
meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch new file +134 -0
new file mode 100644
index 0000000..0ed4eb6
@@ -0,0 +1,134 @@
+From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Fri, 10 May 2019 14:18:04 +0800
+Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
+
+This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83.
+
+The oe-core does not support gpgrt-config, so revert it
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ src/gpgme.m4 | 58 ++++++++++------------------------------------------------
+ 1 file changed, 10 insertions(+), 48 deletions(-)
+
+diff --git a/src/gpgme.m4 b/src/gpgme.m4
+index 2a72f18..6c2be44 100644
+--- a/src/gpgme.m4
++++ b/src/gpgme.m4
+@@ -1,5 +1,5 @@
+ # gpgme.m4 - autoconf macro to detect GPGME.
+-# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH
++# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH
+ #
+ # This file is free software; as a special exception the author gives
+ # unlimited permission to copy and/or distribute it, with or without
+@@ -9,7 +9,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ #
+-# Last-changed: 2018-11-12
++# Last-changed: 2014-10-02
+ 
+ 
+ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+      fi
+   fi
+ 
+-  use_gpgrt_config=""
+-  if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+-    if $GPGRT_CONFIG gpgme --exists; then
+-      GPGME_CONFIG="$GPGRT_CONFIG gpgme"
+-      AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
+-      use_gpgrt_config=yes
+-    fi
+-  fi
+-  if test -z "$use_gpgrt_config"; then
+-    AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+-  fi
++  AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+ 
+   if test "$GPGME_CONFIG" != "no" ; then
+-    if test -z "$use_gpgrt_config"; then
+-      gpgme_version=`$GPGME_CONFIG --version`
+-    else
+-      gpgme_version=`$GPGME_CONFIG --modversion`
+-    fi
++    gpgme_version=`$GPGME_CONFIG --version`
+   fi
+   gpgme_version_major=`echo $gpgme_version | \
+                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+@@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+ 
+ AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
+ [
+-    if test -z "$use_gpgrt_config"; then
+-      gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
+-    else
+-      gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none`
+-    fi
++    gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
+     if test x"$gpgme_config_host" != xnone ; then
+       if test x"$gpgme_config_host" != x"$host" ; then
+   AC_MSG_WARN([[
+ ***
+-*** The config script "$GPGME_CONFIG" was
++*** The config script $GPGME_CONFIG was
+ *** built for $gpgme_config_host and thus may not match the
+ *** used host $host.
+ *** You may want to use the configure option --with-gpgme-prefix
+@@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME],
+      # If we have a recent GPGME, we should also check that the
+      # API is compatible.
+      if test "$req_gpgme_api" -gt 0 ; then
+-        if test -z "$use_gpgrt_config"; then
+-          tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+-        else
+-          tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
+-        fi
++        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+         if test "$tmp" -gt 0 ; then
+            if test "$req_gpgme_api" -ne "$tmp" ; then
+              ok=no
+@@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+      # If we have a recent GPGME, we should also check that the
+      # API is compatible.
+      if test "$req_gpgme_api" -gt 0 ; then
+-        if test -z "$use_gpgrt_config"; then
+-          tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+-        else
+-          tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
+-        fi
++        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+         if test "$tmp" -gt 0 ; then
+            if test "$req_gpgme_api" -ne "$tmp" ; then
+              ok=no
+@@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+      fi
+   fi
+   if test $ok = yes; then
+-    if test -z "$use_gpgrt_config"; then
+-      GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
+-      GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
+-    else
+-      if $GPGRT_CONFIG gpgme-glib --exists; then
+-        GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib"
+-        GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags`
+-        GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs`
+-      else
+-        ok = no
+-      fi
+-    fi
+-  fi
+-  if test $ok = yes; then
++    GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
++    GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
+-- 
+2.7.4
+
meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +30 -42

114 lines not on this page · raw message

meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +16 -17
index 0d0d0c6..ecd1793 100644
@@ -1,6 +1,6 @@
-From 03819ad1270a279223219c0e70ba631bfe517714 Mon Sep 17 00:00:00 2001
+From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
-Date: Wed, 17 Oct 2018 23:32:19 +0800
+Date: Fri, 10 May 2019 14:30:36 +0800
 Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used
 
 gpg-error-config was modified by OE to always return an error.
@@ -11,39 +11,38 @@ Upstream-Status: Inappropriate [changes are specific to OE]
 
 Signed-off-by: Mark Hatle <[email protected]>
 
-Rebase to 1.12.0
+Rebase to 1.13.0
 
 Signed-off-by: Hongxu Jia <[email protected]>
 ---
- lang/python/setup.py.in | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
+ lang/python/setup.py.in | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
-index 65a4be0..11b8413 100755
+index 9785a28..006216d 100755
 --- a/lang/python/setup.py.in
 +++ b/lang/python/setup.py.in
 @@ -30,7 +30,6 @@ import subprocess
  import sys
  
  # Out-of-tree build of the gpg bindings.
--gpg_error_config = ["gpg-error-config"]
- gpgme_config_flags = ["--thread=pthread"]
- gpgme_config = ["gpgme-config"] + gpgme_config_flags
- gpgme_h = ""
-@@ -181,16 +180,8 @@ class BuildExtFirstHack(build):
-         shutil.copy2(source_name, sink_name)
+-gpg_error_config = ['gpg-error-config']
+ gpgme_config_flags = ['--thread=pthread']
+ gpgme_config = ['gpgme-config'] + gpgme_config_flags
+ gpgme_h = ''
+@@ -182,15 +181,9 @@ class BuildExtFirstHack(build):
  
      def _generate_errors_i(self):
--
+ 
 -        try:
 -            subprocess.check_call(
 -                gpg_error_config + ['--version'], stdout=devnull)
 -        except:
--            sys.exit("Could not find gpg-error-config.  " +
--                     "Please install the libgpg-error development package.")
--
+-            sys.exit('Could not find gpg-error-config.  ' +
+-                     'Please install the libgpg-error development package.')
+ 
          gpg_error_content = self._read_header(
--            "gpg-error.h", getconfig("cflags", config=gpg_error_config))
+-            'gpg-error.h', getconfig('cflags', config=gpg_error_config))
 +            "gpg-error.h", os.environ.get('CFLAGS').split())
  
          filter_re = re.compile(r'GPG_ERR_[^ ]* =')
meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch new file +36 -0
new file mode 100644
index 0000000..3afbfc8
@@ -0,0 +1,36 @@
+From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Fri, 10 May 2019 16:19:54 +0800
+Subject: [PATCH] do not auto check var-PYTHON
+
+Upstream auto check the version of python rather than specify option
+[ff6ff61 python: Auto-check for all installed python versions.]
+
+In oe-core, don't check var-PYTHON, use the setting from recipe,
+only check specific python 2.7 and 3.7
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cb2f073..7d74a6d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,8 +423,8 @@ if test "$found_py" = "1"; then
+ 	if test "$found_py" = "1" -o "$found_py3" = "1"; then
+ 	  # Reset everything, so that we can look for another Python.
+           m4_foreach([mym4pythonver],
+-                     [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]],
+-           [unset PYTHON
++                     [[2.7],[3.7]],
++           [
+ 	    unset PYTHON_VERSION
+ 	    unset PYTHON_CPPFLAGS
+ 	    unset PYTHON_LDFLAGS
+-- 
+2.7.4
+
meta/recipes-support/gpgme/gpgme_1.13.0.bb renamed from meta/recipes-support/gpgme/gpgme_1.12.0.bb +6 -6
similarity index 88%
rename from meta/recipes-support/gpgme/gpgme_1.12.0.bb
rename to meta/recipes-support/gpgme/gpgme_1.13.0.bb
index b46c5fc..cbd37da 100644
@@ -6,11 +6,12 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://src/gpgme.h.in;endline=23;md5=4d6319e587fd944adfe61a41a8f15b36 \
+                    file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \
                     file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
 
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
+           file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \
            file://0001-pkgconfig.patch \
            file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \
            file://0003-Correctly-install-python-modules.patch \
@@ -18,10 +19,11 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
            file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
            file://0006-fix-build-path-issue.patch \
            file://0007-python-Add-variables-to-tests.patch \
+           file://0008-do-not-auto-check-var-PYTHON.patch \
           "
 
-SRC_URI[md5sum] = "902fca3a94907efe4e929b2ade545a7c"
-SRC_URI[sha256sum] = "b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8"
+SRC_URI[md5sum] = "e511a0d95c507ab87e713140c82fc7d0"
+SRC_URI[sha256sum] = "d4b23e47a9e784a63e029338cce0464a82ce0ae4af852886afda410f9e39c630"
 
 DEPENDS = "libgpg-error libassuan"
 RDEPENDS_${PN}-cpp += "libstdc++"
@@ -44,9 +46,7 @@ PACKAGECONFIG[python3] = ",,python3 swig-native,"
 # support. Since these bindings are currently not needed, we can disable them.
 DEFAULT_LANGUAGES = ""
 DEFAULT_LANGUAGES_class-target = "cpp"
-LANGUAGES ?= "${DEFAULT_LANGUAGES}"
-LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}"
-LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}"
+LANGUAGES ?= "${DEFAULT_LANGUAGES} python"
 
 PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}"
 PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}"
Signature · 1 line
2.7.4
author
#12 lore raw

PATCH 7/10 subversion: upgrade 1.11.1 -> 1.12.0

In reply to Hongxu Jia

- Backport a patch to fix build failure while APR 1.7.0
...
checking for apr_int64_t Python/C API format string...
configure: error: failed to recognize APR_INT64_T_FMT on this platform
...

- Rebase disable_macos.patch and serfmacro.patch

License-update: no change, declare two new added file
* in build/ac-macros/ax_boost_base.m4
* in build/ac-macros/ax_boost_unit_test_framework.m4

---
 .../subversion/subversion/disable_macos.patch      |  45 +++++----
 .../subversion/subversion/serfmacro.patch          |  27 ++++--
 .../subversion-1.12.0-apr_1.7.0_fix-1.patch        | 107 +++++++++++++++++++++
 .../{subversion_1.11.1.bb => subversion_1.12.0.bb} |   7 +-
 4 files changed, 153 insertions(+), 33 deletions(-)
 create mode 100644 meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
 rename meta/recipes-devtools/subversion/{subversion_1.11.1.bb => subversion_1.12.0.bb} (92%)
meta/recipes-devtools/subversion/subversion/disable_macos.patch +24 -21
index ec3be49..8d2d635 100644
@@ -1,15 +1,25 @@
-These tests don't work in cross compiling, just disable them for now, we don't
-build subversion on OS-X at this time.
+From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 15:21:46 +0800
+Subject: [PATCH] These tests don't work in cross compiling, just disable them
+ for now, we don't build subversion on OS-X at this time.
 
 RP 1014/7/16
 
 Upstream-Status: Pending [needs a rewrite to support a cache value]
 
-Index: subversion-1.8.9/build/ac-macros/macosx.m4
-===================================================================
---- subversion-1.8.9.orig/build/ac-macros/macosx.m4	2012-11-26 03:04:27.000000000 +0000
-+++ subversion-1.8.9/build/ac-macros/macosx.m4	2014-07-16 12:28:58.357300403 +0000
-@@ -24,21 +24,7 @@
+Rebase to 1.12.0
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ build/ac-macros/macosx.m4 | 31 +------------------------------
+ 1 file changed, 1 insertion(+), 30 deletions(-)
+
+diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4
+index 92fa58e..a568e1c 100644
+--- a/build/ac-macros/macosx.m4
++++ b/build/ac-macros/macosx.m4
+@@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability
  AC_DEFUN(SVN_LIB_MACHO_ITERATE,
  [
    AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
@@ -31,7 +41,7 @@ Index: subversion-1.8.9/build/ac-macros/macosx.m4
  ])
  
  dnl SVN_LIB_MACOS_PLIST
-@@ -46,34 +32,7 @@
+@@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support
  AC_DEFUN(SVN_LIB_MACOS_PLIST,
  [
    AC_MSG_CHECKING([for Mac OS property list utilities])
@@ -44,25 +54,18 @@ Index: subversion-1.8.9/build/ac-macros/macosx.m4
 -    #error ProperyList API unavailable.
 -    #endif
 -  ]],[[]])],[
--    dnl ### Hack.  We should only need to pass the -framework options when
--    dnl linking libsvn_subr, since it is the only library that uses Keychain.
--    dnl
--    dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
--    dnl OS X frameworks like it does for normal libraries, so we need to
--    dnl explicitly pass the option to all the users of libsvn_subr to allow
--    dnl static builds to link successfully.
--    dnl
--    dnl This does mean that all executables we link will be linked directly
--    dnl to these frameworks - even when building shared libraries - but that
--    dnl shouldn't cause any problems.
--
--    LIBS="$LIBS -framework CoreFoundation"
+-    SVN_MACOS_PLIST_LIBS="-framework CoreFoundation"
+-    AC_SUBST(SVN_MACOS_PLIST_LIBS)
 -    AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
 -              [Is Mac OS property list API available?])
 -    AC_MSG_RESULT([yes])
 -  ],[
++  AC_SUBST([SVN_MACOS_PLIST_LIBS], [""])
      AC_MSG_RESULT([no])
 -  ])
  ])
  
  dnl SVN_LIB_MACOS_KEYCHAIN
+-- 
+2.7.4
+
meta/recipes-devtools/subversion/subversion/serfmacro.patch +18 -9
index 9a45cb9..507de0f 100644
@@ -1,22 +1,31 @@
-The existing sed expression can match expressions like 
---sysroot=/some/path/xxx-linux/ which clearly isn't intended and 
-injects incorrect paths into LDFLAGS.
+The existing sed expression can match expressions like
+--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects
+incorrect paths into LDFLAGS.
 
 Fix this in the same way we address the problem in CFLAGS.
 
 RP 2016/12/7
 Upstream-Status: Pending
 
-Index: subversion-1.9.4/build/ac-macros/serf.m4
-===================================================================
---- subversion-1.9.4.orig/build/ac-macros/serf.m4
-+++ subversion-1.9.4/build/ac-macros/serf.m4
+Rebase 1.12.0
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ build/ac-macros/serf.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
+index 0a549b3..3a069ac 100644
+--- a/build/ac-macros/serf.m4
++++ b/build/ac-macros/serf.m4
 @@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
-           SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
-           SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` 
+           SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
+           SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
            dnl don't use --libs-only-L because then we might miss some options
 -          LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
 +          LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"]
            break
          else
            AC_MSG_RESULT([no])
+-- 
+2.7.4
+
meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch new file +107 -0

107 lines not on this page · raw message

meta/recipes-devtools/subversion/subversion_1.12.0.bb renamed from meta/recipes-devtools/subversion/subversion_1.11.1.bb +4 -3
similarity index 92%
rename from meta/recipes-devtools/subversion/subversion_1.11.1.bb
rename to meta/recipes-devtools/subversion/subversion_1.12.0.bb
index 8abac74..f059ff9 100644
@@ -2,7 +2,7 @@ SUMMARY = "Subversion (svn) version control system client"
 HOMEPAGE = "http://subversion.apache.org"
 SECTION = "console/network"
 LICENSE = "Apache-2 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=83206f39819e7a4dfca2ff7c190f6ce0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b"
 
 DEPENDS = "apr-util serf sqlite3 file lz4"
 DEPENDS_append_class-native = " file-replacement-native"
@@ -11,10 +11,11 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://disable_macos.patch \
            file://0001-Fix-libtool-name-in-configure.ac.patch \
            file://serfmacro.patch \
+           file://subversion-1.12.0-apr_1.7.0_fix-1.patch \
            "
 
-SRC_URI[md5sum] = "5797bf701d2d868fa964c7bbc4931267"
-SRC_URI[sha256sum] = "9efd2750ca4d72ec903431a24b9c732b6cbb84aad9b7563f59dd96dea5be60bb"
+SRC_URI[md5sum] = "be4f5c0b1b38a5d82bd6d16a16ff1346"
+SRC_URI[sha256sum] = "7fae7c73d8a007c107c0ae5eb372bc0bb013dbfe966fcd5c59cd5a195a5e2edf"
 
 inherit autotools pkgconfig gettext
 
Signature · 1 line
2.7.4
author
#13 lore raw

PATCH 8/10 groff: upgrade 1.22.3 -> 1.22.4

In reply to Hongxu Jia

- Drop groff-1.22.2-correct-man.local-install-path.patch and 0001-Unset-need_charset_alias-when-building-for-musl.patch

- Inherit bbclass pkgcnofig to fix `undefined macro: AC_DEFINE'
...
| configure:20010: error: possibly undefined macro: AC_DEFINE
...

- Use autotools-brokensep to replace autotools to workaround failure caused by out of tree
...

  | rm -f lib/alloca.h-t lib/alloca.h && \
  | { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
  |   cat ../groff-1.22.4/lib/alloca.in.h; \
  | } > lib/alloca.h-t && \
  | mv -f lib/alloca.h-t lib/alloca.h
  | /bin/sh: line 4: lib/alloca.h-t: No such file or directory
  | Makefile:10407: recipe for target 'lib/alloca.h' failed

...

- Add `--without-doc' to not use target groff to generate doc at build time, since upstream commit [cfe916e Support of configure option to build the documentation.]

- Remove groff depends groff-native, and add DEPENDS bison-native

- Add 0001-fix-shebang-for-taget.patch

- Add 0001-support-musl.patch

---
 .../groff/files/0001-fix-shebang-for-taget.patch   | 31 +++++++++++++++
 .../0001-replace-perl-w-with-use-warnings.patch    | 34 +++++++++-------
 .../groff/files/0001-support-musl.patch            | 46 ++++++++++++++++++++++
 .../groff-not-search-fonts-on-build-host.patch     | 20 ++++++++--
 ...need_charset_alias-when-building-for-musl.patch | 30 --------------
 ...off-1.22.2-correct-man.local-install-path.patch | 34 ----------------
 .../groff/{groff_1.22.3.bb => groff_1.22.4.bb}     | 36 ++++-------------
 7 files changed, 119 insertions(+), 112 deletions(-)
 create mode 100644 meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
 rename meta/recipes-extended/groff/{groff-1.22.3 => files}/0001-replace-perl-w-with-use-warnings.patch (76%)
 create mode 100644 meta/recipes-extended/groff/files/0001-support-musl.patch
 rename meta/recipes-extended/groff/{groff-1.22.3 => files}/groff-not-search-fonts-on-build-host.patch (42%)
 delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
 rename meta/recipes-extended/groff/{groff_1.22.3.bb => groff_1.22.4.bb} (62%)
meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch new file +31 -0
new file mode 100644
index 0000000..1b94e8a
@@ -0,0 +1,31 @@
+From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 19:19:27 +0800
+Subject: [PATCH] fix shebang for target
+
+...
+|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in
+package groff requires tmp-glibc/hosttools/bash, but no providers found in
+RDEPENDS_groff? [file-rdeps]
+...
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ contrib/gdiffmk/gdiffmk.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
+index 5ce931e..10f2300 100644
+--- a/contrib/gdiffmk/gdiffmk.sh
++++ b/contrib/gdiffmk/gdiffmk.sh
+@@ -1,4 +1,4 @@
+-#!@BASH_PROG@
++#!/bin/sh
+ # Copyright (C) 2004-2018 Free Software Foundation, Inc.
+ # Written by Mike Bianchi <[email protected] <mailto:[email protected]>>
+ # Thanks to Peter Bray for debugging.
+-- 
+2.7.4
+
meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch renamed from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch +19 -15
similarity index 76%
rename from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
rename to meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
index f1db5b0..eda6a40 100644
@@ -1,7 +1,7 @@
-From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001
+From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
-Date: Thu, 6 Apr 2017 01:46:00 -0700
-Subject: [PATCH] replace "perl -w" with "use warnings"
+Date: Sat, 11 May 2019 17:03:03 +0800
+Subject: [PATCH 1/2] replace "perl -w" with "use warnings"
 
 The shebang's max length is usually 128 as defined in
 /usr/include/linux/binfmts.h:
@@ -18,6 +18,10 @@ So replace "perl -w" with "use warnings" to make it work.
 Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <[email protected]>
+
+Rebase to 1.22.4.
+
+Signed-off-by: Hongxu Jia <[email protected]>
 ---
  font/devpdf/util/BuildFoundries.pl | 3 ++-
  src/devices/gropdf/gropdf.pl       | 3 ++-
@@ -26,7 +30,7 @@ Signed-off-by: Robert Yang <[email protected]>
  4 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
-index 39f2f0d..a2bfd8e 100644
+index f8af826..9584e28 100644
 --- a/font/devpdf/util/BuildFoundries.pl
 +++ b/font/devpdf/util/BuildFoundries.pl
 @@ -1,4 +1,4 @@
@@ -36,15 +40,15 @@ index 39f2f0d..a2bfd8e 100644
  #   BuildFoundries   : Given a Foundry file generate groff and download files
  #   Deri James       : Monday 07 Feb 2011
 @@ -22,6 +22,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  use strict;
 +use warnings;
  
+ (my $progname = $0) =~s @.*/@@;
  my $where=shift||'';
- my $devps=shift||'../devps';
 diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
-index 035d123..b933b32 100644
+index 2ec52d0..ce5a06f 100644
 --- a/src/devices/gropdf/gropdf.pl
 +++ b/src/devices/gropdf/gropdf.pl
 @@ -1,4 +1,4 @@
@@ -59,10 +63,10 @@ index 035d123..b933b32 100644
  use strict;
 +use warnings;
  use Getopt::Long qw(:config bundling);
- use Compress::Zlib;
  
+ use constant
 diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
-index beec820..4b46ea4 100644
+index c9b08b2..61124f3 100644
 --- a/src/devices/gropdf/pdfmom.pl
 +++ b/src/devices/gropdf/pdfmom.pl
 @@ -1,4 +1,4 @@
@@ -71,8 +75,8 @@ index beec820..4b46ea4 100644
  #
  #	pdfmom		: Frontend to run groff -mom to produce PDFs
  #	Deri James	: Friday 16 Mar 2012
-@@ -24,6 +24,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+@@ -23,6 +23,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  use strict;
 +use warnings;
@@ -80,17 +84,17 @@ index beec820..4b46ea4 100644
  my @cmd;
  my $dev='pdf';
 diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
-index 4f2ce83..5c078ff 100644
+index 954c58e..81a6c97 100644
 --- a/src/utils/afmtodit/afmtodit.pl
 +++ b/src/utils/afmtodit/afmtodit.pl
 @@ -1,4 +1,4 @@
 -#! /usr/bin/perl -w
 +#! /usr/bin/perl
  # -*- Perl -*-
- # Copyright (C) 1989-2014  Free Software Foundation, Inc.
+ # Copyright (C) 1989-2018 Free Software Foundation, Inc.
  #      Written by James Clark ([email protected])
 @@ -19,6 +19,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  use strict;
 +use warnings;
@@ -98,5 +102,5 @@ index 4f2ce83..5c078ff 100644
  @afmtodit.tables@
  
 -- 
-2.10.2
+2.7.4
 
meta/recipes-extended/groff/files/0001-support-musl.patch new file +46 -0

46 lines not on this page · raw message

meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch renamed from meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch +16 -4
similarity index 42%
rename from meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
rename to meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch
index ff8f320..c80a2a5 100644
@@ -1,20 +1,32 @@
-groff searchs fonts which are provided by ghostscript on build host.
-It causes non-determinism issue. So not search font dirs on host.
+From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 17:06:29 +0800
+Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on
+ build host. It causes non-determinism issue. So not search font dirs on host.
 
 Upstream-Status: Inappropriate [cross build specific]
 
 Signed-off-by: Kai Kang <[email protected]>
 
+Rebase to 1.22.4
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ font/devpdf/Foundry.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
-index a6e968f..8094642 100644
+index 93e9b66..235b23b 100644
 --- a/font/devpdf/Foundry.in
 +++ b/font/devpdf/Foundry.in
 @@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
  #======================================================================
  
  #Foundry|Name|Searchpath
--foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
+-foundry|U|(gs):@urwfontsdir@ :/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
 +foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
  #Define Flags for afmtodit
  
  r=-i 0 -m
+-- 
+2.7.4
+
meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -30
deleted file mode 100644
index b61b432..0000000
@@ -1,30 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: groff-1.22.3/src/libs/gnulib/lib/Makefile.am
-===================================================================
---- groff-1.22.3.orig/src/libs/gnulib/lib/Makefile.am
-+++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am
-@@ -113,7 +113,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch deleted +0 -34
deleted file mode 100644
index c73328a..0000000
@@ -1,34 +0,0 @@
-Correct the install path of man.local to fix following error:
-    /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
-
-Signed-off-by: Zhenhua Luo <[email protected]>
-Upstream-Status: Pending
-
-diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
-index 1506232..f1468c5 100644
---- a/tmac/Makefile.sub
-+++ b/tmac/Makefile.sub
-@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
- 	  $(RM) $(DESTDIR)$(mdocdir)/$$f; \
- 	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
- 	done
--	-test -f $(DESTDIR)$(localtmacdir)/man.local \
-+	-test -f $(DESTDIR)$(tmacdir)/man.local \
- 	  || $(INSTALL_DATA) $(srcdir)/man.local \
--	       $(DESTDIR)$(localtmacdir)/man.local
-+	       $(DESTDIR)$(tmacdir)/man.local
- 	-test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
- 	  || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
- 
-@@ -164,9 +164,9 @@ uninstall_sub:
- 	$(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
- 	$(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
- 	$(RM) $(DESTDIR)$(tmacdir)/www.tmac
--	-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
-+	-if cmp -s $(DESTDIR)$(tmacdir)/man.local \
- 	           $(srcdir)/man.local; then \
--	  $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
-+	  $(RM) $(DESTDIR)$(tmacdir)/man.local; \
- 	fi
- 	-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
- 	           $(srcdir)/mdoc.local; then \
meta/recipes-extended/groff/groff_1.22.4.bb renamed from meta/recipes-extended/groff/groff_1.22.3.bb +7 -29
similarity index 62%
rename from meta/recipes-extended/groff/groff_1.22.3.bb
rename to meta/recipes-extended/groff/groff_1.22.4.bb
index ba90cad..37eee9a 100644
@@ -8,49 +8,27 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
-	file://groff-1.22.2-correct-man.local-install-path.patch \
-	file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
 	file://0001-replace-perl-w-with-use-warnings.patch \
 	file://groff-not-search-fonts-on-build-host.patch \
+	file://0001-fix-shebang-for-taget.patch \
+	file://0001-support-musl.patch \
 "
 
-SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
-SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
+SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
+SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293"
 
-DEPENDS = "groff-native"
-DEPENDS_class-native = ""
+DEPENDS = "bison-native"
 RDEPENDS_${PN} += "perl sed"
 
-inherit autotools texinfo multilib_script
+inherit autotools-brokensep texinfo multilib_script pkgconfig
 
 MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog"
 
-EXTRA_OECONF = "--without-x"
+EXTRA_OECONF = "--without-x --without-doc"
 PARALLEL_MAKE = ""
 
 CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
 
-do_configure_prepend() {
-	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		sed -i \
-		    -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
-		    -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
-		    -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-		    -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-		    ${S}/contrib/*/Makefile.sub \
-		    ${S}/doc/Makefile.in \
-		    ${S}/doc/Makefile.sub
-	fi
-}
-
-do_configure_append() {
-    # generate gnulib configure script
-    olddir=`pwd`
-    cd ${S}/src/libs/gnulib/
-    ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
-    cd ${olddir}
-}
-
 do_install_append() {
 	# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
 	# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
Signature · 1 line
2.7.4
#14 lore raw

Re: [PATCH 08/10] groff: upgrade 1.22.3 -> 1.22.4

Quoted 19 lines · Hongxu Jia

..

meta/recipes-extended/groff/files/0001-support-musl.patch new file +15 -0
@@ -0,0 +1,46 @@
+From f73df5196c35ef9c4531e4b6b26800c41954fd77 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 20:00:29 +0800
+Subject: [PATCH] support musl
+
+...
+|./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration
+| _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
+| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36,
+|                 from ./lib/math.h:27,
+|                 from ./src/include/driver.h:27,
+|                 from src/devices/grodvi/dvi.cpp:20:
+|recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)'
+|   signbit(float __x)

meta/recipes-extended/groff/files/0001-support-musl.patch line 24

Quoted 10 lines
meta/recipes-extended/groff/files/0001-support-musl.patch new file +9 -0
+|   ^~~~~~~
+...
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ lib/math.in.h | 2 ++
+ 1 file changed, 2 insertions(+)
...

The upstream fix seems to be different, the signbit.m4 part of
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=453ff940449bbbde9ec00f0bbf82a359c5598fc7

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
author
#15 lore raw

Re: [PATCH 08/10] groff: upgrade 1.22.3 -> 1.22.4

Quoted 24 lines · Adrian Bunk
Quoted 23 lines · Hongxu Jia

..

meta/recipes-extended/groff/files/0001-support-musl.patch new file +19 -0
@@ -0,0 +1,46 @@
+From f73df5196c35ef9c4531e4b6b26800c41954fd77 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 20:00:29 +0800
+Subject: [PATCH] support musl
+
+...
+|./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration
+| _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
+| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36,
+|                 from ./lib/math.h:27,
+|                 from ./src/include/driver.h:27,
+|                 from src/devices/grodvi/dvi.cpp:20:
+|recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)'
+|   signbit(float __x)
+|   ^~~~~~~
+...
+
+Upstream-Status: Pending
Quoted 8 lines

meta/recipes-extended/groff/files/0001-support-musl.patch line 24

Quoted 6 lines
meta/recipes-extended/groff/files/0001-support-musl.patch new file +5 -0
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ lib/math.in.h | 2 ++
+ 1 file changed, 2 insertions(+)
...

The upstream fix seems to be different, the signbit.m4 part of
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=453ff940449bbbde9ec00f0bbf82a359c5598fc7

It's a long story, the git version groff is using submodule gnulib rather than itself

http://git.savannah.gnu.org/cgit/groff.git/commit/?id=5fec19d453983bc3127052e4f100110efda93786

Your suggestion works in this situation.

But we do not use git groff, we are building from the source as in distributed tarball files which

does not require gnulib any more, so your fix is not suitable for us

SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \

//Hongxu

Quoted 3 lines

cu
Adrian

author
#16 lore raw

Re: [PATCH 08/10] groff: upgrade 1.22.3 -> 1.22.4

Quoted 5 lines · Hongxu Jia

It's a long story, the git version groff is using submodule gnulib rather than itself

http://git.savannah.gnu.org/cgit/groff.git/commit/?id=5fec19d453983bc3127052e4f100110efda93786

Quoted 8 lines

Your suggestion works in this situation.

But we do not use git groff, we are building from the source as in distributed tarball files which

does not require gnulib any more, so your fix is not suitable for us

SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \

But be on the safe side, I am trying to translate the gnulib fix to groff tarball,

it works.

Thanks your suggestion, v2 incoming.

//Hongxu

Quoted 1 line

//Hongxu

author
#17 lore raw

PATCH v2 1/1 groff: upgrade 1.22.3 -> 1.22.4

- Drop groff-1.22.2-correct-man.local-install-path.patch and 0001-Unset-need_charset_alias-when-building-for-musl.patch

- Inherit bbclass pkgcnofig to fix `undefined macro: AC_DEFINE'
...
| configure:20010: error: possibly undefined macro: AC_DEFINE
...

- Use autotools-brokensep to replace autotools to workaround failure caused by out of tree
...

  | rm -f lib/alloca.h-t lib/alloca.h && \
  | { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
  |   cat ../groff-1.22.4/lib/alloca.in.h; \
  | } > lib/alloca.h-t && \
  | mv -f lib/alloca.h-t lib/alloca.h
  | /bin/sh: line 4: lib/alloca.h-t: No such file or directory
  | Makefile:10407: recipe for target 'lib/alloca.h' failed

...

- Add `--without-doc' to not use target groff to generate doc at build time, since upstream commit [cfe916e Support of configure option to build the documentation.]

- Remove groff depends groff-native, and add DEPENDS bison-native

- Add 0001-fix-shebang-for-taget.patch

- Add 0001-support-musl.patch

---
 .../groff/files/0001-fix-shebang-for-taget.patch   | 31 ++++++++++++++++
 .../0001-replace-perl-w-with-use-warnings.patch    | 34 ++++++++++--------
 .../groff/files/0001-support-musl.patch            | 41 ++++++++++++++++++++++
 .../groff-not-search-fonts-on-build-host.patch     | 20 ++++++++---
 ...need_charset_alias-when-building-for-musl.patch | 30 ----------------
 ...off-1.22.2-correct-man.local-install-path.patch | 34 ------------------
 .../groff/{groff_1.22.3.bb => groff_1.22.4.bb}     | 36 ++++---------------
 7 files changed, 114 insertions(+), 112 deletions(-)
 create mode 100644 meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
 rename meta/recipes-extended/groff/{groff-1.22.3 => files}/0001-replace-perl-w-with-use-warnings.patch (76%)
 create mode 100644 meta/recipes-extended/groff/files/0001-support-musl.patch
 rename meta/recipes-extended/groff/{groff-1.22.3 => files}/groff-not-search-fonts-on-build-host.patch (42%)
 delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
 rename meta/recipes-extended/groff/{groff_1.22.3.bb => groff_1.22.4.bb} (62%)
meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch new file +31 -0
new file mode 100644
index 0000000..1b94e8a
@@ -0,0 +1,31 @@
+From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 19:19:27 +0800
+Subject: [PATCH] fix shebang for target
+
+...
+|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in
+package groff requires tmp-glibc/hosttools/bash, but no providers found in
+RDEPENDS_groff? [file-rdeps]
+...
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ contrib/gdiffmk/gdiffmk.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
+index 5ce931e..10f2300 100644
+--- a/contrib/gdiffmk/gdiffmk.sh
++++ b/contrib/gdiffmk/gdiffmk.sh
+@@ -1,4 +1,4 @@
+-#!@BASH_PROG@
++#!/bin/sh
+ # Copyright (C) 2004-2018 Free Software Foundation, Inc.
+ # Written by Mike Bianchi <[email protected] <mailto:[email protected]>>
+ # Thanks to Peter Bray for debugging.
+-- 
+2.7.4
+
meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch renamed from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch +19 -15
similarity index 76%
rename from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
rename to meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
index f1db5b0..eda6a40 100644
@@ -1,7 +1,7 @@
-From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001
+From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
-Date: Thu, 6 Apr 2017 01:46:00 -0700
-Subject: [PATCH] replace "perl -w" with "use warnings"
+Date: Sat, 11 May 2019 17:03:03 +0800
+Subject: [PATCH 1/2] replace "perl -w" with "use warnings"
 
 The shebang's max length is usually 128 as defined in
 /usr/include/linux/binfmts.h:
@@ -18,6 +18,10 @@ So replace "perl -w" with "use warnings" to make it work.
 Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <[email protected]>
+
+Rebase to 1.22.4.
+
+Signed-off-by: Hongxu Jia <[email protected]>
 ---
  font/devpdf/util/BuildFoundries.pl | 3 ++-
  src/devices/gropdf/gropdf.pl       | 3 ++-
@@ -26,7 +30,7 @@ Signed-off-by: Robert Yang <[email protected]>
  4 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
-index 39f2f0d..a2bfd8e 100644
+index f8af826..9584e28 100644
 --- a/font/devpdf/util/BuildFoundries.pl
 +++ b/font/devpdf/util/BuildFoundries.pl
 @@ -1,4 +1,4 @@
@@ -36,15 +40,15 @@ index 39f2f0d..a2bfd8e 100644
  #   BuildFoundries   : Given a Foundry file generate groff and download files
  #   Deri James       : Monday 07 Feb 2011
 @@ -22,6 +22,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  use strict;
 +use warnings;
  
+ (my $progname = $0) =~s @.*/@@;
  my $where=shift||'';
- my $devps=shift||'../devps';
 diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
-index 035d123..b933b32 100644
+index 2ec52d0..ce5a06f 100644
 --- a/src/devices/gropdf/gropdf.pl
 +++ b/src/devices/gropdf/gropdf.pl
 @@ -1,4 +1,4 @@
@@ -59,10 +63,10 @@ index 035d123..b933b32 100644
  use strict;
 +use warnings;
  use Getopt::Long qw(:config bundling);
- use Compress::Zlib;
  
+ use constant
 diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
-index beec820..4b46ea4 100644
+index c9b08b2..61124f3 100644
 --- a/src/devices/gropdf/pdfmom.pl
 +++ b/src/devices/gropdf/pdfmom.pl
 @@ -1,4 +1,4 @@
@@ -71,8 +75,8 @@ index beec820..4b46ea4 100644
  #
  #	pdfmom		: Frontend to run groff -mom to produce PDFs
  #	Deri James	: Friday 16 Mar 2012
-@@ -24,6 +24,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+@@ -23,6 +23,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  use strict;
 +use warnings;
@@ -80,17 +84,17 @@ index beec820..4b46ea4 100644
  my @cmd;
  my $dev='pdf';
 diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
-index 4f2ce83..5c078ff 100644
+index 954c58e..81a6c97 100644
 --- a/src/utils/afmtodit/afmtodit.pl
 +++ b/src/utils/afmtodit/afmtodit.pl
 @@ -1,4 +1,4 @@
 -#! /usr/bin/perl -w
 +#! /usr/bin/perl
  # -*- Perl -*-
- # Copyright (C) 1989-2014  Free Software Foundation, Inc.
+ # Copyright (C) 1989-2018 Free Software Foundation, Inc.
  #      Written by James Clark ([email protected])
 @@ -19,6 +19,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  use strict;
 +use warnings;
@@ -98,5 +102,5 @@ index 4f2ce83..5c078ff 100644
  @afmtodit.tables@
  
 -- 
-2.10.2
+2.7.4
 
meta/recipes-extended/groff/files/0001-support-musl.patch new file +41 -0

41 lines not on this page · raw message

meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch renamed from meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch +16 -4
similarity index 42%
rename from meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
rename to meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch
index ff8f320..c80a2a5 100644
@@ -1,20 +1,32 @@
-groff searchs fonts which are provided by ghostscript on build host.
-It causes non-determinism issue. So not search font dirs on host.
+From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 17:06:29 +0800
+Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on
+ build host. It causes non-determinism issue. So not search font dirs on host.
 
 Upstream-Status: Inappropriate [cross build specific]
 
 Signed-off-by: Kai Kang <[email protected]>
 
+Rebase to 1.22.4
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ font/devpdf/Foundry.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
-index a6e968f..8094642 100644
+index 93e9b66..235b23b 100644
 --- a/font/devpdf/Foundry.in
 +++ b/font/devpdf/Foundry.in
 @@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
  #======================================================================
  
  #Foundry|Name|Searchpath
--foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
+-foundry|U|(gs):@urwfontsdir@ :/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
 +foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
  #Define Flags for afmtodit
  
  r=-i 0 -m
+-- 
+2.7.4
+
meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -30
deleted file mode 100644
index b61b432..0000000
@@ -1,30 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: groff-1.22.3/src/libs/gnulib/lib/Makefile.am
-===================================================================
---- groff-1.22.3.orig/src/libs/gnulib/lib/Makefile.am
-+++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am
-@@ -113,7 +113,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch deleted +0 -34
deleted file mode 100644
index c73328a..0000000
@@ -1,34 +0,0 @@
-Correct the install path of man.local to fix following error:
-    /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
-
-Signed-off-by: Zhenhua Luo <[email protected]>
-Upstream-Status: Pending
-
-diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
-index 1506232..f1468c5 100644
---- a/tmac/Makefile.sub
-+++ b/tmac/Makefile.sub
-@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
- 	  $(RM) $(DESTDIR)$(mdocdir)/$$f; \
- 	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
- 	done
--	-test -f $(DESTDIR)$(localtmacdir)/man.local \
-+	-test -f $(DESTDIR)$(tmacdir)/man.local \
- 	  || $(INSTALL_DATA) $(srcdir)/man.local \
--	       $(DESTDIR)$(localtmacdir)/man.local
-+	       $(DESTDIR)$(tmacdir)/man.local
- 	-test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
- 	  || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
- 
-@@ -164,9 +164,9 @@ uninstall_sub:
- 	$(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
- 	$(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
- 	$(RM) $(DESTDIR)$(tmacdir)/www.tmac
--	-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
-+	-if cmp -s $(DESTDIR)$(tmacdir)/man.local \
- 	           $(srcdir)/man.local; then \
--	  $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
-+	  $(RM) $(DESTDIR)$(tmacdir)/man.local; \
- 	fi
- 	-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
- 	           $(srcdir)/mdoc.local; then \
meta/recipes-extended/groff/groff_1.22.4.bb renamed from meta/recipes-extended/groff/groff_1.22.3.bb +7 -29
similarity index 62%
rename from meta/recipes-extended/groff/groff_1.22.3.bb
rename to meta/recipes-extended/groff/groff_1.22.4.bb
index ba90cad..37eee9a 100644
@@ -8,49 +8,27 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
-	file://groff-1.22.2-correct-man.local-install-path.patch \
-	file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
 	file://0001-replace-perl-w-with-use-warnings.patch \
 	file://groff-not-search-fonts-on-build-host.patch \
+	file://0001-fix-shebang-for-taget.patch \
+	file://0001-support-musl.patch \
 "
 
-SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
-SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
+SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
+SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293"
 
-DEPENDS = "groff-native"
-DEPENDS_class-native = ""
+DEPENDS = "bison-native"
 RDEPENDS_${PN} += "perl sed"
 
-inherit autotools texinfo multilib_script
+inherit autotools-brokensep texinfo multilib_script pkgconfig
 
 MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog"
 
-EXTRA_OECONF = "--without-x"
+EXTRA_OECONF = "--without-x --without-doc"
 PARALLEL_MAKE = ""
 
 CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
 
-do_configure_prepend() {
-	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		sed -i \
-		    -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
-		    -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
-		    -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-		    -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-		    ${S}/contrib/*/Makefile.sub \
-		    ${S}/doc/Makefile.in \
-		    ${S}/doc/Makefile.sub
-	fi
-}
-
-do_configure_append() {
-    # generate gnulib configure script
-    olddir=`pwd`
-    cd ${S}/src/libs/gnulib/
-    ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
-    cd ${olddir}
-}
-
 do_install_append() {
 	# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
 	# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
Signature · 1 line
2.7.4
author
#18 lore raw

Re: [PATCH V2] groff: upgrade 1.22.3 -> 1.22.4

It seems the patch has been merged to master,
so I will send a fix rebased on that, please drop this V2, sorry for the noisy

//Hongxu

Quoted 425 lines · Hongxu Jia

- Drop groff-1.22.2-correct-man.local-install-path.patch and 0001-Unset-need_charset_alias-when-building-for-musl.patch

- Inherit bbclass pkgcnofig to fix `undefined macro: AC_DEFINE'
...
| configure:20010: error: possibly undefined macro: AC_DEFINE
...

- Use autotools-brokensep to replace autotools to workaround failure caused by out of tree
...

   | rm -f lib/alloca.h-t lib/alloca.h && \
   | { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
   |   cat ../groff-1.22.4/lib/alloca.in.h; \
   | } > lib/alloca.h-t && \
   | mv -f lib/alloca.h-t lib/alloca.h
   | /bin/sh: line 4: lib/alloca.h-t: No such file or directory
   | Makefile:10407: recipe for target 'lib/alloca.h' failed

...

- Add `--without-doc' to not use target groff to generate doc at build time, since upstream commit [cfe916e Support of configure option to build the documentation.]

- Remove groff depends groff-native, and add DEPENDS bison-native

- Add 0001-fix-shebang-for-taget.patch

- Add 0001-support-musl.patch

---
  .../groff/files/0001-fix-shebang-for-taget.patch   | 31 ++++++++++++++++
  .../0001-replace-perl-w-with-use-warnings.patch    | 34 ++++++++++--------
  .../groff/files/0001-support-musl.patch            | 41 ++++++++++++++++++++++
  .../groff-not-search-fonts-on-build-host.patch     | 20 ++++++++---
  ...need_charset_alias-when-building-for-musl.patch | 30 ----------------
  ...off-1.22.2-correct-man.local-install-path.patch | 34 ------------------
  .../groff/{groff_1.22.3.bb => groff_1.22.4.bb}     | 36 ++++---------------
  7 files changed, 114 insertions(+), 112 deletions(-)

create mode 100644 meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
rename meta/recipes-extended/groff/{groff-1.22.3 => files}/0001-replace-perl-w-with-use-warnings.patch (76%) create mode 100644 meta/recipes-extended/groff/files/0001-support-musl.patch
rename meta/recipes-extended/groff/{groff-1.22.3 => files}/groff-not-search-fonts-on-build-host.patch (42%) delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch rename meta/recipes-extended/groff/{groff_1.22.3.bb => groff_1.22.4.bb} (62%)

meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch new file +31 -0
new file mode 100644
index 0000000..1b94e8a
@@ -0,0 +1,31 @@
+From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 19:19:27 +0800
+Subject: [PATCH] fix shebang for target
+
+...
+|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in
+package groff requires tmp-glibc/hosttools/bash, but no providers found in
+RDEPENDS_groff? [file-rdeps]
+...
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ contrib/gdiffmk/gdiffmk.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
+index 5ce931e..10f2300 100644
+--- a/contrib/gdiffmk/gdiffmk.sh
++++ b/contrib/gdiffmk/gdiffmk.sh
+@@ -1,4 +1,4 @@
+-#!@BASH_PROG@
++#!/bin/sh
+ # Copyright (C) 2004-2018 Free Software Foundation, Inc.
+ # Written by Mike Bianchi <[email protected] <mailto:[email protected]>>
+ # Thanks to Peter Bray for debugging.
+--
+2.7.4
+
meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch renamed from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch +19 -15
similarity index 76%
rename from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
rename to meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
index f1db5b0..eda6a40 100644
@@ -1,7 +1,7 @@
-From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001
+From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001
  From: Robert Yang <[email protected]>
-Date: Thu, 6 Apr 2017 01:46:00 -0700
-Subject: [PATCH] replace "perl -w" with "use warnings"
+Date: Sat, 11 May 2019 17:03:03 +0800
+Subject: [PATCH 1/2] replace "perl -w" with "use warnings"
 
  The shebang's max length is usually 128 as defined in
  /usr/include/linux/binfmts.h:
@@ -18,6 +18,10 @@ So replace "perl -w" with "use warnings" to make it work.
  Upstream-Status: Pending
 
  Signed-off-by: Robert Yang <[email protected]>
+
+Rebase to 1.22.4.
+
+Signed-off-by: Hongxu Jia <[email protected]>
  ---
   font/devpdf/util/BuildFoundries.pl | 3 ++-
   src/devices/gropdf/gropdf.pl       | 3 ++-
@@ -26,7 +30,7 @@ Signed-off-by: Robert Yang <[email protected]>
   4 files changed, 8 insertions(+), 4 deletions(-)
 
  diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
-index 39f2f0d..a2bfd8e 100644
+index f8af826..9584e28 100644
  --- a/font/devpdf/util/BuildFoundries.pl
  +++ b/font/devpdf/util/BuildFoundries.pl
  @@ -1,4 +1,4 @@
@@ -36,15 +40,15 @@ index 39f2f0d..a2bfd8e 100644
   #   BuildFoundries   : Given a Foundry file generate groff and download files
   #   Deri James       : Monday 07 Feb 2011
  @@ -22,6 +22,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   use strict;
  +use warnings;
 
+ (my $progname = $0) =~s @.*/@@;
   my $where=shift||'';
- my $devps=shift||'../devps';
  diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
-index 035d123..b933b32 100644
+index 2ec52d0..ce5a06f 100644
  --- a/src/devices/gropdf/gropdf.pl
  +++ b/src/devices/gropdf/gropdf.pl
  @@ -1,4 +1,4 @@
@@ -59,10 +63,10 @@ index 035d123..b933b32 100644
   use strict;
  +use warnings;
   use Getopt::Long qw(:config bundling);
- use Compress::Zlib;
 
+ use constant
  diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
-index beec820..4b46ea4 100644
+index c9b08b2..61124f3 100644
  --- a/src/devices/gropdf/pdfmom.pl
  +++ b/src/devices/gropdf/pdfmom.pl
  @@ -1,4 +1,4 @@
@@ -71,8 +75,8 @@ index beec820..4b46ea4 100644
   #
   #	pdfmom		: Frontend to run groff -mom to produce PDFs
   #	Deri James	: Friday 16 Mar 2012
-@@ -24,6 +24,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+@@ -23,6 +23,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   use strict;
  +use warnings;
@@ -80,17 +84,17 @@ index beec820..4b46ea4 100644
   my @cmd;
   my $dev='pdf';
  diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
-index 4f2ce83..5c078ff 100644
+index 954c58e..81a6c97 100644
  --- a/src/utils/afmtodit/afmtodit.pl
  +++ b/src/utils/afmtodit/afmtodit.pl
  @@ -1,4 +1,4 @@
  -#! /usr/bin/perl -w
  +#! /usr/bin/perl
   # -*- Perl -*-
- # Copyright (C) 1989-2014  Free Software Foundation, Inc.
+ # Copyright (C) 1989-2018 Free Software Foundation, Inc.
   #      Written by James Clark ([email protected])
  @@ -19,6 +19,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   use strict;
  +use warnings;
@@ -98,5 +102,5 @@ index 4f2ce83..5c078ff 100644
   @afmtodit.tables@
 
  --
-2.10.2
+2.7.4
 
meta/recipes-extended/groff/files/0001-support-musl.patch new file +41 -0
new file mode 100644
index 0000000..a837b11
@@ -0,0 +1,41 @@
+From 695965c27be74acb5968f19d51af86065c4b71a9 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 13 May 2019 09:48:14 +0800
+Subject: [PATCH] support musl
+
+...
+|./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration
+| _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
+| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36,
+|                 from ./lib/math.h:27,
+|                 from ./src/include/driver.h:27,
+|                 from src/devices/grodvi/dvi.cpp:20:
+|recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)'
+|   signbit(float __x)
+|   ^~~~~~~
+...
+
+Upstream-Status: Backport [http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=453ff940449bbbde9ec00f0bbf82a359c5598fc7]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ gnulib_m4/signbit.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gnulib_m4/signbit.m4 b/gnulib_m4/signbit.m4
+index 9e7884d..8b9c70c 100644
+--- a/gnulib_m4/signbit.m4
++++ b/gnulib_m4/signbit.m4
+@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT],
+         [case "$host_os" in
+                           # Guess yes on glibc systems.
+            *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
++                          # Guess yes on musl systems.
++           *-musl*)       gl_cv_func_signbit="guessing yes" ;;
+                           # Guess yes on native Windows.
+            mingw*)        gl_cv_func_signbit="guessing yes" ;;
+                           # If we don't know, assume the worst.
+--
+2.7.4
+
meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch renamed from meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch +16 -4
similarity index 42%
rename from meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
rename to meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch
index ff8f320..c80a2a5 100644
@@ -1,20 +1,32 @@
-groff searchs fonts which are provided by ghostscript on build host.
-It causes non-determinism issue. So not search font dirs on host.
+From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 17:06:29 +0800
+Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on
+ build host. It causes non-determinism issue. So not search font dirs on host.
 
  Upstream-Status: Inappropriate [cross build specific]
 
  Signed-off-by: Kai Kang <[email protected]>
 
+Rebase to 1.22.4
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ font/devpdf/Foundry.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
  diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
-index a6e968f..8094642 100644
+index 93e9b66..235b23b 100644
  --- a/font/devpdf/Foundry.in
  +++ b/font/devpdf/Foundry.in
  @@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
   #======================================================================
 
   #Foundry|Name|Searchpath
--foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
+-foundry|U|(gs):@urwfontsdir@ :/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
  +foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
   #Define Flags for afmtodit
 
   r=-i 0 -m
+--
+2.7.4
+
meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -30
deleted file mode 100644
index b61b432..0000000
@@ -1,30 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: groff-1.22.3/src/libs/gnulib/lib/Makefile.am
-===================================================================
---- groff-1.22.3.orig/src/libs/gnulib/lib/Makefile.am
-+++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am
-@@ -113,7 +113,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch deleted +0 -34
deleted file mode 100644
index c73328a..0000000
@@ -1,34 +0,0 @@
-Correct the install path of man.local to fix following error:
-    /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
-
-Signed-off-by: Zhenhua Luo <[email protected]>
-Upstream-Status: Pending
-
-diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
-index 1506232..f1468c5 100644
---- a/tmac/Makefile.sub
-+++ b/tmac/Makefile.sub
-@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
- 	  $(RM) $(DESTDIR)$(mdocdir)/$$f; \
- 	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
- 	done
--	-test -f $(DESTDIR)$(localtmacdir)/man.local \
-+	-test -f $(DESTDIR)$(tmacdir)/man.local \
- 	  || $(INSTALL_DATA) $(srcdir)/man.local \
--	       $(DESTDIR)$(localtmacdir)/man.local
-+	       $(DESTDIR)$(tmacdir)/man.local
- 	-test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
- 	  || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
-
-@@ -164,9 +164,9 @@ uninstall_sub:
- 	$(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
- 	$(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
- 	$(RM) $(DESTDIR)$(tmacdir)/www.tmac
--	-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
-+	-if cmp -s $(DESTDIR)$(tmacdir)/man.local \
- 	           $(srcdir)/man.local; then \
--	  $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
-+	  $(RM) $(DESTDIR)$(tmacdir)/man.local; \
- 	fi
- 	-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
- 	           $(srcdir)/mdoc.local; then \
meta/recipes-extended/groff/groff_1.22.4.bb renamed from meta/recipes-extended/groff/groff_1.22.3.bb +7 -29
similarity index 62%
rename from meta/recipes-extended/groff/groff_1.22.3.bb
rename to meta/recipes-extended/groff/groff_1.22.4.bb
index ba90cad..37eee9a 100644
@@ -8,49 +8,27 @@ LICENSE = "GPLv3"
  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
  SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
-	file://groff-1.22.2-correct-man.local-install-path.patch \
-	file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
  	file://0001-replace-perl-w-with-use-warnings.patch \
  	file://groff-not-search-fonts-on-build-host.patch \
+	file://0001-fix-shebang-for-taget.patch \
+	file://0001-support-musl.patch \
  "
 
-SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
-SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
+SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
+SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293"
 
-DEPENDS = "groff-native"
-DEPENDS_class-native = ""
+DEPENDS = "bison-native"
  RDEPENDS_${PN} += "perl sed"
 
-inherit autotools texinfo multilib_script
+inherit autotools-brokensep texinfo multilib_script pkgconfig
 
  MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog"
 
-EXTRA_OECONF = "--without-x"
+EXTRA_OECONF = "--without-x --without-doc"
  PARALLEL_MAKE = ""
 
  CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
 
-do_configure_prepend() {
-	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		sed -i \
-		    -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
-		    -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
-		    -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-		    -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-		    ${S}/contrib/*/Makefile.sub \
-		    ${S}/doc/Makefile.in \
-		    ${S}/doc/Makefile.sub
-	fi
-}
-
-do_configure_append() {
-    # generate gnulib configure script
-    olddir=`pwd`
-    cd ${S}/src/libs/gnulib/
-    ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
-    cd ${olddir}
-}
-
  do_install_append() {
  	# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
  	# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
author
#19 lore raw

PATCH 9/10 libxml2: upgrade 2.9.8 -> 2.9.9

In reply to Hongxu Jia

- Drop backported fix-CVE-2017-8872.patch, fix-CVE-2018-14404.patch and 0001-Fix-infinite-loop-in-LZMA-decompression.patch

---
 ...1-Fix-infinite-loop-in-LZMA-decompression.patch |  55 ------
 .../libxml/libxml2/fix-CVE-2017-8872.patch         |  65 -------
 .../libxml/libxml2/fix-CVE-2018-14404.patch        |  45 -----
 .../libxml/libxml2/fix-execution-of-ptests.patch   |  24 ++-
 .../recipes-core/libxml/libxml2/libxml-64bit.patch |  24 ++-
 .../libxml/libxml2/libxml-m4-use-pkgconfig.patch   |  16 +-
 .../libxml/libxml2/python-sitepackages-dir.patch   |  13 +-
 meta/recipes-core/libxml/libxml2/runtest.patch     | 204 ++++++++++++---------
 .../libxml/{libxml2_2.9.8.bb => libxml2_2.9.9.bb}  |   7 +-
 9 files changed, 172 insertions(+), 281 deletions(-)
 delete mode 100644 meta/recipes-core/libxml/libxml2/0001-Fix-infinite-loop-in-LZMA-decompression.patch
 delete mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
 delete mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2018-14404.patch
 rename meta/recipes-core/libxml/{libxml2_2.9.8.bb => libxml2_2.9.9.bb} (93%)
meta/recipes-core/libxml/libxml2/0001-Fix-infinite-loop-in-LZMA-decompression.patch deleted +0 -55
deleted file mode 100644
index 16c2295..0000000
@@ -1,55 +0,0 @@
-From 28a9dc642ffd759df1e48be247a114f440a6c16e Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <[email protected]>
-Date: Mon, 30 Jul 2018 13:14:11 +0200
-Subject: [PATCH] Fix infinite loop in LZMA decompression
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Check the liblzma error code more thoroughly to avoid infinite loops.
-
-Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/13
-Closes: https://bugzilla.gnome.org/show_bug.cgi?id=794914
-
-This is CVE-2018-9251 and CVE-2018-14567.
-
-Thanks to Dongliang Mu and Simon Wörner for the reports.
-
-CVE: CVE-2018-9251
-CVE: CVE-2018-14567
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74]
-Signed-off-by: Hongxu Jia <[email protected]>
----
- xzlib.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/xzlib.c b/xzlib.c
-index a839169..0ba88cf 100644
---- a/xzlib.c
-+++ b/xzlib.c
-@@ -562,6 +562,10 @@ xz_decomp(xz_statep state)
-                          "internal error: inflate stream corrupt");
-                 return -1;
-             }
-+            /*
-+             * FIXME: Remapping a couple of error codes and falling through
-+             * to the LZMA error handling looks fragile.
-+             */
-             if (ret == Z_MEM_ERROR)
-                 ret = LZMA_MEM_ERROR;
-             if (ret == Z_DATA_ERROR)
-@@ -587,6 +591,11 @@ xz_decomp(xz_statep state)
-             xz_error(state, LZMA_PROG_ERROR, "compression error");
-             return -1;
-         }
-+        if ((state->how != GZIP) &&
-+            (ret != LZMA_OK) && (ret != LZMA_STREAM_END)) {
-+            xz_error(state, ret, "lzma error");
-+            return -1;
-+        }
-     } while (strm->avail_out && ret != LZMA_STREAM_END);
- 
-     /* update available output and crc check value */
--- 
-2.7.4
-
meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-core/libxml/libxml2/fix-CVE-2018-14404.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch +18 -6
index 51a9e19..ad719d4 100644
@@ -1,14 +1,23 @@
-Make sure that Makefile doesn't try to compile these tests again
-on the target where the source dependencies won't be available.
+From 395c0f53ec226aaabedb166e6b3a7f8590b95a5f Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 20:39:15 +0800
+Subject: [PATCH] Make sure that Makefile doesn't try to compile these tests
+ again on the target where the source dependencies won't be available.
 
 Upstream-Status: Inappropriate [cross-compile specific]
 
 Signed-off-by: Anuj Mittal <[email protected]>
 
-Index: libxml2-2.9.7/Makefile.am
-===================================================================
---- libxml2-2.9.7.orig/Makefile.am
-+++ libxml2-2.9.7/Makefile.am
+Rebase to 2.9.9
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8f4e43d..5edb930 100644
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -211,8 +211,7 @@ install-ptest:
  	sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile
  	$(MAKE) -C python install-ptest
@@ -19,3 +28,6 @@ Index: libxml2-2.9.7/Makefile.am
  	[ -d test   ] || $(LN_S) $(srcdir)/test   .
  	[ -d result ] || $(LN_S) $(srcdir)/result .
  	$(CHECKER) ./runtest$(EXEEXT) && \
+-- 
+2.7.4
+
meta/recipes-core/libxml/libxml2/libxml-64bit.patch +15 -9
index 1147017..fd8e469 100644
@@ -1,14 +1,19 @@
-Upstream-Status: Backport [from debian: bugs.debian.org/439843]
+From 056b14345b1abd76a761ab14538f1bc21302781a Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 20:26:51 +0800
+Subject: [PATCH] libxml 64bit
 
+Upstream-Status: Backport [from debian: bugs.debian.org/439843]
+Signed-off-by: Hongxu Jia <[email protected]>
 ---
- libxml.h |    3 +++
+ libxml.h | 3 +++
  1 file changed, 3 insertions(+)
 
---- libxml2-2.6.29.orig/libxml.h
-+++ libxml2-2.6.29/libxml.h
-@@ -11,10 +11,13 @@
- 
- #ifndef NO_LARGEFILE_SOURCE
+diff --git a/libxml.h b/libxml.h
+index 64e30f7..4e80d90 100644
+--- a/libxml.h
++++ b/libxml.h
+@@ -15,6 +15,9 @@
  #ifndef _LARGEFILE_SOURCE
  #define _LARGEFILE_SOURCE
  #endif
@@ -18,5 +23,6 @@ Upstream-Status: Backport [from debian: bugs.debian.org/439843]
  #ifndef _FILE_OFFSET_BITS
  #define _FILE_OFFSET_BITS 64
  #endif
- #endif
- 
+-- 
+2.7.4
+
meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch +14 -2
index d9ed151..e6998f6 100644
@@ -1,11 +1,20 @@
-AM_PATH_XML2 uses xml-config which we disable through
+From 43edc9a445ed66cceb7533eadeef242940b4592c Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 20:37:12 +0800
+Subject: [PATCH] AM_PATH_XML2 uses xml-config which we disable through
 binconfig-disabled.bbclass, so port it to use pkg-config instead.
 
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <[email protected]>
 
+Rebase to 2.9.9
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ libxml.m4 | 186 ++------------------------------------------------------------
+ 1 file changed, 5 insertions(+), 181 deletions(-)
+
 diff --git a/libxml.m4 b/libxml.m4
-index 68cd824..5fa0a9b 100644
+index 2d7a6f5..1c53585 100644
 --- a/libxml.m4
 +++ b/libxml.m4
 @@ -1,188 +1,12 @@
@@ -202,3 +211,6 @@ index 68cd824..5fa0a9b 100644
 -  AC_SUBST(XML_LIBS)
 -  rm -f conf.xmltest
  ])
+-- 
+2.7.4
+
meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch +9 -4
index e83c832..956ff3f 100644
@@ -1,4 +1,7 @@
-Allow us to pass in PYTHON_SITE_PACKAGES
+From b038c3452667ed17ddb0e791cd7bdc7f8774ac29 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Sat, 11 May 2019 20:35:20 +0800
+Subject: [PATCH] Allow us to pass in PYTHON_SITE_PACKAGES
 
 The python binary used when building for nativesdk doesn't give us the
 correct path here so we need to be able to specify it ourselves.
@@ -6,16 +9,18 @@ correct path here so we need to be able to specify it ourselves.
 Upstream-Status: Inappropriate [config]
 Signed-off-by: Paul Eggleton <[email protected]>
 
-Rebase to 2.9.2
+Rebase to 2.9.9
+
 Signed-off-by: Hongxu Jia <[email protected]>
 ---
  configure.ac | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
+index ca911f3..3bbd654 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -813,7 +813,8 @@ dnl
+@@ -808,7 +808,8 @@ dnl
  
  PYTHON_VERSION=
  PYTHON_INCLUDES=
@@ -26,5 +31,5 @@ diff --git a/configure.ac b/configure.ac
  pythondir=
  if test "$with_python" != "no" ; then
 -- 
-1.9.1
+2.7.4
 
meta/recipes-core/libxml/libxml2/runtest.patch +114 -90

505 lines not on this page · raw message

meta/recipes-core/libxml/libxml2_2.9.9.bb renamed from meta/recipes-core/libxml/libxml2_2.9.8.bb +2 -5
similarity index 93%
rename from meta/recipes-core/libxml/libxml2_2.9.8.bb
rename to meta/recipes-core/libxml/libxml2_2.9.9.bb
index 62643bc..c38f883 100644
@@ -20,13 +20,10 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
            file://libxml-m4-use-pkgconfig.patch \
            file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
            file://fix-execution-of-ptests.patch \
-           file://fix-CVE-2017-8872.patch \
-           file://fix-CVE-2018-14404.patch \
-           file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \
            "
 
-SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d"
-SRC_URI[libtar.sha256sum] = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"
+SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6"
+SRC_URI[libtar.sha256sum] = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
 SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a"
 SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7"
 
Signature · 1 line
2.7.4
author
#20 lore raw

PATCH 10/10 ghostscript: 9.26 -> 9.27

In reply to Hongxu Jia

- Rebase ghostscript-9.02-genarch.patch

- Drop backported CVE patches

---
 .../ghostscript/CVE-2019-3835-0001.patch           |  99 ----
 .../ghostscript/CVE-2019-3835-0002.patch           |  71 ---
 .../ghostscript/CVE-2019-3835-0003.patch           | 295 ----------
 .../ghostscript/CVE-2019-3835-0004.patch           | 167 ------
 .../ghostscript/CVE-2019-3838-0001.patch           |  34 --
 .../ghostscript/CVE-2019-3838-0002.patch           |  30 --
 .../ghostscript/CVE-2019-6116-0001.patch           | 177 ------
 .../ghostscript/CVE-2019-6116-0002.patch           | 442 ---------------
 .../ghostscript/CVE-2019-6116-0003.patch           |  32 --
 .../ghostscript/CVE-2019-6116-0004.patch           | 136 -----
 .../ghostscript/CVE-2019-6116-0005.patch           | 250 ---------
 .../ghostscript/CVE-2019-6116-0006.patch           | 596 ---------------------
 .../ghostscript/CVE-2019-6116-0007.patch           | 346 ------------
 .../ghostscript/ghostscript-9.02-genarch.patch     |  14 +-
 .../{ghostscript_9.26.bb => ghostscript_9.27.bb}   |  19 +-
 15 files changed, 10 insertions(+), 2698 deletions(-)
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0001.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0002.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0003.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0004.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3838-0001.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3838-0002.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0001.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0002.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0003.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0004.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0005.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0006.patch
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0007.patch
 rename meta/recipes-extended/ghostscript/{ghostscript_9.26.bb => ghostscript_9.27.bb} (85%)
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0001.patch deleted +0 -99
deleted file mode 100644
index 30ce04a..0000000
@@ -1,99 +0,0 @@
-From ad3ad6b389653722507e588c5cb34d8731e49e89 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <[email protected]>
-Date: Mon, 26 Nov 2018 18:01:25 +0000
-Subject: [PATCH] Have gs_cet.ps run from gs_init.ps
-
-Previously gs_cet.ps was run on the command line, to set up the interpreter
-state so our output more closely matches the example output for the QL CET
-tests.
-
-Allow a -dCETMODE command line switch, which will cause gs_init.ps to run the
-file directly.
-
-This works better for gpdl as it means the changes are made in the intial
-interpreter state, rather than after initialisation is complete.
-
-This also means adding a definition of the default procedure for black
-generation and under color removal (rather it being defined in-line in
-.setdefaultbgucr
-
-Also, add a check so gs_cet.ps only runs once - if we try to run it a second
-time, we'll just skip over the file, flushing through to the end.
-
-CVE: CVE-2019-3835
-Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
-
-Signed-off-by: Ovidiu Panait <[email protected]>
----
- Resource/Init/gs_cet.ps  | 11 ++++++++++-
- Resource/Init/gs_init.ps | 13 ++++++++++++-
- 2 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/Resource/Init/gs_cet.ps b/Resource/Init/gs_cet.ps
-index d3e1686..75534bb 100644
---- a/Resource/Init/gs_cet.ps
-+++ b/Resource/Init/gs_cet.ps
-@@ -1,6 +1,11 @@
- %!PS
- % Set defaults for Ghostscript to match Adobe CPSI behaviour for CET
- 
-+systemdict /product get (PhotoPRINT SE 5.0v2) readonly eq
-+{
-+  (%END GS_CET) .skipeof
-+} if
-+
- % do this in the server level so it is persistent across jobs
- //true 0 startjob not {
-   (*** Warning: CET startup is not in server default) = flush
-@@ -25,7 +30,9 @@ currentglobal //true setglobal
- 
- /UNROLLFORMS true def
- 
--{ } bind dup
-+(%.defaultbgrucrproc) cvn { } bind def
-+
-+(%.defaultbgrucrproc) cvn load dup
- setblackgeneration
- setundercolorremoval
- 0 array cvx readonly dup dup dup setcolortransfer
-@@ -109,3 +116,5 @@ userdict /.smoothness currentsmoothness put
- % end of slightly nasty hack to give consistent cluster results
- 
- //false 0 startjob pop		% re-enter encapsulated mode
-+
-+%END GS_CET
-diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps
-index 45bebf4..e6b9cd2 100644
---- a/Resource/Init/gs_init.ps
-+++ b/Resource/Init/gs_init.ps
-@@ -1538,10 +1538,18 @@ setpacking
-   % any-part-of-pixel rule.
-   0.5 .setfilladjust
- } bind def
-+
- % Set the default screen and BG/UCR.
-+% We define the proc here, rather than inline in .setdefaultbgucr
-+% for the benefit of gs_cet.ps so jobs that do anything that causes
-+% .setdefaultbgucr to be called will still get the redefined proc
-+% in gs_cet.ps
-+(%.defaultbgrucrproc) cvn { pop 0 } def
-+
- /.setdefaultbgucr {
-   systemdict /setblackgeneration known {
--    { pop 0 } dup setblackgeneration setundercolorremoval
-+    (%.defaultbgrucrproc) cvn load dup
-+    setblackgeneration setundercolorremoval
-   } if
- } bind def
- /.useloresscreen {	% - .useloresscreen <bool>
-@@ -2491,4 +2499,7 @@ WRITESYSTEMDICT {
- % be 'true' in some cases.
- userdict /AGM_preserve_spots //false put
- 
-+systemdict /CETMODE .knownget
-+{ { (gs_cet.ps) runlibfile } if } if
-+
- % The interpreter will run the initial procedure (start).
--- 
-2.18.1
-
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0002.patch deleted +0 -71

71 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0003.patch deleted +0 -295

295 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3835-0004.patch deleted +0 -167

167 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3838-0001.patch deleted +0 -34
deleted file mode 100644
index 593109f..0000000
@@ -1,34 +0,0 @@
-From 53f0cb4c54ac951697704cb87d24154ae08aecce Mon Sep 17 00:00:00 2001
-From: Chris Liddell <[email protected]>
-Date: Wed, 20 Feb 2019 09:54:28 +0000
-Subject: [PATCH] Bug 700576: Make a transient proc executeonly (in
- DefineResource).
-
-This prevents access to .forceput
-
-Solution originally suggested by [email protected].
-
-CVE: CVE-2019-3838
-Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
-
-Signed-off-by: Ovidiu Panait <[email protected]>
----
- Resource/Init/gs_res.ps | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Resource/Init/gs_res.ps b/Resource/Init/gs_res.ps
-index 89c0ed6..a163541 100644
---- a/Resource/Init/gs_res.ps
-+++ b/Resource/Init/gs_res.ps
-@@ -426,7 +426,7 @@ status {
-                         % so we have to use .forceput here.
-                   currentdict /.Instances 2 index .forceput	% Category dict is read-only
-                 } executeonly if
--              }
-+              } executeonly
-               { .LocalInstances dup //.emptydict eq
-                  { pop 3 dict localinstancedict Category 2 index put
-                  }
--- 
-2.18.1
-
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-3838-0002.patch deleted +0 -30
deleted file mode 100644
index 921e5b6..0000000
@@ -1,30 +0,0 @@
-From 0cb5e967c0200559f946291b5b54f8da30c32cd6 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <[email protected]>
-Date: Fri, 22 Feb 2019 12:28:23 +0000
-Subject: [PATCH] Bug 700576(redux): an extra transient proc needs
- executeonly'ed.
-
-CVE: CVE-2019-3838
-Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
-
-Signed-off-by: Ovidiu Panait <[email protected]>
----
- Resource/Init/gs_res.ps | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Resource/Init/gs_res.ps b/Resource/Init/gs_res.ps
-index a163541..8ce4ae3 100644
---- a/Resource/Init/gs_res.ps
-+++ b/Resource/Init/gs_res.ps
-@@ -438,7 +438,7 @@ status {
-                         % Now make the resource value read-only.
-              0 2 copy get { readonly } .internalstopped pop
-              dup 4 1 roll put exch pop exch pop
--           }
-+           } executeonly
-            { /defineresource cvx /typecheck signaloperror
-            }
-         ifelse
--- 
-2.18.1
-
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0001.patch deleted +0 -177

177 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0002.patch deleted +0 -442

442 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0003.patch deleted +0 -32
deleted file mode 100644
index 02b1dc9..0000000
@@ -1,32 +0,0 @@
-From 60b77b8bf8b6e4d30519c47724631012b530cf0e Mon Sep 17 00:00:00 2001
-From: Chris Liddell <[email protected]>
-Date: Sat, 15 Dec 2018 09:08:32 +0000
-Subject: [PATCH 3/7] Bug700317: Fix logic for an older change
-
-Unlike almost every other function in gs, dict_find_string() returns 1 on
-success 0 or <0 on failure. The logic for this case was wrong.
-
-CVE: CVE-2019-6116
-Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
-
-Signed-off-by: Ovidiu Panait <[email protected]>
----
- psi/interp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/psi/interp.c b/psi/interp.c
-index aa5779c..f6c45bb 100644
---- a/psi/interp.c
-+++ b/psi/interp.c
-@@ -703,7 +703,7 @@ again:
-                  * i.e. it's an internal operator we have hidden
-                  */
-                 code = dict_find_string(systemdict, (const char *)bufptr, &tobj);
--                if (code < 0) {
-+                if (code <= 0) {
-                     buf[0] = buf[1] = buf[rlen + 2] = buf[rlen + 3] = '-';
-                     rlen += 4;
-                     bufptr = buf;
--- 
-2.18.1
-
meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0004.patch deleted +0 -136

136 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0005.patch deleted +0 -250

250 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0006.patch deleted +0 -596

596 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/CVE-2019-6116-0007.patch deleted +0 -346

346 lines not on this page · raw message

meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch +7 -7
index fc144f6..7b70bb8 100644
@@ -1,7 +1,7 @@
-From 94850954b88440df6c41d2dd133c422ffc84d9aa Mon Sep 17 00:00:00 2001
+From c076d0fc970f190f723018258790c79b59daba2e Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
-Date: Thu, 29 Mar 2018 16:12:48 +0800
-Subject: [PATCH 07/10] not generate objarch.h at compile time
+Date: Sat, 11 May 2019 21:20:27 +0800
+Subject: [PATCH] not generate objarch.h at compile time
 
 Import patch from windriver linux for cross compilation, and split
 patches into oe way under different directories such as i586, powerpc etc
@@ -12,19 +12,19 @@ Upstream-Status: Pending
 Signed-off-by: Kang Kai <[email protected]>
 Signed-off-by: Wenzong Fan <[email protected]>
 
-Rebase to 9.23
+Rebase to 9.27
 Signed-off-by: Hongxu Jia <[email protected]>
 ---
  base/lib.mak | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/base/lib.mak b/base/lib.mak
-index 0036d1e..302877e 100644
+index 3ed088a..5af2b43 100644
 --- a/base/lib.mak
 +++ b/base/lib.mak
 @@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h
  stdpre_h=$(GLSRC)stdpre.h
- stdint__h=$(GLSRC)stdint_.h $(std_h)
+ stdint__h=$(GLSRC)stdint_.h
  
 -$(GLGEN)arch.h : $(GENARCH_XE)
 -	$(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
@@ -34,5 +34,5 @@ index 0036d1e..302877e 100644
  # Platform interfaces
  
 -- 
-1.8.3.1
+2.7.4
 
meta/recipes-extended/ghostscript/ghostscript_9.27.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.26.bb +3 -16
similarity index 85%
rename from meta/recipes-extended/ghostscript/ghostscript_9.26.bb
rename to meta/recipes-extended/ghostscript/ghostscript_9.27.bb
index 2630084..fcc9e00 100644
@@ -19,7 +19,7 @@ DEPENDS_class-native = "libpng-native"
 UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/${BPN}-${PV}.tar.gz \
+SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/${BPN}-${PV}.tar.gz \
                 file://ghostscript-9.15-parallel-make.patch \
                 file://ghostscript-9.16-Werror-return-type.patch \
                 file://do-not-check-local-libpng-source.patch \
@@ -32,19 +32,6 @@ SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.02-genarch.patch \
            file://objarch.h \
            file://cups-no-gcrypt.patch \
-           file://CVE-2019-6116-0001.patch \
-           file://CVE-2019-6116-0002.patch \
-           file://CVE-2019-6116-0003.patch \
-           file://CVE-2019-6116-0004.patch \
-           file://CVE-2019-6116-0005.patch \
-           file://CVE-2019-6116-0006.patch \
-           file://CVE-2019-6116-0007.patch \
-           file://CVE-2019-3835-0001.patch \
-           file://CVE-2019-3835-0002.patch \
-           file://CVE-2019-3835-0003.patch \
-           file://CVE-2019-3835-0004.patch \
-           file://CVE-2019-3838-0001.patch \
-           file://CVE-2019-3838-0002.patch \
            "
 
 SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -52,8 +39,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
                         file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
                         "
 
-SRC_URI[md5sum] = "806bc2dedbc7f69b003f536658e08d4a"
-SRC_URI[sha256sum] = "831fc019bd477f7cc2d481dc5395ebfa4a593a95eb2fe1eb231a97e450d7540d"
+SRC_URI[md5sum] = "c3990a504a3a23b9babe9de00ed6597d"
+SRC_URI[sha256sum] = "9760e8bdd07a08dbd445188a6557cb70e60ccb6a5601f7dbfba0d225e28ce285"
 
 # Put something like
 #
Signature · 1 line
2.7.4