Skip to contentSkip to conversation

package upgrades

PATCH In review Maxin B. John 3 participants 13 messages Nov 10, 2017 – Nov 17, 2017

lore
Share & tools
lore
#0 lore raw

cover package upgrades

Maxin B. John (7):
ofono: upgrade to 1.21
harfbuzz: upgrade to 1.6.3
quota: upgrade to 4.04
screen: upgrade to 4.6.2
libproxy: upgrade to 0.4.15
sqlite3: upgrade to 3.21.0
libsoup-2.4: upgrade to 2.60.2

 meta/recipes-connectivity/ofono/ofono_1.20.bb      |   8 --
 meta/recipes-connectivity/ofono/ofono_1.21.bb      |   8 ++
 ...dentaly-override-commandline-passed-CFLAG.patch |  33 -----
 .../quota/0001-Fix-build-with-disabled-ldap.patch  |  93 -------------
 .../0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch  |  83 -----------
 ...ing-on-systems-that-do-not-have-rpc-heade.patch | 153 ---------------------
 ...-rpc.rquotad-when-disable-rpc-was-request.patch |  62 ---------
 ...0004-Fix-warnings-due-to-missing-stdlib.h.patch |  46 -------
 .../quota/quota/replace_getrpcbynumber_r.patch     |  40 ++++--
 .../quota/{quota_4.03.bb => quota_4.04.bb}         |  10 +-
 .../screen/0001-fix-for-multijob-build.patch       |  58 --------
 .../screen/0002-comm.h-now-depends-on-term.h.patch |  33 -----
 .../screen/{screen_4.6.1.bb => screen_4.6.2.bb}    |   6 +-
 .../{harfbuzz_1.4.8.bb => harfbuzz_1.6.3.bb}       |   4 +-
 .../{libproxy_0.4.14.bb => libproxy_0.4.15.bb}     |   4 +-
 ...libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb} |   4 +-
 .../sqlite/files/sqlite3-fix-CVE-2017-13685.patch  |  57 --------
 .../{sqlite3_3.20.0.bb => sqlite3_3.21.0.bb}       |   5 +-
 18 files changed, 46 insertions(+), 661 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.20.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_1.21.bb
 delete mode 100644 meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch
 rename meta/recipes-extended/quota/{quota_4.03.bb => quota_4.04.bb} (73%)
 delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
 delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
 rename meta/recipes-extended/screen/{screen_4.6.1.bb => screen_4.6.2.bb} (88%)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.4.8.bb => harfbuzz_1.6.3.bb} (88%)
 rename meta/recipes-support/libproxy/{libproxy_0.4.14.bb => libproxy_0.4.15.bb} (89%)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb} (89%)
 delete mode 100644 meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch
 rename meta/recipes-support/sqlite/{sqlite3_3.20.0.bb => sqlite3_3.21.0.bb} (52%)
Signature · 1 line
2.4.0
#1 lore raw

PATCH 1/7 ofono: upgrade to 1.21

1.20 -> 1.21

---
 meta/recipes-connectivity/ofono/ofono_1.20.bb | 8 --------
 meta/recipes-connectivity/ofono/ofono_1.21.bb | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.20.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_1.21.bb
meta/recipes-connectivity/ofono/ofono_1.20.bb deleted +0 -8
deleted file mode 100644
index 18f983e..0000000
@@ -1,8 +0,0 @@
-require ofono.inc
-
-SRC_URI  = "\
-  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-  file://ofono \
-"
-SRC_URI[md5sum] = "fad0630fce6a9aecdb7db37bc1f1db7d"
-SRC_URI[sha256sum] = "5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5"
meta/recipes-connectivity/ofono/ofono_1.21.bb new file +8 -0
new file mode 100644
index 0000000..1f0e31d
@@ -0,0 +1,8 @@
+require ofono.inc
+
+SRC_URI  = "\
+  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+  file://ofono \
+"
+SRC_URI[md5sum] = "bc2b818f6fe5725d0dd8591aff6640d7"
+SRC_URI[sha256sum] = "a6b021cda0b444b772897cd637d5f455857fb5819b62c279a8302b44f9c7f2c3"
Signature · 1 line
2.4.0
#2 lore raw

