From 96223e6827f7ef91cca9e727e575e89ed5184a83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:31:37 +0000 Subject: [PATCH 01/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- yasm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yasm.spec b/yasm.spec index 4c76532..e8dc7c6 100644 --- a/yasm.spec +++ b/yasm.spec @@ -6,7 +6,7 @@ Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -100,6 +100,9 @@ make check %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.3.0^20230922git9defefa-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.3.0^20230922git9defefa-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From eb9e5654972d869e22ce84e9cbd7171ddfdd97e5 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 15 Feb 2025 22:29:11 +0100 Subject: [PATCH 02/12] fix build with GCC 15 --- yasm-gcc15.patch | 15 +++++++++++++++ yasm.spec | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 yasm-gcc15.patch diff --git a/yasm-gcc15.patch b/yasm-gcc15.patch new file mode 100644 index 0000000..bff0ac0 --- /dev/null +++ b/yasm-gcc15.patch @@ -0,0 +1,15 @@ +diff -up yasm-9defefae9fbcb6958cddbfa778c1ea8605da8b8b/libyasm/bitvect.h.gcc15 yasm-9defefae9fbcb6958cddbfa778c1ea8605da8b8b/libyasm/bitvect.h +--- yasm-9defefae9fbcb6958cddbfa778c1ea8605da8b8b/libyasm/bitvect.h.gcc15 2023-09-22 07:21:20.000000000 +0200 ++++ yasm-9defefae9fbcb6958cddbfa778c1ea8605da8b8b/libyasm/bitvect.h 2025-02-15 22:14:50.029332956 +0100 +@@ -83,7 +83,11 @@ typedef Z_longword *Z_longwordp + #ifdef MACOS_TRADITIONAL + #define boolean Boolean + #else ++ #if __STDC_VERSION__ < 202311L + typedef enum boolean { false = FALSE, true = TRUE } boolean; ++ #else ++ typedef bool boolean; ++ #endif + #endif + #endif + diff --git a/yasm.spec b/yasm.spec index e8dc7c6..2d68eb4 100644 --- a/yasm.spec +++ b/yasm.spec @@ -17,6 +17,8 @@ URL: http://yasm.tortall.net/ Source: https://github.com/yasm/yasm/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # https://github.com/yasm/yasm/issues/270 Patch0: yasm-tests.patch +# https://github.com/yasm/yasm/issues/283 +Patch1: yasm-gcc15.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: python3 @@ -63,6 +65,7 @@ Install this package if you need to rebuild applications that use yasm. %ifarch i686 %patch 0 -p1 %endif +%patch 1 -p1 autoreconf -I m4 -fiv %else %setup -q @@ -102,6 +105,7 @@ make check %changelog * Sun Jan 19 2025 Fedora Release Engineering - 1.3.0^20230922git9defefa-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +- fix build with GCC 15 * Sat Jul 20 2024 Fedora Release Engineering - 1.3.0^20230922git9defefa-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d106c56ecf92921e018675f1f15f954c079bd55e Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 15 Feb 2025 23:56:54 +0100 Subject: [PATCH 03/12] update to git 121ab15 --- .gitignore | 1 + sources | 2 +- yasm.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 10c61ff..4123fef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ yasm-1.1.0.tar.gz /yasm-1.2.0.tar.gz /yasm-1.3.0.tar.gz /yasm-9defefa.tar.gz +/yasm-121ab15.tar.gz diff --git a/sources b/sources index 65b1964..3f7a801 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yasm-9defefa.tar.gz) = 327de3ecaa4aa91bb418aab146fae5d82b478c33f701b7534df3e5f4d490914dd16774874cb5191192532961ed885cc4b942b232e3014306029155571016eeec +SHA512 (yasm-121ab15.tar.gz) = e005153fc14b2131c828848a4026ad7f7982ac611bc0848c6cf2cb4fdeeed91efcffde9b4a6dc4e968f32afff4517620b5157b1cefe418366200bcb05e839b81 diff --git a/yasm.spec b/yasm.spec index 2d68eb4..4c12a68 100644 --- a/yasm.spec +++ b/yasm.spec @@ -1,12 +1,12 @@ %global git 1 -%global commit 9defefae9fbcb6958cddbfa778c1ea8605da8b8b -%global date 20230922 +%global commit 121ab150b3577b666c79a79f4a511798d7ad2432 +%global date 20250625 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 3%{?dist} +Release: 1%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -103,6 +103,9 @@ make check %changelog +* Sat Feb 15 2025 Dominik Mierzejewski - 1.3.0^20250625git121ab15-1 +- update to git 121ab15 + * Sun Jan 19 2025 Fedora Release Engineering - 1.3.0^20230922git9defefa-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - fix build with GCC 15 From 0715b8b7a2574e448b79556e4615fb671d0fc07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sun, 16 Feb 2025 14:01:57 +0100 Subject: [PATCH 04/12] fix tmt metadata --- plans/ci.fmf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - directory: tests execute: - how: beakerlib + how: tmt From bdb774a7e8fd6bbe13880d61f06b739318aa2577 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Sun, 16 Feb 2025 14:59:03 +0100 Subject: [PATCH 05/12] Remove tmt tests and gating The `make check` is already running inside the spec file Signed-off-by: Cristian Le --- .fmf/version | 1 - gating.yaml | 19 --------- plans/ci.fmf | 5 --- tests/Regression/testsuite/main.fmf | 17 -------- tests/Regression/testsuite/runtest.sh | 59 --------------------------- 5 files changed, 101 deletions(-) delete mode 100644 .fmf/version delete mode 100644 gating.yaml delete mode 100644 plans/ci.fmf delete mode 100644 tests/Regression/testsuite/main.fmf delete mode 100755 tests/Regression/testsuite/runtest.sh diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ce3cdc1..0000000 --- a/gating.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 3fd3ab7..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf -execute: - how: tmt diff --git a/tests/Regression/testsuite/main.fmf b/tests/Regression/testsuite/main.fmf deleted file mode 100644 index 1f4b56c..0000000 --- a/tests/Regression/testsuite/main.fmf +++ /dev/null @@ -1,17 +0,0 @@ -summary: testsuite -description: '' -contact: Martin Cermak -component: -- yasm -test: ./runtest.sh -framework: beakerlib -recommend: -- yasm -- bison -- byacc -- gettext-devel -- xmlto -- rpm-build -duration: 48h -extra-summary: /tools/yasm/Regression/testsuite -extra-task: /tools/yasm/Regression/testsuite diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh deleted file mode 100755 index 4c66f1f..0000000 --- a/tests/Regression/testsuite/runtest.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/yasm/Regression/testsuite -# Description: testsuite -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2019 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="yasm" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TMP=\$(mktemp -d)" - rlRun "pushd $TMP" - - rlFetchSrcForInstalled $PACKAGE - rlRun "dnf builddep -y *src.rpm --nobest" - rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm" - rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/yasm.spec" - rlRun "pushd BUILD/yasm-*" - rlPhaseEnd - - rlPhaseStartTest - rlRun "make check |& tee test.log" - rlRun "PASS=$(awk '/# PASS:/ {print $3}' test.log)" - rlRun "FAIL=$(awk '/# FAIL:/ {print $3}' test.log)" - rlRun "test $PASS -ge 44" - rlRun "test $FAIL -eq 0" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd; popd" - rlRun "rm -r $TMP" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd From 27db810e754a997f9029a883a279cbafc1e29268 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 15 Feb 2025 23:56:54 +0100 Subject: [PATCH 06/12] update to git 121ab15 --- .gitignore | 1 + sources | 2 +- yasm.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 10c61ff..4123fef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ yasm-1.1.0.tar.gz /yasm-1.2.0.tar.gz /yasm-1.3.0.tar.gz /yasm-9defefa.tar.gz +/yasm-121ab15.tar.gz diff --git a/sources b/sources index 65b1964..3f7a801 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yasm-9defefa.tar.gz) = 327de3ecaa4aa91bb418aab146fae5d82b478c33f701b7534df3e5f4d490914dd16774874cb5191192532961ed885cc4b942b232e3014306029155571016eeec +SHA512 (yasm-121ab15.tar.gz) = e005153fc14b2131c828848a4026ad7f7982ac611bc0848c6cf2cb4fdeeed91efcffde9b4a6dc4e968f32afff4517620b5157b1cefe418366200bcb05e839b81 diff --git a/yasm.spec b/yasm.spec index 4c76532..a812261 100644 --- a/yasm.spec +++ b/yasm.spec @@ -1,12 +1,12 @@ %global git 1 -%global commit 9defefae9fbcb6958cddbfa778c1ea8605da8b8b -%global date 20230922 +%global commit 121ab150b3577b666c79a79f4a511798d7ad2432 +%global date 20250625 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 2%{?dist} +Release: 1%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -100,6 +100,9 @@ make check %changelog +* Sat Feb 15 2025 Dominik Mierzejewski - 1.3.0^20250625git121ab15-1 +- update to git 121ab15 + * Sat Jul 20 2024 Fedora Release Engineering - 1.3.0^20230922git9defefa-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 13bbd82e963e2a3677f1aad977e9b6081bc5491c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 8 Jul 2025 13:34:25 +0200 Subject: [PATCH 07/12] fixes CVE-2024-22653 (resolves rhbz#2369457) --- yasm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yasm.spec b/yasm.spec index a812261..23e9f6b 100644 --- a/yasm.spec +++ b/yasm.spec @@ -102,6 +102,7 @@ make check %changelog * Sat Feb 15 2025 Dominik Mierzejewski - 1.3.0^20250625git121ab15-1 - update to git 121ab15 +- fixes CVE-2024-22653 (resolves rhbz#2369457) * Sat Jul 20 2024 Fedora Release Engineering - 1.3.0^20230922git9defefa-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 10393557a4645cd0814577d072874ecf927bef4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:11:11 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- yasm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yasm.spec b/yasm.spec index 4c12a68..0cf8e68 100644 --- a/yasm.spec +++ b/yasm.spec @@ -6,7 +6,7 @@ Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -103,6 +103,9 @@ make check %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.3.0^20250625git121ab15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Feb 15 2025 Dominik Mierzejewski - 1.3.0^20250625git121ab15-1 - update to git 121ab15 From d98338a829e0a345c16de8e96efc792030b4e7a7 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 7 Aug 2025 13:04:38 +0200 Subject: [PATCH 09/12] mark as deprecated See https://fedoraproject.org/wiki/Changes/DeprecateYASM . --- yasm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yasm.spec b/yasm.spec index 0cf8e68..d118757 100644 --- a/yasm.spec +++ b/yasm.spec @@ -6,7 +6,7 @@ Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -33,6 +33,7 @@ BuildRequires: byacc BuildRequires: gettext-devel BuildRequires: xmlto Provides: bundled(md5-plumb) +Provides: deprecated() %description Yasm is a complete rewrite of the NASM assembler under the "new" BSD License @@ -103,6 +104,9 @@ make check %changelog +* Thu Aug 07 2025 Dominik Mierzejewski - 1.3.0^20250625git121ab15-3 +- mark as deprecated, see https://fedoraproject.org/wiki/Changes/DeprecateYASM + * Fri Jul 25 2025 Fedora Release Engineering - 1.3.0^20250625git121ab15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f82403071fed758cd4c98cabe4874697ff6dbe05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:01:04 +0000 Subject: [PATCH 10/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- yasm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yasm.spec b/yasm.spec index d118757..a7b884f 100644 --- a/yasm.spec +++ b/yasm.spec @@ -6,7 +6,7 @@ Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 3%{?dist} +Release: 4%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -104,6 +104,9 @@ make check %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.3.0^20250625git121ab15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Aug 07 2025 Dominik Mierzejewski - 1.3.0^20250625git121ab15-3 - mark as deprecated, see https://fedoraproject.org/wiki/Changes/DeprecateYASM From c40a92166ab620cd539f5f8e95bd7644567979be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:33:29 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- yasm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yasm.spec b/yasm.spec index a7b884f..4f606c3 100644 --- a/yasm.spec +++ b/yasm.spec @@ -6,7 +6,7 @@ Summary: Modular Assembler Name: yasm Version: 1.3.0^%{date}git%{shortcommit} -Release: 4%{?dist} +Release: 5%{?dist} # See COPYING for the detail, there is quite a lot! # Bitvect is (GPL-1.0-or-later AND GPL-2.0-or-later OR Artistic-1.0-Perl OR LGPL-2.0-or-later # Everything else is BSD. Either 2 or 3 clause. @@ -104,6 +104,9 @@ make check %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.3.0^20250625git121ab15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.3.0^20250625git121ab15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 6436ea0d411936b71257c663949115539078433f Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 21 Jul 2026 07:07:01 +0200 Subject: [PATCH 12/12] Remove stale 'xmlto' BuildRequires Man pages are pre-built in the upstream tarball. This is a deprecated package with no active upstream development; the pre-built fallback has always been used. Related: rhbz#2503124 Co-Authored-By: Claude AI --- yasm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/yasm.spec b/yasm.spec index 4f606c3..d5c9461 100644 --- a/yasm.spec +++ b/yasm.spec @@ -31,7 +31,6 @@ BuildRequires: gcc BuildRequires: bison BuildRequires: byacc BuildRequires: gettext-devel -BuildRequires: xmlto Provides: bundled(md5-plumb) Provides: deprecated()