Only in netrek-server-vanilla-2.10.2: .prepared Only in netrek-server-vanilla-2.10.2: Makefile diff -ru netrek-server-vanilla-2.10.2.orig/Makefile.in netrek-server-vanilla-2.10.2/Makefile.in --- netrek-server-vanilla-2.10.2.orig/Makefile.in 2006-02-22 20:18:30.000000000 +1100 +++ netrek-server-vanilla-2.10.2/Makefile.in 2006-03-30 16:00:41.000000000 +1100 @@ -16,18 +16,16 @@ .PHONY: rmdependencies clean reallyclean install installbin server utils startup rsa_utils do_xsg do_pledit do_robots do_gum -all: null $(PMAKE) server utils startup rsa_utils do_xsg do_pledit do_robots do_robotd @GUM@ +all: null $(PMAKE) server startup do_robots do_robotd depend: system.mk cd ntserv; $(MAKE) depend cd robots; $(MAKE) depend cd newstartd; $(MAKE) depend cd tools; $(MAKE) depend - cd pledit; $(MAKE) depend cd keycomp; $(MAKE) depend cd sequencer; $(MAKE) depend cd xsg; $(MAKE) depend - cd pledit; $(MAKE) depend -@if [ -f res-rsa/Makefile ]; then \ (cd res-rsa; $(MAKE) depend) \ fi @@ -98,10 +96,8 @@ fi cd newstartd; $(MAKE) clean cd tools; $(MAKE) clean - cd pledit; $(MAKE) clean cd sequencer; $(MAKE) clean cd keycomp; $(MAKE) clean - cd xsg; $(MAKE) clean -@if [ -f res-rsa/Makefile ]; then \ cd res-rsa; echo " cd res-rsa; make clean"; $(MAKE) clean; \ fi @@ -116,10 +112,8 @@ fi cd newstartd; $(MAKE) reallyclean cd tools; $(MAKE) reallyclean - cd pledit; $(MAKE) reallyclean cd sequencer; $(MAKE) reallyclean cd keycomp; $(MAKE) reallyclean - cd xsg; $(MAKE) reallyclean -@if [ -f res-rsa/Makefile ]; then \ cd res-rsa; echo " cd res-rsa; make reallyclean"; \ $(MAKE) reallyclean; \ @@ -147,9 +141,7 @@ fi cd tools; $(MAKE) install DESTDIR=$(DESTDIR) cd keycomp; $(MAKE) install DESTDIR=$(DESTDIR) - cd pledit; $(MAKE) install DESTDIR=$(DESTDIR) cd sequencer; $(MAKE) install DESTDIR=$(DESTDIR) - cd xsg; $(MAKE) install DESTDIR=$(DESTDIR) install: installbin mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SYSCONFDIR) $(DESTDIR)$(LOCALSTATEDIR) @@ -165,10 +157,8 @@ cd robots; $(MAKE) rmdependencies cd newstartd; $(MAKE) rmdependencies cd tools; $(MAKE) rmdependencies - cd pledit; $(MAKE) rmdependencies cd keycomp; $(MAKE) rmdependencies cd sequencer; $(MAKE) rmdependencies - cd xsg; $(MAKE) rmdependencies -@if [ -f res-rsa/Makefile ]; then \ cd res-rsa; echo " cd res-rsa; make rmdependencies"; \ $(MAKE) rmdependencies; \ Only in netrek-server-vanilla-2.10.2: config.status diff -ru netrek-server-vanilla-2.10.2.orig/configure netrek-server-vanilla-2.10.2/configure --- netrek-server-vanilla-2.10.2.orig/configure 2005-09-30 11:41:45.000000000 +1000 +++ netrek-server-vanilla-2.10.2/configure 2006-03-30 15:42:54.000000000 +1100 @@ -1980,44 +1980,9 @@ fi rm -f conftest* - -echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1986: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < -#include -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long)); - exit(0); -} -EOF -if { (eval echo configure:2006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* -fi - -fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 + ac_cv_sizeof_long=4 cat >> confdefs.h <&6 echo "configure:3510: checking for restartable system calls" >&5 -if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < -#include -ucatch (isig) { } -main () { - int i = fork (), status; - if (i == 0) { sleep (3); kill (getppid (), SIGINT); sleep (3); exit (0); } - signal (SIGINT, ucatch); - status = wait(&i); - if (status == -1) wait(&i); - exit (status == -1); -} - -EOF -if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sys_restartable_syscalls=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sys_restartable_syscalls=no -fi -rm -fr conftest* -fi - -fi - +ac_cv_sys_restartable_syscalls=yes echo "$ac_t""$ac_cv_sys_restartable_syscalls" 1>&6 if test $ac_cv_sys_restartable_syscalls = yes; then cat >> confdefs.h <<\EOF #define HAVE_RESTARTABLE_SYSCALLS 1 EOF - fi echo $ac_n "checking for signals style""... $ac_c" 1>&6 Only in netrek-server-vanilla-2.10.2: configure.orig diff -ru netrek-server-vanilla-2.10.2.orig/docs/sample_geno_timer_crontab netrek-server-vanilla-2.10.2/docs/sample_geno_timer_crontab --- netrek-server-vanilla-2.10.2.orig/docs/sample_geno_timer_crontab 2006-02-22 20:51:22.000000000 +1100 +++ netrek-server-vanilla-2.10.2/docs/sample_geno_timer_crontab 2006-03-30 16:00:45.000000000 +1100 @@ -1,9 +1,9 @@ # # NO geno timer # -30 19 * * * /usr/local/games/netrek-server-vanilla/lib/tools/no_geno_timer +30 19 * * * /mnt/netrek-server-vanilla/lib/tools/no_geno_timer # # geno timer # -30 07 * * * /usr/local/games/netrek-server-vanilla/lib/tools/geno_timer +30 07 * * * /mnt/netrek-server-vanilla/lib/tools/geno_timer diff -ru netrek-server-vanilla-2.10.2.orig/include/config.h netrek-server-vanilla-2.10.2/include/config.h --- netrek-server-vanilla-2.10.2.orig/include/config.h 2006-02-22 20:29:40.000000000 +1100 +++ netrek-server-vanilla-2.10.2/include/config.h 2006-03-30 15:55:58.000000000 +1100 @@ -496,13 +496,13 @@ #define HAVE_STDLIB_H 1 /* #undef _ALL_SOURCES */ /* #undef HAVE_SYS_SIGNAL_H */ -#define BSD_SIGNALS 1 +/* #undef BSD_SIGNALS */ /* #undef SYSV_SIGNALS */ -/* #undef POSIX_SIGNALS */ +#define POSIX_SIGNALS 1 /* #undef RESTARTABLE_SYSCALLS */ /* #undef NEED_MEMORY_H */ #define STDC_HEADERS 1 /* 13/01/94 omit hosed index [007] */ -#define HAVE_WAIT3 1 +/* #undef HAVE_WAIT3 */ /* #undef NEED_SYS_SELECT_H */ /* #undef NO_FD_SET */ /* Guess we suck badly if that happens :( */ #define HAVE_UNISTD_H 1 @@ -559,10 +559,10 @@ #ifdef SERVER /* paths substituted by configure, see AC_DEFINE_UNQUOTED in configure.in */ -#define LIBDIR "/usr/local/games/netrek-server-vanilla/lib" -#define BINDIR "/usr/local/games/netrek-server-vanilla/bin" -#define SYSCONFDIR "/usr/local/games/netrek-server-vanilla/etc" -#define LOCALSTATEDIR "/usr/local/games/netrek-server-vanilla/var" +#define LIBDIR "/mnt/netrek-server-vanilla/lib" +#define BINDIR "/mnt/netrek-server-vanilla/bin" +#define SYSCONFDIR "/mnt/netrek-server-vanilla/etc" +#define LOCALSTATEDIR "/mnt/netrek-server-vanilla/var" /* System dependend programs */ #define UPTIME "/usr/bin/uptime" Only in netrek-server-vanilla-2.10.2: ipkg diff -ru netrek-server-vanilla-2.10.2.orig/ntserv/Makefile netrek-server-vanilla-2.10.2/ntserv/Makefile --- netrek-server-vanilla-2.10.2.orig/ntserv/Makefile 2006-02-22 20:51:19.000000000 +1100 +++ netrek-server-vanilla-2.10.2/ntserv/Makefile 2006-03-30 16:00:45.000000000 +1100 @@ -65,7 +65,7 @@ all: $(PMAKE) ntserv daemonII ntserv: $(PMAKE) $(R_OBJS) - $(CC) $(CFLAGS) ${LDFLAGS} -o ntserv $(R_OBJS) $(LIBS) $(LIBCRYPT) `glib-config --libs` -lgdbm + $(CC) $(CFLAGS) ${LDFLAGS} -o ntserv $(R_OBJS) $(LIBS) $(LIBCRYPT) daemonII: $(PMAKE) $(D_OBJS) $(CC) $(CFLAGS) ${LDFLAGS} -o daemonII $(D_OBJS) $(EXTRALIBS) diff -ru netrek-server-vanilla-2.10.2.orig/ntserv/Makefile.in netrek-server-vanilla-2.10.2/ntserv/Makefile.in --- netrek-server-vanilla-2.10.2.orig/ntserv/Makefile.in 2005-09-28 20:04:23.000000000 +1000 +++ netrek-server-vanilla-2.10.2/ntserv/Makefile.in 2006-03-30 15:49:30.000000000 +1100 @@ -65,7 +65,7 @@ all: $(PMAKE) ntserv daemonII ntserv: $(PMAKE) $(R_OBJS) - $(CC) $(CFLAGS) ${LDFLAGS} -o ntserv $(R_OBJS) $(LIBS) $(LIBCRYPT) `glib-config --libs` -lgdbm + $(CC) $(CFLAGS) ${LDFLAGS} -o ntserv $(R_OBJS) $(LIBS) $(LIBCRYPT) daemonII: $(PMAKE) $(D_OBJS) $(CC) $(CFLAGS) ${LDFLAGS} -o daemonII $(D_OBJS) $(EXTRALIBS) diff -ru netrek-server-vanilla-2.10.2.orig/ntserv/db.c netrek-server-vanilla-2.10.2/ntserv/db.c --- netrek-server-vanilla-2.10.2.orig/ntserv/db.c 2005-03-21 20:41:28.000000000 +1100 +++ netrek-server-vanilla-2.10.2/ntserv/db.c 2006-03-30 15:46:16.000000000 +1100 @@ -3,7 +3,7 @@ */ #include "copyright.h" #include "config.h" - +#undef PLAYER_INDEX #include #include #include INC_MATH Only in netrek-server-vanilla-2.10.2/ntserv: db.c.orig Only in netrek-server-vanilla-2.10.2.orig/res-rsa: INSTALL Only in netrek-server-vanilla-2.10.2.orig/res-rsa: LICENSE.US Only in netrek-server-vanilla-2.10.2.orig/res-rsa: Makefile Only in netrek-server-vanilla-2.10.2.orig/res-rsa: Makefile.in Only in netrek-server-vanilla-2.10.2.orig/res-rsa: README Only in netrek-server-vanilla-2.10.2.orig/res-rsa: README.US Only in netrek-server-vanilla-2.10.2.orig/res-rsa: README.mkkey Only in netrek-server-vanilla-2.10.2.orig/res-rsa: config.h Only in netrek-server-vanilla-2.10.2.orig/res-rsa: config.h.in Only in netrek-server-vanilla-2.10.2.orig/res-rsa: config.log Only in netrek-server-vanilla-2.10.2.orig/res-rsa: config.status Only in netrek-server-vanilla-2.10.2.orig/res-rsa: configure Only in netrek-server-vanilla-2.10.2.orig/res-rsa: configure.in Only in netrek-server-vanilla-2.10.2.orig/res-rsa: mkkey.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: random.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa-server.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa.h Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_encode.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_encode_dummy.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_encode_gmp.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_gmp.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_gmp.h Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_math.c Only in netrek-server-vanilla-2.10.2.orig/res-rsa: rsa_math.h diff -ru netrek-server-vanilla-2.10.2.orig/robotd/Makefile netrek-server-vanilla-2.10.2/robotd/Makefile --- netrek-server-vanilla-2.10.2.orig/robotd/Makefile 2006-02-22 20:51:21.000000000 +1100 +++ netrek-server-vanilla-2.10.2/robotd/Makefile 2006-03-30 16:00:45.000000000 +1100 @@ -9,9 +9,9 @@ .PHONY: clean reallyclean install checkin checkout tar dist depend -DESTDIR = /usr/local/games/netrek-server-vanilla/og -XTREKDIR = /usr/local/games/netrek-server-vanilla -XTREKOWNER = james +DESTDIR = /mnt/netrek-server-vanilla/og +XTREKDIR = /mnt/netrek-server-vanilla +XTREKOWNER = root R_OBJS = \ robot.o\ @@ -95,11 +95,11 @@ INPUT = input.o redraw.o -LIBS = -lgdbm -lnsl -lm +LIBS = -lnsl -lm EXTRALIBS = $(LINKFLAGS) -CC = gcc -CFLAGS = -g -O2 -funroll-loops -finline-functions -DATM -DPING -DHAVE_NINT=0 +CC = /usr/src/OpenWrt-SDK-Linux-i686-1/staging_dir_mipsel/bin/mipsel-linux-uclibc-gcc +CFLAGS = -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -funroll-loops -finline-functions -DATM -DPING -DHAVE_NINT=0 LDFLAGS = #CFLAGS = -O6 -fomit-frame-pointer -DATM -DPING diff -ru netrek-server-vanilla-2.10.2.orig/robotd/defaults.c netrek-server-vanilla-2.10.2/robotd/defaults.c --- netrek-server-vanilla-2.10.2.orig/robotd/defaults.c 2005-03-21 16:23:45.000000000 +1100 +++ netrek-server-vanilla-2.10.2/robotd/defaults.c 2006-03-30 15:52:42.000000000 +1100 @@ -14,7 +14,7 @@ struct stringlist *defaults=NULL; char *getenv(); -char *strdup(); +char *strdup(const char *x); initDefaults(deffile) char *deffile; /* As opposed to defile? */ @@ -62,7 +62,7 @@ } char *strdup(str) -char *str; +const char *str; { char *s; Only in netrek-server-vanilla-2.10.2: system.mk diff -ru netrek-server-vanilla-2.10.2.orig/tools/Makefile netrek-server-vanilla-2.10.2/tools/Makefile --- netrek-server-vanilla-2.10.2.orig/tools/Makefile 2006-02-22 20:51:20.000000000 +1100 +++ netrek-server-vanilla-2.10.2/tools/Makefile 2006-03-30 16:00:45.000000000 +1100 @@ -33,7 +33,7 @@ SRCS = ${srcdir}/blotpassword.c ${srcdir}/loadchecker.c ${srcdir}/mess.c \ ${srcdir}/mergescores.c \ ${srcdir}/newscores.c ${srcdir}/planets.c ${srcdir}/players.c \ - ${srcdir}/scores.c ${srcdir}/setgalaxy.c ${srcdir}/showgalaxy.c \ + ${srcdir}/scores.c ${srcdir}/setgalaxy.c \ ${srcdir}/stat.c ${srcdir}/trimscores.c ${srcdir}/watchmes.c \ ${srcdir}/fun.c ${srcdir}/xtkill.c ${srcdir}/keyman.c \ ${srcdir}/nuke.c ${srcdir}/metaget.c \ @@ -47,7 +47,7 @@ EXECS = blotpassword loadchecker mess message newscores planets players \ scores \ - setgalaxy showgalaxy stat trimscores watchmes xtkill \ + setgalaxy stat trimscores watchmes xtkill \ mergescores keyman updated fun conq_vert convert sortdb cambot \ ntpasswd ltd_dump ltd_convert nuke trekon metaget @@ -75,7 +75,6 @@ $(INSTALLPROG) $(INSTALLOPTS) nuke $(DESTDIR)$(LIBDIR)/tools/nuke $(INSTALLPROG) $(INSTALLOPTS) scores $(DESTDIR)$(LIBDIR)/tools/scores $(INSTALLPROG) $(INSTALLOPTS) setgalaxy $(DESTDIR)$(LIBDIR)/tools/setgalaxy - $(INSTALLPROG) $(INSTALLOPTS) showgalaxy $(DESTDIR)$(LIBDIR)/tools/showgalaxy $(INSTALLPROG) $(INSTALLOPTS) stat $(DESTDIR)$(LIBDIR)/tools/stat $(INSTALLPROG) $(INSTALLOPTS) trimscores $(DESTDIR)$(LIBDIR)/tools/trimscores $(INSTALLPROG) $(INSTALLOPTS) watchmes $(DESTDIR)$(LIBDIR)/tools/watchmes diff -ru netrek-server-vanilla-2.10.2.orig/tools/Makefile.in netrek-server-vanilla-2.10.2/tools/Makefile.in --- netrek-server-vanilla-2.10.2.orig/tools/Makefile.in 2006-02-22 19:30:57.000000000 +1100 +++ netrek-server-vanilla-2.10.2/tools/Makefile.in 2006-03-30 15:58:11.000000000 +1100 @@ -33,7 +33,7 @@ SRCS = ${srcdir}/blotpassword.c ${srcdir}/loadchecker.c ${srcdir}/mess.c \ ${srcdir}/mergescores.c \ ${srcdir}/newscores.c ${srcdir}/planets.c ${srcdir}/players.c \ - ${srcdir}/scores.c ${srcdir}/setgalaxy.c ${srcdir}/showgalaxy.c \ + ${srcdir}/scores.c ${srcdir}/setgalaxy.c \ ${srcdir}/stat.c ${srcdir}/trimscores.c ${srcdir}/watchmes.c \ ${srcdir}/fun.c ${srcdir}/xtkill.c ${srcdir}/keyman.c \ ${srcdir}/nuke.c ${srcdir}/metaget.c \ @@ -47,7 +47,7 @@ EXECS = blotpassword loadchecker mess message newscores planets players \ scores \ - setgalaxy showgalaxy stat trimscores watchmes xtkill \ + setgalaxy stat trimscores watchmes xtkill \ mergescores keyman updated fun conq_vert convert sortdb cambot \ ntpasswd ltd_dump ltd_convert nuke trekon metaget @@ -75,7 +75,6 @@ $(INSTALLPROG) $(INSTALLOPTS) nuke $(DESTDIR)$(LIBDIR)/tools/nuke $(INSTALLPROG) $(INSTALLOPTS) scores $(DESTDIR)$(LIBDIR)/tools/scores $(INSTALLPROG) $(INSTALLOPTS) setgalaxy $(DESTDIR)$(LIBDIR)/tools/setgalaxy - $(INSTALLPROG) $(INSTALLOPTS) showgalaxy $(DESTDIR)$(LIBDIR)/tools/showgalaxy $(INSTALLPROG) $(INSTALLOPTS) stat $(DESTDIR)$(LIBDIR)/tools/stat $(INSTALLPROG) $(INSTALLOPTS) trimscores $(DESTDIR)$(LIBDIR)/tools/trimscores $(INSTALLPROG) $(INSTALLOPTS) watchmes $(DESTDIR)$(LIBDIR)/tools/watchmes diff -ru netrek-server-vanilla-2.10.2.orig/tools/geno_timer netrek-server-vanilla-2.10.2/tools/geno_timer --- netrek-server-vanilla-2.10.2.orig/tools/geno_timer 2006-02-22 20:51:21.000000000 +1100 +++ netrek-server-vanilla-2.10.2/tools/geno_timer 2006-03-30 16:00:45.000000000 +1100 @@ -1,7 +1,7 @@ #!/bin/bash -LIBDIR=/usr/local/games/netrek-server-vanilla/lib -LOCALSTATEDIR=/usr/local/games/netrek-server-vanilla/var +LIBDIR=/mnt/netrek-server-vanilla/lib +LOCALSTATEDIR=/mnt/netrek-server-vanilla/var if [ ! -x $LIBDIR/tools/sequencer ]; then echo "Cannot execute sequencer" diff -ru netrek-server-vanilla-2.10.2.orig/tools/no_geno_timer netrek-server-vanilla-2.10.2/tools/no_geno_timer --- netrek-server-vanilla-2.10.2.orig/tools/no_geno_timer 2006-02-22 20:51:21.000000000 +1100 +++ netrek-server-vanilla-2.10.2/tools/no_geno_timer 2006-03-30 16:00:45.000000000 +1100 @@ -1,7 +1,7 @@ #!/bin/bash -LIBDIR=/usr/local/games/netrek-server-vanilla/lib -LOCALSTATEDIR=/usr/local/games/netrek-server-vanilla/var +LIBDIR=/mnt/netrek-server-vanilla/lib +LOCALSTATEDIR=/mnt/netrek-server-vanilla/var if [ ! -x $LIBDIR/tools/sequencer ]; then echo "Cannot execute sequencer" Only in netrek-server-vanilla-2.10.2/xsg: .depend