PATCH 2/7 harfbuzz: upgrade to 1.6.3

In reply to Maxin B. John

1.4.8 -> 1.6.3

---
 .../harfbuzz/{harfbuzz_1.4.8.bb => harfbuzz_1.6.3.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.4.8.bb => harfbuzz_1.6.3.bb} (88%)
meta/recipes-graphics/harfbuzz/harfbuzz_1.6.3.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb +2 -2
similarity index 88%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.6.3.bb
index 4f5e5a3..3cd5924 100644
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
 
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
 
-SRC_URI[md5sum] = "d1aa446e1e65717311c15d9ac0cf31ee"
-SRC_URI[sha256sum] = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"
+SRC_URI[md5sum] = "032281c42a5df6d16b69ca6ec3b09bd4"
+SRC_URI[sha256sum] = "e31eb367beb61a9399d2c78b51c225ab2b1cbd46f364f2d80d97bb422b44101a"
 
 inherit autotools pkgconfig lib_package gtk-doc
 
Signature · 1 line
2.4.0
#3 lore raw

PATCH 3/7 quota: upgrade to 4.04

In reply to Maxin B. John

4.03 -> 4.04

Removed the following backported patches:
1. 0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
2. 0001-Fix-build-with-disabled-ldap.patch
3. 0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch
4. 0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch
5. 0004-Fix-warnings-due-to-missing-stdlib.h.patch

Refreshed the following patch:
1. replace_getrpcbynumber_r.patch

---
 ...dentaly-override-commandline-passed-CFLAG.patch |  33 -----
 .../quota/0001-Fix-build-with-disabled-ldap.patch  |  93 -------------
 .../0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch  |  83 -----------
 ...ing-on-systems-that-do-not-have-rpc-heade.patch | 153 ---------------------
 ...-rpc.rquotad-when-disable-rpc-was-request.patch |  62 ---------
 ...0004-Fix-warnings-due-to-missing-stdlib.h.patch |  46 -------
 .../quota/quota/replace_getrpcbynumber_r.patch     |  40 ++++--
 .../quota/{quota_4.03.bb => quota_4.04.bb}         |  10 +-
 8 files changed, 28 insertions(+), 492 deletions(-)
 delete mode 100644 meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch
 delete mode 100644 meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch
 rename meta/recipes-extended/quota/{quota_4.03.bb => quota_4.04.bb} (73%)
meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch deleted +0 -33
deleted file mode 100644
index 6add470..0000000
@@ -1,33 +0,0 @@
-From 776757a23e9930588950c7fcbc7827ec7a3e51c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]>
-Date: Mon, 4 Jan 2016 15:48:19 +0100
-Subject: [PATCH] Do not accidentaly override commandline passed CFLAGS.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport
-
-Signed-off-by: Tomáš Chvátal <[email protected]>
-Signed-off-by: Jan Kara <[email protected]>
-Signed-off-by: Maxin B. John <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3ba1386..1552c15 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
- # ================
- # Check for cflags
- # ================
--CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
- AC_ARG_ENABLE([werror],
-     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
-     [enable_werror="$enableval"],
--- 
-2.4.0
-
meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch deleted +0 -93

93 lines not on this page · raw message

meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch deleted +0 -83

83 lines not on this page · raw message

meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch deleted +0 -153

153 lines not on this page · raw message

meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch deleted +0 -62

62 lines not on this page · raw message

meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch deleted +0 -46

46 lines not on this page · raw message

meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch +26 -14
index 9ca2ffc..4687ca0 100644
@@ -1,20 +1,32 @@
-Replace getrpcbynumber_r with getrpcbynumber
+From a3808fd165847298d025971eb3c7be7d11caba9d Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <[email protected]>
+Date: Wed, 8 Nov 2017 11:56:55 +0200
+Subject: [PATCH] Replace getrpcbynumber_r with getrpcbynumber
+
 musl and uclibc dont implement it
 
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
-Index: quota-tools/svc_socket.c
-===================================================================
---- quota-tools.orig/svc_socket.c
-+++ quota-tools/svc_socket.c
-@@ -55,7 +55,8 @@ static int svc_socket (u_long number, in
- 	addr.sin_family = AF_INET;
+Signed-off-by: Maxin B. John <[email protected]>
+---
+ svc_socket.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/svc_socket.c b/svc_socket.c
+index 8a44604..5bdaaa0 100644
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -36,7 +36,8 @@ static int get_service_port(u_long number, const char *proto)
+ 	struct servent servbuf, *servp = NULL;
+ 	int ret;
  
- 	if (!port) {
--		ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
-+		rpcp = getrpcbynumber(number);
-+		ret = 0;
- 		if (ret == 0 && rpcp != NULL) {
- 			/* First try name */
- 			ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
+-	ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
++    rpcp = getrpcbynumber(number);
++    ret = 0;
+ 	if (ret == 0 && rpcp != NULL) {
+ 		/* First try name */
+ 		ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
+-- 
+2.4.0
+
meta/recipes-extended/quota/quota_4.04.bb renamed from meta/recipes-extended/quota/quota_4.03.bb +2 -8
similarity index 73%
rename from meta/recipes-extended/quota/quota_4.03.bb
rename to meta/recipes-extended/quota/quota_4.04.bb
index 28b3854..93f3762 100644
@@ -8,19 +8,13 @@ LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad2
                     file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \
-           file://0001-Fix-build-with-disabled-ldap.patch \
-           file://0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch \
            file://fcntl.patch \
            file://remove_non_posix_types.patch \
-           file://0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch \
-           file://0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch \
-           file://0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch \
-           file://0004-Fix-warnings-due-to-missing-stdlib.h.patch \
           "
 SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch"
 
-SRC_URI[md5sum] = "6b09f9c93515c25a528be5754cdfb6f5"
-SRC_URI[sha256sum] = "9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b"
+SRC_URI[md5sum] = "f46f3b0b5141f032f25684005dac49d3"
+SRC_URI[sha256sum] = "735be1887e7f51f54165e778ae43fc859c04e44d88834ecb2f470e91d4ef8edf"
 
 CVE_PRODUCT = "linux_diskquota"
 
Signature · 1 line
2.4.0
#4 lore raw

PATCH 4/7 screen: upgrade to 4.6.2

In reply to Maxin B. John

4.6.1 -> 4.6.2

Removed backported patches:
1. 0001-fix-for-multijob-build.patch
2. 0002-comm.h-now-depends-on-term.h.patch

---
 .../screen/0001-fix-for-multijob-build.patch       | 58 ----------------------
 .../screen/0002-comm.h-now-depends-on-term.h.patch | 33 ------------
 .../screen/{screen_4.6.1.bb => screen_4.6.2.bb}    |  6 +--
 3 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
 delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
 rename meta/recipes-extended/screen/{screen_4.6.1.bb => screen_4.6.2.bb} (88%)
meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -58
deleted file mode 100644
index fbdb0eb..0000000
@@ -1,58 +0,0 @@
-From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <[email protected]>
-Date: Tue, 26 Jul 2016 14:23:59 +0800
-Subject: [PATCH] fix for multijob build
-
-make sure that comm.sh script generates comm.h header before doing
-anything else
-
-Signed-off-by: Amadeusz Sawiski <[email protected]>
-
-Upstream-Status: Backport
-
-Backport patch to fix parallel build failure and update context to make patch
-coulde be applied.
-
-http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd
-
-Signed-off-by: Kai Kang <[email protected]>
-Signed-off-by: Jackie Huang <[email protected]>
----
- Makefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index aca7da3..3607711 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a
-  comm.h layer.h term.h image.h display.h window.h mark.h extern.h
- tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
-  layer.h term.h image.h display.h window.h extern.h
--term.o: layout.h viewport.h canvas.h term.c term.h
-+term.o: layout.h viewport.h canvas.h term.c term.h comm.h
- window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \
-  comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
- utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
-@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a
-  comm.h layer.h term.h image.h display.h window.h extern.h \
-  braille.h
- comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
--kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
-+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h
- acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
-  layer.h term.h image.h display.h window.h extern.h
- braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
-@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
- viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
-  comm.h layer.h term.h image.h display.h window.h extern.h \
-  braille.h
--list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
--list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
-+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
-+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
- list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
- 
--- 
-1.9.1
-
meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch deleted +0 -33
deleted file mode 100644
index b5d71cc..0000000
@@ -1,33 +0,0 @@
-Upstream-Status: Backport
-
-Backport from:
-
-http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c
-
-Signed-off-by: Kai Kang <[email protected]>
----
-From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
-From: Mike Gerwitz <[email protected]>
-Date: Tue, 24 Dec 2013 22:16:31 -0500
-Subject: [PATCH] comm.h now depends on term.h
-
----
- src/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index e791e79..d4f7c0b 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -113,7 +113,7 @@ term.h: term.c term.sh
- 
- kmapdef.c: term.h
- 
--comm.h: comm.c comm.sh config.h
-+comm.h: comm.c comm.sh config.h term.h
- 	AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
- 
- docs:
--- 
-2.4.1
-
meta/recipes-extended/screen/screen_4.6.2.bb renamed from meta/recipes-extended/screen/screen_4.6.1.bb +2 -4
similarity index 88%
rename from meta/recipes-extended/screen/screen_4.6.1.bb
rename to meta/recipes-extended/screen/screen_4.6.2.bb
index bcd83a2..f54113f 100644
@@ -21,13 +21,11 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
            file://Skip-host-file-system-checks-when-cross-compiling.patch \
            file://Avoid-mis-identifying-systems-as-SVR4.patch \
-           file://0002-comm.h-now-depends-on-term.h.patch \
-           file://0001-fix-for-multijob-build.patch \
            file://0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch \
           "
 
-SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd"
-SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64"
+SRC_URI[md5sum] = "a0f529d3333b128dfaa324d978ba73a8"
+SRC_URI[sha256sum] = "1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a"
 
 inherit autotools texinfo
 
Signature · 1 line
2.4.0
#5 lore raw

Re: [PATCH 4/7] screen: upgrade to 4.6.2

Breaks under MIPS, see
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12353.

Ross

Quoted 180 lines · Maxin B. John

4.6.1 -> 4.6.2

Removed backported patches:
1. 0001-fix-for-multijob-build.patch
2. 0002-comm.h-now-depends-on-term.h.patch

---
 .../screen/0001-fix-for-multijob-build.patch       | 58
----------------------
 .../screen/0002-comm.h-now-depends-on-term.h.patch | 33 ------------
 .../screen/{screen_4.6.1.bb => screen_4.6.2.bb}    |  6 +--
 3 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 meta/recipes-extended/screen/
screen/0001-fix-for-multijob-build.patch
 delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-
depends-on-term.h.patch
 rename meta/recipes-extended/screen/{screen_4.6.1.bb => screen_4.6.2.bb}

(88%)

meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -1
deleted file mode 100644
index fbdb0eb..0000000
--- a/meta/recipes-extended/screen/screen/0001-fix-for-

multijob-build.patch
+++ /dev/null

meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -13
@@ -1,58 +0,0 @@
-From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <[email protected]>
-Date: Tue, 26 Jul 2016 14:23:59 +0800
-Subject: [PATCH] fix for multijob build
-
-make sure that comm.sh script generates comm.h header before doing
-anything else
-
-Signed-off-by: Amadeusz Sawiski <[email protected]>
-
-Upstream-Status: Backport
-
-Backport patch to fix parallel build failure and update context to make

patch

meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -15
-coulde be applied.
-
-http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd
-
-Signed-off-by: Kai Kang <[email protected]>
-Signed-off-by: Jackie Huang <[email protected]>
----
- Makefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index aca7da3..3607711 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c

config.h screen.h os.h osdef.h a
- comm.h layer.h term.h image.h display.h window.h mark.h extern.h
- tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
- layer.h term.h image.h display.h window.h extern.h --term.o: layout.h viewport.h canvas.h term.c term.h
-+term.o: layout.h viewport.h canvas.h term.c term.h comm.h
- window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \
- comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
- utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
-@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a

meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -6
-  comm.h layer.h term.h image.h display.h window.h extern.h \
-  braille.h
- comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
--kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
-+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h
- acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h

osdef.h ansi.h acls.h comm.h \
- layer.h term.h image.h display.h window.h extern.h
- braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
-@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
- viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \

meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -5
-  comm.h layer.h term.h image.h display.h window.h extern.h \
-  braille.h
--list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
--list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
-+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h

comm.h
-+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
- list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h

meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -4
-
---
-1.9.1
-
meta/recipes-extended/screen/screen/0002-comm.h-now- renamed from meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch +0 -0

depends-on-term.h.patch
deleted file mode 100644
index b5d71cc..0000000
--- a/meta/recipes-extended/screen/screen/0002-comm.h-now- depends-on-term.h.patch
+++ /dev/null

meta/recipes-extended/screen/screen/0002-comm.h-now- renamed from meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch +0 -28
@@ -1,33 +0,0 @@
-Upstream-Status: Backport
-
-Backport from:
-
-http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c
-
-Signed-off-by: Kai Kang <[email protected]>
----
-From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
-From: Mike Gerwitz <[email protected]>
-Date: Tue, 24 Dec 2013 22:16:31 -0500
-Subject: [PATCH] comm.h now depends on term.h
-
----
- src/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index e791e79..d4f7c0b 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -113,7 +113,7 @@ term.h: term.c term.sh
-
- kmapdef.c: term.h
-
--comm.h: comm.c comm.sh config.h
-+comm.h: comm.c comm.sh config.h term.h
-       AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh

$(srcdir)/comm.sh

meta/recipes-extended/screen/screen/0002-comm.h-now- renamed from meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch +0 -5
-
- docs:
---
-2.4.1
-
meta/recipes-extended/screen/screen_4.6.2.bb renamed from meta/recipes-extended/screen/screen_4.6.1.bb +0 -4
similarity index 88%
rename from meta/recipes-extended/screen/screen_4.6.1.bb
rename to meta/recipes-extended/screen/screen_4.6.2.bb
index bcd83a2..f54113f 100644
@@ -21,13 +21,11 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
 \
            file://Skip-host-file-system-checks-when-cross-compiling.patch
 \
            file://Avoid-mis-identifying-systems-as-SVR4.patch \
-           file://0002-comm.h-now-depends-on-term.h.patch \
-           file://0001-fix-for-multijob-build.patch \
            file://0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
 \
           "
 
-SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd"
-SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45c

ce0e30a5114a368bd6387c966cbbbb7c64"

meta/recipes-extended/screen/screen_4.6.2.bb renamed from meta/recipes-extended/screen/screen_4.6.1.bb +2 -0
+SRC_URI[md5sum] = "a0f529d3333b128dfaa324d978ba73a8"
+SRC_URI[sha256sum] = "1b6922520e6a0ce5e28768d620b0f6

40a6631397f95ccb043b70b91bb503fa3a"

inherit autotools texinfo

--
2.4.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw

Re: [PATCH 4/7] screen: upgrade to 4.6.2

Hi Ross,

Quoted 2 lines · Ross

Breaks under MIPS, see https://bugzilla.yoctoproject.org/show_bug.cgi?id=12353.

Ack. will fix and resend it.

Quoted 15 lines

Ross

Quoted 12 lines · Maxin B. John

4.6.1 -> 4.6.2

Removed backported patches:
1. 0001-fix-for-multijob-build.patch
2. 0002-comm.h-now-depends-on-term.h.patch

                                       ---

.../screen/0001-fix-for-multijob-build.patch | 58 ----------------------
.../screen/0002-comm.h-now-depends-on-term.h.patch | 33 ------------

<snip>

Thanks & Regards,
Maxin

#7 lore raw

PATCH 5/7 libproxy: upgrade to 0.4.15

In reply to Maxin B. John

0.4.14 -> 0.4.15

---
 .../libproxy/{libproxy_0.4.14.bb => libproxy_0.4.15.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libproxy/{libproxy_0.4.14.bb => libproxy_0.4.15.bb} (89%)
meta/recipes-support/libproxy/libproxy_0.4.15.bb renamed from meta/recipes-support/libproxy/libproxy_0.4.14.bb +2 -2
similarity index 89%
rename from meta/recipes-support/libproxy/libproxy_0.4.14.bb
rename to meta/recipes-support/libproxy/libproxy_0.4.15.bb
index 4c39f52..9a687df 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 DEPENDS = "glib-2.0"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
-SRC_URI[md5sum] = "e7514f78f5432210e17a01b6b618dde2"
-SRC_URI[sha256sum] = "e25d046850346a505c0617646f1e68b660092efadf665548a89c280900262ea6"
+SRC_URI[md5sum] = "f6b1d2a1e17a99cd3debaae6d04ab152"
+SRC_URI[sha256sum] = "654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f"
 
 UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases"
 UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar"
Signature · 1 line
2.4.0
#8 lore raw

PATCH 6/7 sqlite3: upgrade to 3.21.0

In reply to Maxin B. John

Remove upstreamed patch:
1. sqlite3-fix-CVE-2017-13685.patch

---
 .../sqlite/files/sqlite3-fix-CVE-2017-13685.patch  | 57 ----------------------
 .../{sqlite3_3.20.0.bb => sqlite3_3.21.0.bb}       |  5 +-
 2 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch
 rename meta/recipes-support/sqlite/{sqlite3_3.20.0.bb => sqlite3_3.21.0.bb} (52%)
meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch deleted +0 -57
deleted file mode 100644
index aac428c..0000000
@@ -1,57 +0,0 @@
-Fix CVE-2017-13685
-
-The dump_callback function in SQLite 3.20.0 allows remote attackers to
-cause a denial of service (EXC_BAD_ACCESS and application crash) via a
-crafted file.
-
-References:
-https://sqlite.org/src/info/02f0f4c54f2819b3
-http://www.mail-archive.com/sqlite-users%40mailinglists.sqlite.org/msg105314.html
-
-Upstream-Status: Backport [https://sqlite.org/src/info/cf0d3715caac9149]
-
-CVE: CVE-2017-13685
-
-Signed-off-by: Wenzong Fan <[email protected]>
-
-Index: src/shell.c
-==================================================================
---- src/shell.c
-+++ src/shell.c
-@@ -2657,10 +2657,11 @@
-   int *aiType      /* Column types */
- ){
-   int i;
-   ShellState *p = (ShellState*)pArg;
- 
-+  if( azArg==0 ) return 0;
-   switch( p->cMode ){
-     case MODE_Line: {
-       int w = 5;
-       if( azArg==0 ) break;
-       for(i=0; i<nArg; i++){
-@@ -3007,10 +3008,11 @@
- */
- static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
-   ShellText *p = (ShellText*)pArg;
-   int i;
-   UNUSED_PARAMETER(az);
-+  if( azArg==0 ) return 0;
-   if( p->n ) appendText(p, "|", 0);
-   for(i=0; i<nArg; i++){
-     if( i ) appendText(p, ",", 0);
-     if( azArg[i] ) appendText(p, azArg[i], 0);
-   }
-@@ -3888,11 +3890,11 @@
-   const char *zType;
-   const char *zSql;
-   ShellState *p = (ShellState *)pArg;
- 
-   UNUSED_PARAMETER(azNotUsed);
--  if( nArg!=3 ) return 1;
-+  if( nArg!=3 || azArg==0 ) return 0;
-   zTable = azArg[0];
-   zType = azArg[1];
-   zSql = azArg[2];
- 
-   if( strcmp(zTable, "sqlite_sequence")==0 ){
meta/recipes-support/sqlite/sqlite3_3.21.0.bb renamed from meta/recipes-support/sqlite/sqlite3_3.20.0.bb +2 -3
similarity index 52%
rename from meta/recipes-support/sqlite/sqlite3_3.20.0.bb
rename to meta/recipes-support/sqlite/sqlite3_3.21.0.bb
index e508258..1d51733 100644
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed0
 
 SRC_URI = "\
   http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_PV}.tar.gz \
-  file://sqlite3-fix-CVE-2017-13685.patch \
   "
-SRC_URI[md5sum] = "e262a28b73cc330e7e83520c8ce14e4d"
-SRC_URI[sha256sum] = "3814c6f629ff93968b2b37a70497cfe98b366bf587a2261a56a5f750af6ae6a0"
+SRC_URI[md5sum] = "7913de4c3126ba3c24689cb7a199ea31"
+SRC_URI[sha256sum] = "d7dd516775005ad87a57f428b6f86afd206cb341722927f104d3f0cf65fbbbe3"
Signature · 1 line
2.4.0
#9 lore raw

PATCH 7/7 libsoup-2.4: upgrade to 2.60.2

In reply to Maxin B. John

2.58.2 -> 2.60.2

---
 .../libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb} (89%)
meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +2 -2
similarity index 89%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb
index c9f95e5..abc7bdb 100644
@@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "eb33adb459c2283efc5c7d09ccdbbcfc"
-SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287ff862542d4fc048f19a92a068a27d17b72"
+SRC_URI[md5sum] = "9c49831b62c4bf18cdb81c86ac6516fd"
+SRC_URI[sha256sum] = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01"
 
 S = "${WORKDIR}/libsoup-${PV}"
 
Signature · 1 line
2.4.0
#10 lore raw

Re: [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2

Alex's 2.60.1 upgrade was just merged, so can you rebase please.

Ross

Quoted 41 lines · Maxin B. John

2.58.2 -> 2.60.2

---
.../libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb} |
4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.58.2.bb =>

libsoup-2.4_2.60.2.bb} (89%)

meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +0 -0
similarity index 89%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb
index c9f95e5..abc7bdb 100644
@@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[

0]}.${@d.getVar('PV').split('.')[1]}"

SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"

meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +0 -2
-SRC_URI[md5sum] = "eb33adb459c2283efc5c7d09ccdbbcfc"
-SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287

ff862542d4fc048f19a92a068a27d17b72"

meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +2 -0
+SRC_URI[md5sum] = "9c49831b62c4bf18cdb81c86ac6516fd"
+SRC_URI[sha256sum] = "7263cfe18872e2e652c196f5667e51

4616d9c97c861dfca82a65a55f45f0da01"

S = "${WORKDIR}/libsoup-${PV}"

--
2.4.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#11 lore raw

Re: [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2

Hi Ross,

Quoted 1 line

Alex's 2.60.1 upgrade was just merged, so can you rebase please.

Sure, will do that.

Quoted 1 line

Ross

On 10 November 2017 at 12:00, Maxin B. John <[email protected]> wrote:

2.58.2 -> 2.60.2

Quoted 7 lines

meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb

Quoted 7 lines

---
.../libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb} | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

rename meta/recipes-support/libsoup/{libsoup-2.4_2.58.2.bb => libsoup-2.4_2.60.2.bb} (89%)

meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +0 -0

Best Regards,
Maxin

#12 lore raw

✗ patchtest: failure for package upgrades (rev2)

In reply to Maxin B. John

== Series Details ==

Series: package upgrades (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/63/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at f706448952)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe