Compare commits

..

21 commits

Author SHA1 Message Date
Fedora Release Engineering
22039e4d23 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 18:50:54 +00:00
Zbigniew Jędrzejewski-Szmek
a73499003b Add sysusers.d config file to allow rpm to create users/groups automatically
See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
2025-02-11 14:36:22 +01:00
Björn Esser
adfe7d1822
Add explicit BR: libxcrypt-devel
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
2025-02-01 19:53:33 +01:00
Gwyn Ciesla
3e9ef0ea5f Fix FTBFS 2025-01-30 14:44:37 -06:00
Fedora Release Engineering
5585ff381f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 14:54:02 +00:00
Fedora Release Engineering
ed7becff83 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 20:13:35 +00:00
Software Management Team
3bec5e2cb9 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:46 +02:00
Fedora Release Engineering
4a98270256 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 08:28:21 +00:00
Fedora Release Engineering
b9675ea1af Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 16:23:24 +00:00
Fedora Release Engineering
07c26b71f8 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 16:37:15 +00:00
Gwyn Ciesla
6c7501633d SPDX license 2023-03-01 15:14:01 -06:00
Fedora Release Engineering
12ba86dd26 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 00:41:50 +00:00
Florian Weimer
0b3c8103ad Apply upstream patch to fix C99 compatibility issue
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2023-01-03 17:51:46 +01:00
Fedora Release Engineering
9ed1b23454 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 23:46:25 +00:00
Fedora Release Engineering
63e7d808a8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 00:01:12 +00:00
Fedora Release Engineering
ef385fdb8d - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 20:08:15 +00:00
Fedora Release Engineering
5386b1010e - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 02:43:29 +00:00
Tom Stellard
632c8250b5 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-17 04:02:05 +00:00
Fedora Release Engineering
0f0d6112f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 14:44:56 +00:00
Jitka Plesnikova
a3437922cc Add perl(FileHandle) for build 2020-04-01 11:46:01 +02:00
Fedora Release Engineering
cceee0d0f0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 15:01:44 +00:00
2 changed files with 98 additions and 10 deletions

27
crossfire-c99.patch Normal file
View file

@ -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 <partmedia@282e977c-c81d-0410-88c4-b93c2d0d6712>
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 */

View file

@ -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 <<EOF
u crossfire - 'Daemon account for the crossfire server' %{_datadir}/%{name} -
EOF
%build
# Change the localstatedir so that the variable data files are
# put in /var/games/crossfire instead of /var/crossfire. This is
@ -127,7 +137,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
@ -213,13 +223,9 @@ install -pD -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{logwatch_conf}/logfiles/%{name}.
install -pD -m 0755 %{SOURCE9} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{name}
install -pD -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name}.conf
install -m0644 -D crossfire.sysusers.conf %{buildroot}%{_sysusersdir}/crossfire.conf
%pre
getent group crossfire >/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 <releng@fedoraproject.org> - 1.71.0-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.71.0-32
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1.71.0-31
- Add explicit BR: libxcrypt-devel
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Mar 01 2023 Gwyn Ciesla <gwync@protonmail.com> = 1.71.0-25
- migrated to SPDX license
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 03 2023 Florian Weimer <fweimer@redhat.com> - 1.71.0-23
- C99 compatibility fix
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Apr 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.71.0-17
- Add perl(FileHandle) for build
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Aug 15 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.71.0-15
- Fix FTBTS