diff --git a/crossfire-c99.patch b/crossfire-c99.patch new file mode 100644 index 0000000..2978abd --- /dev/null +++ b/crossfire-c99.patch @@ -0,0 +1,27 @@ +Declare make_perma_dead and unmake_perma_dead in a shared header file, +so that they can be called from server/resurrection.c without an +implicit function declaration. This improves compatibility with +future compilers. + +Fixed upstream via: + +commit 0980e69c30ce0b04cc33d24daa9917c2ee9be665 +Author: partmedia +Date: Sun Apr 13 17:27:41 2014 +0000 + + Add missing prototypes for permadeath functions. + + git-svn-id: svn://svn.code.sf.net/p/crossfire/code/server/trunk@19336 282e97 +7c-c81d-0410-88c4-b93c2d0d6712 + +diff -ur crossfire-server-1.71.0.orig/include/account_char.h crossfire-server-1.71.0/include/account_char.h +--- crossfire-server-1.71.0.orig/include/account_char.h 2014-04-06 00:30:40.000000000 +0200 ++++ crossfire-server-1.71.0/include/account_char.h 2023-01-03 16:54:56.152855130 +0100 +@@ -36,4 +36,7 @@ + struct account_char_struct *next; + } Account_Char; + ++int make_perma_dead(object *op); ++int unmake_perma_dead(char *account, char *player); ++ + #endif /* OBJECT_H */ diff --git a/crossfire.spec b/crossfire.spec index 6373e0c..4df5165 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,10 +9,10 @@ Name: crossfire Version: 1.71.0 -Release: 15%{?dist} +Release: 33%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions -License: GPLv2+ and MIT +License: GPL-2.0-or-later and MIT URL: http://crossfire.real-time.com Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.bz2 @@ -29,15 +29,19 @@ Source10: logwatch.serviceconf.crossfire #Patch0: crossfire-1.10.0-log-login.patch #Patch1: crossfire-1.11.0-curl.patch Patch2: crossfire-1.71.0-snprintf-formatting.patch +Patch3: crossfire-c99.patch Requires: crossfire-maps BuildRequires: gcc BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel +BuildRequires: perl(FileHandle) BuildRequires: python3-devel BuildRequires: autoconf flex BuildRequires: systemd-rpm-macros +BuildRequires: make +BuildRequires: libxcrypt-devel Requires: %{name}-plugins Requires(post): systemd @@ -104,7 +108,8 @@ logwatch scripts for the Crossfire game server %setup -q -a 1 -n crossfire-server-%{version} #%%patch0 -p0 #%patch1 -p0 -%patch2 -p0 +%patch -P2 -p0 +%patch -P3 -p1 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux @@ -120,6 +125,11 @@ sed -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/ # Change the location of the tmp directory sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@" include/config.h +# Create a sysusers.d config file +cat >crossfire.sysusers.conf </dev/null || groupadd -r crossfire -getent passwd crossfire >/dev/null || \ -useradd -r -g crossfire -d %{_datadir}/%{name} -s /sbin/nologin \ - -c "Daemon account for the crossfire server" crossfire -exit 0 %post if [ $1 -eq 1 ] ; then @@ -308,6 +314,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man6/* %{_unitdir}/%{name}.service +%{_sysusersdir}/crossfire.conf %files doc %doc doc/Developers doc/playbook* doc/scripts doc/spell-docs doc/spoiler doc/spoiler-html doc/*.txt @@ -334,6 +341,60 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.71.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.71.0-32 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Sat Feb 01 2025 Björn Esser - 1.71.0-31 +- Add explicit BR: libxcrypt-devel + +* Thu Jan 16 2025 Fedora Release Engineering - 1.71.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 1.71.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 1.71.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.71.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.71.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Mar 01 2023 Gwyn Ciesla = 1.71.0-25 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 1.71.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 03 2023 Florian Weimer - 1.71.0-23 +- C99 compatibility fix + +* Wed Jul 20 2022 Fedora Release Engineering - 1.71.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.71.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.71.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.71.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.71.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 01 2020 Jitka Plesnikova - 1.71.0-17 +- Add perl(FileHandle) for build + +* Tue Jan 28 2020 Fedora Release Engineering - 1.71.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 15 2019 Gwyn Ciesla - 1.71.0-15 - Fix FTBTS