From fefe42487bdacfd1eb77cfde64623318b33525f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:56:29 +0000 Subject: [PATCH 01/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From cdd57886d260efa8bcc72a3428d9b13a1f3b48a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:53:48 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 210e300..d8b60db 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 65%{?dist} +Release: 66%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -216,6 +216,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.17-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.17-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 096228f7299d10aa92cf8dcd99e760b2c6bbb822 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:37:24 +0000 Subject: [PATCH 03/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index d8b60db..0cbff07 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 66%{?dist} +Release: 67%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -216,6 +216,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.17-67 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.17-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a39266c6c907cd6cf8939fb015b4d430cc2882c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:17:00 +0000 Subject: [PATCH 04/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 0cbff07..384a82a 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 67%{?dist} +Release: 68%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -216,6 +216,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.17-68 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.17-67 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bcd104e17374b3b325ca95cd2b035c902cbf633a Mon Sep 17 00:00:00 2001 From: Jeff Makey Date: Sun, 27 Nov 2022 11:06:09 -0800 Subject: [PATCH 05/20] Add rpmlintrc file to suppress spurious warning about configure command. --- bsd-games.rpmlintrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bsd-games.rpmlintrc diff --git a/bsd-games.rpmlintrc b/bsd-games.rpmlintrc new file mode 100644 index 0000000..fe8cc39 --- /dev/null +++ b/bsd-games.rpmlintrc @@ -0,0 +1,3 @@ +# The bsd-games configure script wasn't generated by +# autoconf and doesn't accept the --libdir parameter. +addFilter('configure-without-libdir-spec') From 6ea095a6cba95fb836ed5c140c4f8e145627b2a8 Mon Sep 17 00:00:00 2001 From: Jeff Makey Date: Sun, 27 Nov 2022 11:13:54 -0800 Subject: [PATCH 06/20] Use printw() format string in canfield to satisfy -Werror=format-security. --- bsd-games-2.17-printw.patch | 20 ++++++++++++++++++++ bsd-games.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 bsd-games-2.17-printw.patch diff --git a/bsd-games-2.17-printw.patch b/bsd-games-2.17-printw.patch new file mode 100644 index 0000000..b73b166 --- /dev/null +++ b/bsd-games-2.17-printw.patch @@ -0,0 +1,20 @@ +--- bsd-games-2.17/canfield/canfield/canfield.c.orig 2004-12-07 05:34:21.000000000 -0800 ++++ bsd-games-2.17/canfield/canfield/canfield.c 2022-11-27 10:08:16.000000000 -0800 +@@ -1647,7 +1647,7 @@ + return; + clear(); + for (cp = basicinstructions; *cp != 0; cp++) +- printw(*cp); ++ printw("%s", *cp); + refresh(); + getch(); + clear(); +@@ -1660,7 +1660,7 @@ + return; + clear(); + for (cp = bettinginstructions; *cp != 0; cp++) +- printw(*cp); ++ printw("%s", *cp); + refresh(); + getch(); + } diff --git a/bsd-games.spec b/bsd-games.spec index 384a82a..1643e05 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 68%{?dist} +Release: 69%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -40,6 +40,7 @@ Patch20: bsd-games-2.17-backgammonrecursion.patch Patch21: bsd-games-2.17-huntversion.patch Patch22: bsd-games-2.17-getrandom.patch Patch23: bsd-games-2.17-printf.patch +Patch24: bsd-games-2.17-printw.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make @@ -89,6 +90,7 @@ popd %patch21 -p1 -b .huntversion %patch22 -p1 -b .getrandom %patch23 -p1 -b .printf +%patch24 -p1 -b .printw %build # We include a templatized configuration settings file to set @@ -216,6 +218,10 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Sun Nov 27 2022 Jeff Makey - 2.17-69 +- Add rpmlintrc file to suppress spurious warning. +- Use printw() format string where needed to satisfy -Werror=format-security. + * Wed Jul 20 2022 Fedora Release Engineering - 2.17-68 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 54d908e7773447e4adb9d8967fc9571c78f1906b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:11:17 +0000 Subject: [PATCH 07/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 1643e05..813b3dd 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 69%{?dist} +Release: 70%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -218,6 +218,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.17-70 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Nov 27 2022 Jeff Makey - 2.17-69 - Add rpmlintrc file to suppress spurious warning. - Use printw() format string where needed to satisfy -Werror=format-security. From a47217583a195de678ceea150320acf3d66ff5dc Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 5 Feb 2023 18:02:11 +0100 Subject: [PATCH 08/20] Fix C99 compatibility issue in hunt (#2152550) Related to: --- bsd-games-c99.patch | 18 ++++++++++++++++++ bsd-games.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 bsd-games-c99.patch diff --git a/bsd-games-c99.patch b/bsd-games-c99.patch new file mode 100644 index 0000000..77d0f49 --- /dev/null +++ b/bsd-games-c99.patch @@ -0,0 +1,18 @@ +The sigpause function in glibc is the XPG version, not the BSD +version. But the signal mask is set by the immediately following +sigsetmask function anyway, so remove the sigpause function call. + +This avoids an implicit function declaration and build failures with +future compilers. + +diff -ur bsd-games-2.17.orig/hunt/hunt/otto.c bsd-games-2.17/hunt/hunt/otto.c +--- bsd-games-2.17.orig/hunt/hunt/otto.c 2004-12-07 14:34:21.000000000 +0100 ++++ bsd-games-2.17/hunt/hunt/otto.c 2023-02-05 17:58:11.266200099 +0100 +@@ -178,7 +178,6 @@ + (void) signal(SIGALRM, nothing); + old_mask = sigblock(sigmask(SIGALRM)); + setitimer(ITIMER_REAL, &pause_time, NULL); +- sigpause(old_mask); + sigsetmask(old_mask); + + /* save away parameters so other functions may use/update info */ diff --git a/bsd-games.spec b/bsd-games.spec index 813b3dd..9a7a7bf 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 70%{?dist} +Release: 71%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -41,6 +41,7 @@ Patch21: bsd-games-2.17-huntversion.patch Patch22: bsd-games-2.17-getrandom.patch Patch23: bsd-games-2.17-printf.patch Patch24: bsd-games-2.17-printw.patch +Patch25: bsd-games-c99.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make @@ -91,6 +92,7 @@ popd %patch22 -p1 -b .getrandom %patch23 -p1 -b .printf %patch24 -p1 -b .printw +%patch25 -p1 -b .c99 %build # We include a templatized configuration settings file to set @@ -218,6 +220,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Sun Feb 05 2023 Florian Weimer - 2.17-71 +- Fix C99 compatibility issue in hunt (#2152550) + * Wed Jan 18 2023 Fedora Release Engineering - 2.17-70 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ca219007c44a138b5385fa76e308c879925ae9ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:57:02 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 9a7a7bf..a1ddebc 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 71%{?dist} +Release: 72%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -220,6 +220,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.17-72 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Feb 05 2023 Florian Weimer - 2.17-71 - Fix C99 compatibility issue in hunt (#2152550) From 7db91aa1d8f62b2eb366da00093cfa87c84a2cd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:43:37 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index a1ddebc..958e8d4 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 72%{?dist} +Release: 73%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -220,6 +220,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.17-73 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.17-72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9324b9139337feeee53297328a529fe1dcee9c81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:50:23 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 958e8d4..0940961 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 73%{?dist} +Release: 74%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -220,6 +220,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 2.17-74 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.17-73 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b58f990bfda752db579619f3c85888a9b16d7bd6 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 12/20] Eliminate use of obsolete %patchN syntax (#2283636) --- bsd-games.spec | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/bsd-games.spec b/bsd-games.spec index 0940961..5e90357 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -66,33 +66,33 @@ bsd-fbg, trek, worm, worms and wump. %prep %setup -q -a2 install -p -m 755 %{SOURCE1} . -%patch0 -p1 -b .debian -%patch1 -p1 -b .ospeed -%patch2 -p1 -b .getline -%patch3 -p1 -b .utmpstruct -%patch4 -p1 -b .setresgid -%patch5 -p1 -b .tetrisgid -%patch6 -p1 -b .hackgid -%patch7 -p1 -b .phantasiagid -%patch8 -p1 -b .monop.rename -%patch9 -p0 -b .banner.rename -%patch10 -p0 -b .cplusplus -%patch11 -p0 -b .nolibtermcap -%patch12 -p0 -b .tetris.rename -%patch13 -p1 -b .gcc43 -%patch14 -p0 -b .wordlimit -%patch16 -p0 -b .backgammonsize -%patch17 -p0 -b .adventurecrc +%patch -P0 -p1 -b .debian +%patch -P1 -p1 -b .ospeed +%patch -P2 -p1 -b .getline +%patch -P3 -p1 -b .utmpstruct +%patch -P4 -p1 -b .setresgid +%patch -P5 -p1 -b .tetrisgid +%patch -P6 -p1 -b .hackgid +%patch -P7 -p1 -b .phantasiagid +%patch -P8 -p1 -b .monop.rename +%patch -P9 -p0 -b .banner.rename +%patch -P10 -p0 -b .cplusplus +%patch -P11 -p0 -b .nolibtermcap +%patch -P12 -p0 -b .tetris.rename +%patch -P13 -p1 -b .gcc43 +%patch -P14 -p0 -b .wordlimit +%patch -P16 -p0 -b .backgammonsize +%patch -P17 -p0 -b .adventurecrc pushd wtf-%{wtf_ver} -%patch18 -p1 -b .wtfrpm +%patch -P18 -p1 -b .wtfrpm popd -%patch19 -p0 -b .adventureinit -%patch20 -p1 -b .backgammonrecursion -%patch21 -p1 -b .huntversion -%patch22 -p1 -b .getrandom -%patch23 -p1 -b .printf -%patch24 -p1 -b .printw -%patch25 -p1 -b .c99 +%patch -P19 -p0 -b .adventureinit +%patch -P20 -p1 -b .backgammonrecursion +%patch -P21 -p1 -b .huntversion +%patch -P22 -p1 -b .getrandom +%patch -P23 -p1 -b .printf +%patch -P24 -p1 -b .printw +%patch -P25 -p1 -b .c99 %build # We include a templatized configuration settings file to set From 6eed09300b3fc007ab2a60143e694166c7d70d14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:37:39 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 5e90357..116a965 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 74%{?dist} +Release: 75%{?dist} License: BSD and BSD with advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz @@ -220,6 +220,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.17-75 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 23 2024 Fedora Release Engineering - 2.17-74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1151b906fcbc9286375ffde8f50089a3881cb82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 08:18:11 +0200 Subject: [PATCH 14/20] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- bsd-games.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bsd-games.spec b/bsd-games.spec index 116a965..8d6f1d9 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,8 +6,9 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 75%{?dist} -License: BSD and BSD with advertising +Release: 76%{?dist} +# Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. +License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz Source1: config.params @@ -220,6 +221,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Aug 28 2024 Miroslav Suchý - 2.17-76 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.17-75 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5bb51ed7097ef236371315ebca3627ac850f8862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 23 Sep 2024 23:10:18 +0100 Subject: [PATCH 15/20] (#2254221) add atc.patch Update wtf to wtf-20230906 --- .gitignore | 1 + atc.patch | 37 +++++++++++++++++++++++++++++++++++++ bsd-games.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 atc.patch diff --git a/.gitignore b/.gitignore index b6fc803..a7ef512 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /bsd-games-2.17.tar.gz /wtf-20170512.tar.gz /wtf-20200829.tar.gz +/wtf-20230906.tar.gz diff --git a/atc.patch b/atc.patch new file mode 100644 index 0000000..dcfb0af --- /dev/null +++ b/atc.patch @@ -0,0 +1,37 @@ +--- bsd-games-2.17/atc/input.c- 2023-10-17 20:06:14.984621967 -0700 ++++ bsd-games-2.17/atc/input.c 2023-10-17 20:08:04.310531159 -0700 +@@ -57,6 +57,7 @@ + #define MAXDEPTH 15 + + #define RETTOKEN '\n' ++#define SPTOKEN ' ' + #define REDRAWTOKEN '\014' /* CTRL(L) */ + #define SHELLTOKEN '!' + #define HELPTOKEN '?' +@@ -96,6 +97,7 @@ + + RULE state0[] = { { ALPHATOKEN, 1, "%c:", setplane}, + { RETTOKEN, -1, "", NULL }, ++ { SPTOKEN, -1, "", NULL }, + { HELPTOKEN, 12, " [a-z]", NULL }}, + state1[] = { { 't', 2, " turn", turn }, + { 'a', 3, " altitude:", NULL }, +@@ -127,6 +129,7 @@ + state4[] = { { '@', 9, " at", NULL }, + { 'a', 9, " at", NULL }, + { RETTOKEN, -1, "", NULL }, ++ { SPTOKEN, -1, "", NULL }, + { HELPTOKEN, 12, " @a", NULL }}, + state5[] = { { NUMTOKEN, 7, "%c", delayb }, + { HELPTOKEN, 12, " [0-9]", NULL }}, +@@ -141,8 +144,10 @@ + { 'a', 4, " 270", rel_dir }, + { 'q', 4, " 315", rel_dir }, + { RETTOKEN, -1, "", NULL }, ++ { SPTOKEN, -1, "", NULL }, + { HELPTOKEN, 12, " @a",NULL }}, + state7[] = { { RETTOKEN, -1, "", NULL }, ++ { SPTOKEN, -1, "", NULL }, + { HELPTOKEN, 12, " ", NULL }}, + state8[] = { { NUMTOKEN, 4, "%c", benum }, + { HELPTOKEN, 12, " [0-9]", NULL }}, diff --git a/bsd-games.spec b/bsd-games.spec index 8d6f1d9..e4ac3bf 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -1,12 +1,12 @@ # Ick! This is only a temporary hack until I have more time # to rebase the affected patches (#4, and possibly more) -%global wtf_ver 20200829 +%global wtf_ver 20230906 Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 76%{?dist} +Release: 77%{?dist} # Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -43,6 +43,8 @@ Patch22: bsd-games-2.17-getrandom.patch Patch23: bsd-games-2.17-printf.patch Patch24: bsd-games-2.17-printw.patch Patch25: bsd-games-c99.patch +Patch26: atc.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make @@ -94,6 +96,7 @@ popd %patch -P23 -p1 -b .printf %patch -P24 -p1 -b .printw %patch -P25 -p1 -b .c99 +%patch -P26 -p1 -b .atc %build # We include a templatized configuration settings file to set @@ -221,6 +224,10 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon Sep 23 2024 Sérgio Basto - 2.17-77 +- (#2254221) add atc.patch +- Update wtf to wtf-20230906 + * Wed Aug 28 2024 Miroslav Suchý - 2.17-76 - convert license to SPDX diff --git a/sources b/sources index 81597ce..d9e70d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (bsd-games-2.17.tar.gz) = cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f -SHA512 (wtf-20200829.tar.gz) = ed8955fa15cefb74d367a1dc6d352877b2ed6ed117271e072afdefdfd2f0021de000030028ff2f13e8b1e5e038d69ace69f4fe4aa30fbbe0a63dda7078be9870 +SHA512 (wtf-20230906.tar.gz) = 7cb6cfc9c0c111b8f9ecff4e893910bc630cb9bb8862ac43ecb55d76c6f34c26fa48a26dd9354abde15900f8c9a042f3583988e07f60c0607268dbb9bd61970e From 87c119ccb364bb58e0d295f5067699d28c9552be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 24 Sep 2024 14:19:15 +0100 Subject: [PATCH 16/20] Only show offensive acronyms with usage: wtf [-o] [-f dbfile] [is] term ... --- bsd-games.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bsd-games.spec b/bsd-games.spec index e4ac3bf..d246c5e 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 77%{?dist} +Release: 78%{?dist} # Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -149,6 +149,7 @@ install -p -m 0755 wtf $RPM_BUILD_ROOT%{_bindir}/ gzip wtf.6 install -p -m 0644 wtf.6.gz $RPM_BUILD_ROOT%{_mandir}/man6/ install -p -m 0644 acronyms* $RPM_BUILD_ROOT%{_datadir}/misc/ +mv $RPM_BUILD_ROOT%{_datadir}/misc/acronyms-o.real $RPM_BUILD_ROOT%{_datadir}/misc/acronyms-o popd %pre @@ -202,7 +203,7 @@ exit 0 %{_bindir}/wump %{_datadir}/%{name} %{_datadir}/misc/acronyms -%{_datadir}/misc/acronyms-o.real +%{_datadir}/misc/acronyms-o %{_datadir}/misc/acronyms.comp %{_datadir}/misc/acronyms-o.fake %{_mandir}/man6/* @@ -224,6 +225,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Tue Sep 24 2024 Sérgio Basto - 2.17-78 +- Only show offensive acronyms with usage: wtf [-o] [-f dbfile] [is] term ... + * Mon Sep 23 2024 Sérgio Basto - 2.17-77 - (#2254221) add atc.patch - Update wtf to wtf-20230906 From 590bddacc010fb6450db0364936a5b42a3033e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 27 Nov 2024 23:27:45 +0000 Subject: [PATCH 17/20] Add boggle_fread_chk.patch --- boggle_fread_chk.patch | 11 +++++++++++ bsd-games.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 boggle_fread_chk.patch diff --git a/boggle_fread_chk.patch b/boggle_fread_chk.patch new file mode 100644 index 0000000..60a7ee8 --- /dev/null +++ b/boggle_fread_chk.patch @@ -0,0 +1,11 @@ +--- bsd-games-2.17/boggle/boggle/word.c.orig 2024-11-27 23:17:50.170707535 +0000 ++++ bsd-games-2.17/boggle/boggle/word.c 2024-11-27 23:22:28.601210911 +0000 +@@ -165,7 +165,7 @@ loaddict(fp) + + p = dictspace; + st = -1; +- while (n > 0 && (st = fread(p, 1, BUFSIZ, fp)) > 0) { ++ while (n > 0 && (st = fread(p, 1, n > st ? BUFSIZ : n, fp)) > 0) { + p += st; + n -= st; + } diff --git a/bsd-games.spec b/bsd-games.spec index d246c5e..47e534b 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 78%{?dist} +Release: 79%{?dist} # Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -44,8 +44,8 @@ Patch23: bsd-games-2.17-printf.patch Patch24: bsd-games-2.17-printw.patch Patch25: bsd-games-c99.patch Patch26: atc.patch +Patch27: boggle_fread_chk.patch -BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make BuildRequires: ncurses-devel @@ -97,6 +97,7 @@ popd %patch -P24 -p1 -b .printw %patch -P25 -p1 -b .c99 %patch -P26 -p1 -b .atc +%patch -P27 -p1 -b .fread_chk %build # We include a templatized configuration settings file to set @@ -225,6 +226,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed Nov 27 2024 Sérgio Basto - 2.17-79 +- Add boggle_fread_chk.patch + * Tue Sep 24 2024 Sérgio Basto - 2.17-78 - Only show offensive acronyms with usage: wtf [-o] [-f dbfile] [is] term ... From 45ae1dd827243731a7b047aef4aae94afb06aecd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:54:24 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 47e534b..2a5f56a 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 79%{?dist} +Release: 80%{?dist} # Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -226,6 +226,9 @@ exit 0 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.17-80 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Nov 27 2024 Sérgio Basto - 2.17-79 - Add boggle_fread_chk.patch From b8c9baac4a6d96e0294a7a5fc62ababd95a47db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 17:23:36 +0100 Subject: [PATCH 19/20] Add sysusers.d config file to allow rpm to create users/groups automatically --- bsd-games.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bsd-games.spec b/bsd-games.spec index 2a5f56a..8f60146 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 80%{?dist} +Release: 81%{?dist} # Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -57,7 +57,6 @@ BuildRequires: libfl-static BuildRequires: flex-devel %endif BuildRequires: bison -Requires(pre): shadow-utils %description Bsd-games includes adventure, arithmetic, atc, backgammon, battlestar, @@ -99,6 +98,13 @@ popd %patch -P26 -p1 -b .atc %patch -P27 -p1 -b .fread_chk +# Create a sysusers.d config file +cat >bsd-games.sysusers.conf </dev/null || groupadd -r $group -done -exit 0 +install -m0644 -D bsd-games.sysusers.conf %{buildroot}%{_sysusersdir}/bsd-games.conf %files %{_bindir}/adventure @@ -224,8 +226,12 @@ exit 0 %config(noreplace) %attr(664,root,games) %{_var}/games/snakerawscores %config(noreplace) %attr(664,root,games) %{_var}/games/bsd-fbg.scores %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me +%{_sysusersdir}/bsd-games.conf %changelog +* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 2.17-81 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 16 2025 Fedora Release Engineering - 2.17-80 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a6da96cc00ed74a2dd139222f35ba3ac7774122d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:53:54 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- bsd-games.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsd-games.spec b/bsd-games.spec index 8f60146..df28236 100644 --- a/bsd-games.spec +++ b/bsd-games.spec @@ -6,7 +6,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 81%{?dist} +Release: 82%{?dist} # Automatically converted from old format: BSD and BSD with advertising - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-BSD-with-advertising URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -229,6 +229,9 @@ install -m0644 -D bsd-games.sysusers.conf %{buildroot}%{_sysusersdir}/bsd-games. %{_sysusersdir}/bsd-games.conf %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.17-82 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 2.17-81 - Add sysusers.d config file to allow rpm to create users/groups automatically