From 63e7d808a88fa51a8efd1c157c9bf85b973611ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:01:12 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 2785eff..75c2895 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -336,6 +336,9 @@ fi %changelog +* 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 From 9ed1b23454408e7cf7419af935aa6e2eaac87b8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:46:25 +0000 Subject: [PATCH 02/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 75c2895..53a2607 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -336,6 +336,9 @@ fi %changelog +* 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 From 0b3c8103add781e649830d0becfbb6da738c52b2 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 3 Jan 2023 17:48:47 +0100 Subject: [PATCH 03/15] Apply upstream patch to fix C99 compatibility issue Related to: --- crossfire-c99.patch | 27 +++++++++++++++++++++++++++ crossfire.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 crossfire-c99.patch 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 53a2607..a8f0bf9 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -29,6 +29,7 @@ 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 @@ -107,6 +108,7 @@ logwatch scripts for the Crossfire game server #%%patch0 -p0 #%patch1 -p0 %patch2 -p0 +%patch3 -p1 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux @@ -336,6 +338,9 @@ fi %changelog +* 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 From 12ba86dd269705133504b397c12c3338957c651a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:41:50 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index a8f0bf9..2b42809 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -338,6 +338,9 @@ fi %changelog +* 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 From 6c7501633d31db98da50f7489747b9f8580acb2b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 15:14:01 -0600 Subject: [PATCH 05/15] SPDX license --- crossfire.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 2b42809..002992b 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,10 +9,10 @@ Name: crossfire Version: 1.71.0 -Release: 24%{?dist} +Release: 25%{?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 @@ -338,6 +338,9 @@ fi %changelog +* 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 From 07c26b71f8c3c317895570d23fd7690e9b2ae083 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:37:15 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 002992b..9cdf55c 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* 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 From b9675ea1af26fb64e67cd7c58eff5557e1ceb575 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:23:24 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 9cdf55c..97462cb 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* 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 From 4a98270256078811bb73247ce190c03e5e7e9f3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:28:21 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 97462cb..48c5076 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* 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 From 3bec5e2cb9d71ae392d875d152f29828023d9ab8 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 09/15] Eliminate use of obsolete %patchN syntax (#2283636) --- crossfire.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 48c5076..260410f 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -107,8 +107,8 @@ logwatch scripts for the Crossfire game server %setup -q -a 1 -n crossfire-server-%{version} #%%patch0 -p0 #%patch1 -p0 -%patch2 -p0 -%patch3 -p1 +%patch -P2 -p0 +%patch -P3 -p1 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux From ed7becff832bbbf12c0168e345df8ddc2e886514 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:13:35 +0000 Subject: [PATCH 10/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 260410f..eb7368a 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* 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 From 5585ff381fc2110cb59acf51b2e3690064f1edee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:54:02 +0000 Subject: [PATCH 11/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index eb7368a..29e02c0 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* 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 From 3e9ef0ea5fb409740a9ac799a8c9fa4ea4ee9648 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 30 Jan 2025 14:44:37 -0600 Subject: [PATCH 12/15] Fix FTBFS --- crossfire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 29e02c0..b9b4921 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -131,7 +131,7 @@ sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@ %configure --localstatedir=%{_var}/games --disable-static #make %%{?_smp_mflags} # parallel build is broken -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS -std=gnu17" # Build the selinux policy file pushd SELinux From adfe7d1822de9cc4dd161ff35bc93da647cabffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:53:33 +0100 Subject: [PATCH 13/15] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- crossfire.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index b9b4921..2a6e4d1 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -41,6 +41,7 @@ BuildRequires: python3-devel BuildRequires: autoconf flex BuildRequires: systemd-rpm-macros BuildRequires: make +BuildRequires: libxcrypt-devel Requires: %{name}-plugins Requires(post): systemd @@ -338,6 +339,9 @@ fi %changelog +* 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 From a73499003bb6a305766696d6f4ba7726c886f329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:22 +0100 Subject: [PATCH 14/15] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- crossfire.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 2a6e4d1..4bd6c31 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -125,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 @@ -313,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 @@ -339,6 +341,9 @@ fi %changelog +* 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 From 22039e4d238b7fb223b00fe56ac0c2ddc14c6adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:50:54 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 4bd6c31..4df5165 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -341,6 +341,9 @@ 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