Hello community,
here is the log from the commit of package mingw64-binutils for
openSUSE:Factory checked in at 2020-09-10 22:53:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mingw64-binutils (Old)
and /work/SRC/openSUSE:Factory/.mingw64-binutils.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mingw64-binutils"
Thu Sep 10 22:53:18 2020 rev:2 rq:833391 version:2.33.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/mingw64-binutils/mingw64-binutils.changes
2020-01-08 17:54:29.809639161 +0100
+++
/work/SRC/openSUSE:Factory/.mingw64-binutils.new.4249/mingw64-binutils.changes
2020-09-10 22:55:20.096420246 +0200
@@ -1,0 +2,27 @@
+Wed Sep 9 21:02:21 UTC 2020 - Jan Engelhardt <[email protected]>
+
+- Revert the ExclusiveArch/BuildArch. Having
+ mingw64-binutils.{aarch64,ppc64,etc.}.rpm with AMD64 PE binaries
+ is exactly the point of mingw64-* packages.
+
+-------------------------------------------------------------------
+Tue Jun 9 07:44:16 UTC 2020 - Ralf Habacker <[email protected]>
+
+- 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)
+
+-------------------------------------------------------------------
+Fri Feb 7 08:59:30 UTC 2020 - Guillaume GARDET <[email protected]>
+
+- Build only on x86* archs
+
+-------------------------------------------------------------------
+Sun Nov 24 06:20:07 UTC 2019 - Ismail Dönmez <[email protected]>
+
+- Update to version 2.33.1
+- Drop 0001-COFF-Check-for-symbols-defined-in-discarded-section.patch
+ Fixed upstream.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/mingw64-binutils/mingw64-cross-binutils.changes
2020-01-08 17:54:30.509639529 +0100
+++
/work/SRC/openSUSE:Factory/.mingw64-binutils.new.4249/mingw64-cross-binutils.changes
2020-09-10 22:55:20.140420310 +0200
@@ -1,0 +2,20 @@
+Tue Jun 9 07:44:16 UTC 2020 - Ralf Habacker <[email protected]>
+
+- 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)
+
+-------------------------------------------------------------------
+Fri Feb 7 08:59:30 UTC 2020 - Guillaume GARDET <[email protected]>
+
+- Build only on x86* archs
+
+-------------------------------------------------------------------
+Sun Nov 24 06:20:56 UTC 2019 - Ismail Dönmez <[email protected]>
+
+- 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:
------------------
++++++ mingw64-binutils.spec ++++++
--- /var/tmp/diff_new_pack.AMkKUb/_old 2020-09-10 22:55:21.116421739 +0200
+++ /var/tmp/diff_new_pack.AMkKUb/_new 2020-09-10 22:55:21.116421739 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mingw64-binutils
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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: mingw64-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: mingw64-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
@@ -33,9 +34,9 @@
BuildRequires: mingw64-cross-gcc
BuildRequires: mingw64-filesystem
BuildRequires: texinfo
+BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%_mingw64_package_header_debug
-BuildArch: noarch
%description
The GNU Binutils are a collection of binary tools.
@@ -53,6 +54,7 @@
%prep
%setup -q -n binutils-%{version}
%patch0 -p1
+%patch1 -p1
%build
mkdir -p build
++++++ mingw64-cross-binutils.spec ++++++
--- /var/tmp/diff_new_pack.AMkKUb/_old 2020-09-10 22:55:21.136421769 +0200
+++ /var/tmp/diff_new_pack.AMkKUb/_new 2020-09-10 22:55:21.136421769 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mingw64-cross-binutils
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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: mingw64-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 <[email protected]>
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 <[email protected]>
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, 31 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>mingw64-cross-binutils</flavor>
</multibuild>
