Compare commits

...
Sign in to create a new pull request.

16 commits

Author SHA1 Message Date
Fedora Release Engineering
c1c8085cce Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-15 20:23:52 +00:00
Miroslav Suchý
c06a31434c migrate license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2026-02-27 08:19:56 +01:00
Fedora Release Engineering
9cae3b41ff Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 08:33:46 +00:00
Fedora Release Engineering
36c9c6d8d9 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 04:36:26 +00:00
Fedora Release Engineering
a6da96cc00 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:53:54 +00:00
b8c9baac4a Add sysusers.d config file to allow rpm to create users/groups automatically 2025-01-23 17:25:09 +01:00
Fedora Release Engineering
45ae1dd827 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 12:54:24 +00:00
Sérgio M. Basto
590bddacc0 Add boggle_fread_chk.patch 2024-11-27 23:27:45 +00:00
Sérgio M. Basto
87c119ccb3 Only show offensive acronyms with usage: wtf [-o] [-f dbfile] [is] term ... 2024-09-24 14:19:15 +01:00
Sérgio M. Basto
5bb51ed709 (#2254221) add atc.patch
Update wtf to wtf-20230906
2024-09-23 23:10:18 +01:00
Miroslav Suchý
1151b906fc convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-08-28 08:18:11 +02:00
Fedora Release Engineering
6eed09300b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 18:37:39 +00:00
Software Management Team
b58f990bfd Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:46 +02:00
Fedora Release Engineering
9324b91393 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-23 00:50:23 +00:00
Fedora Release Engineering
7db91aa1d8 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 14:43:37 +00:00
Fedora Release Engineering
ca219007c4 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 14:57:02 +00:00
5 changed files with 140 additions and 37 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/bsd-games-2.17.tar.gz
/wtf-20170512.tar.gz
/wtf-20200829.tar.gz
/wtf-20230906.tar.gz

37
atc.patch Normal file
View file

@ -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]<ret>", 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<ret>", 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<dir><ret>",NULL }},
state7[] = { { RETTOKEN, -1, "", NULL },
+ { SPTOKEN, -1, "", NULL },
{ HELPTOKEN, 12, " <ret>", NULL }},
state8[] = { { NUMTOKEN, 4, "%c", benum },
{ HELPTOKEN, 12, " [0-9]", NULL }},

11
boggle_fread_chk.patch Normal file
View file

@ -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;
}

View file

@ -1,13 +1,16 @@
# 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: 71%{?dist}
License: BSD and BSD with advertising
Release: 85%{?dist}
# TODO:
# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/721
# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/722
License: BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
URL: ftp://metalab.unc.edu/pub/Linux/games/
Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz
Source1: config.params
@ -42,7 +45,9 @@ 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
Patch26: atc.patch
Patch27: boggle_fread_chk.patch
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: ncurses-devel
@ -54,7 +59,6 @@ BuildRequires: libfl-static
BuildRequires: flex-devel
%endif
BuildRequires: bison
Requires(pre): shadow-utils
%description
Bsd-games includes adventure, arithmetic, atc, backgammon, battlestar,
@ -66,33 +70,42 @@ 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
%patch -P26 -p1 -b .atc
%patch -P27 -p1 -b .fread_chk
# Create a sysusers.d config file
cat >bsd-games.sysusers.conf <<EOF
g gamehack -
g gamesail -
g gamephant -
EOF
%build
# We include a templatized configuration settings file to set
@ -145,13 +158,10 @@ 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
for group in gamehack gamesail gamephant; do
getent group $group >/dev/null || groupadd -r $group
done
exit 0
install -m0644 -D bsd-games.sysusers.conf %{buildroot}%{_sysusersdir}/bsd-games.conf
%files
%{_bindir}/adventure
@ -198,7 +208,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/*
@ -218,8 +228,52 @@ 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
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-85
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-84
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-83
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-82
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.17-81
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-80
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Nov 27 2024 Sérgio Basto <sergio@serjux.com> - 2.17-79
- Add boggle_fread_chk.patch
* Tue Sep 24 2024 Sérgio Basto <sergio@serjux.com> - 2.17-78
- Only show offensive acronyms with usage: wtf [-o] [-f dbfile] [is] term ...
* Mon Sep 23 2024 Sérgio Basto <sergio@serjux.com> - 2.17-77
- (#2254221) add atc.patch
- Update wtf to wtf-20230906
* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 2.17-76
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-75
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-74
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-73
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-72
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Feb 05 2023 Florian Weimer <fweimer@redhat.com> - 2.17-71
- Fix C99 compatibility issue in hunt (#2152550)

View file

@ -1,2 +1,2 @@
SHA512 (bsd-games-2.17.tar.gz) = cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
SHA512 (wtf-20200829.tar.gz) = ed8955fa15cefb74d367a1dc6d352877b2ed6ed117271e072afdefdfd2f0021de000030028ff2f13e8b1e5e038d69ace69f4fe4aa30fbbe0a63dda7078be9870
SHA512 (wtf-20230906.tar.gz) = 7cb6cfc9c0c111b8f9ecff4e893910bc630cb9bb8862ac43ecb55d76c6f34c26fa48a26dd9354abde15900f8c9a042f3583988e07f60c0607268dbb9bd61970e