Merge branch 'rawhide' into f37

.gitignore

@@ -85,30 +85,3 @@ wesnoth-1.8.4.tar.bz2
 /wesnoth-1.17.20.tar.bz2
 /wesnoth-1.17.21.tar.bz2
 /wesnoth-1.17.22.tar.bz2
-/wesnoth-1.17.23.tar.bz2
-/wesnoth-1.17.24.tar.bz2
-/wesnoth-1.17.25.tar.bz2
-/wesnoth-1.17.26.tar.bz2
-/wesnoth-1.18.0.tar.bz2
-/wesnoth-1.18.2.tar.bz2
-/wesnoth-1.19.3.tar.bz2
-/wesnoth-1.19.4.tar.bz2
-/wesnoth-1.19.5.tar.bz2
-/wesnoth-1.19.6.tar.bz2
-/wesnoth-1.19.7.tar.bz2
-/wesnoth-1.19.8.tar.bz2
-/wesnoth-1.19.9.tar.bz2
-/wesnoth-1.19.10.tar.bz2
-/wesnoth-1.19.11.tar.bz2
-/wesnoth-1.19.12.tar.bz2
-/wesnoth-1.19.13.tar.bz2
-/wesnoth-1.19.14.tar.bz2
-/wesnoth-1.19.15.tar.bz2
-/wesnoth-1.19.16.tar.bz2
-/wesnoth-1.19.17.tar.bz2
-/wesnoth-1.19.19.tar.bz2
-/wesnoth-1.19.20.tar.bz2
-/wesnoth-1.19.21.tar.bz2
-/wesnoth-1.19.22.tar.bz2
-/wesnoth-1.19.23.tar.bz2
-/wesnoth-1.19.24.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (wesnoth-1.19.24.tar.bz2) = c82b65d8ae74156bdf8fbb4ab7bcb7ffda0688d7d4cb5d12177a31f297a116288aae8cdc03abff0de80a1099561019ce44ff33d7f0f75953c23d12da74a7d6fb
+SHA512 (wesnoth-1.17.22.tar.bz2) = 386ebc35c16b4f268e0bf4a2ab95f0e558b88c59c72e3714a2716dbd3edaca5f006ed1b5d3663739001c5572fd2d7e8ab7ac70572adaa00c55db5173e7c26a56

wesnoth.spec

@@ -1,6 +1,8 @@
+%global _hardened_build 1
+
 Name:           wesnoth
-Version:        1.19.24
-Release:        5%{?dist}
+Version:        1.17.22
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 License:        GPL-2.0-or-later
@@ -54,6 +56,7 @@ friends--or strangers--and fight multi-player epic fantasy battles.
 %package server
 Summary:        %{summary}
 Requires:       %{name} = %{version}-%{release}
+Requires(pre):  /usr/sbin/useradd
 
 %description server
 This package contains the binaries for running a Wesnoth server
@@ -82,12 +85,6 @@ This package contains the data files for Wesnoth.
 %prep
 %autosetup -p0
 
-# Create a sysusers.d config file.
-# Upstream provides a file that we don't like.
-cat >wesnoth-server.sysusers.conf <<EOF
-u wesnothd - 'Wesnoth server' /run/wesnothd -
-EOF
-
 %build
 scons wesnoth wesnothd campaignd prefix=%{_prefix} \
           bindir=%{_bindir} \
@@ -99,24 +96,20 @@ scons wesnoth wesnothd campaignd prefix=%{_prefix} \
           extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \
           luadir=%{_includedir} \
           fifodir=/run/wesnothd \
-          systemd=True \
           %{?_smp_mflags}
 
 %install
 scons install install-pytools destdir=$RPM_BUILD_ROOT
 
 #Workaround for BZ 1981728
-sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf
-
-#Correct user/group
-sed -i "s/_wesnoth/wesnothd/g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf
+sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf
 
 %if 0%{?flatpak}
 # Fix install paths for flatpak builds where systemd prefix differs from wesnoth prefix
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 mv $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system/wesnothd.service $RPM_BUILD_ROOT%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
-mv $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf $RPM_BUILD_ROOT%{_tmpfilesdir}
+mv $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf $RPM_BUILD_ROOT%{_tmpfilesdir}
 %endif
 
 # extra files we provide
@@ -127,12 +120,10 @@ install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
 mkdir -p ${RPM_BUILD_ROOT}/run/wesnothd/
 touch ${RPM_BUILD_ROOT}/run/wesnothd/socket
 
