* [PATCH 0/4] package upgrades
@ 2016-07-04 13:02 Maxin B. John
2016-07-04 13:02 ` [PATCH 1/4] libsolv: upgrade to 0.6.22 Maxin B. John
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Maxin B. John @ 2016-07-04 13:02 UTC (permalink / raw)
To: openembedded-core
Recipe upgrades as suggested by the Upgrade Helper tool.
Maxin B. John (4):
libsolv: upgrade to 0.6.22
ethtool: upgrade to 4.6
libatomic-ops: upgrade to 7.4.4
screen: upgrade to 4.4.0
.../ethtool/{ethtool_4.5.bb => ethtool_4.6.bb} | 4 +-
meta/recipes-extended/libsolv/libsolv_git.bb | 4 +-
...-stack-overflow-due-to-too-deep-recursion.patch | 58 ----------------------
.../screen/0001-fix-for-multijob-build.patch | 58 ----------------------
.../screen/{screen_4.3.1.bb => screen_4.4.0.bb} | 6 +--
...batomic-ops_7.4.2.bb => libatomic-ops_7.4.4.bb} | 4 +-
6 files changed, 8 insertions(+), 126 deletions(-)
rename meta/recipes-extended/ethtool/{ethtool_4.5.bb => ethtool_4.6.bb} (88%)
delete mode 100644 meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
rename meta/recipes-extended/screen/{screen_4.3.1.bb => screen_4.4.0.bb} (87%)
rename meta/recipes-support/libatomic-ops/{libatomic-ops_7.4.2.bb => libatomic-ops_7.4.4.bb} (85%)
--
2.4.0
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/4] libsolv: upgrade to 0.6.22 2016-07-04 13:02 [PATCH 0/4] package upgrades Maxin B. John @ 2016-07-04 13:02 ` Maxin B. John 2016-07-04 13:06 ` Burton, Ross 2016-07-04 13:02 ` [PATCH 2/4] ethtool: upgrade to 4.6 Maxin B. John ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: Maxin B. John @ 2016-07-04 13:02 UTC (permalink / raw) To: openembedded-core Signed-off-by: Maxin B. John <maxin.john@intel.com> --- meta/recipes-extended/libsolv/libsolv_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libsolv/libsolv_git.bb b/meta/recipes-extended/libsolv/libsolv_git.bb index b41347d..fcd4b55 100644 --- a/meta/recipes-extended/libsolv/libsolv_git.bb +++ b/meta/recipes-extended/libsolv/libsolv_git.bb @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib" -PV = "0.6.21" +PV = "0.6.22" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch" -SRCREV = "bdb5c63245923ed95cf04086b65b2e5a5b5d7b04" +SRCREV = "58655da7eccc0ba8e768f9df6482bb08b90f4da8" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" -- 2.4.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] libsolv: upgrade to 0.6.22 2016-07-04 13:02 ` [PATCH 1/4] libsolv: upgrade to 0.6.22 Maxin B. John @ 2016-07-04 13:06 ` Burton, Ross 2016-07-04 13:18 ` Khem Raj 2016-07-04 13:21 ` Maxin B. John 0 siblings, 2 replies; 10+ messages in thread From: Burton, Ross @ 2016-07-04 13:06 UTC (permalink / raw) To: Maxin B. John; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 315 bytes --] On 4 July 2016 at 14:02, Maxin B. John <maxin.john@intel.com> wrote: > --- a/meta/recipes-extended/libsolv/libsolv_git.bb > +++ b/meta/recipes-extended/libsolv/libsolv_git.bb > As we're tracking versions, can you change the filename to libsolv_0.6.22.bb so you don't need to specify PV explicitly Ross [-- Attachment #2: Type: text/html, Size: 908 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] libsolv: upgrade to 0.6.22 2016-07-04 13:06 ` Burton, Ross @ 2016-07-04 13:18 ` Khem Raj 2016-07-04 13:35 ` Burton, Ross 2016-07-04 13:21 ` Maxin B. John 1 sibling, 1 reply; 10+ messages in thread From: Khem Raj @ 2016-07-04 13:18 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core On Mon, Jul 4, 2016 at 6:06 AM, Burton, Ross <ross.burton@intel.com> wrote: > > As we're tracking versions, can you change the filename to libsolv_0.6.22.bb > so you don't need to specify PV explicitly we do not do that for recipes with git fetchers usually. PV is encoded as PV+git{SRCPV} ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] libsolv: upgrade to 0.6.22 2016-07-04 13:18 ` Khem Raj @ 2016-07-04 13:35 ` Burton, Ross 2016-07-04 22:04 ` Khem Raj 0 siblings, 1 reply; 10+ messages in thread From: Burton, Ross @ 2016-07-04 13:35 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 477 bytes --] On 4 July 2016 at 14:18, Khem Raj <raj.khem@gmail.com> wrote: > we do not do that for recipes with git fetchers usually. PV is encoded > as PV+git{SRCPV} > For recipes which are tracking releases, it's fairly common - and I feel clearer - use have the PV in the filename and thus PV instead of spreading the SHA everywhere for no reason. It's version 0.6.22, nobody cares what the SHA is. *If* it was a SHA beyond 0.6.22 then PV+SHA makes perfect sense. Ross [-- Attachment #2: Type: text/html, Size: 947 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] libsolv: upgrade to 0.6.22 2016-07-04 13:35 ` Burton, Ross @ 2016-07-04 22:04 ` Khem Raj 0 siblings, 0 replies; 10+ messages in thread From: Khem Raj @ 2016-07-04 22:04 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core On Mon, Jul 4, 2016 at 6:35 AM, Burton, Ross <ross.burton@intel.com> wrote: > > On 4 July 2016 at 14:18, Khem Raj <raj.khem@gmail.com> wrote: >> >> we do not do that for recipes with git fetchers usually. PV is encoded >> as PV+git{SRCPV} > > > For recipes which are tracking releases, it's fairly common - and I feel > clearer - use have the PV in the filename and thus PV instead of spreading > the SHA everywhere for no reason. It's version 0.6.22, nobody cares what the > SHA is. > > *If* it was a SHA beyond 0.6.22 then PV+SHA makes perfect sense. seems ok. dont have strong opinions either way > > Ross ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] libsolv: upgrade to 0.6.22 2016-07-04 13:06 ` Burton, Ross 2016-07-04 13:18 ` Khem Raj @ 2016-07-04 13:21 ` Maxin B. John 1 sibling, 0 replies; 10+ messages in thread From: Maxin B. John @ 2016-07-04 13:21 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core Hi, >On Mon, Jul 04, 2016 at 02:06:44PM +0100, Burton, Ross wrote: > On 4 July 2016 at 14:02, Maxin B. John <maxin.john@intel.com> wrote: > > --- a/meta/recipes-extended/libsolv/libsolv_git.bb > +++ b/meta/recipes-extended/libsolv/libsolv_git.bb > > As we're tracking versions, can you change the filename to libsolv_0.6.22.bb so you don't need to specify PV explicitly Ok, will do that. > Ross Warm Regards, Maxin ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/4] ethtool: upgrade to 4.6 2016-07-04 13:02 [PATCH 0/4] package upgrades Maxin B. John 2016-07-04 13:02 ` [PATCH 1/4] libsolv: upgrade to 0.6.22 Maxin B. John @ 2016-07-04 13:02 ` Maxin B. John 2016-07-04 13:02 ` [PATCH 3/4] libatomic-ops: upgrade to 7.4.4 Maxin B. John 2016-07-04 13:02 ` [PATCH 4/4] screen: upgrade to 4.4.0 Maxin B. John 3 siblings, 0 replies; 10+ messages in thread From: Maxin B. John @ 2016-07-04 13:02 UTC (permalink / raw) To: openembedded-core Signed-off-by: Maxin B. John <maxin.john@intel.com> --- meta/recipes-extended/ethtool/{ethtool_4.5.bb => ethtool_4.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_4.5.bb => ethtool_4.6.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool_4.5.bb b/meta/recipes-extended/ethtool/ethtool_4.6.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_4.5.bb rename to meta/recipes-extended/ethtool/ethtool_4.6.bb index c47b30a..788d4ea 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.5.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.6.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "10038f417db89a1508584d5c375f79bb" -SRC_URI[sha256sum] = "3b1e69d4de3322e2fe2b1e90befaf2c1ea886469d43ba73af3da36be5e2cc5e7" +SRC_URI[md5sum] = "1186dd83a0384109b92c6cd40a7bb0e5" +SRC_URI[sha256sum] = "ad45620887f7e61312fc2f9ca3fd50d49ac7737ed874b0b02845d07e0fa3ca49" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" -- 2.4.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] libatomic-ops: upgrade to 7.4.4 2016-07-04 13:02 [PATCH 0/4] package upgrades Maxin B. John 2016-07-04 13:02 ` [PATCH 1/4] libsolv: upgrade to 0.6.22 Maxin B. John 2016-07-04 13:02 ` [PATCH 2/4] ethtool: upgrade to 4.6 Maxin B. John @ 2016-07-04 13:02 ` Maxin B. John 2016-07-04 13:02 ` [PATCH 4/4] screen: upgrade to 4.4.0 Maxin B. John 3 siblings, 0 replies; 10+ messages in thread From: Maxin B. John @ 2016-07-04 13:02 UTC (permalink / raw) To: openembedded-core Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../libatomic-ops/{libatomic-ops_7.4.2.bb => libatomic-ops_7.4.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libatomic-ops/{libatomic-ops_7.4.2.bb => libatomic-ops_7.4.4.bb} (85%) diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.4.bb similarity index 85% rename from meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb rename to meta/recipes-support/libatomic-ops/libatomic-ops_7.4.4.bb index fdb70d8..930c1b8 100644 --- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.4.bb @@ -12,8 +12,8 @@ SRC_URI = "\ file://0001-Add-initial-nios2-architecture-support.patch \ " -SRC_URI[md5sum] = "1d6538604b314d2fccdf86915e5c0857" -SRC_URI[sha256sum] = "04fa615f62992547bcbda562260e28b504bc4c06e2f985f267f3ade30304b5dd" +SRC_URI[md5sum] = "426d804baae12c372967a6d183e25af2" +SRC_URI[sha256sum] = "bf210a600dd1becbf7936dd2914cf5f5d3356046904848dcfd27d0c8b12b6f8f" S = "${WORKDIR}/libatomic_ops-${PV}" -- 2.4.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] screen: upgrade to 4.4.0 2016-07-04 13:02 [PATCH 0/4] package upgrades Maxin B. John ` (2 preceding siblings ...) 2016-07-04 13:02 ` [PATCH 3/4] libatomic-ops: upgrade to 7.4.4 Maxin B. John @ 2016-07-04 13:02 ` Maxin B. John 3 siblings, 0 replies; 10+ messages in thread From: Maxin B. John @ 2016-07-04 13:02 UTC (permalink / raw) To: openembedded-core Removed the following backported patch: * 0001-fix-for-multijob-build.patch * 0001-Fix-stack-overflow-due-to-too-deep-recursion.patch Signed-off-by: Maxin B. John <maxin.john@intel.com> --- ...-stack-overflow-due-to-too-deep-recursion.patch | 58 ---------------------- .../screen/0001-fix-for-multijob-build.patch | 58 ---------------------- .../screen/{screen_4.3.1.bb => screen_4.4.0.bb} | 6 +-- 3 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch rename meta/recipes-extended/screen/{screen_4.3.1.bb => screen_4.4.0.bb} (87%) diff --git a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch b/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch deleted file mode 100644 index 4ac820f..0000000 --- a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch +++ /dev/null @@ -1,58 +0,0 @@ -Bug: 45713 - -How to reproduce: -Run this command inside screen -$ printf '\x1b[10000000T' - -screen will recursively call MScrollV to depth n/256. -This is time consuming and will overflow stack if n is huge. - -Fixes CVE-2015-6806 - -Upstream-Status: Backport -CVE: CVE-2015-6806 - -Signed-off-by: Kuang-che Wu <kcwu@csie.org> -Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur screen-4.3.1-orig/ansi.c screen-4.3.1/ansi.c ---- screen-4.3.1-orig/ansi.c 2015-06-29 00:22:55.000000000 +0300 -+++ screen-4.3.1/ansi.c 2015-10-06 13:13:58.297648039 +0300 -@@ -2502,13 +2502,13 @@ - return; - if (n > 0) - { -+ if (ye - ys + 1 < n) -+ n = ye - ys + 1; - if (n > 256) - { - MScrollV(p, n - 256, ys, ye, bce); - n = 256; - } -- if (ye - ys + 1 < n) -- n = ye - ys + 1; - #ifdef COPY_PASTE - if (compacthist) - { -@@ -2562,15 +2562,15 @@ - } - else - { -- if (n < -256) -- { -- MScrollV(p, n + 256, ys, ye, bce); -- n = -256; -- } - n = -n; - if (ye - ys + 1 < n) - n = ye - ys + 1; - -+ if (n > 256) -+ { -+ MScrollV(p, - (n - 256), ys, ye, bce); -+ n = 256; -+ } - ml = p->w_mlines + ye; - /* Clear lines */ - for (i = ye; i > ye - n; i--, ml--) 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 40ecef0..0000000 --- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch +++ /dev/null @@ -1,58 +0,0 @@ -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> ---- -From c0de6dd7970b2c7b426a5c39dcbc31c2bef87232 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net> -Date: Thu, 2 Jan 2014 18:18:06 +0100 -Subject: [PATCH] fix for multijob build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -make sure that comm.sh script generates comm.h header before doing -anything else - -Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> ---- - Makefile.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index ce86cbc..dea16d8 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_window.o: list_generic.h list_window.c window.h 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 - diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/meta/recipes-extended/screen/screen_4.4.0.bb similarity index 87% rename from meta/recipes-extended/screen/screen_4.3.1.bb rename to meta/recipes-extended/screen/screen_4.4.0.bb index 00d878b..e970c5b 100644 --- a/meta/recipes-extended/screen/screen_4.3.1.bb +++ b/meta/recipes-extended/screen/screen_4.4.0.bb @@ -22,13 +22,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://0001-fix-for-multijob-build.patch \ file://0002-comm.h-now-depends-on-term.h.patch \ - file://0001-Fix-stack-overflow-due-to-too-deep-recursion.patch \ " -SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad" -SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63" +SRC_URI[md5sum] = "d26e11a3648c2b11aaefa215a55dfd39" +SRC_URI[sha256sum] = "ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b" inherit autotools texinfo -- 2.4.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-07-04 22:04 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-07-04 13:02 [PATCH 0/4] package upgrades Maxin B. John 2016-07-04 13:02 ` [PATCH 1/4] libsolv: upgrade to 0.6.22 Maxin B. John 2016-07-04 13:06 ` Burton, Ross 2016-07-04 13:18 ` Khem Raj 2016-07-04 13:35 ` Burton, Ross 2016-07-04 22:04 ` Khem Raj 2016-07-04 13:21 ` Maxin B. John 2016-07-04 13:02 ` [PATCH 2/4] ethtool: upgrade to 4.6 Maxin B. John 2016-07-04 13:02 ` [PATCH 3/4] libatomic-ops: upgrade to 7.4.4 Maxin B. John 2016-07-04 13:02 ` [PATCH 4/4] screen: upgrade to 4.4.0 Maxin B. John
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox