* [PATCH 0/7] package upgrades
@ 2017-11-10 12:00 Maxin B. John
2017-11-10 12:00 ` [PATCH 1/7] ofono: upgrade to 1.21 Maxin B. John
` (7 more replies)
0 siblings, 8 replies; 13+ messages in thread
From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw)
To: openembedded-core
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%)
--
2.4.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/7] ofono: upgrade to 1.21 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-10 12:00 ` [PATCH 2/7] harfbuzz: upgrade to 1.6.3 Maxin B. John ` (6 subsequent siblings) 7 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core 1.20 -> 1.21 Signed-off-by: Maxin B. John <maxin.john@intel.com> --- 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 diff --git a/meta/recipes-connectivity/ofono/ofono_1.20.bb b/meta/recipes-connectivity/ofono/ofono_1.20.bb deleted file mode 100644 index 18f983e..0000000 --- a/meta/recipes-connectivity/ofono/ofono_1.20.bb +++ /dev/null @@ -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" diff --git a/meta/recipes-connectivity/ofono/ofono_1.21.bb b/meta/recipes-connectivity/ofono/ofono_1.21.bb new file mode 100644 index 0000000..1f0e31d --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono_1.21.bb @@ -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" -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/7] harfbuzz: upgrade to 1.6.3 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John 2017-11-10 12:00 ` [PATCH 1/7] ofono: upgrade to 1.21 Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-10 12:00 ` [PATCH 3/7] quota: upgrade to 4.04 Maxin B. John ` (5 subsequent siblings) 7 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core 1.4.8 -> 1.6.3 Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../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%) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.6.3.bb 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 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.6.3.bb @@ -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 -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/7] quota: upgrade to 4.04 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John 2017-11-10 12:00 ` [PATCH 1/7] ofono: upgrade to 1.21 Maxin B. John 2017-11-10 12:00 ` [PATCH 2/7] harfbuzz: upgrade to 1.6.3 Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-10 12:00 ` [PATCH 4/7] screen: upgrade to 4.6.2 Maxin B. John ` (4 subsequent siblings) 7 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core 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 Signed-off-by: Maxin B. John <maxin.john@intel.com> --- ...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%) diff --git a/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch b/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch deleted file mode 100644 index 6add470..0000000 --- a/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch +++ /dev/null @@ -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?= <tchvatal@suse.com> -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 <tchvatal@suse.com> -Signed-off-by: Jan Kara <jack@suse.cz> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - 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 - diff --git a/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch b/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch deleted file mode 100644 index a79e477..0000000 --- a/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 39fd30ce57e3c34c3649866bf9345a71f0b78667 Mon Sep 17 00:00:00 2001 -From: Jan Kara <jack@suse.cz> -Date: Mon, 4 Jan 2016 15:10:53 +0100 -Subject: [PATCH] Fix build with disabled ldap - -Upstream-Status: Backport - -Reported-by: Tomas Chvatal <tchvatal@suse.com> -Signed-off-by: Jan Kara <jack@suse.cz> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - warnquota.c | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git a/warnquota.c b/warnquota.c -index 3734f0e..e9868c1 100644 ---- a/warnquota.c -+++ b/warnquota.c -@@ -109,13 +109,13 @@ struct configparams { - char *user_signature; - char *group_message; - char *group_signature; -+ time_t cc_before; -+#ifdef USE_LDAP_MAIL_LOOKUP - int use_ldap_mail; /* 0 */ -+ int ldap_is_setup; /* 0 */ - int ldap_starttls; /* 0 */ - int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */ - int ldap_vers; /* LDAP_VERSION3 */ -- time_t cc_before; --#ifdef USE_LDAP_MAIL_LOOKUP -- int ldap_is_setup; /* 0 */ - char ldap_host[CNF_BUFFER]; - int ldap_port; - char ldap_uri[CNF_BUFFER]; -@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config) - } - maildev[0] = 0; - config->user_signature = config->user_message = config->group_signature = config->group_message = NULL; -+ config->cc_before = -1; -+ -+#ifdef USE_LDAP_MAIL_LOOKUP - config->use_ldap_mail = 0; - config->ldap_starttls = 0; - config->ldap_tls = LDAP_OPT_X_TLS_NEVER; - config->ldap_vers = LDAP_VERSION3; -- config->cc_before = -1; -- --#ifdef USE_LDAP_MAIL_LOOKUP - config->ldap_port = config->ldap_is_setup = 0; - config->ldap_host[0] = 0; - config->ldap_uri[0] = 0; -@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config) - create_eoln(config->group_signature); - verify_format(config->group_signature, "GROUP_SIGNATURE"); - } -+ else if (!strcmp(var, "CC_BEFORE")) { -+ int num; -+ char unit[10]; -+ -+ if (sscanf(value, "%d%s", &num, unit) != 2) -+ goto cc_parse_err; -+ if (str2timeunits(num, unit, &config->cc_before) < 0) { -+cc_parse_err: -+ die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); -+ } -+ } -+#ifdef USE_LDAP_MAIL_LOOKUP - else if (!strcmp(var, "LDAP_MAIL")) { - if(strcasecmp(value, "true") == 0) - config->use_ldap_mail = 1; -@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config) - else - config->ldap_starttls = 0; - } -- else if (!strcmp(var, "CC_BEFORE")) { -- int num; -- char unit[10]; -- -- if (sscanf(value, "%d%s", &num, unit) != 2) -- goto cc_parse_err; -- if (str2timeunits(num, unit, &config->cc_before) < 0) { --cc_parse_err: -- die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); -- } -- } --#ifdef USE_LDAP_MAIL_LOOKUP - else if (!strcmp(var, "LDAP_HOST")) - sstrncpy(config->ldap_host, value, CNF_BUFFER); - else if (!strcmp(var, "LDAP_PORT")) --- -2.4.0 - diff --git a/meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch b/meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch deleted file mode 100644 index 6fb2daf..0000000 --- a/meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch +++ /dev/null @@ -1,83 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From feca6d2e55d992bbe176ee8faa734c105eb1b2e1 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Tue, 29 Mar 2016 20:48:05 -0400 -Subject: [PATCH] Use NGROUPS_MAX instead of NGROUPS - -NGRROUPS_MAX is what is defined by SuSv3; NGROUPS is not guaranteed by -any standard, but is just an ancient BSD'ism. Since Android's bionic -libc has the former but not the latter, let's use NGROUPS_MAX instead. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - quota.c | 5 +++-- - quotaops.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/quota.c b/quota.c -index 049dac4..e195ead 100644 ---- a/quota.c -+++ b/quota.c -@@ -48,6 +48,7 @@ - #include <errno.h> - #include <string.h> - #include <unistd.h> -+#include <limits.h> - #ifdef RPC - #include <rpc/rpc.h> - #include "rquota.h" -@@ -296,7 +297,7 @@ static int showquotas(int type, qid_t id, int mntcnt, char **mnt) - int main(int argc, char **argv) - { - int ngroups; -- gid_t gidset[NGROUPS], *gidsetp; -+ gid_t gidset[NGROUPS_MAX], *gidsetp; - int i, ret; - struct option long_opts[] = { - { "help", 0, NULL, 'h' }, -@@ -405,7 +406,7 @@ int main(int argc, char **argv) - ret |= showquotas(USRQUOTA, getuid(), argc, argv); - if (flags & FL_GROUP) { - ngroups = sysconf(_SC_NGROUPS_MAX); -- if (ngroups > NGROUPS) { -+ if (ngroups > NGROUPS_MAX) { - gidsetp = malloc(ngroups * sizeof(gid_t)); - if (!gidsetp) - die(1, _("Gid set allocation (%d): %s\n"), ngroups, strerror(errno)); -diff --git a/quotaops.c b/quotaops.c -index 136aec3..590dc1b 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -51,6 +51,7 @@ - #include <unistd.h> - #include <time.h> - #include <ctype.h> -+#include <limits.h> - - #if defined(RPC) - #include "rquota.h" -@@ -97,7 +98,7 @@ struct dquot *getprivs(qid_t id, struct quota_handle **handles, int quiet) - #if defined(BSD_BEHAVIOUR) - int j, ngroups; - uid_t euid; -- gid_t gidset[NGROUPS], *gidsetp; -+ gid_t gidset[NGROUPS_MAX], *gidsetp; - #endif - - for (i = 0; handles[i]; i++) { -@@ -115,7 +116,7 @@ struct dquot *getprivs(qid_t id, struct quota_handle **handles, int quiet) - if (geteuid() == 0) - break; - ngroups = sysconf(_SC_NGROUPS_MAX); -- if (ngroups > NGROUPS) { -+ if (ngroups > NGROUPS_MAX) { - gidsetp = malloc(ngroups * sizeof(gid_t)); - if (!gidsetp) { - gid2group(id, name); --- -2.6.1 - diff --git a/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch b/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch deleted file mode 100644 index 6cea548..0000000 --- a/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch +++ /dev/null @@ -1,153 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From f30e1ada8326463cc0af048afa058bc2f1dc9370 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Tue, 29 Mar 2016 20:48:04 -0400 -Subject: [PATCH] Allow building on systems that do not have rpc header files - -Android's bionic C library doesn't have Sun RPC support. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - Makefile.am | 30 ++++++++++++++++-------------- - quotaops.c | 2 ++ - setquota.c | 2 ++ - 3 files changed, 20 insertions(+), 14 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6d7ea0e..82db99f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,5 @@ - ACLOCAL_AMFLAGS = -I m4 - --BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c -- - docdir = $(datadir)/doc/@PACKAGE@ - doc_DATA = \ - README.mailserver \ -@@ -12,11 +10,6 @@ doc_DATA = \ - doc/quotas.preformated \ - doc/quotas-1.eps - --rpcsvcdir = $(includedir)/rpcsvc --rpcsvc_DATA = \ -- rquota.h \ -- rquota.x -- - sysconf_DATA = \ - warnquota.conf \ - quotatab \ -@@ -35,15 +28,12 @@ man_MANS = \ - quota.1 \ - quot.8 \ - repquota.8 \ -- rpc.rquotad.8 \ - rquota.3 \ - setquota.8 \ - warnquota.conf.5 \ - warnquota.8 \ - xqmstats.8 - --CLEANFILES = rquota.c rquota.h rquota_clnt.c -- - SUBDIRS = po - - EXTRA_DIST = \ -@@ -55,9 +45,15 @@ EXTRA_DIST = \ - Changelog \ - ldap-scripts - --noinst_LIBRARIES = \ -- libquota.a \ -- librpcclient.a -+noinst_LIBRARIES = libquota.a -+ -+if WITH_RPC -+rpcsvcdir = $(includedir)/rpcsvc -+rpcsvc_DATA = \ -+ rquota.h \ -+ rquota.x -+ -+noinst_LIBRARIES += librpcclient.a - - librpcclient_a_SOURCES = \ - rquota.c \ -@@ -67,8 +63,10 @@ librpcclient_a_SOURCES = \ - rquota_clnt.c - librpcclient_a_CFLAGS = -Wno-unused - --if WITH_RPC - RPCLIBS = librpcclient.a -+BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c -+CLEANFILES = rquota.c rquota.h rquota_clnt.c -+man_MANS += rpc.rquotad.8 - endif - - libquota_a_SOURCES = \ -@@ -217,6 +215,7 @@ convertquota_LDADD = \ - libquota.a \ - $(RPCLIBS) - -+if WITH_RPC - rpc_rquotad_SOURCES = \ - rquota_server.c \ - rquota_svc.c \ -@@ -225,6 +224,7 @@ rpc_rquotad_LDADD = \ - libquota.a \ - $(WRAP_LIBS) \ - $(RPCLIBS) -+endif - - quota_nld_SOURCES = quota_nld.c - quota_nld_CFLAGS = \ -@@ -236,6 +236,7 @@ quota_nld_LDADD = \ - $(DBUS_LIBS) \ - $(LIBNL3_LIBS) - -+if WITH_RPC - # ------------------ - # Rpcgen conversions - # ------------------ -@@ -250,6 +251,7 @@ quota_nld_LDADD = \ - rquota_clnt.c: rquota.x - @rm -f $@ - @$(RPCGEN) -l -o $@ $< -+endif - - # -------- - # Quotaoff -diff --git a/quotaops.c b/quotaops.c -index 47ef9a7..136aec3 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -34,7 +34,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/file.h> -diff --git a/setquota.c b/setquota.c -index 51d7b3c..8ecd9c3 100644 ---- a/setquota.c -+++ b/setquota.c -@@ -7,7 +7,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <errno.h> - #include <stdio.h> --- -2.6.1 - diff --git a/meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch b/meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch deleted file mode 100644 index 1455384..0000000 --- a/meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From c7a76237e7a51a69d0236ebfc191e462f805cf4e Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 15 Feb 2016 14:42:14 +0100 -Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested. - -This fixes a buch of undefined references: - -x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa -ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st -yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_ -svc.o svc_socket.o libquota.a -rquota_svc.o: In function `rquotaprog_2': -rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args' -rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args' -rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args' -rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args' -rquota_svc.o: In function `rquotaprog_1': -rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args' -rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args' -rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args' -rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args' -collect2: error: ld returned 1 exit status -Makefile:901: recipe for target 'rpc.rquotad' failed - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 77f8400..6d7ea0e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -116,8 +116,11 @@ sbin_PROGRAMS = \ - xqmstats \ - edquota \ - setquota \ -- convertquota \ -+ convertquota -+if WITH_RPC -+sbin_PROGRAMS += \ - rpc.rquotad -+endif - if WITH_NETLINK - sbin_PROGRAMS += \ - quota_nld --- -2.6.1 - diff --git a/meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch b/meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch deleted file mode 100644 index bdb4cea..0000000 --- a/meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From c4b56ee58b9b76d2598535cf6109a27b22e60abe Mon Sep 17 00:00:00 2001 -From: Jan Kara <jack@suse.cz> -Date: Wed, 30 Mar 2016 10:21:13 +0200 -Subject: [PATCH] Fix warnings due to missing stdlib.h - -When compiling without RPC, we do not get stdlib.h automatically -included via other includes and thus miss some function definitions. -Include stdlib.h explicitely. - -Signed-off-by: Jan Kara <jack@suse.cz> ---- - quotaops.c | 1 + - setquota.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/quotaops.c b/quotaops.c -index 590dc1b..56cf622 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -52,6 +52,7 @@ - #include <time.h> - #include <ctype.h> - #include <limits.h> -+#include <stdlib.h> - - #if defined(RPC) - #include "rquota.h" -diff --git a/setquota.c b/setquota.c -index 8ecd9c3..421631e 100644 ---- a/setquota.c -+++ b/setquota.c -@@ -17,6 +17,7 @@ - #include <getopt.h> - #include <time.h> - #include <ctype.h> -+#include <stdlib.h> - - #if defined(RPC) - #include "rquota.h" --- -2.6.1 - diff --git a/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch b/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch index 9ca2ffc..4687ca0 100644 --- a/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch +++ b/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch @@ -1,20 +1,32 @@ -Replace getrpcbynumber_r with getrpcbynumber +From a3808fd165847298d025971eb3c7be7d11caba9d Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +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 <raj.khem@gmail.com> -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 <maxin.john@intel.com> +--- + 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 + diff --git a/meta/recipes-extended/quota/quota_4.03.bb b/meta/recipes-extended/quota/quota_4.04.bb 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 --- a/meta/recipes-extended/quota/quota_4.03.bb +++ b/meta/recipes-extended/quota/quota_4.04.bb @@ -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" -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/7] screen: upgrade to 4.6.2 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John ` (2 preceding siblings ...) 2017-11-10 12:00 ` [PATCH 3/7] quota: upgrade to 4.04 Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-16 16:09 ` Burton, Ross 2017-11-10 12:00 ` [PATCH 5/7] libproxy: upgrade to 0.4.15 Maxin B. John ` (3 subsequent siblings) 7 siblings, 1 reply; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core 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 Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../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%) diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted file mode 100644 index fbdb0eb..0000000 --- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -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 <amade@asmblr.net> - -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 <kai.kang@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - 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 - diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/meta/recipes-extended/screen/screen/0002-comm.h-now-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 @@ -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 <kai.kang@windriver.com> ---- -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz <mike@mikegerwitz.com> -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 - diff --git a/meta/recipes-extended/screen/screen_4.6.1.bb b/meta/recipes-extended/screen/screen_4.6.2.bb 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 --- a/meta/recipes-extended/screen/screen_4.6.1.bb +++ b/meta/recipes-extended/screen/screen_4.6.2.bb @@ -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 -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 4/7] screen: upgrade to 4.6.2 2017-11-10 12:00 ` [PATCH 4/7] screen: upgrade to 4.6.2 Maxin B. John @ 2017-11-16 16:09 ` Burton, Ross 2017-11-17 11:20 ` Maxin B. John 0 siblings, 1 reply; 13+ messages in thread From: Burton, Ross @ 2017-11-16 16:09 UTC (permalink / raw) To: Maxin B. John; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 7126 bytes --] Breaks under MIPS, see https://bugzilla.yoctoproject.org/show_bug.cgi?id=12353. Ross On 10 November 2017 at 12:00, Maxin B. John <maxin.john@intel.com> wrote: > 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 > > Signed-off-by: Maxin B. John <maxin.john@intel.com> > --- > .../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%) > > diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch > b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch > deleted file mode 100644 > index fbdb0eb..0000000 > --- a/meta/recipes-extended/screen/screen/0001-fix-for- > multijob-build.patch > +++ /dev/null > @@ -1,58 +0,0 @@ > -From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 > -From: Jackie Huang <jackie.huang@windriver.com> > -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 <amade@asmblr.net> > - > -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 <kai.kang@windriver.com> > -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > ---- > - 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 > - > diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch > b/meta/recipes-extended/screen/screen/0002-comm.h-now- > 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 > @@ -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 <kai.kang@windriver.com> > ---- > -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 > -From: Mike Gerwitz <mike@mikegerwitz.com> > -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 > - > diff --git a/meta/recipes-extended/screen/screen_4.6.1.bb > b/meta/recipes-extended/screen/screen_4.6.2.bb > 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 > --- a/meta/recipes-extended/screen/screen_4.6.1.bb > +++ b/meta/recipes-extended/screen/screen_4.6.2.bb > @@ -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" > +SRC_URI[md5sum] = "a0f529d3333b128dfaa324d978ba73a8" > +SRC_URI[sha256sum] = "1b6922520e6a0ce5e28768d620b0f6 > 40a6631397f95ccb043b70b91bb503fa3a" > > inherit autotools texinfo > > -- > 2.4.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 9648 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/7] screen: upgrade to 4.6.2 2017-11-16 16:09 ` Burton, Ross @ 2017-11-17 11:20 ` Maxin B. John 0 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-17 11:20 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core Hi Ross, On Thu, Nov 16, 2017 at 04:09:20PM +0000, Burton, Ross wrote: >Breaks under MIPS, see https://bugzilla.yoctoproject.org/show_bug.cgi?id=12353. > Ack. will fix and resend it. >Ross >>On 10 November 2017 at 12:00, Maxin B. John <maxin.john@intel.com> wrote: >> >> 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 >> >> Signed-off-by: Maxin B. John <maxin.john@intel.com> >> --- >> .../screen/0001-fix-for-multijob-build.patch | 58 ---------------------- >> .../screen/0002-comm.h-now-depends-on-term.h.patch | 33 ------------ <snip> Thanks & Regards, Maxin ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/7] libproxy: upgrade to 0.4.15 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John ` (3 preceding siblings ...) 2017-11-10 12:00 ` [PATCH 4/7] screen: upgrade to 4.6.2 Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-10 12:00 ` [PATCH 6/7] sqlite3: upgrade to 3.21.0 Maxin B. John ` (2 subsequent siblings) 7 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core 0.4.14 -> 0.4.15 Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../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%) diff --git a/meta/recipes-support/libproxy/libproxy_0.4.14.bb b/meta/recipes-support/libproxy/libproxy_0.4.15.bb 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 --- a/meta/recipes-support/libproxy/libproxy_0.4.14.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.15.bb @@ -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" -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/7] sqlite3: upgrade to 3.21.0 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John ` (4 preceding siblings ...) 2017-11-10 12:00 ` [PATCH 5/7] libproxy: upgrade to 0.4.15 Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-10 12:00 ` [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 Maxin B. John 2017-11-10 12:35 ` ✗ patchtest: failure for package upgrades (rev2) Patchwork 7 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core Remove upstreamed patch: 1. sqlite3-fix-CVE-2017-13685.patch Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../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%) diff --git a/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch b/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch deleted file mode 100644 index aac428c..0000000 --- a/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch +++ /dev/null @@ -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 <wenzong.fan@windriver.com> - -Index: src/shell.c -================================================================== ---- src/shell.c -+++ src/shell.c -@@ -2657,10 +2657,11 @@ - int *aiType /* Column types */ - ){ - int i; - ShellState *p = (ShellState*)pArg; - -+ if( azArg==0 ) return 0; - switch( p->cMode ){ - case MODE_Line: { - int w = 5; - if( azArg==0 ) break; - for(i=0; i<nArg; i++){ -@@ -3007,10 +3008,11 @@ - */ - static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){ - ShellText *p = (ShellText*)pArg; - int i; - UNUSED_PARAMETER(az); -+ if( azArg==0 ) return 0; - if( p->n ) appendText(p, "|", 0); - for(i=0; i<nArg; i++){ - if( i ) appendText(p, ",", 0); - if( azArg[i] ) appendText(p, azArg[i], 0); - } -@@ -3888,11 +3890,11 @@ - const char *zType; - const char *zSql; - ShellState *p = (ShellState *)pArg; - - UNUSED_PARAMETER(azNotUsed); -- if( nArg!=3 ) return 1; -+ if( nArg!=3 || azArg==0 ) return 0; - zTable = azArg[0]; - zType = azArg[1]; - zSql = azArg[2]; - - if( strcmp(zTable, "sqlite_sequence")==0 ){ diff --git a/meta/recipes-support/sqlite/sqlite3_3.20.0.bb b/meta/recipes-support/sqlite/sqlite3_3.21.0.bb 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 --- a/meta/recipes-support/sqlite/sqlite3_3.20.0.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.21.0.bb @@ -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" -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John ` (5 preceding siblings ...) 2017-11-10 12:00 ` [PATCH 6/7] sqlite3: upgrade to 3.21.0 Maxin B. John @ 2017-11-10 12:00 ` Maxin B. John 2017-11-10 12:26 ` Burton, Ross 2017-11-10 12:35 ` ✗ patchtest: failure for package upgrades (rev2) Patchwork 7 siblings, 1 reply; 13+ messages in thread From: Maxin B. John @ 2017-11-10 12:00 UTC (permalink / raw) To: openembedded-core 2.58.2 -> 2.60.2 Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../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%) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb 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 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb @@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "eb33adb459c2283efc5c7d09ccdbbcfc" -SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287ff862542d4fc048f19a92a068a27d17b72" +SRC_URI[md5sum] = "9c49831b62c4bf18cdb81c86ac6516fd" +SRC_URI[sha256sum] = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01" S = "${WORKDIR}/libsoup-${PV}" -- 2.4.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 2017-11-10 12:00 ` [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 Maxin B. John @ 2017-11-10 12:26 ` Burton, Ross 2017-11-10 13:06 ` Maxin B. John 0 siblings, 1 reply; 13+ messages in thread From: Burton, Ross @ 2017-11-10 12:26 UTC (permalink / raw) To: Maxin B. John; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1661 bytes --] Alex's 2.60.1 upgrade was just merged, so can you rebase please. Ross On 10 November 2017 at 12:00, Maxin B. John <maxin.john@intel.com> wrote: > 2.58.2 -> 2.60.2 > > Signed-off-by: Maxin B. John <maxin.john@intel.com> > --- > .../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%) > > diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb > b/meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb > 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 > --- a/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb > +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb > @@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[ > 0]}.${@d.getVar('PV').split('.')[1]}" > > SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" > > -SRC_URI[md5sum] = "eb33adb459c2283efc5c7d09ccdbbcfc" > -SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287 > ff862542d4fc048f19a92a068a27d17b72" > +SRC_URI[md5sum] = "9c49831b62c4bf18cdb81c86ac6516fd" > +SRC_URI[sha256sum] = "7263cfe18872e2e652c196f5667e51 > 4616d9c97c861dfca82a65a55f45f0da01" > > S = "${WORKDIR}/libsoup-${PV}" > > -- > 2.4.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 3319 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 2017-11-10 12:26 ` Burton, Ross @ 2017-11-10 13:06 ` Maxin B. John 0 siblings, 0 replies; 13+ messages in thread From: Maxin B. John @ 2017-11-10 13:06 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core Hi Ross, >Alex's 2.60.1 upgrade was just merged, so can you rebase please. Sure, will do that. >Ross On 10 November 2017 at 12:00, Maxin B. John <maxin.john@intel.com> wrote: 2.58.2 -> 2.60.2 >>Signed-off-by: Maxin B. John <maxin.john@intel.com> >>--- >>.../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%) >> >>diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.60.2.bb Best Regards, Maxin ^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ patchtest: failure for package upgrades (rev2) 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John ` (6 preceding siblings ...) 2017-11-10 12:00 ` [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 Maxin B. John @ 2017-11-10 12:35 ` Patchwork 7 siblings, 0 replies; 13+ messages in thread From: Patchwork @ 2017-11-10 12:35 UTC (permalink / raw) To: Maxin John; +Cc: openembedded-core == 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 (openembedded-core@lists.openembedded.org) 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-11-17 11:19 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-11-10 12:00 [PATCH 0/7] package upgrades Maxin B. John 2017-11-10 12:00 ` [PATCH 1/7] ofono: upgrade to 1.21 Maxin B. John 2017-11-10 12:00 ` [PATCH 2/7] harfbuzz: upgrade to 1.6.3 Maxin B. John 2017-11-10 12:00 ` [PATCH 3/7] quota: upgrade to 4.04 Maxin B. John 2017-11-10 12:00 ` [PATCH 4/7] screen: upgrade to 4.6.2 Maxin B. John 2017-11-16 16:09 ` Burton, Ross 2017-11-17 11:20 ` Maxin B. John 2017-11-10 12:00 ` [PATCH 5/7] libproxy: upgrade to 0.4.15 Maxin B. John 2017-11-10 12:00 ` [PATCH 6/7] sqlite3: upgrade to 3.21.0 Maxin B. John 2017-11-10 12:00 ` [PATCH 7/7] libsoup-2.4: upgrade to 2.60.2 Maxin B. John 2017-11-10 12:26 ` Burton, Ross 2017-11-10 13:06 ` Maxin B. John 2017-11-10 12:35 ` ✗ patchtest: failure for package upgrades (rev2) Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox