+++ /dev/null
---- crossfire-1.9.1/acinclude.m4.wiget 2006-06-29 09:25:33.000000000 +0200
-+++ crossfire-1.9.1/acinclude.m4 2007-02-03 23:43:47.000000000 +0100
-@@ -6,7 +6,8 @@
- PY_INCLUDES=""
- dir=""
- if test "x$PYTHON_HOME" != "x"; then
-- for dir in $PYTHON_HOME/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
-+ for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
-+ dir=$PYTHON_HOME/include/python${pyver}
- AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
- if test "x$cf_have_python_h" != "x" ; then
- PY_INCLUDES="-I$dir"
-@@ -16,16 +17,21 @@
- PYTHON_SEARCH=$PYTHON
- else
- AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])
-+ PY_INCLUDES=""
- if test "x$cf_have_python_h" = "x" ; then
-- for dir in /usr{,/local}/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
-+ for ldir in "" /local ; do
-+ for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
-+ dir=/usr${ldir}/include/python${pyver}
- AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
- if test "x$cf_have_python_h" != "x" ; then
- PY_INCLUDES="-I$dir"
- break
- fi
- done
-- else
-- PY_INCLUDES=""
-+ if test "x$PY_INCLUDES" != "x" ; then
-+ break
-+ fi
-+ done
- fi
- fi
-
-@@ -61,8 +67,8 @@
- fi
-
- else
-- for lib in python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
-- AC_CHECK_LIB($lib, PyArg_ParseTuple,[PYTHON_LIB="-l$lib"])
-+ for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
-+ AC_CHECK_LIB(python$pyver, PyArg_ParseTuple,[PYTHON_LIB="-lpython$pyver"])
- if test "x$PYTHON_LIB" != "x" ; then
- break
- fi
-@@ -374,9 +380,9 @@
- EOF
- AC_MSG_CHECKING([xslt compliance of $1])
- to_run=$1
-- to_run=${to_run/\%1/configtest.xml}
-- to_run=${to_run/\%2/configtest.xsl}
-- to_run=${to_run/\%3/configtest.out}
-+ to_run="$(echo $to_run|sed -e 's/\%1/configtest.xml/')"
-+ to_run="$(echo $to_run|sed -e 's/\%2/configtest.xsl/')"
-+ to_run="$(echo $to_run|sed -e 's/\%3/configtest.out/')"
- if AC_TRY_COMMAND([$to_run]);then
- AC_MSG_RESULT([yes]);
- [$2]
---- crossfire-1.10.0/check-fragment.am.wiget 2007-02-04 00:00:02.000000000 +0100
-+++ crossfire-1.10.0/check-fragment.am 2007-02-04 00:06:01.000000000 +0100
-@@ -16,8 +16,8 @@ automenu:
- echo '<?xml version="1.0"?><menu>' > $$output_menu; \
- echo '<parentMenu>$(CHECK_PARENT_NAME)</parentMenu>' >> $$output_menu;\
- for tst in $$list; do \
-- tst="$${tst/check_/}" ; \
-- tst="$${tst/-/_}" ; \
-+ tst=$$(echo $$tst|sed -e 's/check_//') ; \
-+ tst=$$(echo $$tst|sed -e'/-/_/') ; \
- xml="$(LOGDIR)/$${tst}.xml" ;\
- if test -e "$$xml"; then \
- successCount=`grep -c 'result="success"' $$xml`;\
-@@ -39,14 +39,14 @@ logreport: automenu
- srcdir='$(top_srcdir)'; \
- xsl="$${srcdir}/test/templates/logresult.xsl" ; \
- xsltproc='$(XSLTENGINE)';\
-- xsltproc=$${xsltproc/\%2/$$xsl};\
-+ xsltproc=$$(echo $$xsltproc|sed -e "/\%2/$$xsl/");\
- xml_siteuri='$(CHECK_ROOT)' ;\
- xml_check_folder='../logs/$(CHECK_FOLDER)' ;\
- runxml='.autorun.xml';\
- if test -n "$$list"; then \
- for tst in $$list; do \
-- tst="$${tst/check_/}" ; \
-- tst="$${tst/-/_}" ; \
-+ tst=$$(echo $$tst|sed -e "s/check_//") ; \
-+ tst=$$(echo $$tst|sed -e "/-/_/") ; \
- checkFile="$${tst}.xml" ;\
- echo '<?xml version="1.0"?><config>' > $$runxml;\
- echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
-@@ -54,8 +54,8 @@ logreport: automenu
- echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
- html=$(LOGDIR)/$${tst}.html ;\
- if test -e "$(LOGDIR)/$$xml"; then \
-- torun="$${xsltproc/\%1/$$runxml}";\
-- torun="$${torun/\%3/$$html}";\
-+ torun=$$(echo $$xsltproc|sed -e "/\%1/$$runxml/");\
-+ torun=$$(echo $$torun|sed -e "s/\%3/$$html/");\
- echo "running $$torun";\
- $$torun; \
- fi; \
-@@ -65,8 +65,8 @@ logreport: automenu
- echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
- echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
- html='$(LOGDIR)/.index.html' ;\
-- torun="$${xsltproc/\%1/$$runxml}";\
-- torun="$${torun/\%3/$$html}";\
-+ torun=$$(echo $$xsltproc|sed -e "s/\%1/$$runxml/");\
-+ torun=$$(echo $$torun|sed -e "s/\%3/$$html/');\
- echo "running $$torun";\
- $$torun;
- template-copy: $(LOGDIR)
-@@ -79,7 +79,7 @@ textlog:
- @srcdir='$(top_srcdir)'; \
- xsl="$${srcdir}/test/templates/checkTextResult.xsl" ; \
- xsltproc='$(XSLTENGINE)';\
-- xsltproc="$${xsltproc/\%2/$$xsl}";\
-+ xsltproc=$$(echo $$xsltproc|sed -e "s/\%2/$$xsl/");\
- xml_siteuri='$(CHECK_ROOT)' ;\
- xml_check_folder='../logs/$(CHECK_FOLDER)' ;\
- runxml='.autorun.xml';\
-@@ -87,8 +87,8 @@ textlog:
- echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
- echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
- txt='$(LOGDIR)/testlog.txt' ;\
-- torun="$${xsltproc/\%1/$$runxml}";\
-- torun="$${torun/\%3/$$txt}";\
-+ torun=$$(echo $$xsltproc|sed -e "s/\%1/$$runxml/");\
-+ torun=$$(echo $$torun|sed -e "s/\%3/$$txt/");\
- echo "running $$torun";\
- $$torun;
-
+++ /dev/null
---- crossfire-1.9.1/utils/Makefile.am~ 2005-04-14 08:48:06.000000000 +0200
-+++ crossfire-1.9.1/utils/Makefile.am 2012-02-09 18:51:51.781707765 +0100
-@@ -1,8 +1,8 @@
-
- nodist_bin_SCRIPTS = crossloop.pl crossloop player_dl.pl
- dist_bin_SCRIPTS = crossloop.web
--nodist_pkglib_SCRIPTS =
--dist_pkglib_SCRIPTS = mktable.script add_throw.perl metaserver.pl
-+nodist_pkglibexec_SCRIPTS =
-+dist_pkglibexec_SCRIPTS = mktable.script add_throw.perl metaserver.pl
- dist_noinst_SCRIPTS = ad2c.script mktable.script player_dl.html cfmeta-rrd
-
- EXTRA_DIST =
---- crossfire-1.9.1/random_maps/Makefile.am~ 2005-04-12 08:31:52.000000000 +0200
-+++ crossfire-1.9.1/random_maps/Makefile.am 2012-02-11 00:37:18.154431672 +0100
-@@ -24,7 +24,7 @@
- # The author can be reached via e-mail to mark@pyramid.com
-
-
--pkglib_PROGRAMS = random_map
-+pkglibexec_PROGRAMS = random_map
-
- random_map_SOURCES = standalone.c
-
+++ /dev/null
---- crossfire-1.10.0/server/daemon.c.wig2 2006-05-13 08:32:14.000000000 +0200
-+++ crossfire-1.10.0/server/daemon.c 2007-02-04 14:22:56.000000000 +0100
-@@ -104,8 +104,8 @@ FILE *become_daemon (const char *filenam
- * Set up the standard file descriptors.
- */
- (void) open ("/dev/null", O_RDONLY); /* root inode already in core */
-- (void) dup2 (0, 1);
-- (void) dup2 (0, 2);
-+ (void) dup2 (fileno(logfile), 1);
-+ (void) dup2 (fileno(logfile), 2);
-
- if ((i = open ("/dev/tty", O_RDWR)) >= 0) { /* did open succeed? */
- #if (defined(SYSV) || defined(hpux)) && defined(TIOCTTY)
+++ /dev/null
---- crossfire-1.10.0/server/c_chat.c.orig 2007-03-19 07:48:12.000000000 +0100
-+++ crossfire-1.10.0/server/c_chat.c 2023-02-08 06:14:55.912346304 +0100
-@@ -178,7 +178,7 @@ static int do_tell(object* op, char* par
- pl->listening = original_listen;
-
- /* Update last_tell value [mids 01/14/2002] */
-- snprintf(pl->last_tell, sizeof(pl->last_tell), op->name);
-+ snprintf(pl->last_tell, sizeof(pl->last_tell), "%s", op->name);
-
- /* Hidden DMs get the message, but player should think DM isn't online. */
- if (!pl->hidden || QUERY_FLAG(op, FLAG_WIZ)) {
---- crossfire-1.10.0/server/shop.c.orig 2007-03-19 07:48:12.000000000 +0100
-+++ crossfire-1.10.0/server/shop.c 2023-02-08 06:18:30.381655457 +0100
-@@ -801,7 +801,7 @@ int can_pay(object *pl) {
- denominations++;
- snprintf(coinbuf, sizeof(coinbuf), " %d %s,", coincount[i],
- find_archetype(coins[i])->clone.name_pl);
-- snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), coinbuf);
-+ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s", coinbuf);
- }
- }
- if (denominations == 0)
+++ /dev/null
---- crossfire-1.9.1/crossedit/png.c~ 2006-03-18 08:25:12.000000000 +0100
-+++ crossfire-1.9.1/crossedit/png.c 2012-02-11 00:40:51.528599356 +0100
-@@ -269,7 +269,7 @@
- png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- return PNGX_OUTOFMEM;
- }
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp (png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- return PNGX_DATA;
- }
+++ /dev/null
---- crossfire-1.10.0/include/global.h.orig 2007-03-19 07:48:19.000000000 +0100
-+++ crossfire-1.10.0/include/global.h 2023-02-09 17:31:29.185751281 +0100
-@@ -189,7 +189,7 @@ EXTERN godlink *first_god;
- EXTERN racelink *first_race;
-
- #define NROF_COMPRESS_METHODS 4
--EXTERN const char *uncomp[NROF_COMPRESS_METHODS][3];
-+extern const char *uncomp[NROF_COMPRESS_METHODS][3];
- /*
- * The editor uses these (will get them out of here later):
- */
---- crossfire-1.10.0/random_maps/room_gen_onion.c.orig 2007-03-19 07:48:22.000000000 +0100
-+++ crossfire-1.10.0/random_maps/room_gen_onion.c 2023-02-09 17:33:56.719291087 +0100
-@@ -55,8 +55,6 @@ centered, linear onion bottom/rig
- */
-
-
--int *free_x_list;
--int *free_y_list;
- #include <global.h>
- #include <random_map.h>
-
---- crossfire-1.10.0/random_maps/room_gen_spiral.c.orig 2007-03-19 07:48:22.000000000 +0100
-+++ crossfire-1.10.0/random_maps/room_gen_spiral.c 2023-02-09 17:33:40.613233533 +0100
-@@ -39,9 +39,6 @@ char **map_gen_spiral(int xsize, int ysi
- #define MAX_SPIRAL_OPT 8 /* this should be 2x the last real option */
- #include <math.h>
-
--int *free_x_list;
--int *free_y_list;
--
- #ifndef MIN
- #define MIN(x,y) (((x)<(y))? (x):(y))
- #endif
---- crossfire-1.10.0/include/timers.h.orig 2007-03-19 07:48:19.000000000 +0100
-+++ crossfire-1.10.0/include/timers.h 2023-02-09 17:43:24.871986328 +0100
-@@ -57,7 +57,7 @@ typedef struct _cftimer
-
- #define MAX_TIMERS 1000
-
--cftimer timers_table[MAX_TIMERS];
-+extern cftimer timers_table[MAX_TIMERS];
-
- #define TIMER_ERR_NONE 0
- #define TIMER_ERR_ID -1
---- crossfire-1.10.0/server/timers.c.orig 2007-03-19 07:48:12.000000000 +0100
-+++ crossfire-1.10.0/server/timers.c 2023-02-09 17:43:24.859623858 +0100
-@@ -3,6 +3,8 @@
- #include <sproto.h>
- #endif
-
-+cftimer timers_table[MAX_TIMERS];
-+
- static void cftimer_process_event(tag_t ob_tag);
-
- /*****************************************************************************/
---- crossfire-1.10.0/include/material.h.orig 2007-03-19 07:48:19.000000000 +0100
-+++ crossfire-1.10.0/include/material.h 2023-02-09 17:25:30.487836297 +0100
-@@ -66,7 +66,7 @@ typedef struct _materialtype {
- struct _materialtype *next;
- } materialtype_t;
-
--EXTERN materialtype_t *materialt;
-+extern materialtype_t *materialt;
-
- #endif /* MATERIAL_H */
-
---- crossfire-1.10.0/common/utils.c.orig 2023-02-09 17:28:35.687293865 +0100
-+++ crossfire-1.10.0/common/utils.c 2023-02-09 17:26:39.287314780 +0100
-@@ -250,6 +250,8 @@ void decay_objects(mapstruct *m)
-
- /* convert materialname to materialtype_t */
-
-+materialtype_t *materialt;
-+
- materialtype_t *name_to_material(const char *name)
- {
- materialtype_t *mt, *nmt;
---- crossfire-1.10.0/server/init.c.orig 2007-03-19 07:48:12.000000000 +0100
-+++ crossfire-1.10.0/server/init.c 2023-02-09 17:28:32.903944361 +0100
-@@ -215,8 +215,6 @@ static void parse_args(int argc, char *a
- }
- }
-
--materialtype_t *materialt;
--
- static materialtype_t *get_empty_mat(void) {
- materialtype_t *mt;
- int i;
---- crossfire-1.10.0/plugins/cfpython/include/cfpython.h.orig 2007-03-19 07:48:18.000000000 +0100
-+++ crossfire-1.10.0/plugins/cfpython/include/cfpython.h 2023-02-09 17:38:17.190671400 +0100
-@@ -88,7 +88,7 @@ typedef struct PythonCmdStruct
-
- /* This plugin allows up to 1024 custom commands. */
- #define NR_CUSTOM_CMD 1024
--PythonCmd CustomCommand[NR_CUSTOM_CMD];
-+extern PythonCmd CustomCommand[NR_CUSTOM_CMD];
- #include <cfpython_proto.h>
-
- #endif /* PLUGIN_PYTHON_H */
---- crossfire-1.10.0/plugins/cfpython/cfpython.c.orig 2007-03-19 07:48:18.000000000 +0100
-+++ crossfire-1.10.0/plugins/cfpython/cfpython.c 2023-02-09 17:38:17.327338859 +0100
-@@ -63,6 +63,8 @@
- #define PYTHON_DEBUG /* give us some general infos out */
- #define PYTHON_CACHE_SIZE 16 /* number of python scripts to store the bytecode of at a time */
-
-+PythonCmd CustomCommand[NR_CUSTOM_CMD];
-+
- typedef struct {
- char *file;
- PyCodeObject *code;
+++ /dev/null
---- crossfire-1.9.1/acinclude.m4~ 2011-02-13 10:39:46.944104327 +0100
-+++ crossfire-1.9.1/acinclude.m4 2011-02-13 10:42:41.044603409 +0100
-@@ -6,7 +6,7 @@
- PY_INCLUDES=""
- dir=""
- if test "x$PYTHON_HOME" != "x"; then
-- for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
-+ for pyver in "" 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
- dir=$PYTHON_HOME/include/python${pyver}
- AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
- if test "x$cf_have_python_h" != "x" ; then
-@@ -20,7 +20,7 @@
- PY_INCLUDES=""
- if test "x$cf_have_python_h" = "x" ; then
- for ldir in "" /local ; do
-- for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
-+ for pyver in "" 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
- dir=/usr${ldir}/include/python${pyver}
- AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
- if test "x$cf_have_python_h" != "x" ; then
-@@ -67,7 +67,7 @@
- fi
-
- else
-- for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
-+ for pyver in "" 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
- AC_CHECK_LIB(python$pyver, PyArg_ParseTuple,[PYTHON_LIB="-lpython$pyver"])
- if test "x$PYTHON_LIB" != "x" ; then
- break
Summary: Multiplayer roguelike game server
Summary(pl.UTF-8): Serwer gry roguelike dla wielu graczy
Name: crossfire
-Version: 1.10.0
+Version: 1.75.0
Release: 1
License: GPL v2+
Group: X11/Applications/Games
Source0: https://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
-# Source0-md5: d56ad6cac04ea49f8b6b326b441553a3
+# Source0-md5: 7d2e39294056ad521f603dfc31c2cf7f
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
-Patch0: %{name}-ac260.patch
-Patch1: %{name}-format.patch
-Patch2: %{name}-daemon.patch
-Patch3: %{name}-python.patch
-Patch4: %{name}-am.patch
-Patch5: %{name}-libpng15.patch
-Patch6: %{name}-no-common.patch
+Patch0: python3.patch
URL: https://crossfire.real-time.com/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: check
BuildRequires: cproto
BuildRequires: libtool
-BuildRequires: python-devel >= 1:2.3
+BuildRequires: python3-devel
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXt-devel
Requires(post,preun): /sbin/chkconfig
-%pyrequires_eq python
+%pyrequires_eq python3
Requires: crossfire-maps
Requires: rc-scripts
Conflicts: logrotate < 3.8.0
+Obsoletes: crossfire-editor < 1.75.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _localstatedir /var/lib
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+ utils/cfdb_convert
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
%configure \
+ PYTHON=%{__python3} \
+ PYTHON_LIBS="`python3-config --libs --embed`" \
--disable-static
-install -d test/include
-%{__make} -C test/toolkit proto
-
-%{__make}
+%{__make} V=1
%install
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc DEVELOPERS README TODO ChangeLog
-%doc doc/{alchemy.doc,experience,metaserver,multigod,plugins}
-%attr(750,root,games) %{_bindir}/crossfire
-%attr(755,root,games) %{_bindir}/crossfire-config
+%doc AUTHORS README.rst ChangeLog
+%attr(750,root,games) %{_bindir}/crossfire-server
+%attr(755,root,games) %{_bindir}/cfdb_convert
%dir %attr(750,root,games) %{_datadir}/crossfire
%{_datadir}/crossfire/*
-%{_mandir}/man6/crossfire.6*
-%{_mandir}/man6/crossfire-config.6*
+%{_mandir}/man6/crossfire-server.6*
%dir %attr(770,root,games) %{_localstatedir}/crossfire
%dir %attr(770,root,games) %{_localstatedir}/crossfire/players
%dir %attr(770,root,games) %{_localstatedir}/crossfire/unique-items
%attr(660,root,games) %config(noreplace) %verify(not md5 mtime size) /var/log/crossfire
%dir %{_libdir}/crossfire
%dir %{_libdir}/crossfire/plugins
+%attr(755,root,root) %{_libdir}/crossfire/plugins/cfcitybell.so
+%attr(755,root,root) %{_libdir}/crossfire/plugins/citylife.so
%if "%{_libexecdir}" != "%{_libdir}"
%dir %{_libexecdir}/crossfire
%endif
-%attr(755,root,root) %{_libexecdir}/crossfire/add_throw.perl
-%attr(755,root,root) %{_libexecdir}/crossfire/metaserver.pl
-%attr(755,root,root) %{_libexecdir}/crossfire/mktable.script
%attr(755,root,root) %{_libexecdir}/crossfire/random_map
-%files editor
-%defattr(644,root,root,755)
-%doc crossedit/doc/*.doc
-%attr(755,root,root) %{_bindir}/crossedit
-%{_mandir}/man6/crossedit.6*
-
%files doc
%defattr(644,root,root,755)
%doc doc/{handbook.ps,spoiler.ps}
-%doc doc/{PlayerStats,RunTimeCommands,SurvivalGuide}
-%doc doc/{skills.doc,spellcasters_guide_to_runes}
-%doc doc/spell-docs/{*.txt,spell-list.ps,spell-summary.ps}
+%doc doc/{stats.txt,commands.txt,survival-guide.txt}
+%doc doc/{skills.txt,runes-guide.txt}
%files plugin-python
%defattr(644,root,root,755)
--- /dev/null
+--- crossfire-1.75.0/plugins/cfpython/cfpython.c~ 2021-01-05 17:53:30.000000000 +0100
++++ crossfire-1.75.0/plugins/cfpython/cfpython.c 2023-09-19 16:52:06.242248061 +0200
+@@ -60,7 +60,6 @@
+ #include <cfpython.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
+-#include <node.h>
+ #include <svnversion.h>
+
+ CF_PLUGIN char SvnRevPlugin[] = SVN_REV;
projects / packages / crossfire.git / commitdiff