-%if "%{_sbindir}" != "%{_bindir}"
 # move server stuff into sbindir
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 mv $RPM_BUILD_ROOT/%{_bindir}/wesnothd $RPM_BUILD_ROOT/%{_sbindir}
 mv $RPM_BUILD_ROOT/%{_bindir}/campaignd $RPM_BUILD_ROOT/%{_sbindir}
-%endif
 
 # Wesnoth ships its own fonts, replace with Fedora packaged versions
 for f in dejavu-sans-fonts/DejaVuSans-Bold.ttf dejavu-sans-mono-fonts/DejaVuSansMono-Bold.ttf dejavu-sans-mono-fonts/DejaVuSansMono.ttf dejavu-sans-fonts/DejaVuSans-Oblique.ttf dejavu-sans-fonts/DejaVuSans.ttf ; do
@@ -143,7 +134,9 @@ done
 # language stuff
 %find_lang %{name} LANGFILES --with-man
 
-install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesnoth-server.conf
+%pre server
+/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
+          -r -d /run/wesnothd wesnothd 2> /dev/null || :
 
 
 %post server
@@ -176,9 +169,7 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno
 %attr(0700,wesnothd,wesnothd) %dir /run/wesnothd/
 %ghost /run/wesnothd/socket
 %{_unitdir}/wesnothd.service
-%{_tmpfilesdir}/wesnothd.tmpfiles.conf
-%exclude %{_prefix}/lib/sysusers.d/wesnothd.sysusers.conf
-%{_sysusersdir}/wesnoth-server.conf
+%{_tmpfilesdir}/wesnothd.conf
 
 %files data -f LANGFILES
 %{_datadir}/applications/org.wesnoth.Wesnoth.desktop
@@ -190,135 +181,6 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno
 %{_mandir}/*/man6/wesnoth*.6*
 
 %changelog
-* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.19.24-5
-- Rebuilt for Python 3.15.0b4 ABI change
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.24-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.19.24-3
-- Rebuilt for openssl 4.0
-
-* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 1.19.24-2
-- Rebuilt for Python 3.15
-
-* Thu May 21 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.24-1
-- 1.19.24
-
-* Thu Apr 23 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.23-1
-- 1.19.23
-
-* Tue Mar 24 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.22-1
-- 1.19.22
-
-* Thu Feb 26 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.21-1
-- 1.19.21
-
-* Wed Jan 21 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.20-1
-- 1.19.20
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.19-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Thu Jan 15 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.19-2
-- Patch for Boost 1.90.0
-
-* Fri Jan 02 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.19-1
-- 1.19.19
-
-* Tue Oct 21 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.17-1
-- 1.19.17
-
-* Mon Sep 22 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.16-1
-- 1.19.16
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.19.15-2
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Tue Aug 19 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.15-1
-- 1.19.15
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.19.14-3
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 21 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.14-1
-- 1.19.14
-
-* Mon Jun 16 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.13-1
-- 1.19.13
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1.19.12-2
-- Rebuilt for Python 3.14
-
-* Wed May 21 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.12-1
-- 1.19.12
-
-* Tue May 06 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.11-1
-- 1.19.11
-
-* Mon Mar 17 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.10-1
-- 1.19.10
-
-* Mon Mar 10 2025 Zbigniew Jędrzejewski-Szmek  <zbyszek@in.waw.pl> - 1.19.9-2
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Tue Feb 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.9-1
-- 1.19.9
-
-* Thu Jan 23 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.8-1
-- 1.19.8
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Dec 19 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.7-1
-- 1.19.7
-
-* Tue Nov 26 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.6-1
-- 1.19.6
-
-* Wed Oct 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.5-1
-- 1.19.5
-
-* Mon Sep 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.4-1
-- 1.19.4
-
-* Fri Aug 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.3-1
-- 1.19.3
-
-* Wed Jul 31 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.18.2-1
-- 1.18.2
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.18.0-3
-- Rebuilt for the bin-sbin merge
-
-* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1.18.0-2
-- Rebuilt for Python 3.13
-
-* Mon Mar 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.18.0-1
-- 1.18.0
-
-* Wed Feb 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.17.26-1
-- 1.17.26
-
-* Mon Jan 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.17.25-1
-- 1.17.25
-
-* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 1.17.24-2
-- Rebuilt for Boost 1.83
-
-* Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.24-1
-- 1.17.24
-
-* Tue Nov 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.23-1
-- 1.17.23
-
 * Wed Oct 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.22-1
 - 1.17.22
 
@@ -355,6 +217,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno
 * Mon Apr 17 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.15-1
 - 1.17.15
 
+* Thu Mar 30 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.14-2
+- Boost rebuild.
+
 * Mon Mar 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.14-1
 - 1.17.14