Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw32-binutils for openSUSE:Factory checked in at 2021-11-02 19:18:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw32-binutils (Old) and /work/SRC/openSUSE:Factory/.mingw32-binutils.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw32-binutils" Tue Nov 2 19:18:59 2021 rev:2 rq:928737 version:2.33.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw32-binutils/mingw32-binutils.changes 2020-01-08 17:53:53.673620161 +0100 +++ /work/SRC/openSUSE:Factory/.mingw32-binutils.new.1890/mingw32-binutils.changes 2021-11-02 19:19:34.655102967 +0100 @@ -1,0 +2,15 @@ +Tue Jun 9 07:44:16 UTC 2020 - Ralf Habacker <ralf.habacker@freenet.de> + +- Add patches to fix (boo#920134) + * 0001-Fix-a-potential-infinite-loop-in-the-Windows-resourc.patch + * 0001-Fix-the-windmc-program-to-conform-to-the-behaviour-o.patch + (removed conflicting changelog entry) + +------------------------------------------------------------------- +Sun Nov 24 17:08:10 UTC 2019 - Ismail D��nmez <idonmez@suse.com> + +- Update to version 2.33.1 +- Drop 0001-COFF-Check-for-symbols-defined-in-discarded-section.patch + Fixed upstream. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/mingw32-binutils/mingw32-cross-binutils.changes 2020-01-08 17:53:53.753620203 +0100 +++ /work/SRC/openSUSE:Factory/.mingw32-binutils.new.1890/mingw32-cross-binutils.changes 2021-11-02 19:19:34.679102986 +0100 @@ -1,0 +2,14 @@ +Tue Jun 9 07:44:16 UTC 2020 - Ralf Habacker <ralf.habacker@freenet.de> + +- Add patches to fix (boo#920134) + * 0001-Fix-a-potential-infinite-loop-in-the-Windows-resourc.patch + * 0001-Fix-the-windmc-program-to-conform-to-the-behaviour-o.patch + (removed conflicting changelog entry) +------------------------------------------------------------------- +Sun Nov 24 17:08:25 UTC 2019 - Ismail D��nmez <idonmez@suse.com> + +- Update to version 2.33.1 +- Drop 0001-COFF-Check-for-symbols-defined-in-discarded-section.patch + Fixed upstream. + +------------------------------------------------------------------- Old: ---- 0001-COFF-Check-for-symbols-defined-in-discarded-section.patch binutils-2.32.tar.bz2 New: ---- 0001-Fix-a-potential-infinite-loop-in-the-Windows-resourc.patch 0001-Fix-the-windmc-program-to-conform-to-the-behaviour-o.patch _multibuild binutils-2.33.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw32-binutils.spec ++++++ --- /var/tmp/diff_new_pack.MTPOQT/_old 2021-11-02 19:19:35.407103544 +0100 +++ /var/tmp/diff_new_pack.MTPOQT/_new 2021-11-02 19:19:35.407103544 +0100 @@ -1,7 +1,7 @@ # # spec file for package mingw32-binutils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: mingw32-binutils -Version: 2.32 +Version: 2.33.1 Release: 0 Summary: GNU Binutils -License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0+ and LGPL-3.0+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Libraries -Url: http://www.gnu.org/software/binutils/ -Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 +URL: http://www.gnu.org/software/binutils/ +Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz Source99: mingw32-binutils-rpmlintrc -Patch0: 0001-COFF-Check-for-symbols-defined-in-discarded-section.patch +Patch0: 0001-Fix-a-potential-infinite-loop-in-the-Windows-resourc.patch +Patch1: 0001-Fix-the-windmc-program-to-conform-to-the-behaviour-o.patch #!BuildIgnore: post-build-checks BuildRequires: bison BuildRequires: flex @@ -53,6 +54,7 @@ %prep %setup -q -n binutils-%{version} %patch0 -p1 +%patch1 -p1 %build mkdir -p build ++++++ mingw32-cross-binutils.spec ++++++ --- /var/tmp/diff_new_pack.MTPOQT/_old 2021-11-02 19:19:35.423103557 +0100 +++ /var/tmp/diff_new_pack.MTPOQT/_new 2021-11-02 19:19:35.423103557 +0100 @@ -1,7 +1,7 @@ # # spec file for package mingw32-cross-binutils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: mingw32-cross-binutils -Version: 2.32 +Version: 2.33.1 Release: 0 Summary: GNU Binutils -License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0+ and LGPL-3.0+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Libraries -Url: http://www.gnu.org/software/binutils/ -Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 -Patch0: 0001-COFF-Check-for-symbols-defined-in-discarded-section.patch +URL: http://www.gnu.org/software/binutils/ +Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz +Patch0: 0001-Fix-a-potential-infinite-loop-in-the-Windows-resourc.patch +Patch1: 0001-Fix-the-windmc-program-to-conform-to-the-behaviour-o.patch #!BuildIgnore: post-build-checks BuildRequires: bison BuildRequires: flex @@ -41,6 +42,7 @@ %prep %setup -q -n binutils-%{version} %patch0 -p1 +%patch1 -p1 %build mkdir -p build ++++++ 0001-Fix-a-potential-infinite-loop-in-the-Windows-resourc.patch ++++++ From 8affa48ac7c55ade04713654a22f1c56319b1195 Mon Sep 17 00:00:00 2001 From: Joel Anderson <joelanderson333@gmail.com> Date: Fri, 5 Jun 2020 11:11:03 +0100 Subject: [PATCH] Fix a potential infinite loop in the Windows resource parser. PR 26082 * mclex.c (yylex): Add test for an empty input stream. --- binutils/mclex.c | 18 ++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/binutils/mclex.c b/binutils/mclex.c index 7e0688b07b..1b5d5c374f 100644 --- a/binutils/mclex.c +++ b/binutils/mclex.c @@ -337,17 +337,19 @@ yylex (void) if (mclex_want_line) { start_token = input_stream_pos; + if (input_stream_pos[0] == 0) + return -1; if (input_stream_pos[0] == '.' && (input_stream_pos[1] == '\n' || (input_stream_pos[1] == '\r' && input_stream_pos[2] == '\n'))) - { - mclex_want_line = FALSE; - while (input_stream_pos[0] != 0 && input_stream_pos[0] != '\n') - ++input_stream_pos; - if (input_stream_pos[0] == '\n') - ++input_stream_pos; - return MCENDLINE; - } + { + mclex_want_line = FALSE; + while (input_stream_pos[0] != 0 && input_stream_pos[0] != '\n') + ++input_stream_pos; + if (input_stream_pos[0] == '\n') + ++input_stream_pos; + return MCENDLINE; + } while (input_stream_pos[0] != 0 && input_stream_pos[0] != '\n') ++input_stream_pos; if (input_stream_pos[0] == '\n') -- 2.26.1 ++++++ 0001-Fix-the-windmc-program-to-conform-to-the-behaviour-o.patch ++++++ From 25065fcd192d9958c03e107985aea41d651e4a16 Mon Sep 17 00:00:00 2001 From: Ralf Habacker <ralf.habacker@freenet.de> Date: Wed, 10 Jun 2020 10:07:26 +0100 Subject: [PATCH] Fix the windmc program to conform to the behaviour of mc.exe by rejecting lines that reach end-of-file without a terminating newline character. PR 26082 * mclex.c (yylex): Reject lines that reach end-of-file without a terminating newline character. --- binutils/mclex.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/binutils/mclex.c b/binutils/mclex.c index 1b5d5c374f..da8bfb5131 100644 --- a/binutils/mclex.c +++ b/binutils/mclex.c @@ -323,6 +323,21 @@ mc_token (const unichar *t, size_t len) return -1; } +/* Skip characters in input_stream_pos up to and including a newline + character. Returns non-zero if the newline was found, zero otherwise. */ + +static int +skip_until_eol (void) +{ + while (input_stream_pos[0] != 0 && input_stream_pos[0] != '\n') + ++input_stream_pos; + if (input_stream_pos[0] == 0) + return 0; + if (input_stream_pos[0] == '\n') + ++input_stream_pos; + return 1; +} + int yylex (void) { @@ -334,29 +349,28 @@ yylex (void) fatal ("Input stream not setuped.\n"); return -1; } + if (mclex_want_line) { start_token = input_stream_pos; if (input_stream_pos[0] == 0) return -1; + /* PR 26082: Reject a period followed by EOF. */ + if (input_stream_pos[0] == '.' && input_stream_pos[1] == 0) + return -1; if (input_stream_pos[0] == '.' && (input_stream_pos[1] == '\n' || (input_stream_pos[1] == '\r' && input_stream_pos[2] == '\n'))) { mclex_want_line = FALSE; - while (input_stream_pos[0] != 0 && input_stream_pos[0] != '\n') - ++input_stream_pos; - if (input_stream_pos[0] == '\n') - ++input_stream_pos; - return MCENDLINE; + return skip_until_eol () ? MCENDLINE : -1; } - while (input_stream_pos[0] != 0 && input_stream_pos[0] != '\n') - ++input_stream_pos; - if (input_stream_pos[0] == '\n') - ++input_stream_pos; + if (!skip_until_eol ()) + return -1; yylval.ustr = get_diff (input_stream_pos, start_token); return MCLINE; } + while ((ch = input_stream_pos[0]) <= 0x20) { if (ch == 0) @@ -404,10 +418,8 @@ yylex (void) { case ';': ++start_token; - while (input_stream_pos[0] != '\n' && input_stream_pos[0] != 0) - ++input_stream_pos; - if (input_stream_pos[0] == '\n') - input_stream_pos++; + if (!skip_until_eol ()) + return -1; yylval.ustr = get_diff (input_stream_pos, start_token); return MCCOMMENT; case '=': -- 2.26.1 ++++++ _multibuild ++++++ <multibuild> <flavor>mingw32-cross-binutils</flavor> </multibuild>