Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory checked in at 2015-03-30 19:34:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armagetron"
Changes:
--------
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes 2015-03-18 13:08:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2015-03-30 19:34:04.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Mar 29 16:56:55 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 0.2.8.3.3:
+ + security fix: do not read ahead of the beginning of network
+ buffer.
+ + security fix: don't attribute network errors from processing
+ random packets to the connection to the server.
+ + security fix: while at it, don't process random packets unless
+ they may be important.
+ + fix for potential crash with friend list filtering.
+ + intel driver compatibility.
+ + fix for rare crash with sound lock.
+ + fix for camera turning for bizarre axis configurations.
+- Install appdata.xml in order to be shown in AppStream based
+ software centers.
+- Drop armagetron-configure.patch: fixed upstream.
+
+-------------------------------------------------------------------
Old:
----
armagetron-configure.patch
armagetronad-0.2.8.3.2.src.tar.bz2
New:
----
armagetronad-0.2.8.3.3.src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armagetron.spec ++++++
--- /var/tmp/diff_new_pack.9CAEHW/_old 2015-03-30 19:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.9CAEHW/_new 2015-03-30 19:34:05.000000000 +0200
@@ -25,12 +25,11 @@
Summary: OpenGL Game Similar to the Film Tron
License: GPL-2.0+
Group: Amusements/Games
-Version: 0.2.8.3.2
+Version: 0.2.8.3.3
Release: 0
Url: http://armagetronad.sourceforge.net
-Source: %{name}ad-%{version}.src.tar.bz2
+Source: http://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2
Source1: armagetron_add.tar.gz
-Patch0: armagetron-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -45,11 +44,6 @@
%prep
%setup -q -a 1 -n armagetronad-%version
-%patch0 -p1
-#patch1
-#patch2
-#patch3
-#patch4
%build
autoreconf -fi
@@ -68,6 +62,8 @@
make DESTDIR=%buildroot install uninstall_location=foobar
mkdir -p %{buildroot}%{_datadir}/applications/
install armagetron_add/*.desktop %{buildroot}%{_datadir}/applications/
+mkdir -p %{buildroot}%{_datadir}/appdata
+install armagetron_add/Armagetron.appdata.xml %{buildroot}%{_datadir}/appdata/
mkdir -p %{buildroot}%{_datadir}/pixmaps/
pushd %buildroot
mv %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
@@ -87,6 +83,8 @@
%config %{_sysconfdir}/armagetronad
%{_bindir}/armagetronad
%{_datadir}/armagetronad
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/Armagetron.appdata.xml
%attr(644,root,root) %{_datadir}/applications/*
%{_datadir}/pixmaps/%{name}.png
++++++ armagetron_add.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/Armagetron.desktop new/armagetron_add/Armagetron.desktop
--- old/armagetron_add/Armagetron.desktop 2005-04-14 16:24:32.000000000 +0200
+++ new/armagetron_add/Armagetron.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Armagetron
-GenericName=A fast OpenGL racer with walls
-Exec=armagetronad
-Icon=armagetron
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/README.SuSE new/armagetron_add/README.SuSE
--- old/armagetron_add/README.SuSE 2002-07-23 00:02:16.000000000 +0200
+++ new/armagetron_add/README.SuSE 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-Armagetron - A 3D Tron-like high speed game.
-
- The rules are simple: you ride a light cycle (a kind of motorbike that can
- only turn 90 degrees at a time, leaves a wall behind and cannot be
- stopped) and have to avoid running into walls while at the same time you
- have to try to get your opponnet to run into them.
-
- The idea is based on the Disney movie from 1982 called "Tron". If you
- ever wanted to take a try at one of those speed demons features in the
- movie, this is your chance. Of all the Tron clones out there, I think one
- is the one that comes closest to the feeling the movie tries to express.
- This is in part thanks to the sophisticated camera motions, in part to the
- superb modelling work and in part to the fabulous sound effects. To add
- some extra fascination into the game, unlike to other Tron clones, in
- armagetron you can accelerate. Alas, there's no accelerate button. If
- you want to drive fast, you have to drive good -- and really really close
- to the walls.
-
- Armagetron can be played against AI opponents, against other humans over
- the network, or a mixture of both.
-
- Still not convinced? http://armagetron.sourceforge.net
-
---------
-
-The html doc starts at:
-
- /usr/share/doc/packages/armagetron/index.html
-
-The default config(for hardware rendering), is:
-
- /usr/share/games/armagetron/config/default.cfg
-
-Example config for 3D Hardware Support:
-
- /usr/share/games/armagetron/hardware.ArmageTronrc
-
-Example config for no 3D Hardware Support:
-
- /usr/share/games/armagetron/software.ArmageTronrc
-
-If a user want to try it, he should backup his ~/.armagetron/user.cfg and
-replace it with hardware.ArmageTronrc.
-
-To make it the default for new users without an ~/.armagetron/user.cfg
-replace /usr/share/games/armagetron/config/default.cfg with it.
-
--------
-
-Armagetron is written by and copyright Manuel Moss
-The copyright of this package is GPL, version 2 or later.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/armagetron-server.6 new/armagetron_add/armagetron-server.6
--- old/armagetron_add/armagetron-server.6 2002-07-22 23:56:51.000000000 +0200
+++ new/armagetron_add/armagetron-server.6 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.TH ARMAGETRON 6 "July 30, 2000"
-.SH NAME
-armagetron-master \- armagetron master game server
-.SH SYNOPSIS
-.B armagetron-master
-.SH DESCRIPTION
-The master program will read the normal configuration file
-\fB~/.armagetron/user.cfg\fP and set up a network game according to the
-settings in the game menu (Number of AI players, game mode and finish
-mode), and it will limit its output badwidth to the value set in the
-network game menu. A dedicated server takes input from the keyboard and
-interprets it just the way it does with the configuration files;
-additionally to the usual configuration files, the dedicated server will
-read the file everytime.cfg before each round; it may be comfortable to
-place quickly changing settings there.
-.SH SEE ALSO
-armagetron(6).
-.P
-Armagetron is documented fully by the provided HTML docs, found under
-/usr/share/doc/packages/armagetron/ or the armagetron website,
-\fIhttp://armagetron.sourceforge.net/\fP.
-.SH AUTHOR
-Armagetron was written by Manuel Moos
-.P
-This manual page was adapted from the original HTML version by Marcelo
-E. Magallon , and changed by Berhard Kaindl for
-SuSE Linux 8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/armagetron.6 new/armagetron_add/armagetron.6
--- old/armagetron_add/armagetron.6 2002-07-22 23:58:03.000000000 +0200
+++ new/armagetron_add/armagetron.6 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.TH ARMAGETRON 6 "July 30, 2000"
-.SH NAME
-armagetron \- A 3D Tron-like high speed game
-.SH SYNOPSIS
-.B armagetron
-.SH DESCRIPTION
-The rules are simple: you ride a lightcycle (a kind of motorbike that
-can only turn 90 degrees at a time, leaves a wall behind and cannot be
-stopped). Avoid running into a wall. Make your opponent run into a
-wall. (Just in case you do not know: this idea is stolen from the
-Disney movie "Tron" from 1982 (did they steal the idea from someone
-else? I don't know).)
-.PP
-One thing is different than in other Tron-Clones: You can accelerate.
-Oh, not by pressing an acceleration button, that would not be new. You
-accelerate by driving close to walls (Only player walls count, the rim
-has no such effect.) That allows some interesting tactics (of course,
-the AI players are not smart enough for that). Every time you make a
-turn, you loose 5% of your speed, so don't be to nervous; speed is your
-only resource against other players!
-.PP
-First thing you shold do is go into the "Player Menu", set your name and
-your keyboard and mouse configuration. Then, go into the "Game Menu" and
-start a single player game against one AI opponent (the game mode does
-not really matter here). Then, get some friends together and try the
-multiplayer modes!
-.PP
-\fBSHIFT-ESC\fP is the "boss key" and quits Armagetron as fast as
-possible.
-.SH SEE ALSO
-Armagetron is documented fully by the provided HTML docs, found under
-/usr/share/doc/packages/armagetron/ or the armagetron website,
-\fIhttp://armagetron.sourceforge.net/\fP.
-.SH AUTHOR
-Armagetron was written by Manuel Moos
-.P
-This manual page was adapted from the original HTML version by Marcelo
-E. Magallon , and updated for SuSE Linux 8 by
-Bernhard Kaindl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/default.cfg new/armagetron_add/default.cfg
--- old/armagetron_add/default.cfg 2002-07-22 23:48:43.000000000 +0200
+++ new/armagetron_add/default.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,149 +0,0 @@
- COLOR_R_1 15
- COLOR_G_1 3
- COLOR_B_1 3
- FAV_NUM_PER_TEAM_PLAYER_1 3
- NAME_TEAM_AFTER_PLAYER_1 0
- SPECTATOR_MODE_1 0
- INSTANT_CHAT_STRING_1_1 LOL!
- INSTANT_CHAT_STRING_1_2 :-)
- INSTANT_CHAT_STRING_1_3 :-(
- INSTANT_CHAT_STRING_1_4 Well done!
- INSTANT_CHAT_STRING_1_5 Almost got you...
- INSTANT_CHAT_STRING_1_6 Hehe!
- INSTANT_CHAT_STRING_1_7 Got one!
- INSTANT_CHAT_STRING_1_8
- INSTANT_CHAT_STRING_1_9
- INSTANT_CHAT_STRING_1_10
- INSTANT_CHAT_STRING_1_11
- INSTANT_CHAT_STRING_1_12
- ALLOW_CAM_1_0 1
- ALLOW_CAM_1_1 1
- ALLOW_CAM_1_2 1
- ALLOW_CAM_1_3 1
- ALLOW_CAM_1_4 1
- ALLOW_CAM_1_5 1
- START_FOV_1 90
- START_CAM_1 4
- CAMCENTER_1 1
- PLAYER_1 Player 1
- PING_CHARITY 0
- MAX_IN_RATE 4
- MAX_OUT_RATE 4
- CUSTOM_SERVER_NAME
- SP_EXPLOSION_RADIUS 4
- SP_WALLS_LENGTH -1
- SP_WALLS_STAY_UP_DELAY 0
- SP_TEAM_BALLACNE_ON_QUIT 0
- SP_TEAM_BALLACNE_WITH_AIS 1
- SP_TEAM_MAX_INBALLANCE_PERM 1
- SP_TEAM_MAX_INBALLANCE 2
- SP_TEAM_MAX_PLAYERS 5
- SP_TEAM_MIN_PLAYERS 0
- SP_TEAMS_MAX 10
- SP_TEAMS_MIN 0
- SP_FINISH_TYPE 1
- SP_GAME_TYPE 1
- SP_SIZE_FACTOR -3
- SP_SPEED_FACTOR 0
- SP_AUTO_AIS 1
- SP_MIN_PLAYERS 0
- EXPLOSION_RADIUS 4
- WALLS_LENGTH -1
- WALLS_STAY_UP_DELAY 0
- TEAM_BALLACNE_ON_QUIT 0
- TEAM_BALLACNE_WITH_AIS 1
- TEAM_MAX_INBALLANCE_PERM 1
- TEAM_MAX_INBALLANCE 2
- TEAM_MAX_PLAYERS 5
- TEAM_MIN_PLAYERS 0
- TEAMS_MAX 10
- TEAMS_MIN 2
- FINISH_TYPE 1
- GAME_TYPE 1
- SIZE_FACTOR -3
- SPEED_FACTOR 0
- AUTO_IQ 0
- AUTO_AIS 0
- AI_IQ 100
- MIN_PLAYERS 4
- NUM_AIS 0
- MOVIEPACK 1
- MOUSE_GRAB 0
- WRAP_MENU 1
- SPARKS 1
- TEXTURES_HI 0
- PREDICT_OBJECTS 1
- LAG_O_METER 1
- INFINITY_PLANE 0
- SKY_WOBBLE 1
- LOWER_SKY 0
- UPPER_SKY 0
- DITHER 1
- HIGH_RIM 1
- FLOOR_MIRROR 0
- SHOW_FPS 1
- SMOOTH_SHADING 1
- ALPHA_BLEND 1
- PERSP_CORRECT 0
- POLY_ANTIALIAS 0
- LINE_ANTIALIAS 0
- ARMAGETRON_VERSION 0.2.0 RC
- SOUND_SOURCES 10
- SOUND_QUALITY 2
- SOUND_BUFFER_SHIFT 0
- CLIENT_PORT 4534
- SERVER_PORT 4534
- SERVER_NAME Unnamed Server
- BIG_BROTHER 1
- KEYBOARD 333 PLAYER_BIND ZOOM_OUT 1
-KEYBOARD 332 PLAYER_BIND ZOOM_IN 1
-KEYBOARD 327 PLAYER_BIND BANK_DOWN 1
-KEYBOARD 326 PLAYER_BIND BANK_UP 1
-KEYBOARD 325 PLAYER_BIND LOOK_LEFT 1
-KEYBOARD 324 PLAYER_BIND LOOK_RIGHT 1
-KEYBOARD 293 PLAYER_BIND INSTANT_CHAT_12 1
-KEYBOARD 292 PLAYER_BIND INSTANT_CHAT_11 1
-KEYBOARD 291 PLAYER_BIND INSTANT_CHAT_10 1
-KEYBOARD 290 PLAYER_BIND INSTANT_CHAT_9 1
-KEYBOARD 289 PLAYER_BIND INSTANT_CHAT_8 1
-KEYBOARD 288 PLAYER_BIND INSTANT_CHAT_7 1
-KEYBOARD 287 PLAYER_BIND INSTANT_CHAT_6 1
-KEYBOARD 286 PLAYER_BIND INSTANT_CHAT_5 1
-KEYBOARD 285 PLAYER_BIND INSTANT_CHAT_4 1
-KEYBOARD 284 PLAYER_BIND INSTANT_CHAT_3 1
-KEYBOARD 283 PLAYER_BIND INSTANT_CHAT_2 1
-KEYBOARD 282 PLAYER_BIND INSTANT_CHAT_1 1
-KEYBOARD 281 PLAYER_BIND GLANCE_RIGHT 1
-KEYBOARD 280 PLAYER_BIND MESS_UP 0
-KEYBOARD 279 PLAYER_BIND GLANCE_BACK 1
-KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 274 PLAYER_BIND CYCLE_BRAKE 1
-KEYBOARD 273 PLAYER_BIND CYCLE_BRAKE 1
-KEYBOARD 271 PLAYER_BIND MOVE_DOWN 1
-KEYBOARD 270 PLAYER_BIND MOVE_UP 1
-KEYBOARD 261 PLAYER_BIND MOVE_FORWARD 1
-KEYBOARD 259 PLAYER_BIND MOVE_RIGHT 1
-KEYBOARD 258 PLAYER_BIND MOVE_BACK 1
-KEYBOARD 257 PLAYER_BIND MOVE_LEFT 1
-KEYBOARD 127 PLAYER_BIND GLANCE_LEFT 1
-KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 121 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 115 PLAYER_BIND CHAT 1
-KEYBOARD 113 PLAYER_BIND BANK_UP 1
-KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
-KEYBOARD 97 PLAYER_BIND BANK_DOWN 1
-KEYBOARD 9 PLAYER_BIND SCORE 0
- COLOR_STRINGS 1
- USE_DISPLAYLISTS 0
- SOFTWARE_RENDERER 0
- FAILED_ATTEMPTS 0
- CHECK_ERRORS 1
- COLORDEPTH 1
- FULLSCREEN 0
- CUSTOM_SCREEN_ASPECT 1
- CUSTOM_SCREEN_WIDTH 800
- CUSTOM_SCREEN_HEIGHT 600
- ARMAGETRON_SCREENMODE 5
- VIEWPORT_CONF 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/hardware.ArmageTronrc new/armagetron_add/hardware.ArmageTronrc
--- old/armagetron_add/hardware.ArmageTronrc 2002-03-18 13:25:13.000000000 +0100
+++ new/armagetron_add/hardware.ArmageTronrc 1970-01-01 01:00:00.000000000 +0100
@@ -1,188 +0,0 @@
- PING_CHARITY 0
- MAX_IN_RATE 4
- MAX_OUT_RATE 4
- SERVER_NAME
- FINISH_TYPE 1
- GAME_TYPE 1
- AUTO_AIS 1
- NUM_AIS 6
- MOVIEPACK 1
- ZTRICK 0
- MOUSE_GRAB 0
- WRAP_MENU 1
- SPARKS 1
- TEXTURES_HI 0
- PREDICT_OBJECTS 1
- LAG_O_METER 1
- INFINITY_PLANE 0
- SKY_WOBBLE 1
- LOWER_SKY 1
- UPPER_SKY 1
- DITHER 0
- HIGH_RIM 1
- FLOOR_DETAIL 3
- FLOOR_MIRROR 2
- SHOW_FPS 1
- TEXT_OUT 1
- SMOOTH_SHADING 1
- ALPHA_BLEND 1
- PERSP_CORRECT -1
- POLY_ANITALIAS -1
- LINE_ANITALIAS -1
- MESSAGE_OF_DAY_4
- MESSAGE_OF_DAY_3
- MESSAGE_OF_DAY_2
- MESSAGE_OF_DAY_1
- ARMAGETRON_VERSION UNKNOWN
- GL_VENDOR VA Linux Systems Inc.
- GL_RENDERER Mesa DRI G400 20010622 AGP 1x x86
- GL_VERSION 1.2 Mesa 3.4.2
- GL_EXTENSIONS GL_ARB_multitexture GL_ARB_transpose_matrix GL_EXT_abgr GL_EXT_blend_func_separate GL_EXT_clip_volume_hint GL_EXT_compiled_vertex_array GL_EXT_histogram GL_EXT_packed_pixels GL_EXT_polygon_offset GL_EXT_rescale_normal GL_EXT_stencil_wrap GL_EXT_texture3D GL_EXT_texture_env_add GL_EXT_texture_object GL_EXT_vertex_array GL_MESA_window_pos GL_MESA_resize_buffers GL_NV_texgen_reflection GL_PGI_misc_hints GL_SGIS_pixel_texture GL_SGIS_texture_edge_clamp
- TEXTURE_MODE_3 9987
- TEXTURE_MODE_2 9987
- TEXTURE_MODE_1 9987
- TEXTURE_MODE_0 9987
- COLOR_R_4 15
- COLOR_G_4 15
- COLOR_B_4 3
- CAMWOBBLE_4 0
- AUTO_INCAM_4 0
- SPECTATOR_MODE_4 0
- INSTANT_CHAT_STRING_4_1 LOL!
- INSTANT_CHAT_STRING_4_2 :-)
- INSTANT_CHAT_STRING_4_3 :-(
- INSTANT_CHAT_STRING_4_4 Well done!
- INSTANT_CHAT_STRING_4_5 Almost got you...
- INSTANT_CHAT_STRING_4_6 Hehe!
- INSTANT_CHAT_STRING_4_7 Got one!
- INSTANT_CHAT_STRING_4_8
- INSTANT_CHAT_STRING_4_9
- INSTANT_CHAT_STRING_4_10
- INSTANT_CHAT_STRING_4_11
- INSTANT_CHAT_STRING_4_12
- ALLOW_CAM_4_0 1
- ALLOW_CAM_4_1 1
- ALLOW_CAM_4_2 1
- ALLOW_CAM_4_3 1
- ALLOW_CAM_4_4 1
- START_FOV_4 90
- START_CAM_4 3
- CAMCENTER_4 1
- PLAYER_4 Player 4
- COLOR_R_3 3
- COLOR_G_3 3
- COLOR_B_3 15
- CAMWOBBLE_3 0
- AUTO_INCAM_3 0
- SPECTATOR_MODE_3 0
- INSTANT_CHAT_STRING_3_1 LOL!
- INSTANT_CHAT_STRING_3_2 :-)
- INSTANT_CHAT_STRING_3_3 :-(
- INSTANT_CHAT_STRING_3_4 Well done!
- INSTANT_CHAT_STRING_3_5 Almost got you...
- INSTANT_CHAT_STRING_3_6 Hehe!
- INSTANT_CHAT_STRING_3_7 Got one!
- INSTANT_CHAT_STRING_3_8
- INSTANT_CHAT_STRING_3_9
- INSTANT_CHAT_STRING_3_10
- INSTANT_CHAT_STRING_3_11
- INSTANT_CHAT_STRING_3_12
- ALLOW_CAM_3_0 1
- ALLOW_CAM_3_1 1
- ALLOW_CAM_3_2 1
- ALLOW_CAM_3_3 1
- ALLOW_CAM_3_4 1
- START_FOV_3 90
- START_CAM_3 3
- CAMCENTER_3 1
- PLAYER_3 Player 3
- COLOR_R_2 3
- COLOR_G_2 15
- COLOR_B_2 3
- CAMWOBBLE_2 0
- AUTO_INCAM_2 0
- SPECTATOR_MODE_2 0
- INSTANT_CHAT_STRING_2_1 LOL!
- INSTANT_CHAT_STRING_2_2 :-)
- INSTANT_CHAT_STRING_2_3 :-(
- INSTANT_CHAT_STRING_2_4 Well done!
- INSTANT_CHAT_STRING_2_5 Almost got you...
- INSTANT_CHAT_STRING_2_6 Hehe!
- INSTANT_CHAT_STRING_2_7 Got one!
- INSTANT_CHAT_STRING_2_8
- INSTANT_CHAT_STRING_2_9
- INSTANT_CHAT_STRING_2_10
- INSTANT_CHAT_STRING_2_11
- INSTANT_CHAT_STRING_2_12
- ALLOW_CAM_2_0 1
- ALLOW_CAM_2_1 1
- ALLOW_CAM_2_2 1
- ALLOW_CAM_2_3 1
- ALLOW_CAM_2_4 1
- START_FOV_2 90
- START_CAM_2 3
- CAMCENTER_2 1
- PLAYER_2 Player 2
- COLOR_R_1 15
- COLOR_G_1 3
- COLOR_B_1 3
- CAMWOBBLE_1 0
- AUTO_INCAM_1 0
- SPECTATOR_MODE_1 0
- INSTANT_CHAT_STRING_1_1 LOL!
- INSTANT_CHAT_STRING_1_2 :-)
- INSTANT_CHAT_STRING_1_3 :-(
- INSTANT_CHAT_STRING_1_4 Well done!
- INSTANT_CHAT_STRING_1_5 Almost got you...
- INSTANT_CHAT_STRING_1_6 Hehe!
- INSTANT_CHAT_STRING_1_7 Got one!
- INSTANT_CHAT_STRING_1_8
- INSTANT_CHAT_STRING_1_9
- INSTANT_CHAT_STRING_1_10
- INSTANT_CHAT_STRING_1_11
- INSTANT_CHAT_STRING_1_12
- ALLOW_CAM_1_0 1
- ALLOW_CAM_1_1 1
- ALLOW_CAM_1_2 1
- ALLOW_CAM_1_3 1
- ALLOW_CAM_1_4 1
- START_FOV_1 90
- START_CAM_1 3
- CAMCENTER_1 1
- PLAYER_1 Player 1
- VIEWPORT_TO_PLAYER_1 0
- VIEWPORT_TO_PLAYER_2 1
- VIEWPORT_TO_PLAYER_3 2
- VIEWPORT_TO_PLAYER_4 3
- SOUND_SOURCES 10
- SOUND_QUALITY 2
- SOUND_BUFFER_SHIFT 0
- BIG_BROTHER 1
- KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 273 PLAYER_BIND MOVE_FORWARD 1
-KEYBOARD 271 PLAYER_BIND GLANCE_BACK 1
-KEYBOARD 264 PLAYER_BIND BANK_UP 1
-KEYBOARD 262 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 261 PLAYER_BIND CYCLE_BRAKE 1
-KEYBOARD 260 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 259 PLAYER_BIND GLANCE_RIGHT 1
-KEYBOARD 258 PLAYER_BIND BANK_DOWN 1
-KEYBOARD 257 PLAYER_BIND GLANCE_LEFT 1
-KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
-KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1
- COLOR_STRINGS 1
- SOFTWARE_RENDERER 0
- FAILED_ATTEMPTS 0
- LAST_TRUECOLOR 0
- TRUECOLOR 0
- LAST_FULLSCREEN 0
- FULLSCREEN 0
- ARMAGETRON_LAST_SCREENMODE 6
- ARMAGETRON_SCREENMODE 6
- CUSTOM_SCREEN_WIDTH 800
- CUSTOM_SCREEN_HEIGHT 600
- VIEWPORT_CONF 0
- FIRST_USE 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armagetron_add/software.Armagetronrc new/armagetron_add/software.Armagetronrc
--- old/armagetron_add/software.Armagetronrc 2002-03-18 13:25:06.000000000 +0100
+++ new/armagetron_add/software.Armagetronrc 1970-01-01 01:00:00.000000000 +0100
@@ -1,188 +0,0 @@
- PING_CHARITY 0
- MAX_IN_RATE 4
- MAX_OUT_RATE 4
- SERVER_NAME
- FINISH_TYPE 1
- GAME_TYPE 1
- AUTO_AIS 1
- NUM_AIS 4
- MOVIEPACK 1
- ZTRICK 0
- MOUSE_GRAB 0
- WRAP_MENU 1
- SPARKS 1
- TEXTURES_HI 0
- PREDICT_OBJECTS 1
- LAG_O_METER 1
- INFINITY_PLANE 0
- SKY_WOBBLE 1
- LOWER_SKY 0
- UPPER_SKY 0
- DITHER 0
- HIGH_RIM 0
- FLOOR_DETAIL 1
- FLOOR_MIRROR 0
- SHOW_FPS 1
- TEXT_OUT 1
- SMOOTH_SHADING 1
- ALPHA_BLEND 0
- PERSP_CORRECT -1
- POLY_ANITALIAS -1
- LINE_ANITALIAS -1
- MESSAGE_OF_DAY_4
- MESSAGE_OF_DAY_3
- MESSAGE_OF_DAY_2
- MESSAGE_OF_DAY_1
- ARMAGETRON_VERSION UNKNOWN
- GL_VENDOR Brian Paul
- GL_RENDERER Mesa X11
- GL_VERSION 1.3 Mesa 4.0.1
- GL_EXTENSIONS GL_ARB_imaging GL_ARB_multisample GL_ARB_multitexture GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_texture_env_combine GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_transpose_matrix GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_func_separate GL_EXT_blend_logic_op GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_clip_volume_hint GL_EXT_convolution GL_EXT_compiled_vertex_array GL_EXT_fog_coord GL_EXT_histogram GL_EXT_packed_pixels GL_EXT_paletted_texture GL_EXT_point_parameters GL_EXT_polygon_offset GL_EXT_rescale_normal GL_EXT_secondary_color GL_EXT_shared_texture_palette GL_EXT_stencil_wrap GL_EXT_texture3D GL_EXT_texture_edge_clamp GL_EXT_texture_env_add GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_EXT_texture_object GL_EXT_texture_lod_bias GL_EXT_vertex_array GL_HP_occlusion_test GL_IBM_rasterpos_clip GL_INGR_blend_func_separate GL_MESA_resize_buffers GL_MESA_window_pos GL_NV_blend_squ¿pöÿ¿
- TEXTURE_MODE_3 9728
- TEXTURE_MODE_2 9984
- TEXTURE_MODE_1 -1
- TEXTURE_MODE_0 -1
- COLOR_R_4 15
- COLOR_G_4 15
- COLOR_B_4 3
- CAMWOBBLE_4 0
- AUTO_INCAM_4 0
- SPECTATOR_MODE_4 0
- INSTANT_CHAT_STRING_4_1 LOL!
- INSTANT_CHAT_STRING_4_2 :-)
- INSTANT_CHAT_STRING_4_3 :-(
- INSTANT_CHAT_STRING_4_4 Well done!
- INSTANT_CHAT_STRING_4_5 Almost got you...
- INSTANT_CHAT_STRING_4_6 Hehe!
- INSTANT_CHAT_STRING_4_7 Got one!
- INSTANT_CHAT_STRING_4_8
- INSTANT_CHAT_STRING_4_9
- INSTANT_CHAT_STRING_4_10
- INSTANT_CHAT_STRING_4_11
- INSTANT_CHAT_STRING_4_12
- ALLOW_CAM_4_0 1
- ALLOW_CAM_4_1 1
- ALLOW_CAM_4_2 1
- ALLOW_CAM_4_3 1
- ALLOW_CAM_4_4 1
- START_FOV_4 90
- START_CAM_4 3
- CAMCENTER_4 1
- PLAYER_4 Player 4
- COLOR_R_3 3
- COLOR_G_3 3
- COLOR_B_3 15
- CAMWOBBLE_3 0
- AUTO_INCAM_3 0
- SPECTATOR_MODE_3 0
- INSTANT_CHAT_STRING_3_1 LOL!
- INSTANT_CHAT_STRING_3_2 :-)
- INSTANT_CHAT_STRING_3_3 :-(
- INSTANT_CHAT_STRING_3_4 Well done!
- INSTANT_CHAT_STRING_3_5 Almost got you...
- INSTANT_CHAT_STRING_3_6 Hehe!
- INSTANT_CHAT_STRING_3_7 Got one!
- INSTANT_CHAT_STRING_3_8
- INSTANT_CHAT_STRING_3_9
- INSTANT_CHAT_STRING_3_10
- INSTANT_CHAT_STRING_3_11
- INSTANT_CHAT_STRING_3_12
- ALLOW_CAM_3_0 1
- ALLOW_CAM_3_1 1
- ALLOW_CAM_3_2 1
- ALLOW_CAM_3_3 1
- ALLOW_CAM_3_4 1
- START_FOV_3 90
- START_CAM_3 3
- CAMCENTER_3 1
- PLAYER_3 Player 3
- COLOR_R_2 3
- COLOR_G_2 15
- COLOR_B_2 3
- CAMWOBBLE_2 0
- AUTO_INCAM_2 0
- SPECTATOR_MODE_2 0
- INSTANT_CHAT_STRING_2_1 LOL!
- INSTANT_CHAT_STRING_2_2 :-)
- INSTANT_CHAT_STRING_2_3 :-(
- INSTANT_CHAT_STRING_2_4 Well done!
- INSTANT_CHAT_STRING_2_5 Almost got you...
- INSTANT_CHAT_STRING_2_6 Hehe!
- INSTANT_CHAT_STRING_2_7 Got one!
- INSTANT_CHAT_STRING_2_8
- INSTANT_CHAT_STRING_2_9
- INSTANT_CHAT_STRING_2_10
- INSTANT_CHAT_STRING_2_11
- INSTANT_CHAT_STRING_2_12
- ALLOW_CAM_2_0 1
- ALLOW_CAM_2_1 1
- ALLOW_CAM_2_2 1
- ALLOW_CAM_2_3 1
- ALLOW_CAM_2_4 1
- START_FOV_2 90
- START_CAM_2 3
- CAMCENTER_2 1
- PLAYER_2 Player 2
- COLOR_R_1 15
- COLOR_G_1 3
- COLOR_B_1 3
- CAMWOBBLE_1 0
- AUTO_INCAM_1 0
- SPECTATOR_MODE_1 0
- INSTANT_CHAT_STRING_1_1 LOL!
- INSTANT_CHAT_STRING_1_2 :-)
- INSTANT_CHAT_STRING_1_3 :-(
- INSTANT_CHAT_STRING_1_4 Well done!
- INSTANT_CHAT_STRING_1_5 Almost got you...
- INSTANT_CHAT_STRING_1_6 Hehe!
- INSTANT_CHAT_STRING_1_7 Got one!
- INSTANT_CHAT_STRING_1_8
- INSTANT_CHAT_STRING_1_9
- INSTANT_CHAT_STRING_1_10
- INSTANT_CHAT_STRING_1_11
- INSTANT_CHAT_STRING_1_12
- ALLOW_CAM_1_0 1
- ALLOW_CAM_1_1 1
- ALLOW_CAM_1_2 1
- ALLOW_CAM_1_3 1
- ALLOW_CAM_1_4 1
- START_FOV_1 90
- START_CAM_1 3
- CAMCENTER_1 1
- PLAYER_1 Player 1
- VIEWPORT_TO_PLAYER_1 0
- VIEWPORT_TO_PLAYER_2 1
- VIEWPORT_TO_PLAYER_3 2
- VIEWPORT_TO_PLAYER_4 3
- SOUND_SOURCES 10
- SOUND_QUALITY 2
- SOUND_BUFFER_SHIFT 0
- BIG_BROTHER 1
- KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 273 PLAYER_BIND MOVE_FORWARD 1
-KEYBOARD 271 PLAYER_BIND GLANCE_BACK 1
-KEYBOARD 264 PLAYER_BIND BANK_UP 1
-KEYBOARD 262 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 261 PLAYER_BIND CYCLE_BRAKE 1
-KEYBOARD 260 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 259 PLAYER_BIND GLANCE_RIGHT 1
-KEYBOARD 258 PLAYER_BIND BANK_DOWN 1
-KEYBOARD 257 PLAYER_BIND GLANCE_LEFT 1
-KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
-KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1
- COLOR_STRINGS 1
- SOFTWARE_RENDERER 1
- FAILED_ATTEMPTS 0
- LAST_TRUECOLOR 0
- TRUECOLOR 0
- LAST_FULLSCREEN 0
- FULLSCREEN 0
- ARMAGETRON_LAST_SCREENMODE 4
- ARMAGETRON_SCREENMODE 4
- CUSTOM_SCREEN_WIDTH 800
- CUSTOM_SCREEN_HEIGHT 600
- VIEWPORT_CONF 0
- FIRST_USE 0
++++++ armagetronad-0.2.8.3.2.src.tar.bz2 -> armagetronad-0.2.8.3.3.src.tar.bz2 ++++++
++++ 14701 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/ChangeLog new/armagetronad-0.2.8.3.3/ChangeLog
--- old/armagetronad-0.2.8.3.2/ChangeLog 2011-09-11 12:48:28.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/ChangeLog 2015-02-01 10:25:17.000000000 +0100
@@ -1,7 +1,35 @@
------------------------------------------------------------------------
-r9916 | z-man | 2011-09-11 12:41:12 +0200 (Sun, 11 Sep 2011) | 2 lines
+r10712 | z-man | 2015-01-29 23:53:15 +0100 (Thu, 29 Jan 2015) | 2 lines
-Injecting source again.
+Tagging 0.2.8.3.3_rc1
+
+------------------------------------------------------------------------
+r10706 | z-man | 2015-01-29 23:39:48 +0100 (Thu, 29 Jan 2015) | 1 line
+
+Merging fixes for various potential bugs from 0.2.8.
+------------------------------------------------------------------------
+r10505 | z-man | 2013-01-29 23:12:03 +0100 (Tue, 29 Jan 2013) | 2 lines
+
+Fixing possible crash due to friends list buffer overrun; no exploit potential.
+
+------------------------------------------------------------------------
+r10495 | z-man | 2013-01-27 16:37:31 +0100 (Sun, 27 Jan 2013) | 2 lines
+
+Fixed custom and internal camera turns when axes have angles > 90 degrees between them.
+
+------------------------------------------------------------------------
+r10393 | z-man | 2012-03-31 17:59:04 +0200 (Sat, 31 Mar 2012) | 2 lines
+
+Backporting rare crashfix: Adding sound lock when alpha objects get resorted.
+
+------------------------------------------------------------------------
+r10262 | z-man | 2011-11-20 12:28:42 +0100 (Sun, 20 Nov 2011) | 1 line
+
+Backport fix: Switching to glColor4f because Intel drivers don't like it if you alternate between them and glColor3f in different glBegin()/glEnd() blocks.
+------------------------------------------------------------------------
+r10004 | z-man | 2011-10-11 11:45:06 +0200 (Tue, 11 Oct 2011) | 2 lines
+
+Clearing display lists if moviepack seting changed to flush out all texture changes.
------------------------------------------------------------------------
r9914 | z-man | 2011-09-11 12:40:11 +0200 (Sun, 11 Sep 2011) | 2 lines
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/INSTALL new/armagetronad-0.2.8.3.3/INSTALL
--- old/armagetronad-0.2.8.3.2/INSTALL 2010-02-02 01:59:15.000000000 +0100
+++ new/armagetronad-0.2.8.3.3/INSTALL 2014-01-02 20:14:59.000000000 +0100
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -362,4 +368,3 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/NEWS new/armagetronad-0.2.8.3.3/NEWS
--- old/armagetronad-0.2.8.3.2/NEWS 2011-09-11 12:41:55.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/NEWS 2015-02-26 20:33:16.000000000 +0100
@@ -1,3 +1,14 @@
+Changes since 0.2.8.3.2:
+- security fix: do not read ahead of the beginning of network buffer.
+- security fix: don't attribute network errors from processing random
+ packets to the connection to the server
+- security fix: while at it, don't process random packets unless they
+ may be important
+- fix for potential crash with friend list filtering
+- intel driver compatibility
+- fix for rare crash with sound lock
+- fix for camera turning for bizarre axis configurations
+
Changes since 0.2.8.3.1:
- security fix: old style action commands from clients no loger cause hangs and crashes
- security fix: oversized packets are ignored properly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/compile new/armagetronad-0.2.8.3.3/compile
--- old/armagetronad-0.2.8.3.2/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/armagetronad-0.2.8.3.3/compile 2014-01-02 20:14:59.000000000 +0100
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/configure.ac new/armagetronad-0.2.8.3.3/configure.ac
--- old/armagetronad-0.2.8.3.2/configure.ac 2011-09-11 12:50:26.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/configure.ac 2015-02-26 20:38:05.000000000 +0100
@@ -8,7 +8,7 @@
m4_include(accustomdir.m4)
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(armagetronad,0.2.8.3.2)
+AC_INIT(armagetronad,0.2.8.3.3)
dnl FIXME: remove this in the future, when automake decides to actually set datarootdir by default
dnl http://www.gnu.org/software/hello/manual/autoconf/Changed-Directory-Variable...
@@ -241,14 +241,14 @@
AC_ARG_ENABLE(uninstall,
AC_HELP_STRING([--enable-uninstall@<:@=cmd@:>@],
- [will install an uninstaller script (default=enabled)]),
+ [will install an uninstaller script [BROKEN] (default=disabled)]),
if test "$enableval" = "no"; then
enable_uninstall=no
else
enable_uninstall=yes
external_uninstall_cmd=$enableval
fi,
-enable_uninstall=yes)
+enable_uninstall=no)
AC_SUBST(external_uninstall_cmd)
AC_ARG_ENABLE(multiver,
@@ -731,7 +731,7 @@
CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"
LIBS="$LIBS $PNGLIBS"
-AC_CHECK_FUNC(png_check_sig,
+AC_CHECK_FUNC(png_sig_cmp,
,
AC_MSG_ERROR([You need libpng to compile Armagetron.]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/fingerprint new/armagetronad-0.2.8.3.3/fingerprint
--- old/armagetronad-0.2.8.3.2/fingerprint 2011-09-11 12:50:18.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/fingerprint 2015-02-26 20:37:41.000000000 +0100
@@ -1,11 +1,13 @@
-Path: /home/manuel/Tron/bzr/admin/release/tags/0.2.8.3.2/armagetronad
-URL: https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/armagetronad/t...
-Repository Root: https://armagetronad.svn.sourceforge.net/svnroot/armagetronad
+Path: /home/manuel/Tron/bzr/admin/release/tags/0.2.8.3.3/armagetronad
+Working Copy Root Path: /home/manuel/Tron/bzr/admin/release/tags/0.2.8.3.3
+URL: https://svn.code.sf.net/p/armagetronad/code/armagetronad/tags/0.2.8.3.3/arma...
+Relative URL: ^/armagetronad/tags/0.2.8.3.3/armagetronad
+Repository Root: https://svn.code.sf.net/p/armagetronad/code
Repository UUID: 7d95bf1e-0414-0410-9756-b78462a59f44
-Revision: 9917
+Revision: 10741
Node Kind: directory
Schedule: normal
Last Changed Author: z-man
-Last Changed Rev: 9916
-Last Changed Date: 2011-09-11 12:41:12 +0200 (Sun, 11 Sep 2011)
+Last Changed Rev: 10740
+Last Changed Date: 2015-02-26 20:28:18 +0100 (Thu, 26 Feb 2015)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/missing new/armagetronad-0.2.8.3.3/missing
--- old/armagetronad-0.2.8.3.2/missing 2010-02-02 01:59:15.000000000 +0100
+++ new/armagetronad-0.2.8.3.3/missing 2014-01-02 20:14:59.000000000 +0100
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard , 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to ."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'autom4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/config_ide.h new/armagetronad-0.2.8.3.3/src/config_ide.h
--- old/armagetronad-0.2.8.3.2/src/config_ide.h 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/config_ide.h 2015-02-26 20:37:49.000000000 +0100
@@ -99,4 +99,4 @@
#define HAVE_WMEMSET 1
// define version
-#define VERSION "0.2.8.3.2"
+#define VERSION "0.2.8.3.3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/bugs.html new/armagetronad-0.2.8.3.3/src/doc/bugs.html
--- old/armagetronad-0.2.8.3.2/src/doc/bugs.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/bugs.html 2015-02-26 20:37:49.000000000 +0100
@@ -62,7 +62,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -310,7 +310,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/changelog.html new/armagetronad-0.2.8.3.3/src/doc/changelog.html
--- old/armagetronad-0.2.8.3.2/src/doc/changelog.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/changelog.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -447,7 +447,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/commands.html new/armagetronad-0.2.8.3.3/src/doc/commands.html
--- old/armagetronad-0.2.8.3.2/src/doc/commands.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/commands.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -899,7 +899,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/compile.html new/armagetronad-0.2.8.3.3/src/doc/compile.html
--- old/armagetronad-0.2.8.3.2/src/doc/compile.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/compile.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -200,7 +200,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/config.html new/armagetronad-0.2.8.3.3/src/doc/config.html
--- old/armagetronad-0.2.8.3.2/src/doc/config.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/config.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -660,7 +660,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/faq.html new/armagetronad-0.2.8.3.3/src/doc/faq.html
--- old/armagetronad-0.2.8.3.2/src/doc/faq.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/faq.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -397,7 +397,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/index.html new/armagetronad-0.2.8.3.3/src/doc/index.html
--- old/armagetronad-0.2.8.3.2/src/doc/index.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/index.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -344,7 +344,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/install_linux.html new/armagetronad-0.2.8.3.3/src/doc/install_linux.html
--- old/armagetronad-0.2.8.3.2/src/doc/install_linux.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/install_linux.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -188,7 +188,7 @@
<strong>make</strong>; however, only GNU make is supported.
To build the dedicated server, add the option <strong>--disable-glout</strong> to the configure script.
To change the installation path, use the option <strong>--prefix=new_path</strong>.
-Type <pre>uninstall-armagetronad(-dedicated)-0.2.8.3.2</pre> to uninstall.
+Type <pre>uninstall-armagetronad(-dedicated)-0.2.8.3.3</pre> to uninstall.
</p>
<p align=justify>
@@ -236,7 +236,7 @@
<a name=multiple><h3 align=left>Multiple versions</h3></a>
If you give the additional option <strong>--enable-multiver</strong> to <strong>configure</strong>, all installation
-directories and executables will get the suffix <strong>0.2.8.3.2</strong>. Symbolic links will be created to
+directories and executables will get the suffix <strong>0.2.8.3.3</strong>. Symbolic links will be created to
your convenience. This allows to install multiple versions in parallel, where <strong>armagetronad(-dedicated)</strong> will
always start the last installed version.
@@ -281,7 +281,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/install_macosx.html new/armagetronad-0.2.8.3.3/src/doc/install_macosx.html
--- old/armagetronad-0.2.8.3.2/src/doc/install_macosx.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/install_macosx.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/install_windows.html new/armagetronad-0.2.8.3.3/src/doc/install_windows.html
--- old/armagetronad-0.2.8.3.2/src/doc/install_windows.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/install_windows.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -294,7 +294,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/net/index.html new/armagetronad-0.2.8.3.3/src/doc/net/index.html
--- old/armagetronad-0.2.8.3.2/src/doc/net/index.html 2011-09-11 12:50:24.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/net/index.html 2015-02-26 20:37:47.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:47+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron: network code documentation</title>
@@ -178,7 +178,7 @@
Manuel Moos(<b> </b> <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ).
<p align=center>
-Last modification: Sun Sep 11 12:50:24 CEST 2011
+Last modification: Thu Feb 26 20:37:47 CET 2015
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/net/lower.html new/armagetronad-0.2.8.3.3/src/doc/net/lower.html
--- old/armagetronad-0.2.8.3.2/src/doc/net/lower.html 2011-09-11 12:50:24.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/net/lower.html 2015-02-26 20:37:47.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:47+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron: network code documentation</title>
@@ -208,7 +208,7 @@
Manuel Moos(<b> </b> <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ).
<p align=center>
-Last modification: Sun Sep 11 12:50:24 CEST 2011
+Last modification: Thu Feb 26 20:37:47 CET 2015
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/net/middle.html new/armagetronad-0.2.8.3.3/src/doc/net/middle.html
--- old/armagetronad-0.2.8.3.2/src/doc/net/middle.html 2011-09-11 12:50:24.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/net/middle.html 2015-02-26 20:37:47.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:47+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron: network code documentation</title>
@@ -329,7 +329,7 @@
Manuel Moos(<b> </b> <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ).
<p align=center>
-Last modification: Sun Sep 11 12:50:24 CEST 2011
+Last modification: Thu Feb 26 20:37:47 CET 2015
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/net/upper.html new/armagetronad-0.2.8.3.3/src/doc/net/upper.html
--- old/armagetronad-0.2.8.3.2/src/doc/net/upper.html 2011-09-11 12:50:24.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/net/upper.html 2015-02-26 20:37:47.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:24+01:00">
+ <meta name="date" content="2015-02-26T20:37:47+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron: network code documentation</title>
@@ -523,7 +523,7 @@
Manuel Moos(<b> </b> <script language="JavaScript"> var b = "sf.net "; var c = "z-man"; var a="users"; document.write(c); document.write("@") ; document.write(a) ; document.write(".") ; document.write(b); </script> ).
<p align=center>
-Last modification: Sun Sep 11 12:50:24 CEST 2011
+Last modification: Thu Feb 26 20:37:47 CET 2015
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/network.html new/armagetronad-0.2.8.3.3/src/doc/network.html
--- old/armagetronad-0.2.8.3.2/src/doc/network.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/network.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -579,7 +579,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/readme_macosx.html new/armagetronad-0.2.8.3.3/src/doc/readme_macosx.html
--- old/armagetronad-0.2.8.3.2/src/doc/readme_macosx.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/readme_macosx.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/todo.html new/armagetronad-0.2.8.3.3/src/doc/todo.html
--- old/armagetronad-0.2.8.3.2/src/doc/todo.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/todo.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:48+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -146,7 +146,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/doc/versions.html new/armagetronad-0.2.8.3.3/src/doc/versions.html
--- old/armagetronad-0.2.8.3.2/src/doc/versions.html 2011-09-11 12:50:25.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/doc/versions.html 2015-02-26 20:37:49.000000000 +0100
@@ -61,7 +61,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="date" content="2011-09-11T12:50:25+01:00">
+ <meta name="date" content="2015-02-26T20:37:49+01:00">
<meta name="author" content="Manuel Moos">
<title>Armagetron Advanced: Documentation</title>
@@ -172,7 +172,7 @@
</p>
<p align=center>
-Last modification: Sep 11 2011
+Last modification: Jan 29 2015
</p>
<p align=center><!--#spaceportsbanner--></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/engine/eCamera.cpp new/armagetronad-0.2.8.3.3/src/engine/eCamera.cpp
--- old/armagetronad-0.2.8.3.2/src/engine/eCamera.cpp 2011-09-11 12:41:53.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/engine/eCamera.cpp 2015-01-29 23:53:56.000000000 +0100
@@ -1765,7 +1765,18 @@
if ( Center() && wrongDirection > 0 )
{
// if so, turn to the side using the last driving direction
- newdir = newdir + Center()->LastDirection()*(wrongDirection*ts*turnSpeed*customTurnSpeed180);
+ eCoord normedLastDir = Center()->LastDirection();
+ REAL wrongWrongDirection = -eCoord::F(cycleDir, normedLastDir);
+ if( wrongWrongDirection > 0)
+ {
+ normedLastDir = normedLastDir + cycleDir * (wrongWrongDirection/cycleDir.NormSquared());
+ REAL n = normedLastDir.NormSquared();
+ if(n > 0)
+ {
+ normedLastDir *= 1/sqrt(n);
+ }
+ }
+ newdir = newdir + normedLastDir*(wrongDirection*ts*turnSpeed*customTurnSpeed180);
}
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/engine/eGameObject.cpp new/armagetronad-0.2.8.3.3/src/engine/eGameObject.cpp
--- old/armagetronad-0.2.8.3.2/src/engine/eGameObject.cpp 2011-09-11 12:41:53.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/engine/eGameObject.cpp 2015-01-29 23:53:56.000000000 +0100
@@ -880,6 +880,9 @@
// but the small flickering error is to be tolerated, especially
// since alpha blended game objects tend to gently fade in.
int firstAlphaID = firstAlpha->id;
+
+ eSoundLocker locker;
+
grid->gameObjects.Remove(firstAlpha,firstAlpha->id);
grid->gameObjects.Add(firstAlpha,firstAlpha->id);
grid->gameObjects.Remove(object,object->id);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/macosx/config_common.h.in new/armagetronad-0.2.8.3.3/src/macosx/config_common.h.in
--- old/armagetronad-0.2.8.3.2/src/macosx/config_common.h.in 2011-09-11 12:50:26.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/macosx/config_common.h.in 2015-02-26 20:38:05.000000000 +0100
@@ -163,7 +163,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.2.8.3.2"
+#define VERSION "0.2.8.3.3"
/* Windows 9x/NT/2k/XP */
/* #undef WIN32 */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/network/nNetwork.cpp new/armagetronad-0.2.8.3.3/src/network/nNetwork.cpp
--- old/armagetronad-0.2.8.3.2/src/network/nNetwork.cpp 2011-09-11 12:41:48.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/network/nNetwork.cpp 2015-01-29 23:53:54.000000000 +0100
@@ -1413,6 +1413,10 @@
}
void login_deny_handler(nMessage &m){
+ // only the server is allowed to send this
+ if(m.SenderID() != 0)
+ return;
+
if ( !m.End() )
{
// tOutput output;
@@ -1908,6 +1912,11 @@
unsigned short id = m.SenderID();
//m.Read(id);
+ // only the server or legal clients are allowed to send this
+ // (client check comes later)
+ if(sn_GetNetState() == nCLIENT && id != 0)
+ return;
+
if (sn_Connections[id].socket)
{
tOutput o;
@@ -2266,7 +2275,7 @@
nAddress addrFrom; // the sender of the current packet
len = sn_Connections[peer].socket->Read( reinterpret_cast(buff),maxrec*2, addrFrom);
- if (len>0){
+ if (len>=2){
if ( len >= maxrec*2 )
{
#ifndef DEDICATED
@@ -2360,6 +2369,10 @@
}
else
{
+ // logged in clients should ignore packets from unknown sources
+ if(sn_GetNetState() != nSERVER && sn_myNetID != 0)
+ continue;
+
// assume it's a new connection
id = MAXCLIENTS+1;
peers[ MAXCLIENTS+1 ] = addrFrom;
@@ -2491,7 +2504,7 @@
catch(nKillHim)
{
con << "nKillHim signal caught: ";
- sn_DisconnectUser(peer, "$network_kill_error");
+ sn_DisconnectUser(id, "$network_kill_error");
}
#endif
}
@@ -3332,9 +3345,9 @@
}
// clients can only disconnect from the server
- if ( i != 0 && sn_GetNetState() == nCLIENT )
+ if ( i != 0 && i <= MAXCLIENTS && sn_GetNetState() == nCLIENT )
{
- tERR_ERROR( "Client tried to disconnect from another client: impossible and a bad idea." );
+ tERR_WARN( "Client tried to disconnect from another client: impossible and a bad idea." );
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/tron/gGame.cpp new/armagetronad-0.2.8.3.3/src/tron/gGame.cpp
--- old/armagetronad-0.2.8.3.2/src/tron/gGame.cpp 2011-09-11 12:41:47.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/tron/gGame.cpp 2015-01-29 23:53:54.000000000 +0100
@@ -1794,6 +1794,13 @@
#ifndef DEDICATED
if (sr_glOut){
+ static bool lastMoviePack=sg_MoviePack();
+ if(lastMoviePack!=sg_MoviePack())
+ {
+ lastMoviePack=sg_MoviePack();
+ rDisplayList::ClearAll();
+ }
+
RenderAllViewports(grid);
sr_ResetRenderState(true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/tron/gServerBrowser.cpp new/armagetronad-0.2.8.3.3/src/tron/gServerBrowser.cpp
--- old/armagetronad-0.2.8.3.2/src/tron/gServerBrowser.cpp 2011-09-11 12:41:47.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/tron/gServerBrowser.cpp 2015-01-29 23:53:54.000000000 +0100
@@ -392,7 +392,7 @@
int i;
tString userNames = run->UserNames();
tString* friends = getFriends();
- for (i = MAX_FRIENDS; i>=0; i--)
+ for (i = MAX_FRIENDS-1; i>=0; i--)
{
if (run->Users() > 0 && friends[i].Len() > 1 && userNames.StrPos(friends[i]) >= 0)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/armagetronad-0.2.8.3.2/src/tron/gWall.cpp new/armagetronad-0.2.8.3.3/src/tron/gWall.cpp
--- old/armagetronad-0.2.8.3.2/src/tron/gWall.cpp 2011-09-11 12:41:47.000000000 +0200
+++ new/armagetronad-0.2.8.3.3/src/tron/gWall.cpp 2015-01-29 23:53:54.000000000 +0100
@@ -1114,19 +1114,19 @@
{
BeginQuads();
- glColor3f(r,g,b);
+ glColor4f(r,g,b,1);
glTexCoord2f(ta,hfrac);
glVertex3f(p1.x,p1.y,extrarise);
- glColor3f(r,g,b);
+ glColor4f(r,g,b,1);
glTexCoord2f(ta,0);
glVertex3f(p1.x,p1.y,extrarise + h*hfrac);
- glColor3f(r,g,b);
+ glColor4f(r,g,b,1);
glTexCoord2f(te,0);
glVertex3f(p2.x,p2.y,extrarise + h*hfrac);
- glColor3f(r,g,b);
+ glColor4f(r,g,b,1);
glTexCoord2f(te,hfrac);
glVertex3f(p2.x,p2.y,extrarise);