PU: cups, dbus, dbus-test, diffutils, sudo
cover PU: cups, dbus, dbus-test, diffutils, sudo
The following changes since commit 4972d5dbd94a5a1fe9848e20730245f0f715501f:
glib-2.0: Improve shared-mime-info dependency handling (2019-02-18 10:33:13 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/PU-20190219
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20190219
Chen Qi (5):
cups: upgrade to 2.2.10
dbus: upgrade to 1.12.12
dbus-test: upgrade to 1.12.12
diffutils: upgrade to 3.7
sudo: upgrade to 1.8.27
.../{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb} | 4 +--
.../dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} | 4 +--
.../cups/{cups_2.2.9.bb => cups_2.2.10.bb} | 4 +--
...need_charset_alias-when-building-for-musl.patch | 33 ----------------------
.../0001-explicitly-disable-replacing-getopt.patch | 30 --------------------
.../{diffutils-3.6 => diffutils}/run-ptest | 0
.../{diffutils_3.6.bb => diffutils_3.7.bb} | 6 ++--
meta/recipes-extended/sudo/sudo.inc | 2 +-
.../sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb} | 25 ++++++++++++++--
9 files changed, 32 insertions(+), 76 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb} (95%)
rename meta/recipes-core/dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} (97%)
rename meta/recipes-extended/cups/{cups_2.2.9.bb => cups_2.2.10.bb} (40%)
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
rename meta/recipes-extended/diffutils/{diffutils-3.6 => diffutils}/run-ptest (100%)
rename meta/recipes-extended/diffutils/{diffutils_3.6.bb => diffutils_3.7.bb} (77%)
rename meta/recipes-extended/sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb} (66%)Signature · 1 line
1.9.1
PATCH 1/5 cups: upgrade to 2.2.10
---
meta/recipes-extended/cups/{cups_2.2.9.bb => cups_2.2.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/cups/{cups_2.2.9.bb => cups_2.2.10.bb} (40%)meta/recipes-extended/cups/cups_2.2.10.bb renamed from meta/recipes-extended/cups/cups_2.2.9.bb +2 -2
@@ -2,5 +2,5 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" -SRC_URI[md5sum] = "798e83bb1a240f5417a252903d83ae0c" -SRC_URI[sha256sum] = "6d22d5da253b97643320da0bf95574acd85ff2abe3ec1a51d36093841d891156" +SRC_URI[md5sum] = "3d22d747403ec5dcd0b66d1332564816" +SRC_URI[sha256sum] = "77c8b2b3bb7fe8b5fbfffc307f2c817b2d7ec67b657f261a1dd1c61ab81205bb"
Signature · 1 line
1.9.1
PATCH 3/5 dbus-test: upgrade to 1.12.12
In reply to Chen Qi---
meta/recipes-core/dbus/{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb} (95%)meta/recipes-core/dbus/dbus-test_1.12.12.bb renamed from meta/recipes-core/dbus/dbus-test_1.12.10.bb +2 -2
@@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef" -SRC_URI[sha256sum] = "4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7" +SRC_URI[md5sum] = "ea11069521beeee4e47f0086596a43c8" +SRC_URI[sha256sum] = "9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
Signature · 1 line
1.9.1
PATCH 4/5 diffutils: upgrade to 3.7
In reply to Chen QiThe following two patches are removed as they are not needed anymore.
0001-Unset-need_charset_alias-when-building-for-musl.patch 0001-explicitly-disable-replacing-getopt.patch
---
...need_charset_alias-when-building-for-musl.patch | 33 ----------------------
.../0001-explicitly-disable-replacing-getopt.patch | 30 --------------------
.../{diffutils-3.6 => diffutils}/run-ptest | 0
.../{diffutils_3.6.bb => diffutils_3.7.bb} | 6 ++--
4 files changed, 2 insertions(+), 67 deletions(-)
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
rename meta/recipes-extended/diffutils/{diffutils-3.6 => diffutils}/run-ptest (100%)
rename meta/recipes-extended/diffutils/{diffutils_3.6.bb => diffutils_3.7.bb} (77%)meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -33
@@ -1,33 +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(-) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index e1d74db..c0e92dd 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -1882,7 +1882,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 ;; \ --- -2.1.4 -
meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Subject: explicitly disable replacing getopt - -Explicitly disable replacing getopt to avoid compilation error like below. - - xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option' - -Upstream-Status: Inappropriate [workaround] -Signed-off-by: Chen Qi <[email protected]> ---- - m4/getopt.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/getopt.m4 b/m4/getopt.m4 -index 3ebc7b7..8934426 100644 ---- a/m4/getopt.m4 -+++ b/m4/getopt.m4 -@@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], - fi - ]) - if test $REPLACE_GETOPT = 1; then -- dnl Arrange for getopt.h to be created. -- gl_GETOPT_SUBSTITUTE_HEADER -+ dnl Explicitly disable replacing getopt -+ : - fi - ]) - --- -2.11.0 -
meta/recipes-extended/diffutils/diffutils/run-ptest renamed from meta/recipes-extended/diffutils/diffutils-3.6/run-ptest +0 -0
meta/recipes-extended/diffutils/diffutils_3.7.bb renamed from meta/recipes-extended/diffutils/diffutils_3.6.bb +2 -4
@@ -4,13 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" require diffutils.inc SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://run-ptest \ " -SRC_URI_append_libc-glibc = " file://0001-explicitly-disable-replacing-getopt.patch" -SRC_URI[md5sum] = "07cf286672ced26fba54cd0313bdc071" -SRC_URI[sha256sum] = "d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6" +SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461" +SRC_URI[sha256sum] = "b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"
Signature · 1 line
1.9.1
PATCH 2/5 dbus: upgrade to 1.12.12
In reply to Chen Qi---
meta/recipes-core/dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} (97%)meta/recipes-core/dbus/dbus_1.12.12.bb renamed from meta/recipes-core/dbus/dbus_1.12.10.bb +2 -2
@@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef" -SRC_URI[sha256sum] = "4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7" +SRC_URI[md5sum] = "ea11069521beeee4e47f0086596a43c8" +SRC_URI[sha256sum] = "9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8" inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
Signature · 1 line
1.9.1
PATCH 5/5 sudo: upgrade to 1.8.27
In reply to Chen QiLicense-Update: copyright years updated
---
meta/recipes-extended/sudo/sudo.inc | 2 +-
.../sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb} | 25 ++++++++++++++++++++--
2 files changed, 24 insertions(+), 3 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb} (66%)meta/recipes-extended/sudo/sudo.inc +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=45f9838a00199411eb97075c1e6a3102 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=4a162fc04b86b03f5632180fe6076cda \ file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
meta/recipes-extended/sudo/sudo_1.8.27.bb renamed from meta/recipes-extended/sudo/sudo_1.8.26.bb +23 -2
@@ -1,3 +1,24 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- doc/LICENSE +# +++ doc/LICENSE +# @@ -1,6 +1,6 @@ +# Sudo is distributed under the following license: +# +# - Copyright (c) 1994-1996, 1998-2018 +# + Copyright (c) 1994-1996, 1998-2019 +# Todd C. Miller <[email protected]> +# +# Permission to use, copy, modify, and distribute this software for any +# +# + require sudo.inc SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
@@ -7,8 +28,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "833084947d98e7745b94845f4b7a8a9a" -SRC_URI[sha256sum] = "40da219a6f0341ccb22d04a98988e27f09b831d2561b14c6154067a49ef3fee2" +SRC_URI[md5sum] = "b5c184b13b6b5de32af630af2fd013fd" +SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
Signature · 1 line
1.9.1
Re: [PATCH 5/5] sudo: upgrade to 1.8.27
Quoted 25 lines · Chen Qi
meta/recipes-extended/sudo/sudo_1.8.27.bb renamed from meta/recipes-extended/sudo/sudo_1.8.26.bb +1
-0@@ -1,3 +1,24 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtoolupgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes inmeta/recipes-extended/sudo/sudo_1.8.27.bb renamed from meta/recipes-extended/sudo/sudo_1.8.26.bb +15
-0+# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- doc/LICENSE +# +++ doc/LICENSE +# @@ -1,6 +1,6 @@ +# Sudo is distributed under the following license: +# +# - Copyright (c) 1994-1996, 1998-2018 +# + Copyright (c) 1994-1996, 1998-2019 +# Todd C. Miller <[email protected]> +# +# Permission to use, copy, modify, and distribute this softwarefor any
meta/recipes-extended/sudo/sudo_1.8.27.bb line 21
Quoted 3 lines
meta/recipes-extended/sudo/sudo_1.8.27.bb renamed from meta/recipes-extended/sudo/sudo_1.8.26.bb +3
-0+# +# +
Thanks for the upgrades. I removed this bit in the patch I queued for testing!
Cheers,
Richard