Merge lp:~armagetronad-ap/armagetronad/0.2.9-armagetronad-sty+ct+ap into lp:~z-man/armagetronad/0.2.9-armagetronad-sty+ct+ap

[Armanelgtron]

[lp:~armagetronad-ap/armagetronad/0.2.9-armagetronad-sty+ct+ap]

1108. By Armanelgtron on 2020-06-15

Have LADDERLOG_ENABLED enabled by default for servers but disabled for clients (where it's generally less useful anyway).

1109. By Armanelgtron on 2020-06-18

Check CanRespawn for zone spawn action.

1110. By Armanelgtron on 2020-06-20

Merge from 0.2.8.

1111. By Armanelgtron on 2020-06-30

Disallow scoreboard from being toggled while chatting instead of just closing it when entering chat.

1112. By Armanelgtron on 2020-06-30

Aspect ratio correction for text.

1113. By Armanelgtron on 2020-06-30

Don't include colors when shrinking center messages.

1114. By Armanelgtron on 2020-07-01

Add VERIFY_COLOR_STRICT and escape noncompliant color codes on the server so clients don't have to support it.

1115. By Armanelgtron on 2020-07-02

A couple patches, mainly color related:
Less strict color filtering for
 - names so they can't wind up visibly illegally long.
 - logs/console output
 - center message shrinking
Complete the implementation of CONSOLE_LOG_COLOR_DECORATE_TIMESTAMP

1116. By Armanelgtron on 2020-07-02

More aspect ratio correction: for text in server browser and fullscreen messages.

1117. By Armanelgtron on 2020-07-03

"Hack" to fade zones in before round begins

1118. By Armanelgtron on 2020-07-03

Converted 0.4's font to textures. Using that instead.

=== modified file '.bzrignore'
--- .bzrignore	2019-07-26 01:01:51 +0000
+++ .bzrignore	2020-07-03 06:03:19 +0000
@@ -17,12 +17,14 @@
 ChangeLog
 EclipseBuild
 ./INSTALL
+./compile
 Makefile.in
 ./aclocal.m4
 ./autom4te.cache
 ./config.h.in
 ./config.sub
 ./configure
+./compile
 ./depcomp
 ./install-sh
 ./missing
@@ -34,6 +36,7 @@
 ./config.h
 ./config.log
 ./config.status
+./config.guess
 ./extrapaths
 ./stamp-h1
 ./universal_variable*
@@ -64,4 +67,5 @@
 a.out.dSYM
 src/armagetronad_main_master
 src/doc/COPYING.txt
-rubbish
 \ No newline at end of file
+rubbish
+./version.h
 
=== added file '.dockerignore'
--- .dockerignore	1970-01-01 00:00:00 +0000
+++ .dockerignore	2020-07-03 06:03:19 +0000
@@ -0,0 +1,5 @@
+Dockerfile
+dockerbuild
+.dockerignore
+.gitlab-ci.yml
+builds
 
=== modified file '.gitignore'
--- .gitignore	2019-07-26 01:01:51 +0000
+++ .gitignore	2020-07-03 06:03:19 +0000
@@ -3,10 +3,16 @@
 Armagetron Advanced.app
 desktop/os-x/Info.plist
 .gdbinit
+.cache
+.lock.*
+docker/images/context
+docker/deploy/*.gpg
+docker/deploy/ssh
 batch/rcd_config
 batch/rcd_server
 batch/rcd_startstop
 batch/serverstarter
+*.digest.local
 ./armagetronad-dedicated
 COPYING
 ChangeLog
@@ -19,6 +25,7 @@
 /config.h.in
 /config.sub
 /configure
+/builds
 /depcomp
 /install-sh
 /ylwrap
@@ -31,6 +38,7 @@
 /config.h
 /config.log
 /config.status
+/config.guess
 /extrapaths
 /stamp-h1
 /universal_variable*
@@ -42,6 +50,7 @@
 config/rc.config
 desktop/armagetronad-armagetronad.desktop
 language/languages.txt
+language/*.bak
 resource/included/
 resource/automatic/
 .deps
 
=== added file '.gitlab-ci.yml'
--- .gitlab-ci.yml	1970-01-01 00:00:00 +0000
+++ .gitlab-ci.yml	2020-07-03 06:03:19 +0000
@@ -0,0 +1,364 @@
+image: registry.gitlab.com/armagetronad/armagetronad/armaroot_64@sha256:182493edea0ad5b31f8dfe0c27b414cc2a3d710a051b6f2359a21da791ca8a68
+
+variables:
+  # https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
+  #DOCKER_TLS_CERTDIR: "/certs"
+  #DOCKER_HOST: ""
+
+services:
+  # required for shared runners, does not hurt for our runner (just some diagnostic complaints)
+  - name: docker:19.03.0-dind
+    alias: docker
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+
+stages:
+  - minimal_build
+  - build_prepare
+  - build_base
+  - build_main
+  - build_collect
+  - test
+  - stage
+  - deploy
+
+default:
+  # common before script: bootstrap, configure, make dist, prepare docker builds
+  before_script:
+    - if ! test -d gitlab_build; then
+    -  docker help > /dev/null
+    -  touch timestamp.tag
+    -  test "x${ARMAGETRONAD_FAKERELEASE}" == "x" && export ARMAGETRONAD_FAKERELEASE=false
+    -  test -r configure || ./bootstrap.sh
+    -  ls docker/build -al
+    -  cat version.m4
+    -  mkdir -p gitlab_build
+    -  cd gitlab_build
+    -  . ../docker/scripts/brand.sh .
+    -  ../configure  --prefix=/usr/local --disable-glout --disable-sysinstall --disable-desktop progname="${PROGRAM_NAME}" progtitle="${PROGRAM_TITLE}"
+    -  test "x${ARMAGETRONAD_FAKERELEASE}" == "xtrue" && cp ../docker/build/fakerelease_proto.sh docker/build/fakerelease.sh 
+    -  cd docker/build
+    -  make CI_prepare -j`nproc`
+    -  cd ../../../
+    - else
+    -  find . -newer timestamp.tag ! -path "./gitlab_build" -exec touch -r timestamp.tag \{\} \;
+    -  ./docker/scripts/fix_gits.sh || exit $?
+    - fi
+    
+  # cache git checkouts of repositories we depend on
+  cache:
+    paths:
+     - docker/scripts/.cache
+
+
+# very basic build
+build_prepare:
+  stage: build_prepare
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+      when: on_success
+    - when: on_success
+  script: [""]
+  artifacts:
+    untracked: true
+    expire_in: 1 day
+
+
+build_server_32_raw:
+  stage: build_base
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh -k result.build_server_32
+  after_script:
+    - rm -rf gitlab_build/docker/build/context*.dir
+  artifacts:
+    untracked: true
+    expire_in: 1 day
+
+build_server_steam_raw:
+  stage: build_base
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh -k result.build_server_steam
+  artifacts:
+    untracked: true
+    expire_in: 1 day
+
+    # It seems like GitLab CI, all else being equal, schedules jobs in the order
+# listed here. So list the ones that take longest first.
+# Windows builds are worst because they have an additional layer of emulation,
+# are not parallelized and are client and server build in one.
+build_windows:
+  needs:
+  - build_server_32_raw
+  dependencies:
+  - build_server_32_raw
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_windows
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+build_windows_steam:
+  needs:
+  - build_server_steam_raw
+  dependencies:
+  - build_server_steam_raw
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_windows_steam
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+# debtest is faster, but also not paralellized
+build_debtest:
+  dependencies:
+  - build_prepare
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_debtest
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+# steam builds server and client in one go (the server is already pre-built), they are packed together
+build_linux_steam:
+  dependencies:
+  - build_server_steam_raw
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_linux_steam
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+build_client_64:
+  dependencies:
+  - build_prepare
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_linux_client_64
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+build_client_32:
+  dependencies:
+  - build_prepare
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_linux_client_32
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+build_server_64:
+  dependencies:
+  - build_prepare
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_linux_server_64
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+# this one is special, it can rely on previous build work
+build_server_32:
+  dependencies:
+  - build_server_32_raw
+  stage: build_main
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh CI_linux_server_32
+  artifacts:
+    paths:
+    - gitlab_build/docker/build/
+    expire_in: 1 day
+
+build_collect:
+  stage: build_collect
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: on_success
+  - when: on_success
+  script:
+    - gitlab_build/docker/build/make_ci.sh debtest.tag CI || exit $?
+    - rm -rf src
+  artifacts:
+    untracked: true
+    expire_in: 1 week
+
+# deploy to staged environment
+deploy-staged:
+  dependencies:
+   - build_prepare
+   - build_collect
+  stage: stage
+  tags:
+   - armagetronad_deploy
+  rules:
+  - if: $CI_MERGE_REQUEST_ID
+    when: never
+  - if: $CI_COMMIT_REF_PROTECTED == "true"
+    when: on_success
+  - when: never
+  before_script:
+    - ./docker/scripts/fix_gits.sh || exit $?
+    - ./docker/deploy/prepare_deploy.sh || exit $?
+
+  script:
+    # mark 
+    - echo ${CI_PIPELINE_IID} > /messageboard/current_pipeline_${CI_COMMIT_REF_NAME}
+    # now enter the docker build directory and just invoke make there
+    - cd gitlab_build/docker/build
+    - make staged_deploy -O -j$(nproc) -k
+
+
+# do the actual release; manually for final releases, delayed to avoid spam for everyone else
+delay-release:
+  dependencies: []
+  stage: stage
+  rules: 
+  - if: $CI_MERGE_REQUEST_ID
+    when: never
+  - if: '$CI_COMMIT_REF_PROTECTED == "false"'
+    when: never
+  - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME !~ /^release/'
+    when: delayed
+    start_in: '6 hours'
+  - when: on_success
+  before_script: [""]
+  script: [""]
+
+# do the actual release; manually for final releases, delayed to avoid spam for everyone else
+deploy-release:
+  dependencies:
+   - build_prepare
+   - build_collect
+  stage: deploy
+  tags:
+   - armagetronad_deploy
+  rules: 
+   - if: $CI_MERGE_REQUEST_ID
+     when: never
+   - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME =~ /^release/'
+     when: manual
+   - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME !~ /^release/'
+     when: on_success
+   - when: never
+  before_script:
+    - ./docker/scripts/fix_gits.sh || exit $?
+    - ./docker/deploy/prepare_deploy.sh || exit $?
+  script:
+    - tagfile=/messageboard/current_pipeline_${CI_COMMIT_REF_NAME}
+    - if ! echo ${CI_COMMIT_REF_NAME} | grep -q ^release && test -r ${tagfile} && ! test ${CI_PIPELINE_IID} == `cat ${tagfile}`; then
+    -   echo "A newer build is already in the pipeline, abort."
+    -   exit 0
+    - fi
+
+    # now enter the docker build directory and just invoke make there
+    - cd gitlab_build/docker/build
+    - make unstaged_deploy -O -j$(nproc) -k
+
+
+
+
+# pack up the downloadable build files in one handy artifact
+pack:
+  stage: stage
+  needs:
+   - build_collect
+  dependencies:
+   - build_collect
+  script: [""]
+  before_script:
+    # test that everything has been prepared correctly
+    - if ! test -d gitlab_build; then
+    -  echo "No build yet!"
+    -  exit 1
+    - fi
+    - find . -newer timestamp.tag ! -path "./gitlab_build" -exec touch -r timestamp.tag \{\} \;
+    - if ! make -C gitlab_build/docker/build -q CI_pack.tag; then
+    -  make -d -C gitlab_build/docker/build -q CI_pack.tag || exit $?
+    -  exit 1
+    - fi
+    - ./docker/scripts/fix_gits.sh || exit $?
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - gitlab_build/docker/build/upload
+
+
+
+
+testbuild:
+  stage: test
+  rules:
+   - when: never
+  script:
+    - docker build -t armagetronad_server .
+
+
+
+
+# for local testing
+complete_build:
+  stage: build_main
+  rules:
+  - when: never
+  script:
+    - cd gitlab_build/docker/build
+    - make -O -j$(nproc) CI_base
+    - make -O -j$(nproc) CI
+    
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - gitlab_build/docker/build/upload
 
=== modified file 'AUTHORS'
--- AUTHORS	2012-05-21 04:31:14 +0000
+++ AUTHORS	2020-07-03 06:03:19 +0000
@@ -37,7 +37,7 @@
 Oscilloscope             : Most default instant chats
 Belenus                  : OpenBSD support sniplets
 hoop                     : Zone rendering settings
-fman23                   : Console Commands
+fman23                   : Console commands
 LOVER$BOY                : Console Commands
 
 Translators who aren't already cited above:
 
=== added file 'CHANGELOG.md'
--- CHANGELOG.md	1970-01-01 00:00:00 +0000
+++ CHANGELOG.md	2020-07-03 06:03:19 +0000
@@ -0,0 +1,807 @@
+
+#### Changes since 0.2.8.3.5:
+
+##### Fixed Bugs
+
+ * Debian builds: Documentation html files have empty last change ([#9](https://gitlab.com/armagetronad/armagetronad/-/issues/9))
+ * Ubuntu PPA release candidate builds would overwrite previous stable releases ([#15](https://gitlab.com/armagetronad/armagetronad/-/issues/15))
+
+##### New Features
+
+ * Adapt ChangeLog and fingerprint generation to git ([#11](https://gitlab.com/armagetronad/armagetronad/-/issues/11))
+ * Integrated build system ([#14](https://gitlab.com/armagetronad/armagetronad/-/issues/14))
+
+
+##### Changes on the 0.2.9 branch
+
+ * Added detection and reaction code for timing assist bots
+ * /shuffle now works before you actually join a team
+ * Implemented /shout command and associated settings
+ * Fixed suspension and silenced status not being re-applied after a player
+   disconnects and rejoins a server.
+ * Tweaks to enemy influence system.
+ * Ingame menu and console now are drawn on top of a semi-transparent,
+   darkened area for increased readability.
+ * New first start menu with clearer language selection and initial setup.
+ * Tutorial match against one AI at slower speed.
+ * Tutorial tooltips for the most important keybindings.
+ * ADD_MASTER_SERVER command to announce a server to a new master server.
+   Simplifies the process to list your server on a subculture.
+ * Team launch positions logged to ladderlog with POSITIONS event. Disabled by
+   default.
+ * New command-line option "--input" added to poll for input from a file
+   instead of stdin.
+ * Added WHITELIST_ENEMIES_[IP/USERNAME] to allow players to be enemies, even
+   if they come from the same IP address and ALLOW_ENEMIES_SAME_IP is
+   disabled (which is its default setting).
+ * GAME_END, NEW_MATCH, and NEW_ROUND ladderlog events include date and time.
+ * Added ENCODING ladderlog event, which specifies the encoding for data in
+   ladderlog.txt.
+ * "--input" now can be used more than once to read from multiple files or pipes.
+ * new team management ladderlog messages:
+   TEAM_CREATED <team name>
+   TEAM_DESTROYED <team name>
+   TEAM_RENAMED <old team name> <new team name>
+   TEAM_PLAYER_ADDED <team name> <player>
+   TEAM_PLAYER_REMOVED <team name> <player>
+ * Manage external scripts on Unix dedicated servers. New commands: 
+   SPAWN_SCRIPT, RESPAWN_SCRIPT, FORCE_RESPAWN_SCRIPT, KILL_SCRIPT,
+   LIST_SCRIPTS, SCRIPT_ENV.
+ * New setting ACCESS_LEVEL_ANNOUNCE_LOGIN that determines if a player's
+   login/logout message can be announced.
+ * Authentication is now enabled by default.
+
+#### Changes since 0.2.8.3.4:
+
+ * Security fix: Check that the remote is allowed to create an object
+   before creating it, not decide whether it gets to keep it after
+   it already has been created and potential damage has been done.
+   No arbitrary code could be executed, but a client could effectively 
+   shut down a server by sending crucial objects, such as the main game
+   timer or the game itself.
+ * Compilation fixes for current systems.
+
+#### Changes since 0.2.8.3.3:
+
+ * Eliminated undefined behavior that was fine in gcc 5, but now
+   (rightfully!) turned into crashes in gcc 6.
+ * Eliminated compilation disambiguity that was just causing a mild
+   performance degradation in gcc 5 and is now a compilation failure in
+   gcc 6.
+   
+#### 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
+ * security fix: never read one byte outside of the received buffer
+ * security fix: only include .cfg files from the var subfolder
+ * compiler compatibility: adapted to gcc 4.60
+ * smaller spelling fixes
+ * FOV calculations now correct for widescreen and horizontal splitscreen
+ * Additional checks against illegal values passed to renderer
+
+#### Changes since 0.2.8.3:
+
+ * fixed temporary sound disappearance when alt-tabbing away and back
+ * default subcultures are now distributed
+ * enable 32 bit color depth at desktop resolution
+ * no more display lists for SiS cards
+ * spelling mistakes and missing German translations
+
+#### Changes since 0.2.8.3_rc4:
+
+ * New setting: KEEP_PLAYER_SLOT allows the server to kick (preferably) spectators
+   if it gets full so there is always one slot open for players
+ * New setting: ACCESS_LEVEL_AUTOKICK_IMMUNITY sets the access level required 
+   to be immune from such kicks (and idle autokicks, too)
+ * Intercepted chat commands are now written to ladderlog.txt. Format:
+   COMMAND /command-intercepted player [command arguments]
+ * Increased default speed of server pinging
+ * Reordered game menus a bit
+ * fast finish works again
+
+#### Changes since 0.2.8.3_rc3:
+
+ * Pinging previously popular servers earlier for quicker server
+   browsing
+ * Improved master server random polling, the second polled master now
+   also is random, and all masters are polled if need be
+ * Custom camera snaps to cycle direction once when activated if the turn speed
+   is zero.
+ * RESERVE_SCREEN_NAME now works regardless of the ALLOW_IMPOSTOR setting.
+ * USER_LEVEL now escapes the given authenticated name so you don't have to
+   guess the escaping rules. Ex: USER_LEVEL "name with spaces@forums" 2
+   changes user level for name\_with\_spaces@forums
+
+#### Changes since 0.2.8.3_rc2:
+
+ * Fixed crash with server polling
+ * ROUND_WINNER and MATCH_WINNER ladderlog events now include the players of
+   the team.
+ * Camera switches to user preferred camera when you die in incam mode
+ * Better support for custom language files
+ * Players can no longer spam chat with /shuffle messages. Added new setting
+   SHUFFLE_SPAM_MESSAGES_PER_ROUND, a per round, per player limit on the number
+   of shuffle messages displayed.
+
+#### Changes since 0.2.8.3_rc1:
+
+ * Fixed dark color filters, such as FILTER_DARK_COLOR_STRINGS, to not filter
+   the reset color.
+ * ASE moviepack models no longer have a vertex count limit
+ * Fixed endless recursion crash between rounds
+
+#### Changes since 0.2.8.3_beta3:
+
+ * Chat prefix spam protection. Guards against prefix spam, such as when a
+   user always changes their chat message color, or prefixes all messages
+   with a clan tag. Toggle with the PREFIX_SPAM_ENABLE setting.
+ * Fixed VOTING_MATURITY to use the time when the player entered as its 
+   reference time.
+ * Fixed single player highscore list not containing everyone.
+ * Fixed generation of duplicate names in highscore lists.
+ * Fixed camera crash when the grid is empty.
+
+#### Changes since 0.2.8.3_beta2:
+ * Fixed 'invincibility' bug. It really was cycles freezing in time.
+ * Fixed sporadic sound related crash at round end.
+ * setting rename: SILENCE_ALL -> SILENCE_DEFAULT.
+ * Sound no longer gets muted after you switch the sound settings.
+ * Fixed object collision detection that would sometimes pick a wrong 
+   wall to collide with, most likely the reason behind wrongly accredited
+   kills.
+ * Fixed inability to switch viewport assignment in four player mode.
+ * Better handling of lag clusterbombs.
+ * Server disconnects now also take immediate effect even when you're
+   in a menu or chatting.
+
+#### Changes since 0.2.8.3_beta1:
+ * Made ready for Armatrators
+ * Authentication routines now use utf8 as forward- compatibility with
+   trunk. Previously, non-ASCII usernames simply didn't work at all.
+ * Better lag slide protection: clients no longer get confused when
+   the server sends their cycle back in time, and the server no longer
+   does that for old clients.
+ * Fixed rare wallpassing bug; it required what whould usually be an
+   instakill and infinte wall length.
+
+#### Changes since 0.2.8.2:
+
+New settings and commands:
+
+ * MIN_PLAY_TIME_*: minimal play time required before you are allowed to
+   play on this server.
+ * SPAM_AUTOKICK_COUNT: minimal number of spam warning messages you get in a
+   row before you get kicked.
+ * FORTRESS_COLLAPSE_SPEED: tune the collapse speed of fortress zones.
+ * VOTE_KICK_REASON: default reason given on kick votes.
+ * "/vote" chat interface to votes; "/vote kick <player>" issues a kick vote.
+ * new vote type "/vote suspend <player>" suspends a player for 
+   VOTING_SUSPEND_ROUNDS rounds.
+ * new vote type "/vote include <file>", includes configuration file
+   vote/<file>.
+ * new vote type "/vote command <command>" executes console command
+   <command>. (Both that and /vote include are by default only available
+   to moderators).
+ * VOTING_HARM_TIME: time between all harmful votes against a player
+ * VOTING_KICK_MINHARM: auto-transform the first few menu issued kick 
+   votes to suspensions
+ * (UN)SUSPEND kicks a player to spectator mode with a timeout. Intended to
+   let new players watch before they play.
+ * VOTES_CANCEL cancels all running polls.
+ * VOTING_SUSPEND [<minutes>] disallows voting during a specified amount of time.
+ * ZONE_ALPHA_TOGGLE to override the systemwide alpha blendings setting and
+   have zones rendered in wireframe mode even when alpha blending is on.
+ * ZONE_ALPHA(_SERVER) to control intensity of zone rendering.
+ * SCORE_HOLE for awarding sacrifice.
+ * SCORE_SURVIVE for player survival and FORTRESS_HELD_SCORE for not losing
+   each fortress zone.
+ * KICK_TO and MOVE_TO: redirect a client to a different server
+ * DEFAULT_KICK(_TO)_MESSAGE: default reason given to players for a kick
+ * DEFAULT_KICK_TO_SERVER/PORT: default redirection target for KICK/MOVE_TO.
+ * RENAME renames a player.
+ * If all clients support it, PING_CHARITY_MIN/MAX can be used to constrain ping charity.
+ * VOTE_KICK_TO_SERVER/PORT: redirection target for vote kicks.
+ * SILENCE and VOICE allow to control chat of annoying players.
+ * SILENCE_ALL can be used on the server to inhibit all cross-team communication unless specifically voiced.
+ * ENABLE_CHAT can be set to 0 to disable all chat. If it is set on the server it only disables public chat and logged in players can still speak.
+ * LAG_*: controls game level lag compensation.
+ * FILTER_NAME_MIDDLE: collapses multiple whitespaces to one in player names.
+ * FORTRESS_CONQEST_TIMEOUT: if an enemy contact with a zone happens longer ago than
+   this value, it is discarded from zone memory.
+ * TOPOLOGY_POLICE_PARALLEL, extra topology police flag to control the checks
+   for walls getting copied into the grid in exactly the same place.
+ * CAMERA_GLANCE_*: separate settings for the glancing camera, work like CAMERA_CUSTOM_*.
+   Likewise, CAMERA_SERVER_GLANCE_* can replace CAMERA_SERVER_CUSTOM_* when glancing.
+   CAMERA_*CUSTOM_GLANCE* are server side settings that can control whether server or
+   clientside settings are used in various situations, see settings.cfg for details.
+ * CYCLE_BOOST_? and CYCLE_BOOSTFACTOR_? for boosts when breaking away from walls,
+   see settings.cfg or config.html for details
+ * CYCLE_ACCEL_TUNNEL, works like CYCLE_ACCEL_SLINGSHOT, but is active when
+   none of the two walls you're in between is your own.
+ * CYCLE_WIDTH for making it impossible to squeeze through tight tunnels,
+   see settings.cfg for details
+ * VOTING_MATURITY controls how long you have to wait after login before
+   you can issue kick votes.
+ * CYCLE_DELAY_DOUBLEBIND_BONUS is an extra factor applied to CYCLE_DELAY
+   for turns in the same direction. Can be used to limit the advantage
+   doublebinders get while not punishing players who press both left and
+   right at the same time.
+ * LAG_O_METER_(TRESHOLD|BLEND|USE_OLD): Configure the minimal size of the
+   Lag-O-Meter, its color and whether to scrap it all and stick with the old
+   one.
+ * ALLOW_TEAM_CHANGE: if set to 0 players won't be able to join a team, create
+   a new team or change to another team.
+ * ALLOW_TEAM_CHANGE_PLAYER/DISALLOW_TEAM_CHANGE_PLAYER: allow/disallow specific
+   players to switch teams
+ * INTERCEPT_COMMANDS is a space-delimited list of chat commands that shall be
+   intercepted by an external script. Example value: /login /admin /teamleave
+   /teamshuffle /shuffle /team
+ * INTERCEPT_UNKNOWN_COMMANDS is a boolean specifying if an external script
+   wishes to handle unrecognized chat commands. This would allow hooking
+   arbitrary things like /foobarz or /mode ctf
+ * CONSOLE_LADDER_LOG boolean places the ladderlog on stdout prefixed with
+   "[L] "
+ * PLAYER_MESSAGE <user ID or name> <Message>: Like /msg, but from the
+   console
+ * All ladderlog outputs can be enabled or disabled separately by using
+   LADDERLOG_WRITE_*. LADDERLOG_WRITE_ALL enables or disables all ladderlog
+   output alltogether.
+ * CHAT_LOG controls whether to write a machine-readable chatlog to
+   var/chatlog.txt
+ * CONSOLE_DECORATE_TIMESTAMP write a timestamp for every console message?
+ * LADDERLOG_DECORATE_TIMESTAMP prefix every ladderlog message with a timestamp?
+ * SLAP <player> [points] sends a message to everyone and subtracts a number
+   of points (default: 1) from <player>'s score. Negative points are
+   supported.
+ * AUTO_TEAM_SPEC_SPAM to disable the spectator join/leave messages you get
+   when AUTO_TEAM is enabled
+
+If --enable-armathentication was activated:
+
+ * /lock, /unlock, /invite and /uninvite team management chat for players of
+   access level ACCESS_LEVEL_TEAM or better.
+ * /teams chat command that rougly prints team layout.
+ * ACCESS_LEVEL_IPS to let admins see IPs of players in the list.
+ * ACCESS_LEVEL_SPY_MSG/TEAM to let admins spy on team/private messages.
+ * CASACL to temporarily raise the access level
+ * ACCESS_LEVEL to modify the required access level to change settings
+ * AUTHORITY_WHITELIST and AUTHORITY_BLACKLIST to filter authorities you want on your server.
+ * GLOBAL_ID_ENABLED to toggle remote accounts
+ * LOCAL_USER, LOCAL_TEAM for local login accounts
+ * MD5_PREFIX/MD5_SUFFIX for additional password scrambling
+ * USER_LEVEL to grant users various access levels
+ * RESERVE_SCREEN_NAME to reserve a screen name to a certain player
+ * USER_ALIAS to bend authentication names around 
+ * (UN)BAN_USER to ban really stupid users based on their global user ID, 
+   BAN_USER_LIST to show a list.
+ * ACCESS_LEVEL_OP/ADMIN/CHAT/PLAY/PLAY_SLIDING to control who can do which things
+ * /login chat command then uses the more secure hashed base logins
+ * new chat commands /op and /deop to change other players' access rights
+
+Featurelets:
+
+ * Added Polish language file
+ * clientside play time tracking and server controlled minimal required experience
+   to be allowed to play.
+ * color codes in chat increase the spam level logarithmically.
+ * /team messages get a reduced spam level; reduction factor is given by 
+   (team size)/(number of total players).
+ * /team messages can be used by spectators to chat with other spectators only.
+ * Performance optimizations. Using OpenGL display lists to cache geometry.
+ * Removed ztrick, antialiasing and perspective correction settings. They all had only one right
+   setting and caused us some interesting bug reports.
+ * Added PLAYER_RANDOM_COLOR for lazy people who just want to have a
+   color that differs from everyone else on the server.
+ * Configuration files get reloaded on SIGHUP
+ * all admin commands now also accept partial name matches, like /msg, and check for case sensitive
+   matches in the screen name first, then the user name, then case insensitive matches in the two.
+ * --enable-krawallserver has been actually implemented now, and it enables secure logins
+   to accounts local to the server and not-so-secure logins managed by authentication servers.
+ * A subculture list for server groups that are not managed by our main master servers
+ * A friends list and filter for the server browser that shows you only servers with
+   your friends on them.
+ * The client now can handle network traffic while it is waiting for the graphics
+   card to swap buffers.
+ * The dedicated server no longer uses a fixed delay, but a select() call (that
+   returns when network data arrives) to idle. When data arrives, it does 
+   the minimum amount of work before it sends out the responses, resulting in
+   lower latency. It is now safe to decrease DEDICATED_FPS to 20 or 10, latency
+   is no longer influenced by that setting.
+ * Game level lag compensation. When a command arrives from a client that is delayed,
+   it is backdated to the time it was issued, provided enough "lag credit" is left.
+   The client is informed of the delay so it can compensate in the future, which it does
+   by forging the game timer.
+ * Nonnormalized axes and axes with odd turning directions are now properly supported
+ * The camera has a memory which player you like to watch. Every time you manually switch
+   the camera and your favorite player is not dead, the favorite is set to the currently 
+   watched player. The next time the camera doesn't know what to watch, your favorite
+   will be selected.
+ * Players leaving to spectator mode with <0.2.8.2 clients are handled like
+   spectators of 0.2.8.2 clients: they stay visible to the others.
+ * Kick statistics are now persistent across server runs.
+ * MESSAGE_OF_DAY is now displayed fullscreen if both server and client support it
+ * Manual fullscreen messages can be triggered with
+   FULLSCREEN_MESSAGE <timeout> <message content>
+ * Axes Indicators by meriton, can be enabled using the AXES_INDICATORS
+   setting.
+ * New "About" menu item in the main menu displays the version of
+   Armagetron Advanced, the paths it uses, links to the main site, wiki
+   and forums and the names of the project admins.
+ * New entries in ladderlog.txt:
+   - GAME_TIME <time> (only if enabled via the LADDERLOG_GAME_TIME_INTERVAL
+     setting): The time that has passed since the last start of a round
+   - BASEZONE_CONQUERED <team> <x> <y>: A fortress zone belonging to <team>
+     at the coordinates (<x>, <y>) has been conquered
+   - BASEZONE_CONQUERER <player>: at the time of the last BASEZONE_CONQUERED
+     message, <player> has been in the conquered zone
+   - ONLINE_PLAYER <player> [<ping [<team>]]: At the beginning of the round,
+     <player> had <ping> and was on <team>. This line is not printed for bots
+   - NUM_HUMANS <n>: There are <n> players that are not AIs and are part of a
+     team.
+   - ROUND_SCORE has the player's team name appended.
+   - ROUND_SCORE_TEAM: score a team accumulated during the last round.
+   - WAIT_FOR_EXTENAL_SCRIPT: printed if the setting of the same name is
+     enabled. In this case the server will delay the start of the next round
+     until WAIT_FOR_EXTENAL_SCRIPT_TIMEOUT is reached or the setting is
+     disabled.
+ * Wrapped console lines are indented by an amount of spaces that can be
+   specified using the setting CONSOLE_INDENT.
+ * /help command that supports multiple help topics. Use
+   HELP_INTRODUCTORY_BLURB and ADD_HELP_TOPIC to control its contents
+ * /rtfm command that allows moderators to send help messages to newbies
+ * /players now shows the players' color and allows searching
+ * TEAM_ELIMINATION_MODE sets the way ArmagetronAd removes teams when there's too much teams.
+
+Bugfixes:
+
+ * Added compensation for drifting timers (observed often with
+   overclocked mainboards)
+ * Text input fields now let the text wrap correctly and make use of the space allocated
+   for them in a not-completely-dumb way. And *sigh* depending on the text field, color
+   codes are either ignored (for the usernames) or both displayed in text and rendered.
+ * "KICK 2pack" no longer kicks user 2 instead of player 2pack.
+ * Fixed various trail end related extrapolation/simulation inaccuracies that looked
+   like lag.
+ * When extrapolating, the game's sensors never detected own or teammates' walls,
+   it mistook them for enemy walls.
+ * The acceleration and boost system always used settings for enemy walls instead of
+   settings for team players' walls. That means that old clients connecting to a
+   0.2.8.3+ server that has CYCLE_ACCEL_ENEMY and CYCLE_ACCEL_TEAM set to different
+   values experience syncing problems. The default behavior therefore is to lock 0.2.8.2
+   and earlier out of your server if you set one of them away from the default. 
+   If you want to set both accelerations away from the default, but to the same value,
+   there won't be a compatibility problem; in that case, set CYCLE_ACCEL_ENEMY_OVERRIDE
+   and CYCLE_ACCEL_TEAM_OVERRIDE to 0 and old clients will be allowed in. However, you
+   should manually lock out players with 0.2.7 clients, for example by modifying
+   CYCLE_ACCEL_RIM a tiny bit.
+ * "Team Red" bug. If the server allows maximally two teams, no team ever
+   gets to be Team Red.
+ * Phasing made even more difficult; nice side effect of the fix is
+   reduced network bandwidth usage.
+ * Speed gauge resets between rounds.
+ * More accurate Lag-O-Meter by meriton.
+ * Zones were sometimes invisible.
+
+Internals:
+
+ * A complete netsync cycle is now sn_Receive(); nNetObject::SyncAll(); sn_SendPlanned();.
+ * Ping charity is now completely server controlled.
+
+#### Changes since 0.2.8.1:
+ * Timestamps and teamscores added to scorelog.txt
+ * Dedicated server now works on FreeBSD and OpenBSD
+ * User running the dedicated server is called "armagetronad" again, the
+   longer "armagetronad-dedicated" caused problems with BSD
+ * Test versions refuse to connect to servers more than one version ahead
+ * Prepared client for respawns
+ * Team spawn formation is now configurable
+ * Added reasons to bans
+ * Added spectator autokicking
+ * Added history to chat and console (wrtlprnft). Press "Cursor up" to
+   edit and repeat previous chats and console commands.
+ * You only enter a game once your client is synced
+ * /msg now prefers exact matches over partial matches
+ * Cycles now have better memory for pending turns (wrtlprnft)
+ * Added player join/leave/rename messages to ladderlog.txt with IPs
+ * Ping variance influence on packet loss tolerance code is now clamped
+   by the regular, configurable, packet loss tolerance: effect of variance
+   can be no bigger than the effect of ping.
+ * Spectators are now regular players and can chat
+ * The /msg command now converts the entered pattern into the internal
+   name so if you write "/msg öäü" and there is a user named "öäü" with
+   an internal nick of "oau" it will still get matched
+ * Team changes are now only executed when allowed, the need for the 
+   temporary/permanent team imbalance setting distinction has gone away
+ * Added brake toggle button
+   Bugfixes:
+ * Client sometimes crashed when leaving a server with AIs on over the menu
+ * The server starting scripts were chowning /var/run and /var/log to armagetronad
+ * Short names could crash the server
+ * Direct cycle collisions sometimes lead to both passing trough each other
+ * Init scripts now installed correctly with --enable-initscripts
+ * Hopeless pending team change wishes are deleted
+ * Large timesteps are now broken down into smaller ones on the game level 
+ * Pretend keys are released before entering chat
+ * Two cycle steering events were sent if you doublebound the brake
+ * Large speed boosts out of game rule bounds were possible during network
+   glitches
+ * Debug recording reliability increased, function call with undefined return
+   value eliminated
+ * Recording and scorekeeping no longer conflict
+ * Input during a recording now has an end marker, making quick keypresses
+   after leaving a menu not break it
+ * CYCLE_RUBBER_DELAY was overridden sometimes by packet loss tolerance
+ * ALLOW_CONTROL_DURING_CHAT now ignores modifier keys like shift and
+   has been reactivated
+ * The camera sometimes got stuck in free mode for the first round you watch
+ * Crashfix in hole blowing code when no cycle was set
+ * After a "perfect" 180, you're more often on the right side of your own wall
+   That code caused some havoc at first, so it has been reworked
+ * The smart cam did not like fluctuating framerates
+ * Improved debug recording reliability: multiple master server visits
+   and too quick keypresses were causing trouble.
+ * Canonical DESTDIR support and added ROOTDIR support for testing
+ * Login floods are detected and ignored
+ * Player name updates sanitized
+ * Disabled complicated feasibility tests for team menu entries, 
+   they did not have the full information and were often wrong
+ * Team score only added to player score if no teamplay is possible
+
+#### Changes since 0.2.8.0:
+ * INCLUDE console command now gives a file not found error
+ * ALL user given paths are validated for security problems in a special function
+ * Fallback to default map on map load failure works again (broken sine 0.2.8.0_rc4)
+
+#### Changes since 0.2.8.0_rc4:
+Bugfixes:
+
+ * SECURITY FIX: via a MAP_FILE path with included .., it was possible
+   to write files anywhere, provided they did not exist previously.
+   Clients with this vulnerability are locked out of the server now.
+ * ALLOW_CONTROL_DURING_CHAT has been disabled for now.
+ * Another connection termination bug.
+
+#### Changes since 0.2.8.0_rc3: 
+ * Added spectator mode toggle key.
+ * Thresholds when a white background bar is rendered behind texts is
+   now configurable in the expert section of settings.cfg.
+ * Ingame menu trigger key is configurable now, only ESC stays hardcoded.
+ * The map parser checks whether the map is stored at the right location.
+ * Map validation errors are now visible on the client.
+ * Made magic numbers used by the smart camera configurable for user tweaking.
+   This is undocumented and unsupported.
+ * The server browser now shows a B beside the score to mark bookmarked servers.
+ Bugfixes:
+ * -Os compile option is filtered out if GCC 3.3 is used, it makes the build go bad.
+ * Extremely low values of CYCLE_DELAY were not honored, an arbitrary delay of .005s
+   was added to it.
+ * On entering a server, the camera would sometimes be stuck in free mode.
+
+#### Changes since 0.2.8.0_rc2:
+ * Almost final artwork
+ * Moviepacks can now also contain texture replacements for the default cycle model
+ * Added number of teammates alive to HUD
+   Bugfixes:
+ * Dual textured floor rendering is now disabled without alpha blending as it
+   did not work anyway.
+ * Lag-O-Meter now has the correct size (the old, buggy one can be restored by
+   setting LAG_O_METER_SCALE to .5).
+ * The network system made some IDs randomly unusable, causing zombie
+   cycles, invisible walls and disconnections.
+ * The AI Team from a previous local game session was sometimes still visible
+   on the score table in the following network game on a remote server.
+ * The server did not start a new match when temporarily, only spectators were online.
+ * Player walls were rendered twice.
+ * The server wrote console center messages to stderr.
+ * UNBAN_IP did not work at all.
+ * The code that should kill a cycle in performance/DOS protection
+   circumstances just crashed.
+
+#### Changes since 0.2.8.0_rc1: 
+ * Bugfixes:
+   - Dedicated server for Windows works again.
+   - Cycle turns are now executed more accurately on the server.
+   - Timer stuttering at end of round (was non-critical, but ugly).
+   - Custom camera did not turn when the internal camera was
+     configured not to turn.
+   - Idle player kick code crashed when it kicked a client with
+     many players.
+   - The code that removes inactive players after a while removed
+     the AI players.
+ * Reverted smart camera movement to pre-beta4 behavior,
+   the new code made some players seasick :)
+ * Ingame admin interface gives more useful information to the invoker 
+ * Small font rendering improvements
+ * Zone conquest message, if it is not the one that ends the round,
+   now states the name of the zone owning team.
+
+#### Changes since 0.2.8_beta4.2:
+ * Fixed bugs:
+   - Random client disconnection
+   - Another vote-not-appearing-on-client bug
+   - Invisible wall segments right after turn
+   - Arena initialization before all settings are transmitted from the server
+   - The server was using more rubber than the client sometimes
+   - Crash with moviepack and some maps
+   - Object sync messages not accepted by client in second network session
+ * Improved kill/suicide/team kill distinction (ENEMY_* settings)
+ * Chatbots and idle players can be removed from the game and kicked
+   (CHATTER/IDLE_REMOVE_TIME,IDLE_KICK_TIME)
+ * Players/team leaders can pause the game before a rond starts (PLAYER_CHAT_WAIT*)
+ * Color codes can be filtered from player names (FILTER_COLOR_NAMES)
+ * New machine readable log file: ladderlog.txt
+ * Configurable and better core dump/team kill/suicide distinction algorithm
+ * Unknown settings are recognized now in configuration files
+ * All global key bindings (Grab mouse, pause and texture reload were left)
+   are now configurable
+ * Player listing length limit adjusted so two teams/16 players fits on screen
+ * Less verbose upgrade warning messages
+ * Imposters can get a non-conflicting name (ALLOW_IMPOST[EO]RS)
+
+#### Changes since 0.2.8_beta4:
+ * Fixed bugs:
+   - Windows version had a memory overwrite error causing crashes and weird behavior.
+   - The game quit when the chat key and a key bound to an instant chat were pressed to quickly.
+   - Votes expired too early on the client.
+   - Performance: a lot of unused temporary walls were hanging around each round.
+   - Cycles sometimes warped to odd locations.
+ * Tweaked smart camera to not stay in front of the cycle so much.
+   - Tweaked smart camera custom glancing.
+     Report back whether you like or hate it!
+ * Made custom camera even more configurable, changed default settings.
+   (old ones are still in settings.cfg)
+ * Forced glancing end on cycle turn now looks better.
+ * FOV settings now deal better with wide screens/splitscreen mode.
+ * Increased ping measurements again by adding the fluctuations. The raw 
+   average ping caused the game logic to be too picky.
+
+#### Changes since 0.2.8_beta3:
+ * Famous fixed bugs: 
+   - Random huge felt lag or blank screen (it was actually a problem with the timer) is gone.
+   - Bogus "possible phase bug" message.
+   - Seemingly random walls popping out of nothing, only to disappear a second later.
+   - Random camera focus changes while you were still alive.
+   - Every 100th console line got deleted.
+ * Reduced pings! Actually, just the measurement is improved, the actual latency
+   stays the same. I hope nobody notices that. Good thing nobody reads NEWS files :)
+ * New text editing convenience: Home and end keys work, and CTRL+left/right/del/backspace
+   work on whole words. Thanks, Nemo!
+ * New instant chat functions: There are now 25 instant chat strings. If an instant
+   chat string ends in a \, it will not be sent immediately, it's opened to be edited by you.
+   Pressing an instant chat key while already chatting will insert the string, provided the
+   key does not produce a regular character.
+ * If enabled by the server administrator: control your cycle while you chat.
+ * Turning speed of custom and internal camera can be adjusted with CAMERA_CUSTOM_TURN_SPEED
+   and CAMERA_IN_TURN_SPEED.
+ * The custom camera zooms out from a closeup at round start. Useful to see your position
+   in your team. Configurable with CAMERA_CUSTOM_ZOOM.
+ * Master server redundancy enabled. Thanks to Lucifer for hosting the backup master!
+
+#### Changes since 0.2.8_beta2:
+ * More bugfixes: most annoying was the crash/infinite loop a server got in when
+   the master server was unreachable
+ * Added zones to map specification
+ * Reworked top level map format (sorry to the map makers for the inconvenience)
+ * Windows: added start menu entries that open the system and user data directories
+ * Bandwidth limitation now works. That means if you lowered the bandwidth
+   limits in the network setup, they were not respected. You probably should
+   readjust them.
+
+#### Changes since 0.2.8_beta1:
+ * bugfixes, of course
+ * added recording and playback startmenu entries for Windows
+ * abuse prevention: added IP banning, player number per IP and client limit, 
+   doublebinding can be crippled on server command
+
+#### Changes since 0.2.7.1:
+ * Server side cycle synchronization issues fixed:
+   - destination removal fixed
+   - lag sliding caused by different interpretation of grinding turn commands on client and server fixed
+   - niceness for older clients: sync interval decreased, no sync in front of wall to prevent local tunneling
+ * Client side cycle synchronization issues fixed:
+   - smooth corrections now only affect the appearance, the correct values are used internally
+   - sync messages are no longer ignored,
+   - new extrapolating sync method implemented,
+   - ghosting fixed,
+   - wall ends sticking out fixed ( for enemy cycles ),
+   - the sophisticated distance based sync code implemented years ago is now actually used, oh dear.
+ * Performance improvements:
+   - netobject synchronization does no longer traverse all netobjects
+   - disabled gameobject-gameobject interaction
+ * added support for nonorthogonal driving directions
+ * added support for debug recording and playback
+ * switched to using automake
+
+#### Changes since 0.2.7.0:
+ * Fixed security issues: fake message ID crash, fake peer ID crash ( both
+   maybe could be used to execute arbitrary code ), fake logout exploit, fake
+   connections DOS attack
+ * The feared "left grid" error message has been replaced by recovery code
+ * Fixed transfer of infinite floats over the network
+ * Fixed network timer inaccuracies on long running servers
+ * Fixed rip bug ( for those who like it: search and you will find )
+ * Fixed wall bending ( there is still some wall bending left, but it will be
+   too small to notice )
+ * Fixed tunneling bugs ( you were able to move from one side of a wall to the other )
+ * Fixed bounce bug ( a small zigzag towards a wall sometimes put you further
+   away from it, leaving a hole )
+ * Fixed massive reference counting overflow crash caused by repeated close grinding/180ing
+ * Made rubber code customizable and frame rate independent ( new CYCLE_RUBBER_
+   variables in settings.cfg )
+ * For debugging and scripting: dedicated server console messages can be
+   decorated with client ID and IP
+ * Topology police: facility to catch tunneling issues after they happened. off
+   by default
+ * Cycle network code is more robust
+ * Update frequency of cycle position now configurable and more frequent for
+   client's own cycle that the rest by default
+ * Corrected rc.d scripts to start the server as a system service
+ * Voting more configurable: voters can be made public, spectators can't vote
+   any more by default
+ * Moviepack floor color fixed
+ * Hostname lookup failure fixed
+ * "PLAYER_1 nick" console command problems fixed
+ * Windows libraries moved out of the main source tree
+ * Source code now compatible with 64 bit and gcc 3.4
+ * Colored explosions!
+ * HUD enhancements: customization, works in splitscreen mode
+ * Directory scanning code added ( not yet visible, will be used for
+    moviepack/cycle selection )
+ * Moviepack sky texture support
+ * Master server can now run on windows, too
+ * Explosion sound now actually works
+
+#### Changes since 0.2.6.0:
+ * added HUD
+ * Winzone may now be a deathzone
+
+#### Changes since 0.2.5.2:
+ * Split custom camera into server defined and client defined custom camera
+ * Fixed monster chat message exploit
+ * Added local player silencing
+ * Added Kick voting
+ * Added player names on cycles ( implemented by Christian Reitwiessner )
+ * Harsher ( and configurable ) spam protection
+ * Fixed strangely bent walls
+
+#### Changes since 0.2.5.1:
+ * Fixed fullscreen toggle while chatting
+ * Disabled trilinear filtering for ATI cards by default ( to avoid lockups )
+ * Worked around flawy S3 texture storage
+ * Fixed crash when trying to change teams in spectator mode
+
+#### Changes since 0.2.5:
+ * Another go at the "11th Round Bug"
+ * Player list is now sorted after displayed score ( before: some invisible combination of team score and own score )
+ * Fixed brakes when connecting to a 0.2.4 or earlier server
+ * Updated FAQ with server setting hints
+ * Unified Windows and Unix network code
+ * Fixed texture hardware mode
+ * Less connection losses
+ * Fixed network ID related crash
+ * Added player names to information you get from a server
+ * Added window-fullscreen toggle key and separate setting of screen resolution/window size
+
+#### Changes since 0.2.4:
+ * Fixed online observer mode switching
+ * Fixed command line options
+ * Fixed player quit message
+ * Fixed AI join message
+ * Fixed double registration of some network objects ( had no known visible symptom )
+ * Added security checks to see if Armagetron is run correctly
+ * Fixed big brother ( reporting of OS, graphic card and version to the master server )
+ * Disabled memory manager by default
+ * Fixed single player exit game crash
+ * Fixed zero length sting receive crash
+ * Completed network version control
+ * Added timestamps to logfiles ( code fragments by k_at_work )
+ * Added reason to login deny/kick messages
+ * Fixed 11th round bug ( additional round started after match end )
+ * Added --doc command line switch to print offline version of online help
+ * Fixed sign of rise/drop highscore messages
+ * New console commands: quit/exit ( dedicated server only ), kick <player name>, center_message <message> and console_message <message>
+ * New setting item: MAX_CLIENTS
+ * Improved server browser, less skipping around
+ * Added instant win zone
+ * Cycle brake is now of limited duration
+
+#### Changes since 0.2.3:
+ * Fixed score display ( really! )
+ * Fixed freestyle mode round counting
+ * Fixed server freezer
+ * Fixed explosion sync
+ * Fixed AI crashes when player leaves in mid-battle
+ * Fixed configure script: now really uses sdl-config
+ * Speeded up deletion of unreachable servers
+ * Fixed endless recursion bug ( "11th player bug" )
+ * Moved team start positions further apart
+ * Player name is now taken from $USER on first start and player color is randomized
+
+#### Changes since 0.2.2:
+ * Fixed highscores and ladder
+ * Delayed score deletion after match end
+ * Fixed autoexec.cfg loading
+ * More automatic rebuilding
+ * Fixed dedicated server idle quitting
+ * Fixed auto AI
+ * Fixed instant chat
+ * Fixed score display for many players or long player names
+ * Fixed very rare client crash
+ * Fixed not so rare release only crash
+ * Fixed balance-related typos
+ * Tweaked smart camera so that it works well when braking
+ * Fixed finish mode game setting
+
+#### Changes since 0.2.1:
+ * Fixed another connection-loss bug
+ * Fixed observer freeze
+ * Observers now don't just get kicked when nobody else is online
+ * Fixed software renderer detection
+ * Updated FAQ
+ * Fixed config file loading on some architectures
+ * Improved team coloring
+ * Fixed stuck brake bug
+
+#### Changes since 0.2.0:
+ * Fixed crash when watching a quitting player
+
+#### Changes since 0.2.pre4:
+ * Fixed crashes
+ * Fixed windows network connection problems
+ * Fixed clour related problems
+ * Added marker for own cycle to avoid confusion in team mode
+ * Changed directory placement: configuration resides in /etc/armagetron,
+   user configuration in ~/.armagetron/var
+ * Data files added to ~/.armagetron/textures ( or /models or /sounds )
+   are now loaded in favor of original data, allowing user specific mods
+
+#### Changes since 0.2.pre3:
+ * Fixed some more rare crashes and lockups
+ * Fixed team handling: all team change operations now get only active
+   on next round address
+ * Fixed moviesounds
+ * Fixed server-master server communications
+ * new installation method: make update ( keeps user configuration )
+
+#### Changes since 0.2.pre2:
+ * Fixed some rare crashes and lockups
+ * Improved cycle handling over network
+ * It is now allowed to fight with an arbitrary large team against the AI
+   regardless of the balancing settings
+ * improved rendering precision: z-fighting artefact are now uncommon,
+   and at the same time early clipping on the near clipping plane
+
+#### Changes since 0.2.pre:
+ * got rid of "zombie" players
+ * corrected team messages
+ * fixed chatting
+ * fixed 32 bit rendering
+
+#### Changes since 0.1.4.9:
+ * it is now possible for players to form teams
+ * explosion now can blow holes in player walls
+ * delay added to wall disappearance after death
+ * finite wall length supported for snake-style gameplay
+ * arena size and game speed configurable in the menu
+ * the AI has been greatly improved
+ * there is an Internet master server active
+ * support for localization has been added, currently featuring 
+   English and German
+ * AI players now have names
+ * the moviepack title screen is displayed
+ * Linux version: easier system-wide installation with RPM packages 
+   or "make install"
+
 
=== added file 'CHANGELOG_FROZEN.md'
--- CHANGELOG_FROZEN.md	1970-01-01 00:00:00 +0000
+++ CHANGELOG_FROZEN.md	2020-07-03 06:03:19 +0000
@@ -0,0 +1,792 @@
+##### Changes on the 0.2.9 branch
+
+ * Added detection and reaction code for timing assist bots
+ * /shuffle now works before you actually join a team
+ * Implemented /shout command and associated settings
+ * Fixed suspension and silenced status not being re-applied after a player
+   disconnects and rejoins a server.
+ * Tweaks to enemy influence system.
+ * Ingame menu and console now are drawn on top of a semi-transparent,
+   darkened area for increased readability.
+ * New first start menu with clearer language selection and initial setup.
+ * Tutorial match against one AI at slower speed.
+ * Tutorial tooltips for the most important keybindings.
+ * ADD_MASTER_SERVER command to announce a server to a new master server.
+   Simplifies the process to list your server on a subculture.
+ * Team launch positions logged to ladderlog with POSITIONS event. Disabled by
+   default.
+ * New command-line option "--input" added to poll for input from a file
+   instead of stdin.
+ * Added WHITELIST_ENEMIES_[IP/USERNAME] to allow players to be enemies, even
+   if they come from the same IP address and ALLOW_ENEMIES_SAME_IP is
+   disabled (which is its default setting).
+ * GAME_END, NEW_MATCH, and NEW_ROUND ladderlog events include date and time.
+ * Added ENCODING ladderlog event, which specifies the encoding for data in
+   ladderlog.txt.
+ * "--input" now can be used more than once to read from multiple files or pipes.
+ * new team management ladderlog messages:
+   TEAM_CREATED <team name>
+   TEAM_DESTROYED <team name>
+   TEAM_RENAMED <old team name> <new team name>
+   TEAM_PLAYER_ADDED <team name> <player>
+   TEAM_PLAYER_REMOVED <team name> <player>
+ * Manage external scripts on Unix dedicated servers. New commands: 
+   SPAWN_SCRIPT, RESPAWN_SCRIPT, FORCE_RESPAWN_SCRIPT, KILL_SCRIPT,
+   LIST_SCRIPTS, SCRIPT_ENV.
+ * New setting ACCESS_LEVEL_ANNOUNCE_LOGIN that determines if a player's
+   login/logout message can be announced.
+ * Authentication is now enabled by default.
+
+#### Changes since 0.2.8.3.4:
+
+ * Security fix: Check that the remote is allowed to create an object
+   before creating it, not decide whether it gets to keep it after
+   it already has been created and potential damage has been done.
+   No arbitrary code could be executed, but a client could effectively 
+   shut down a server by sending crucial objects, such as the main game
+   timer or the game itself.
+ * Compilation fixes for current systems.
+
+#### Changes since 0.2.8.3.3:
+
+ * Eliminated undefined behavior that was fine in gcc 5, but now
+   (rightfully!) turned into crashes in gcc 6.
+ * Eliminated compilation disambiguity that was just causing a mild
+   performance degradation in gcc 5 and is now a compilation failure in
+   gcc 6.
+   
+#### 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
+ * security fix: never read one byte outside of the received buffer
+ * security fix: only include .cfg files from the var subfolder
+ * compiler compatibility: adapted to gcc 4.60
+ * smaller spelling fixes
+ * FOV calculations now correct for widescreen and horizontal splitscreen
+ * Additional checks against illegal values passed to renderer
+
+#### Changes since 0.2.8.3:
+
+ * fixed temporary sound disappearance when alt-tabbing away and back
+ * default subcultures are now distributed
+ * enable 32 bit color depth at desktop resolution
+ * no more display lists for SiS cards
+ * spelling mistakes and missing German translations
+
+#### Changes since 0.2.8.3_rc4:
+
+ * New setting: KEEP_PLAYER_SLOT allows the server to kick (preferably) spectators
+   if it gets full so there is always one slot open for players
+ * New setting: ACCESS_LEVEL_AUTOKICK_IMMUNITY sets the access level required 
+   to be immune from such kicks (and idle autokicks, too)
+ * Intercepted chat commands are now written to ladderlog.txt. Format:
+   COMMAND /command-intercepted player [command arguments]
+ * Increased default speed of server pinging
+ * Reordered game menus a bit
+ * fast finish works again
+
+#### Changes since 0.2.8.3_rc3:
+
+ * Pinging previously popular servers earlier for quicker server
+   browsing
+ * Improved master server random polling, the second polled master now
+   also is random, and all masters are polled if need be
+ * Custom camera snaps to cycle direction once when activated if the turn speed
+   is zero.
+ * RESERVE_SCREEN_NAME now works regardless of the ALLOW_IMPOSTOR setting.
+ * USER_LEVEL now escapes the given authenticated name so you don't have to
+   guess the escaping rules. Ex: USER_LEVEL "name with spaces@forums" 2
+   changes user level for name\_with\_spaces@forums
+
+#### Changes since 0.2.8.3_rc2:
+
+ * Fixed crash with server polling
+ * ROUND_WINNER and MATCH_WINNER ladderlog events now include the players of
+   the team.
+ * Camera switches to user preferred camera when you die in incam mode
+ * Better support for custom language files
+ * Players can no longer spam chat with /shuffle messages. Added new setting
+   SHUFFLE_SPAM_MESSAGES_PER_ROUND, a per round, per player limit on the number
+   of shuffle messages displayed.
+
+#### Changes since 0.2.8.3_rc1:
+
+ * Fixed dark color filters, such as FILTER_DARK_COLOR_STRINGS, to not filter
+   the reset color.
+ * ASE moviepack models no longer have a vertex count limit
+ * Fixed endless recursion crash between rounds
+
+#### Changes since 0.2.8.3_beta3:
+
+ * Chat prefix spam protection. Guards against prefix spam, such as when a
+   user always changes their chat message color, or prefixes all messages
+   with a clan tag. Toggle with the PREFIX_SPAM_ENABLE setting.
+ * Fixed VOTING_MATURITY to use the time when the player entered as its 
+   reference time.
+ * Fixed single player highscore list not containing everyone.
+ * Fixed generation of duplicate names in highscore lists.
+ * Fixed camera crash when the grid is empty.
+
+#### Changes since 0.2.8.3_beta2:
+ * Fixed 'invincibility' bug. It really was cycles freezing in time.
+ * Fixed sporadic sound related crash at round end.
+ * setting rename: SILENCE_ALL -> SILENCE_DEFAULT.
+ * Sound no longer gets muted after you switch the sound settings.
+ * Fixed object collision detection that would sometimes pick a wrong 
+   wall to collide with, most likely the reason behind wrongly accredited
+   kills.
+ * Fixed inability to switch viewport assignment in four player mode.
+ * Better handling of lag clusterbombs.
+ * Server disconnects now also take immediate effect even when you're
+   in a menu or chatting.
+
+#### Changes since 0.2.8.3_beta1:
+ * Made ready for Armatrators
+ * Authentication routines now use utf8 as forward- compatibility with
+   trunk. Previously, non-ASCII usernames simply didn't work at all.
+ * Better lag slide protection: clients no longer get confused when
+   the server sends their cycle back in time, and the server no longer
+   does that for old clients.
+ * Fixed rare wallpassing bug; it required what whould usually be an
+   instakill and infinte wall length.
+
+#### Changes since 0.2.8.2:
+
+New settings and commands:
+
+ * MIN_PLAY_TIME_*: minimal play time required before you are allowed to
+   play on this server.
+ * SPAM_AUTOKICK_COUNT: minimal number of spam warning messages you get in a
+   row before you get kicked.
+ * FORTRESS_COLLAPSE_SPEED: tune the collapse speed of fortress zones.
+ * VOTE_KICK_REASON: default reason given on kick votes.
+ * "/vote" chat interface to votes; "/vote kick <player>" issues a kick vote.
+ * new vote type "/vote suspend <player>" suspends a player for 
+   VOTING_SUSPEND_ROUNDS rounds.
+ * new vote type "/vote include <file>", includes configuration file
+   vote/<file>.
+ * new vote type "/vote command <command>" executes console command
+   <command>. (Both that and /vote include are by default only available
+   to moderators).
+ * VOTING_HARM_TIME: time between all harmful votes against a player
+ * VOTING_KICK_MINHARM: auto-transform the first few menu issued kick 
+   votes to suspensions
+ * (UN)SUSPEND kicks a player to spectator mode with a timeout. Intended to
+   let new players watch before they play.
+ * VOTES_CANCEL cancels all running polls.
+ * VOTING_SUSPEND [<minutes>] disallows voting during a specified amount of time.
+ * ZONE_ALPHA_TOGGLE to override the systemwide alpha blendings setting and
+   have zones rendered in wireframe mode even when alpha blending is on.
+ * ZONE_ALPHA(_SERVER) to control intensity of zone rendering.
+ * SCORE_HOLE for awarding sacrifice.
+ * SCORE_SURVIVE for player survival and FORTRESS_HELD_SCORE for not losing
+   each fortress zone.
+ * KICK_TO and MOVE_TO: redirect a client to a different server
+ * DEFAULT_KICK(_TO)_MESSAGE: default reason given to players for a kick
+ * DEFAULT_KICK_TO_SERVER/PORT: default redirection target for KICK/MOVE_TO.
+ * RENAME renames a player.
+ * If all clients support it, PING_CHARITY_MIN/MAX can be used to constrain ping charity.
+ * VOTE_KICK_TO_SERVER/PORT: redirection target for vote kicks.
+ * SILENCE and VOICE allow to control chat of annoying players.
+ * SILENCE_ALL can be used on the server to inhibit all cross-team communication unless specifically voiced.
+ * ENABLE_CHAT can be set to 0 to disable all chat. If it is set on the server it only disables public chat and logged in players can still speak.
+ * LAG_*: controls game level lag compensation.
+ * FILTER_NAME_MIDDLE: collapses multiple whitespaces to one in player names.
+ * FORTRESS_CONQEST_TIMEOUT: if an enemy contact with a zone happens longer ago than
+   this value, it is discarded from zone memory.
+ * TOPOLOGY_POLICE_PARALLEL, extra topology police flag to control the checks
+   for walls getting copied into the grid in exactly the same place.
+ * CAMERA_GLANCE_*: separate settings for the glancing camera, work like CAMERA_CUSTOM_*.
+   Likewise, CAMERA_SERVER_GLANCE_* can replace CAMERA_SERVER_CUSTOM_* when glancing.
+   CAMERA_*CUSTOM_GLANCE* are server side settings that can control whether server or
+   clientside settings are used in various situations, see settings.cfg for details.
+ * CYCLE_BOOST_? and CYCLE_BOOSTFACTOR_? for boosts when breaking away from walls,
+   see settings.cfg or config.html for details
+ * CYCLE_ACCEL_TUNNEL, works like CYCLE_ACCEL_SLINGSHOT, but is active when
+   none of the two walls you're in between is your own.
+ * CYCLE_WIDTH for making it impossible to squeeze through tight tunnels,
+   see settings.cfg for details
+ * VOTING_MATURITY controls how long you have to wait after login before
+   you can issue kick votes.
+ * CYCLE_DELAY_DOUBLEBIND_BONUS is an extra factor applied to CYCLE_DELAY
+   for turns in the same direction. Can be used to limit the advantage
+   doublebinders get while not punishing players who press both left and
+   right at the same time.
+ * LAG_O_METER_(TRESHOLD|BLEND|USE_OLD): Configure the minimal size of the
+   Lag-O-Meter, its color and whether to scrap it all and stick with the old
+   one.
+ * ALLOW_TEAM_CHANGE: if set to 0 players won't be able to join a team, create
+   a new team or change to another team.
+ * ALLOW_TEAM_CHANGE_PLAYER/DISALLOW_TEAM_CHANGE_PLAYER: allow/disallow specific
+   players to switch teams
+ * INTERCEPT_COMMANDS is a space-delimited list of chat commands that shall be
+   intercepted by an external script. Example value: /login /admin /teamleave
+   /teamshuffle /shuffle /team
+ * INTERCEPT_UNKNOWN_COMMANDS is a boolean specifying if an external script
+   wishes to handle unrecognized chat commands. This would allow hooking
+   arbitrary things like /foobarz or /mode ctf
+ * CONSOLE_LADDER_LOG boolean places the ladderlog on stdout prefixed with
+   "[L] "
+ * PLAYER_MESSAGE <user ID or name> <Message>: Like /msg, but from the
+   console
+ * All ladderlog outputs can be enabled or disabled separately by using
+   LADDERLOG_WRITE_*. LADDERLOG_WRITE_ALL enables or disables all ladderlog
+   output alltogether.
+ * CHAT_LOG controls whether to write a machine-readable chatlog to
+   var/chatlog.txt
+ * CONSOLE_DECORATE_TIMESTAMP write a timestamp for every console message?
+ * LADDERLOG_DECORATE_TIMESTAMP prefix every ladderlog message with a timestamp?
+ * SLAP <player> [points] sends a message to everyone and subtracts a number
+   of points (default: 1) from <player>'s score. Negative points are
+   supported.
+ * AUTO_TEAM_SPEC_SPAM to disable the spectator join/leave messages you get
+   when AUTO_TEAM is enabled
+
+If --enable-armathentication was activated:
+
+ * /lock, /unlock, /invite and /uninvite team management chat for players of
+   access level ACCESS_LEVEL_TEAM or better.
+ * /teams chat command that rougly prints team layout.
+ * ACCESS_LEVEL_IPS to let admins see IPs of players in the list.
+ * ACCESS_LEVEL_SPY_MSG/TEAM to let admins spy on team/private messages.
+ * CASACL to temporarily raise the access level
+ * ACCESS_LEVEL to modify the required access level to change settings
+ * AUTHORITY_WHITELIST and AUTHORITY_BLACKLIST to filter authorities you want on your server.
+ * GLOBAL_ID_ENABLED to toggle remote accounts
+ * LOCAL_USER, LOCAL_TEAM for local login accounts
+ * MD5_PREFIX/MD5_SUFFIX for additional password scrambling
+ * USER_LEVEL to grant users various access levels
+ * RESERVE_SCREEN_NAME to reserve a screen name to a certain player
+ * USER_ALIAS to bend authentication names around 
+ * (UN)BAN_USER to ban really stupid users based on their global user ID, 
+   BAN_USER_LIST to show a list.
+ * ACCESS_LEVEL_OP/ADMIN/CHAT/PLAY/PLAY_SLIDING to control who can do which things
+ * /login chat command then uses the more secure hashed base logins
+ * new chat commands /op and /deop to change other players' access rights
+
+Featurelets:
+
+ * Added Polish language file
+ * clientside play time tracking and server controlled minimal required experience
+   to be allowed to play.
+ * color codes in chat increase the spam level logarithmically.
+ * /team messages get a reduced spam level; reduction factor is given by 
+   (team size)/(number of total players).
+ * /team messages can be used by spectators to chat with other spectators only.
+ * Performance optimizations. Using OpenGL display lists to cache geometry.
+ * Removed ztrick, antialiasing and perspective correction settings. They all had only one right
+   setting and caused us some interesting bug reports.
+ * Added PLAYER_RANDOM_COLOR for lazy people who just want to have a
+   color that differs from everyone else on the server.
+ * Configuration files get reloaded on SIGHUP
+ * all admin commands now also accept partial name matches, like /msg, and check for case sensitive
+   matches in the screen name first, then the user name, then case insensitive matches in the two.
+ * --enable-krawallserver has been actually implemented now, and it enables secure logins
+   to accounts local to the server and not-so-secure logins managed by authentication servers.
+ * A subculture list for server groups that are not managed by our main master servers
+ * A friends list and filter for the server browser that shows you only servers with
+   your friends on them.
+ * The client now can handle network traffic while it is waiting for the graphics
+   card to swap buffers.
+ * The dedicated server no longer uses a fixed delay, but a select() call (that
+   returns when network data arrives) to idle. When data arrives, it does 
+   the minimum amount of work before it sends out the responses, resulting in
+   lower latency. It is now safe to decrease DEDICATED_FPS to 20 or 10, latency
+   is no longer influenced by that setting.
+ * Game level lag compensation. When a command arrives from a client that is delayed,
+   it is backdated to the time it was issued, provided enough "lag credit" is left.
+   The client is informed of the delay so it can compensate in the future, which it does
+   by forging the game timer.
+ * Nonnormalized axes and axes with odd turning directions are now properly supported
+ * The camera has a memory which player you like to watch. Every time you manually switch
+   the camera and your favorite player is not dead, the favorite is set to the currently 
+   watched player. The next time the camera doesn't know what to watch, your favorite
+   will be selected.
+ * Players leaving to spectator mode with <0.2.8.2 clients are handled like
+   spectators of 0.2.8.2 clients: they stay visible to the others.
+ * Kick statistics are now persistent across server runs.
+ * MESSAGE_OF_DAY is now displayed fullscreen if both server and client support it
+ * Manual fullscreen messages can be triggered with
+   FULLSCREEN_MESSAGE <timeout> <message content>
+ * Axes Indicators by meriton, can be enabled using the AXES_INDICATORS
+   setting.
+ * New "About" menu item in the main menu displays the version of
+   Armagetron Advanced, the paths it uses, links to the main site, wiki
+   and forums and the names of the project admins.
+ * New entries in ladderlog.txt:
+   - GAME_TIME <time> (only if enabled via the LADDERLOG_GAME_TIME_INTERVAL
+     setting): The time that has passed since the last start of a round
+   - BASEZONE_CONQUERED <team> <x> <y>: A fortress zone belonging to <team>
+     at the coordinates (<x>, <y>) has been conquered
+   - BASEZONE_CONQUERER <player>: at the time of the last BASEZONE_CONQUERED
+     message, <player> has been in the conquered zone
+   - ONLINE_PLAYER <player> [<ping [<team>]]: At the beginning of the round,
+     <player> had <ping> and was on <team>. This line is not printed for bots
+   - NUM_HUMANS <n>: There are <n> players that are not AIs and are part of a
+     team.
+   - ROUND_SCORE has the player's team name appended.
+   - ROUND_SCORE_TEAM: score a team accumulated during the last round.
+   - WAIT_FOR_EXTENAL_SCRIPT: printed if the setting of the same name is
+     enabled. In this case the server will delay the start of the next round
+     until WAIT_FOR_EXTENAL_SCRIPT_TIMEOUT is reached or the setting is
+     disabled.
+ * Wrapped console lines are indented by an amount of spaces that can be
+   specified using the setting CONSOLE_INDENT.
+ * /help command that supports multiple help topics. Use
+   HELP_INTRODUCTORY_BLURB and ADD_HELP_TOPIC to control its contents
+ * /rtfm command that allows moderators to send help messages to newbies
+ * /players now shows the players' color and allows searching
+ * TEAM_ELIMINATION_MODE sets the way ArmagetronAd removes teams when there's too much teams.
+
+Bugfixes:
+
+ * Added compensation for drifting timers (observed often with
+   overclocked mainboards)
+ * Text input fields now let the text wrap correctly and make use of the space allocated
+   for them in a not-completely-dumb way. And *sigh* depending on the text field, color
+   codes are either ignored (for the usernames) or both displayed in text and rendered.
+ * "KICK 2pack" no longer kicks user 2 instead of player 2pack.
+ * Fixed various trail end related extrapolation/simulation inaccuracies that looked
+   like lag.
+ * When extrapolating, the game's sensors never detected own or teammates' walls,
+   it mistook them for enemy walls.
+ * The acceleration and boost system always used settings for enemy walls instead of
+   settings for team players' walls. That means that old clients connecting to a
+   0.2.8.3+ server that has CYCLE_ACCEL_ENEMY and CYCLE_ACCEL_TEAM set to different
+   values experience syncing problems. The default behavior therefore is to lock 0.2.8.2
+   and earlier out of your server if you set one of them away from the default. 
+   If you want to set both accelerations away from the default, but to the same value,
+   there won't be a compatibility problem; in that case, set CYCLE_ACCEL_ENEMY_OVERRIDE
+   and CYCLE_ACCEL_TEAM_OVERRIDE to 0 and old clients will be allowed in. However, you
+   should manually lock out players with 0.2.7 clients, for example by modifying
+   CYCLE_ACCEL_RIM a tiny bit.
+ * "Team Red" bug. If the server allows maximally two teams, no team ever
+   gets to be Team Red.
+ * Phasing made even more difficult; nice side effect of the fix is
+   reduced network bandwidth usage.
+ * Speed gauge resets between rounds.
+ * More accurate Lag-O-Meter by meriton.
+ * Zones were sometimes invisible.
+
+Internals:
+
+ * A complete netsync cycle is now sn_Receive(); nNetObject::SyncAll(); sn_SendPlanned();.
+ * Ping charity is now completely server controlled.
+
+#### Changes since 0.2.8.1:
+ * Timestamps and teamscores added to scorelog.txt
+ * Dedicated server now works on FreeBSD and OpenBSD
+ * User running the dedicated server is called "armagetronad" again, the
+   longer "armagetronad-dedicated" caused problems with BSD
+ * Test versions refuse to connect to servers more than one version ahead
+ * Prepared client for respawns
+ * Team spawn formation is now configurable
+ * Added reasons to bans
+ * Added spectator autokicking
+ * Added history to chat and console (wrtlprnft). Press "Cursor up" to
+   edit and repeat previous chats and console commands.
+ * You only enter a game once your client is synced
+ * /msg now prefers exact matches over partial matches
+ * Cycles now have better memory for pending turns (wrtlprnft)
+ * Added player join/leave/rename messages to ladderlog.txt with IPs
+ * Ping variance influence on packet loss tolerance code is now clamped
+   by the regular, configurable, packet loss tolerance: effect of variance
+   can be no bigger than the effect of ping.
+ * Spectators are now regular players and can chat
+ * The /msg command now converts the entered pattern into the internal
+   name so if you write "/msg öäü" and there is a user named "öäü" with
+   an internal nick of "oau" it will still get matched
+ * Team changes are now only executed when allowed, the need for the 
+   temporary/permanent team imbalance setting distinction has gone away
+ * Added brake toggle button
+   Bugfixes:
+ * Client sometimes crashed when leaving a server with AIs on over the menu
+ * The server starting scripts were chowning /var/run and /var/log to armagetronad
+ * Short names could crash the server
+ * Direct cycle collisions sometimes lead to both passing trough each other
+ * Init scripts now installed correctly with --enable-initscripts
+ * Hopeless pending team change wishes are deleted
+ * Large timesteps are now broken down into smaller ones on the game level 
+ * Pretend keys are released before entering chat
+ * Two cycle steering events were sent if you doublebound the brake
+ * Large speed boosts out of game rule bounds were possible during network
+   glitches
+ * Debug recording reliability increased, function call with undefined return
+   value eliminated
+ * Recording and scorekeeping no longer conflict
+ * Input during a recording now has an end marker, making quick keypresses
+   after leaving a menu not break it
+ * CYCLE_RUBBER_DELAY was overridden sometimes by packet loss tolerance
+ * ALLOW_CONTROL_DURING_CHAT now ignores modifier keys like shift and
+   has been reactivated
+ * The camera sometimes got stuck in free mode for the first round you watch
+ * Crashfix in hole blowing code when no cycle was set
+ * After a "perfect" 180, you're more often on the right side of your own wall
+   That code caused some havoc at first, so it has been reworked
+ * The smart cam did not like fluctuating framerates
+ * Improved debug recording reliability: multiple master server visits
+   and too quick keypresses were causing trouble.
+ * Canonical DESTDIR support and added ROOTDIR support for testing
+ * Login floods are detected and ignored
+ * Player name updates sanitized
+ * Disabled complicated feasibility tests for team menu entries, 
+   they did not have the full information and were often wrong
+ * Team score only added to player score if no teamplay is possible
+
+#### Changes since 0.2.8.0:
+ * INCLUDE console command now gives a file not found error
+ * ALL user given paths are validated for security problems in a special function
+ * Fallback to default map on map load failure works again (broken sine 0.2.8.0_rc4)
+
+#### Changes since 0.2.8.0_rc4:
+Bugfixes:
+
+ * SECURITY FIX: via a MAP_FILE path with included .., it was possible
+   to write files anywhere, provided they did not exist previously.
+   Clients with this vulnerability are locked out of the server now.
+ * ALLOW_CONTROL_DURING_CHAT has been disabled for now.
+ * Another connection termination bug.
+
+#### Changes since 0.2.8.0_rc3: 
+ * Added spectator mode toggle key.
+ * Thresholds when a white background bar is rendered behind texts is
+   now configurable in the expert section of settings.cfg.
+ * Ingame menu trigger key is configurable now, only ESC stays hardcoded.
+ * The map parser checks whether the map is stored at the right location.
+ * Map validation errors are now visible on the client.
+ * Made magic numbers used by the smart camera configurable for user tweaking.
+   This is undocumented and unsupported.
+ * The server browser now shows a B beside the score to mark bookmarked servers.
+ Bugfixes:
+ * -Os compile option is filtered out if GCC 3.3 is used, it makes the build go bad.
+ * Extremely low values of CYCLE_DELAY were not honored, an arbitrary delay of .005s
+   was added to it.
+ * On entering a server, the camera would sometimes be stuck in free mode.
+
+#### Changes since 0.2.8.0_rc2:
+ * Almost final artwork
+ * Moviepacks can now also contain texture replacements for the default cycle model
+ * Added number of teammates alive to HUD
+   Bugfixes:
+ * Dual textured floor rendering is now disabled without alpha blending as it
+   did not work anyway.
+ * Lag-O-Meter now has the correct size (the old, buggy one can be restored by
+   setting LAG_O_METER_SCALE to .5).
+ * The network system made some IDs randomly unusable, causing zombie
+   cycles, invisible walls and disconnections.
+ * The AI Team from a previous local game session was sometimes still visible
+   on the score table in the following network game on a remote server.
+ * The server did not start a new match when temporarily, only spectators were online.
+ * Player walls were rendered twice.
+ * The server wrote console center messages to stderr.
+ * UNBAN_IP did not work at all.
+ * The code that should kill a cycle in performance/DOS protection
+   circumstances just crashed.
+
+#### Changes since 0.2.8.0_rc1: 
+ * Bugfixes:
+   - Dedicated server for Windows works again.
+   - Cycle turns are now executed more accurately on the server.
+   - Timer stuttering at end of round (was non-critical, but ugly).
+   - Custom camera did not turn when the internal camera was
+     configured not to turn.
+   - Idle player kick code crashed when it kicked a client with
+     many players.
+   - The code that removes inactive players after a while removed
+     the AI players.
+ * Reverted smart camera movement to pre-beta4 behavior,
+   the new code made some players seasick :)
+ * Ingame admin interface gives more useful information to the invoker 
+ * Small font rendering improvements
+ * Zone conquest message, if it is not the one that ends the round,
+   now states the name of the zone owning team.
+
+#### Changes since 0.2.8_beta4.2:
+ * Fixed bugs:
+   - Random client disconnection
+   - Another vote-not-appearing-on-client bug
+   - Invisible wall segments right after turn
+   - Arena initialization before all settings are transmitted from the server
+   - The server was using more rubber than the client sometimes
+   - Crash with moviepack and some maps
+   - Object sync messages not accepted by client in second network session
+ * Improved kill/suicide/team kill distinction (ENEMY_* settings)
+ * Chatbots and idle players can be removed from the game and kicked
+   (CHATTER/IDLE_REMOVE_TIME,IDLE_KICK_TIME)
+ * Players/team leaders can pause the game before a rond starts (PLAYER_CHAT_WAIT*)
+ * Color codes can be filtered from player names (FILTER_COLOR_NAMES)
+ * New machine readable log file: ladderlog.txt
+ * Configurable and better core dump/team kill/suicide distinction algorithm
+ * Unknown settings are recognized now in configuration files
+ * All global key bindings (Grab mouse, pause and texture reload were left)
+   are now configurable
+ * Player listing length limit adjusted so two teams/16 players fits on screen
+ * Less verbose upgrade warning messages
+ * Imposters can get a non-conflicting name (ALLOW_IMPOST[EO]RS)
+
+#### Changes since 0.2.8_beta4:
+ * Fixed bugs:
+   - Windows version had a memory overwrite error causing crashes and weird behavior.
+   - The game quit when the chat key and a key bound to an instant chat were pressed to quickly.
+   - Votes expired too early on the client.
+   - Performance: a lot of unused temporary walls were hanging around each round.
+   - Cycles sometimes warped to odd locations.
+ * Tweaked smart camera to not stay in front of the cycle so much.
+   - Tweaked smart camera custom glancing.
+     Report back whether you like or hate it!
+ * Made custom camera even more configurable, changed default settings.
+   (old ones are still in settings.cfg)
+ * Forced glancing end on cycle turn now looks better.
+ * FOV settings now deal better with wide screens/splitscreen mode.
+ * Increased ping measurements again by adding the fluctuations. The raw 
+   average ping caused the game logic to be too picky.
+
+#### Changes since 0.2.8_beta3:
+ * Famous fixed bugs: 
+   - Random huge felt lag or blank screen (it was actually a problem with the timer) is gone.
+   - Bogus "possible phase bug" message.
+   - Seemingly random walls popping out of nothing, only to disappear a second later.
+   - Random camera focus changes while you were still alive.
+   - Every 100th console line got deleted.
+ * Reduced pings! Actually, just the measurement is improved, the actual latency
+   stays the same. I hope nobody notices that. Good thing nobody reads NEWS files :)
+ * New text editing convenience: Home and end keys work, and CTRL+left/right/del/backspace
+   work on whole words. Thanks, Nemo!
+ * New instant chat functions: There are now 25 instant chat strings. If an instant
+   chat string ends in a \, it will not be sent immediately, it's opened to be edited by you.
+   Pressing an instant chat key while already chatting will insert the string, provided the
+   key does not produce a regular character.
+ * If enabled by the server administrator: control your cycle while you chat.
+ * Turning speed of custom and internal camera can be adjusted with CAMERA_CUSTOM_TURN_SPEED
+   and CAMERA_IN_TURN_SPEED.
+ * The custom camera zooms out from a closeup at round start. Useful to see your position
+   in your team. Configurable with CAMERA_CUSTOM_ZOOM.
+ * Master server redundancy enabled. Thanks to Lucifer for hosting the backup master!
+
+#### Changes since 0.2.8_beta2:
+ * More bugfixes: most annoying was the crash/infinite loop a server got in when
+   the master server was unreachable
+ * Added zones to map specification
+ * Reworked top level map format (sorry to the map makers for the inconvenience)
+ * Windows: added start menu entries that open the system and user data directories
+ * Bandwidth limitation now works. That means if you lowered the bandwidth
+   limits in the network setup, they were not respected. You probably should
+   readjust them.
+
+#### Changes since 0.2.8_beta1:
+ * bugfixes, of course
+ * added recording and playback startmenu entries for Windows
+ * abuse prevention: added IP banning, player number per IP and client limit, 
+   doublebinding can be crippled on server command
+
+#### Changes since 0.2.7.1:
+ * Server side cycle synchronization issues fixed:
+   - destination removal fixed
+   - lag sliding caused by different interpretation of grinding turn commands on client and server fixed
+   - niceness for older clients: sync interval decreased, no sync in front of wall to prevent local tunneling
+ * Client side cycle synchronization issues fixed:
+   - smooth corrections now only affect the appearance, the correct values are used internally
+   - sync messages are no longer ignored,
+   - new extrapolating sync method implemented,
+   - ghosting fixed,
+   - wall ends sticking out fixed ( for enemy cycles ),
+   - the sophisticated distance based sync code implemented years ago is now actually used, oh dear.
+ * Performance improvements:
+   - netobject synchronization does no longer traverse all netobjects
+   - disabled gameobject-gameobject interaction
+ * added support for nonorthogonal driving directions
+ * added support for debug recording and playback
+ * switched to using automake
+
+#### Changes since 0.2.7.0:
+ * Fixed security issues: fake message ID crash, fake peer ID crash ( both
+   maybe could be used to execute arbitrary code ), fake logout exploit, fake
+   connections DOS attack
+ * The feared "left grid" error message has been replaced by recovery code
+ * Fixed transfer of infinite floats over the network
+ * Fixed network timer inaccuracies on long running servers
+ * Fixed rip bug ( for those who like it: search and you will find )
+ * Fixed wall bending ( there is still some wall bending left, but it will be
+   too small to notice )
+ * Fixed tunneling bugs ( you were able to move from one side of a wall to the other )
+ * Fixed bounce bug ( a small zigzag towards a wall sometimes put you further
+   away from it, leaving a hole )
+ * Fixed massive reference counting overflow crash caused by repeated close grinding/180ing
+ * Made rubber code customizable and frame rate independent ( new CYCLE_RUBBER_
+   variables in settings.cfg )
+ * For debugging and scripting: dedicated server console messages can be
+   decorated with client ID and IP
+ * Topology police: facility to catch tunneling issues after they happened. off
+   by default
+ * Cycle network code is more robust
+ * Update frequency of cycle position now configurable and more frequent for
+   client's own cycle that the rest by default
+ * Corrected rc.d scripts to start the server as a system service
+ * Voting more configurable: voters can be made public, spectators can't vote
+   any more by default
+ * Moviepack floor color fixed
+ * Hostname lookup failure fixed
+ * "PLAYER_1 nick" console command problems fixed
+ * Windows libraries moved out of the main source tree
+ * Source code now compatible with 64 bit and gcc 3.4
+ * Colored explosions!
+ * HUD enhancements: customization, works in splitscreen mode
+ * Directory scanning code added ( not yet visible, will be used for
+    moviepack/cycle selection )
+ * Moviepack sky texture support
+ * Master server can now run on windows, too
+ * Explosion sound now actually works
+
+#### Changes since 0.2.6.0:
+ * added HUD
+ * Winzone may now be a deathzone
+
+#### Changes since 0.2.5.2:
+ * Split custom camera into server defined and client defined custom camera
+ * Fixed monster chat message exploit
+ * Added local player silencing
+ * Added Kick voting
+ * Added player names on cycles ( implemented by Christian Reitwiessner )
+ * Harsher ( and configurable ) spam protection
+ * Fixed strangely bent walls
+
+#### Changes since 0.2.5.1:
+ * Fixed fullscreen toggle while chatting
+ * Disabled trilinear filtering for ATI cards by default ( to avoid lockups )
+ * Worked around flawy S3 texture storage
+ * Fixed crash when trying to change teams in spectator mode
+
+#### Changes since 0.2.5:
+ * Another go at the "11th Round Bug"
+ * Player list is now sorted after displayed score ( before: some invisible combination of team score and own score )
+ * Fixed brakes when connecting to a 0.2.4 or earlier server
+ * Updated FAQ with server setting hints
+ * Unified Windows and Unix network code
+ * Fixed texture hardware mode
+ * Less connection losses
+ * Fixed network ID related crash
+ * Added player names to information you get from a server
+ * Added window-fullscreen toggle key and separate setting of screen resolution/window size
+
+#### Changes since 0.2.4:
+ * Fixed online observer mode switching
+ * Fixed command line options
+ * Fixed player quit message
+ * Fixed AI join message
+ * Fixed double registration of some network objects ( had no known visible symptom )
+ * Added security checks to see if Armagetron is run correctly
+ * Fixed big brother ( reporting of OS, graphic card and version to the master server )
+ * Disabled memory manager by default
+ * Fixed single player exit game crash
+ * Fixed zero length sting receive crash
+ * Completed network version control
+ * Added timestamps to logfiles ( code fragments by k_at_work )
+ * Added reason to login deny/kick messages
+ * Fixed 11th round bug ( additional round started after match end )
+ * Added --doc command line switch to print offline version of online help
+ * Fixed sign of rise/drop highscore messages
+ * New console commands: quit/exit ( dedicated server only ), kick <player name>, center_message <message> and console_message <message>
+ * New setting item: MAX_CLIENTS
+ * Improved server browser, less skipping around
+ * Added instant win zone
+ * Cycle brake is now of limited duration
+
+#### Changes since 0.2.3:
+ * Fixed score display ( really! )
+ * Fixed freestyle mode round counting
+ * Fixed server freezer
+ * Fixed explosion sync
+ * Fixed AI crashes when player leaves in mid-battle
+ * Fixed configure script: now really uses sdl-config
+ * Speeded up deletion of unreachable servers
+ * Fixed endless recursion bug ( "11th player bug" )
+ * Moved team start positions further apart
+ * Player name is now taken from $USER on first start and player color is randomized
+
+#### Changes since 0.2.2:
+ * Fixed highscores and ladder
+ * Delayed score deletion after match end
+ * Fixed autoexec.cfg loading
+ * More automatic rebuilding
+ * Fixed dedicated server idle quitting
+ * Fixed auto AI
+ * Fixed instant chat
+ * Fixed score display for many players or long player names
+ * Fixed very rare client crash
+ * Fixed not so rare release only crash
+ * Fixed balance-related typos
+ * Tweaked smart camera so that it works well when braking
+ * Fixed finish mode game setting
+
+#### Changes since 0.2.1:
+ * Fixed another connection-loss bug
+ * Fixed observer freeze
+ * Observers now don't just get kicked when nobody else is online
+ * Fixed software renderer detection
+ * Updated FAQ
+ * Fixed config file loading on some architectures
+ * Improved team coloring
+ * Fixed stuck brake bug
+
+#### Changes since 0.2.0:
+ * Fixed crash when watching a quitting player
+
+#### Changes since 0.2.pre4:
+ * Fixed crashes
+ * Fixed windows network connection problems
+ * Fixed clour related problems
+ * Added marker for own cycle to avoid confusion in team mode
+ * Changed directory placement: configuration resides in /etc/armagetron,
+   user configuration in ~/.armagetron/var
+ * Data files added to ~/.armagetron/textures ( or /models or /sounds )
+   are now loaded in favor of original data, allowing user specific mods
+
+#### Changes since 0.2.pre3:
+ * Fixed some more rare crashes and lockups
+ * Fixed team handling: all team change operations now get only active
+   on next round address
+ * Fixed moviesounds
+ * Fixed server-master server communications
+ * new installation method: make update ( keeps user configuration )
+
+#### Changes since 0.2.pre2:
+ * Fixed some rare crashes and lockups
+ * Improved cycle handling over network
+ * It is now allowed to fight with an arbitrary large team against the AI
+   regardless of the balancing settings
+ * improved rendering precision: z-fighting artefact are now uncommon,
+   and at the same time early clipping on the near clipping plane
+
+#### Changes since 0.2.pre:
+ * got rid of "zombie" players
+ * corrected team messages
+ * fixed chatting
+ * fixed 32 bit rendering
+
+#### Changes since 0.1.4.9:
+ * it is now possible for players to form teams
+ * explosion now can blow holes in player walls
+ * delay added to wall disappearance after death
+ * finite wall length supported for snake-style gameplay
+ * arena size and game speed configurable in the menu
+ * the AI has been greatly improved
+ * there is an Internet master server active
+ * support for localization has been added, currently featuring 
+   English and German
+ * AI players now have names
+ * the moviepack title screen is displayed
+ * Linux version: easier system-wide installation with RPM packages 
+   or "make install"
 
=== added file 'Dockerfile'
--- Dockerfile	1970-01-01 00:00:00 +0000
+++ Dockerfile	2020-07-03 06:03:19 +0000
@@ -0,0 +1,94 @@
+ARG BASE_BUILD_SMALL=registry.gitlab.com/armagetronad/armagetronad/armalpine_32:028_0
+ARG BASE_BUILD_FULL=registry.gitlab.com/armagetronad/armagetronad/armabuild_64:028_0
+ARG BASE_LINUX=i386/alpine:3.7
+ARG PROGRAM_NAME=armagetronad-unk
+ARG PROGRAM_TITLE="Armagetron UNK"
+ARG FAKERELEASE=false
+ARG BRANCH=master-fix-unknown-bug
+
+########################################
+
+# bootstrap source
+FROM ${BASE_BUILD_FULL} AS bootstrap
+MAINTAINER Manuel Moos <[e-mail]>
+
+ENV SOURCE_DIR /home/docker/armagetronad
+ENV BUILD_DIR /home/docker/build
+
+COPY --chown=docker . ${SOURCE_DIR}
+RUN chmod 755 ${SOURCE_DIR}
+WORKDIR ${SOURCE_DIR}
+# these files are in .dockerignore, but if they're in git, restore them.
+RUN test -d .git && git checkout .dockerignore .gitlab-ci.yml Dockerfile
+RUN git status
+#RUN ./batch/make/version .
+#RUN false
+RUN test -r configure || ./bootstrap.sh
+RUN cat version.m4
+#RUN false
+
+########################################
+
+# build tarball
+FROM bootstrap AS configured
+
+#ARG PROGRAM_NAME
+#ARG PROGRAM_TITLE
+ARG FAKERELEASE
+ARG BRANCH
+
+RUN mkdir -p ${BUILD_DIR} && chmod 755 ${BUILD_DIR}
+WORKDIR ${BUILD_DIR}
+RUN . ../armagetronad/docker/scripts/brand.sh . && ARMAGETRONAD_FAKERELEASE=${FAKERELEASE} ../armagetronad/configure --prefix=/usr/local --disable-glout --disable-sysinstall --disable-desktop progname="${PROGRAM_NAME}" progtitle="${PROGRAM_TITLE}"
+RUN make -j$(nproc) dist && make -C docker/build tag.gits
+RUN if [ ${FAKERELEASE} = true ]; then cp ../armagetronad/docker/build/fakerelease_proto.sh docker/build/fakerelease.sh; fi
+
+########################################
+
+# build server
+FROM bootstrap AS build_server
+
+ARG PROGRAM_NAME
+ARG PROGRAM_TITLE
+
+RUN bash ./configure --prefix=/usr/local --disable-glout --disable-sysinstall --disable-desktop progname="${PROGRAM_NAME}" progtitle="${PROGRAM_TITLE}"
+RUN make -j$(nproc)
+RUN DESTDIR=/home/docker/destdir make install
+
+########################################
+
+# build client
+FROM bootstrap AS build_client
+
+ARG PROGRAM_NAME
+ARG PROGRAM_TITLE
+
+RUN bash ./configure --prefix=/usr/local --disable-sysinstall --disable-desktop progname="${PROGRAM_NAME}" progtitle="${PROGRAM_TITLE}"
+RUN make -j$(nproc)
+RUN DESTDIR=/home/docker/destdir make install
+
+########################################
+
+FROM ${BASE_LINUX} AS run_server_base
+MAINTAINER Manuel Moos <[e-mail]>
+
+# runtime dependencies
+RUN apk add \
+boost-thread \
+libxml2 \
+protobuf \
+python \
+shadow \
+--no-cache
+
+########################################
+
+FROM run_server_base AS run_server
+MAINTAINER Manuel Moos <[e-mail]>
+
+ARG PROGRAM_NAME
+
+WORKDIR /
+COPY --chown=root --from=build_server /home/docker/destdir/ /
+RUN sh /usr/local/share/games/${PROGRAM_NAME}-dedicated/scripts/sysinstall install /usr/local
+
 
=== modified file 'Makefile.am'
--- Makefile.am	2019-07-26 01:01:51 +0000
+++ Makefile.am	2020-07-03 06:03:19 +0000
@@ -19,7 +19,7 @@
 
 # resource is included as a subdir for the purpose of keeping this makefile short and delegating
 # resource management to a more appropriate place anyway
-SUBDIRS = src resource batch config desktop
+SUBDIRS = src resource batch config desktop docker/build
 
 # special tasks to do if we're building the master server
 if BUILDMASTER
@@ -80,8 +80,11 @@
 #	clear SVN
 	find $(distdir) -depth -name .svn -exec rm -rf \{\} \;
 
-#   strip comments from translated files
-	cd $(distdir)/language; python2 ./update.py --dist
+#	clear git and bzr
+	rm -rf .git .bzr
+
+#   	strip comments from translated files
+	cd $(distdir)/language; `which python3 python python2 2> /dev/null | head -n 1` ./update.py --dist
 #	restore timestamps
 	cd $(distdir)/language; for f in *.txt; do test -r $$f.bak && touch -r $$f.bak $$f; done
 	rm -f $(distdir)/language/*.bak
 
=== modified file 'Makefile.manual'
--- Makefile.manual	2011-11-30 19:48:10 +0000
+++ Makefile.manual	2020-07-03 06:03:19 +0000
@@ -146,9 +146,7 @@
 
 # make snapshot of SVN state, tracking relevant changes in .changetag
 fingerprint: .changetag
-# easy, just do svn info, that contains all the information needed. If that fails, try other scms.
-	svn info ${top_srcdir} > $@ || svk info ${top_srcdir} > $@ || { bzr testament ${top_srcdir}; bzr info ${top_srcdir};  } > $@ || echo "unknown" > $@
-	svn info `dirname ${top_srcdir}` >> @$ || svn info `dirname ${top_srcdir}` >> $@ || echo "unknown" >> $@
+	git -C ${top_srcdir} show HEAD -s > $@ || svn info ${top_srcdir} > $@ || svk info ${top_srcdir} > $@ || { bzr testament ${top_srcdir}; bzr info ${top_srcdir};  } > $@ || echo "unknown" > $@
 	diff $@ .changetag > /dev/null 2>&1 || cp $@ .changetag
 
 ########################
@@ -162,8 +160,8 @@
 # Keep the changelog up to date as well (triggered by make dist only)
 $(srcdir)/ChangeLog: .changetag
 	touch $@
-	@echo -e "\nGenerating ChangeLog from SVN/BZR, please be patient...\n"
-	cd ${srcdir}; svn log 2>&1 > ChangeLog || bzr log --gnu-changelog 2>&1 > ChangeLog || echo "No official releasse: no changelog" > ChangeLog
+	@echo -e "\nGenerating ChangeLog from GIT/BZR, please be patient...\n"
+	cd ${srcdir}; git log 2>&1 > ChangeLog || bzr log --gnu-changelog 2>&1 > ChangeLog || echo "No official releasse: no changelog" > ChangeLog
 	test -r $@ || touch $@
 
 # extra target to make before a real distribution is built
 
=== modified file 'NEWS'
--- NEWS	2014-01-13 03:59:54 +0000
+++ NEWS	2020-07-03 06:03:19 +0000
@@ -1,4 +1,19 @@
-Changes since 0.2.8.3.x:
+
+Changes since 0.2.8.3.5:
+
+  Fixed Bugs
+
+- Debian builds: Documentation html files have empty last change (#9)
+- Ubuntu PPA release candidate builds would overwrite previous stable releases (#15)
+
+  New Features
+
+- Adapt ChangeLog and fingerprint generation to git (#11)
+- Integrated build system (#14)
+
+
+  Changes on the 0.2.9 branch
+
 - Added detection and reaction code for timing assist bots
 - /shuffle now works before you actually join a team
 - Implemented /shout command and associated settings
@@ -36,7 +51,38 @@
   login/logout message can be announced.
 - Authentication is now enabled by default.
 
+Changes since 0.2.8.3.4:
+
+- Security fix: Check that the remote is allowed to create an object
+  before creating it, not decide whether it gets to keep it after
+  it already has been created and potential damage has been done.
+  No arbitrary code could be executed, but a client could effectively 
+  shut down a server by sending crucial objects, such as the main game
+  timer or the game itself.
+- Compilation fixes for current systems.
+
+Changes since 0.2.8.3.3:
+
+- Eliminated undefined behavior that was fine in gcc 5, but now
+  (rightfully!) turned into crashes in gcc 6.
+- Eliminated compilation disambiguity that was just causing a mild
+  performance degradation in gcc 5 and is now a compilation failure in
+  gcc 6.
+  
+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
 - security fix: never read one byte outside of the received buffer
@@ -47,6 +93,7 @@
 - Additional checks against illegal values passed to renderer
 
 Changes since 0.2.8.3:
+
 - fixed temporary sound disappearance when alt-tabbing away and back
 - default subcultures are now distributed
 - enable 32 bit color depth at desktop resolution
@@ -54,8 +101,9 @@
 - spelling mistakes and missing German translations
 
 Changes since 0.2.8.3_rc4:
+
 - New setting: KEEP_PLAYER_SLOT allows the server to kick (preferably) spectators
-   if it gets full so there is always one slot open for players
+  if it gets full so there is always one slot open for players
 - New setting: ACCESS_LEVEL_AUTOKICK_IMMUNITY sets the access level required 
   to be immune from such kicks (and idle autokicks, too)
 - Intercepted chat commands are now written to ladderlog.txt. Format:
@@ -65,6 +113,7 @@
 - fast finish works again
 
 Changes since 0.2.8.3_rc3:
+
 - Pinging previously popular servers earlier for quicker server
   browsing
 - Improved master server random polling, the second polled master now
@@ -77,6 +126,7 @@
   changes user level for name\_with\_spaces@forums
 
 Changes since 0.2.8.3_rc2:
+
 - Fixed crash with server polling
 - ROUND_WINNER and MATCH_WINNER ladderlog events now include the players of
   the team.
@@ -87,12 +137,14 @@
   of shuffle messages displayed.
 
 Changes since 0.2.8.3_rc1:
+
 - Fixed dark color filters, such as FILTER_DARK_COLOR_STRINGS, to not filter
   the reset color.
 - ASE moviepack models no longer have a vertex count limit
 - Fixed endless recursion crash between rounds
 
 Changes since 0.2.8.3_beta3:
+
 - Chat prefix spam protection. Guards against prefix spam, such as when a
   user always changes their chat message color, or prefixes all messages
   with a clan tag. Toggle with the PREFIX_SPAM_ENABLE setting.
@@ -127,7 +179,8 @@
 
 Changes since 0.2.8.2:
 
-  New settings and commands:
+New settings and commands:
+
 - MIN_PLAY_TIME_*: minimal play time required before you are allowed to
   play on this server.
 - SPAM_AUTOKICK_COUNT: minimal number of spam warning messages you get in a
@@ -217,6 +270,7 @@
   when AUTO_TEAM is enabled
 
 If --enable-armathentication was activated:
+
 - /lock, /unlock, /invite and /uninvite team management chat for players of
   access level ACCESS_LEVEL_TEAM or better.
 - /teams chat command that rougly prints team layout.
@@ -237,7 +291,8 @@
 - /login chat command then uses the more secure hashed base logins
 - new chat commands /op and /deop to change other players' access rights
 
-  Featurelets:
+Featurelets:
+
 - Added Polish language file
 - clientside play time tracking and server controlled minimal required experience
   to be allowed to play.
@@ -286,19 +341,19 @@
   Armagetron Advanced, the paths it uses, links to the main site, wiki
   and forums and the names of the project admins.
 - New entries in ladderlog.txt:
-  - GAME_TIME <time> (only if enabled via the LADDERLOG_GAME_TIME_INTERVAL
+  GAME_TIME <time> (only if enabled via the LADDERLOG_GAME_TIME_INTERVAL
     setting): The time that has passed since the last start of a round
-  - BASEZONE_CONQUERED <team> <x> <y>: A fortress zone belonging to <team>
+  BASEZONE_CONQUERED <team> <x> <y>: A fortress zone belonging to <team>
     at the coordinates (<x>, <y>) has been conquered
-  - BASEZONE_CONQUERER <player>: at the time of the last BASEZONE_CONQUERED
+  BASEZONE_CONQUERER <player>: at the time of the last BASEZONE_CONQUERED
     message, <player> has been in the conquered zone
-  - ONLINE_PLAYER <player> [<ping [<team>]]: At the beginning of the round,
+  ONLINE_PLAYER <player> [<ping [<team>]]: At the beginning of the round,
     <player> had <ping> and was on <team>. This line is not printed for bots
-  - NUM_HUMANS <n>: There are <n> players that are not AIs and are part of a
+  NUM_HUMANS <n>: There are <n> players that are not AIs and are part of a
     team.
-  - ROUND_SCORE has the player's team name appended.
-  - ROUND_SCORE_TEAM: score a team accumulated during the last round.
-  - WAIT_FOR_EXTENAL_SCRIPT: printed if the setting of the same name is
+  ROUND_SCORE has the player's team name appended.
+  ROUND_SCORE_TEAM: score a team accumulated during the last round.
+  WAIT_FOR_EXTENAL_SCRIPT: printed if the setting of the same name is
     enabled. In this case the server will delay the start of the next round
     until WAIT_FOR_EXTENAL_SCRIPT_TIMEOUT is reached or the setting is
     disabled.
@@ -310,7 +365,8 @@
 - /players now shows the players' color and allows searching
 - TEAM_ELIMINATION_MODE sets the way ArmagetronAd removes teams when there's too much teams.
 
-  Bugfixes:
+Bugfixes:
+
 - Added compensation for drifting timers (observed often with
   overclocked mainboards)
 - Text input fields now let the text wrap correctly and make use of the space allocated
@@ -339,7 +395,8 @@
 - More accurate Lag-O-Meter by meriton.
 - Zones were sometimes invisible.
 
-  Internals:
+Internals:
+
 - A complete netsync cycle is now sn_Receive(); nNetObject::SyncAll(); sn_SendPlanned();.
 - Ping charity is now completely server controlled.
 
@@ -410,6 +467,7 @@
 
 Changes since 0.2.8.0_rc4:
 Bugfixes:
+
 - SECURITY FIX: via a MAP_FILE path with included .., it was possible
   to write files anywhere, provided they did not exist previously.
   Clients with this vulnerability are locked out of the server now.
@@ -458,11 +516,11 @@
   Cycle turns are now executed more accurately on the server.
   Timer stuttering at end of round (was non-critical, but ugly).
   Custom camera did not turn when the internal camera was
-  configured not to turn.
+    configured not to turn.
   Idle player kick code crashed when it kicked a client with
-  many players.
+    many players.
   The code that removes inactive players after a while removed
-  the AI players.
+    the AI players.
 - Reverted smart camera movement to pre-beta4 behavior,
   the new code made some players seasick :)
 - Ingame admin interface gives more useful information to the invoker 
@@ -502,7 +560,7 @@
   Cycles sometimes warped to odd locations.
 - Tweaked smart camera to not stay in front of the cycle so much.
   Tweaked smart camera custom glancing.
-  Report back whether you like or hate it!
+    Report back whether you like or hate it!
 - Made custom camera even more configurable, changed default settings.
   (old ones are still in settings.cfg)
 - Forced glancing end on cycle turn now looks better.
@@ -601,7 +659,7 @@
 - Colored explosions!
 - HUD enhancements: customization, works in splitscreen mode
 - Directory scanning code added ( not yet visible, will be used for
-  moviepack/cycle selection )
+   moviepack/cycle selection )
 - Moviepack sky texture support
 - Master server can now run on windows, too
 - Explosion sound now actually works
@@ -746,3 +804,4 @@
 - the moviepack title screen is displayed
 - Linux version: easier system-wide installation with RPM packages 
   or "make install"
+
 
=== modified file 'batch/checkbugle.py'
--- batch/checkbugle.py	2008-12-11 08:15:17 +0000
+++ batch/checkbugle.py	2020-07-03 06:03:19 +0000
@@ -2,6 +2,8 @@
 
 # checks bugle trace log for OpenGL problems
 
+from __future__ import print_function
+
 import sys
 
 count = 0
@@ -38,7 +40,7 @@
     lineNo=lineNo+1
     
     if False and function.find( 'List' ) >= 0 and function.find( 'Call' ) < 0:
-        print "%d (%s) (%s) (%s) (%s)" % (count, line[:-1], function, args, result)
+        print("%d (%s) (%s) (%s) (%s)" % (count, line[:-1], function, args, result))
 
         count = count + 1
         if count > 100:
@@ -46,12 +48,12 @@
 
     if function == 'glBegin':
         if inBlock:
-            print "Error: Still in block.", lineNo
+            print("Error: Still in block.", lineNo)
             exit(-1)
         inBlock = True
     elif function == 'glEnd':
         if not inBlock:
-            print "Error: Not in block.", lineNo
+            print("Error: Not in block.", lineNo)
             exit(-1)
         inBlock = False
     else:
@@ -64,15 +66,15 @@
     if function == 'glGenLists':
         legalLists[result] = True
         if inList:
-            print "Error: Still in list generation.", lineNo
+            print("Error: Still in list generation.", lineNo)
             exit(-1)
 
     if function == 'glEndList':
         if not inList:
-            print "Error: Not in list generation.", lineNo
+            print("Error: Not in list generation.", lineNo)
             exit(-1)
         if inBlockAtListStart != inBlock:
-            print "Error: glBegin/glEnd mismatch in list.", lineNo
+            print("Error: glBegin/glEnd mismatch in list.", lineNo)
             exit(-1)
         inList=False
 
@@ -81,50 +83,50 @@
         list=args[0:args.find(',')]
         currentList=list
         if inList:
-            print "Error: Still in list generation.", lineNo
+            print("Error: Still in list generation.", lineNo)
             exit(-1)
         if not legalLists[list]:
-            print "Error: list %s used, but not generated." % [list], lineNo
+            print("Error: list %s used, but not generated." % [list], lineNo)
             exit(-1)
         setLists[list]=True
         inList=True
     elif inList:
         if not function in usedInList:
             usedInList[function]=lineNo
-            #print lineNo, function
+            #print(lineNo, function)
         
     if function == 'glCallList':
         list=args
         if not legalLists[list]:
-            print "Error: list %s used, but not generated." % [list], lineNo
+            print("Error: list %s used, but not generated." % [list], lineNo)
             exit(-1)
         if inList and currentList == list:
-            print "Error: list %s used, but it's just getting generated." % [list], lineNo
+            print("Error: list %s used, but it's just getting generated." % [list], lineNo)
             exit(-1)
         if not setLists[list]:
-            print "Error: list %s used, but not set." % [list], lineNo
+            print("Error: list %s used, but not set." % [list], lineNo)
             exit(-1)
 
     if function == 'glDeleteLists':
         list=args[0:args.find(',')]
         if not legalLists[list]:
-            print "Error: list %s used, but not generated." % [list], lineNo
+            print("Error: list %s used, but not generated." % [list], lineNo)
             exit(-1)
         legalLists[list]=False
         setLists[list]=False
 
-print "Used in display lists:"
+print("Used in display lists:")
 for f in usedInList:
-    print f, usedInList[f]
+    print(f, usedInList[f])
 
 print
-print "Used in glBegin/End:"
+print("Used in glBegin/End:")
 for f in usedInBlock:
-    print f, usedInBlock[f]
+    print(f, usedInBlock[f])
 
 print
-print "Used outside glBegin/End:"
+print("Used outside glBegin/End:")
 for f in usedOutBlock:
-    print f, usedOutBlock[f]
+    print(f, usedOutBlock[f])
     
     
 
=== added file 'batch/git_ff_to_release.sh'
--- batch/git_ff_to_release.sh	1970-01-01 00:00:00 +0000
+++ batch/git_ff_to_release.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Depending on which branch this is invoked on, fast forward from next a little less stable branch
+# master -> beta, beta -> release
+
+#set -x
+
+sd=$1
+test -z "${sd}" && sd=`dirname $0`
+
+git update-index --refresh 
+if ! git diff-index --quiet HEAD --; then
+    echo ""
+    echo "Local modifications detected, abort. Commit first."
+    exit 1
+fi
+
+HASH=`git -C ${sd} rev-parse HEAD`
+BRANCH=`git -C ${sd} rev-parse --abbrev-ref HEAD`
+# BRANCH=beta_0.2.9
+SUFFIX=`echo ${BRANCH} | sed -e s/^release// -e s/^beta// -e s/^legacy//`
+
+MERGE_FROM=""
+
+case ${BRANCH} in
+    release*)
+        MERGE_FROM=beta${SUFFIX}
+        ;;
+    beta)
+        MERGE_FROM=master
+        ;;
+    beta*)
+        if test "${SUFFIX}" = "_0.2.9"; then
+            SUFFIX=_0.2.8
+        fi
+        MERGE_FROM=legacy${SUFFIX}
+        ;;
+    *)
+        echo "Unknown branch, don't know what to do."
+        exit 0
+        ;;
+esac
+
+git -C ${sd} fetch origin || exit $?
+
+# merge the listed branches from origin and, if present, locally
+TOTAL_MERGE=""
+for s in ${MERGE_FROM}; do
+    TOTAL_MERGE="${TOTAL_MERGE} origin/$s"
+    if git -C ${sd} branch -l | grep -q " $s\$"; then
+        TOTAL_MERGE="${TOTAL_MERGE} ${s}"
+    fi
+done
+
+git -C ${sd} merge --ff-only ${TOTAL_MERGE} || exit $?
+
+NEW_HASH=`git -C ${sd} rev-parse HEAD`
+test ${NEW_HASH} = ${HASH} && exit 0
+
+echo
+echo '****************************'
+echo 'New revisions in this merge:'
+echo '****************************'
+git log ${HASH}..
+
+echo
+echo In case you change your mind and 'git reset --hard', the pre-merge git revision is:
+echo ${HASH}
 \ No newline at end of file
 
=== added file 'batch/git_merge_safe_sources.sh'
--- batch/git_merge_safe_sources.sh	1970-01-01 00:00:00 +0000
+++ batch/git_merge_safe_sources.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Depending on which branch this is invoked on, merge all other branches that can be deemed safe
+
+#set -x
+
+sd=$1
+test -z "${sd}" && sd=`dirname $0`
+
+git -C ${sd} update-index --refresh 
+if ! git -C ${sd} diff-index --quiet HEAD --; then
+    echo ""
+    echo "Local modifications detected, abort. Commit first."
+    exit 1
+fi
+
+HASH=`git -C ${sd} rev-parse HEAD`
+BRANCH=`git -C ${sd} rev-parse --abbrev-ref HEAD`
+#BRANCH=beta_0.2.9
+SUFFIX=`echo ${BRANCH} | sed -e s/^release// -e s/^beta// -e s/^legacy//`
+
+MERGE_FROM=""
+
+case ${BRANCH} in
+    release*)
+        echo "Release branch, nothing safe to merge."
+        exit 0
+        ;;
+    beta*)
+        MERGE_FROM=release${SUFFIX}
+        ;;
+    legacy*)
+        if test "${SUFFIX}" = "_0.2.8"; then
+            SUFFIX=_0.2.9
+            MERGE_FROM=legacy_0.2.8.3
+        fi
+        MERGE_FROM="${MERGE_FROM} release${SUFFIX} beta${SUFFIX}"
+        ;;
+    master)
+        MERGE_FROM="legacy_0.2.8 legacy_0.2.8.3"
+        #MERGE_FROM="release beta legacy_0.2.8 legacy_0.2.8.3"
+        ;;
+    *)
+        echo "Unknown branch, don't know what to do."
+        exit 0
+        ;;
+esac
+
+git -C ${sd} fetch origin || exit $?
+
+# merge the listed branches from origin and, if present, locally
+TOTAL_MERGE=""
+for s in ${MERGE_FROM}; do
+    TOTAL_MERGE="${TOTAL_MERGE} origin/$s"
+    if git -C ${sd} branch -l | grep -q " $s\$"; then
+        TOTAL_MERGE="${TOTAL_MERGE} ${s}"
+    fi
+done
+
+git -C ${sd} pull --ff-only origin || exit $?
+git -C ${sd} merge ${TOTAL_MERGE} || exit $?
+
+NEW_HASH=`git -C ${sd} rev-parse HEAD`
+test ${NEW_HASH} = ${HASH} && exit 0
+
+echo
+echo '****************************'
+echo 'New revisions in this merge:'
+echo '****************************'
+git log ${HASH}..
+
+echo
+echo In case you change your mind and 'git reset --hard', the pre-merge git revision is:
+echo ${HASH}
 \ No newline at end of file
 
=== modified file 'batch/ladder.py'
--- batch/ladder.py	2006-05-29 01:55:42 +0000
+++ batch/ladder.py	2020-07-03 06:03:19 +0000
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # purpose: process ladderlog.txt and generate a usefull ladder league from it
 
+from __future__ import print_function
+
 import math
 
 
@@ -150,12 +152,12 @@
             if diagonal < minDiagonal: minDiagonal = diagonal
             averageDiagonal += diagonal/len(players)
 
-        print averageDiagonal   
+        print(averageDiagonal)
 
         maxDeviation = 1
         if minDiagonal < 0:
             maxDeviation = -1/minDiagonal
-        print maxDeviation
+        print(maxDeviation)
 
         # initialize score vector
         score = {}
@@ -197,7 +199,7 @@
                 error += abs(deltascore[i])
 
             if iter == 100:
-                print error 
+                print(error)
                 iter = 0   
             iter += 1
 
@@ -230,9 +232,9 @@
 
 scoreDataBase = PairScoreDictionary()
 scoreDataBase.ReadLog( open( "ladderlog.txt" ) )
-#print "read"
+#print("read")
 ladder = scoreDataBase.GenerateLadder()
 
 for entry in ladder:
-    print entry[1], entry[0]
+    print(entry[1], entry[0])
 
 
=== added file 'batch/make/patchnotes.py'
--- batch/make/patchnotes.py	1970-01-01 00:00:00 +0000
+++ batch/make/patchnotes.py	2020-07-03 06:03:19 +0000
@@ -0,0 +1,204 @@
+#!/usr/bin/python3
+#wd=`dirname $0`
+
+# generates patch notes from git log references to gitlab issues
+# parameters: <path to git repository> <path to frozen changelog> <gitlab team> <gitlab project>
+
+
+# issue query URI sample
+# https://gitlab.com/api/v4/projects/9837210/issues?scope=all&state=closed&iids[]=11&iids[]=9
+
+# Looks for commit lines of the form
+# Implements https://gitlab.com/armagetronad/armagetronad/-/issues/11
+# or 
+# Fixes #11
+# looks up the referenced issues in the GitLab API, generates a ChangeLog/Patch Note line for each
+
+import sys, argparse
+import subprocess
+from packaging import version
+from string import Template
+import urllib.request
+import json
+
+# checks whether s represents an iteger
+def RepresentsInt(s):
+	try:
+		int(s)
+		return True
+	except ValueError:
+		return False
+
+# retrieve tags from git repository
+def GetTags(repo, tag_lower_limit):
+	alltags_raw=subprocess.run(["git", "-C", repo, "tag", "-l", "--merged"], stdout=subprocess.PIPE)
+	alltags=alltags_raw.stdout.decode('utf-8').split('\n')
+	return list(filter(lambda x: len(x) > 0 and version.parse(x) >= version.parse(tag_lower_limit), alltags))
+
+	# sort tags in chronological order (assuming they're all on the same branch)
+	revisions={}
+	for tag in tags:
+		# count number of revisions since tag
+		revisions_since_tag_raw=subprocess.run(["git", "-C", repo, "rev-list", "--count", tag + ".."], stdout=subprocess.PIPE)
+		revisions[tag]=int(revisions_since_tag_raw.stdout.decode('utf-8'))
+
+	print(revisions)
+	tags.sort(key=lambda x: revisions[x], reverse=True)
+	return tags
+
+# return (tag, list of issues fixed after tag as integers)
+def FixedAfterTag(repo, team, project, tags):
+	# for each tag, collect which issues have been resolved (Fix.. Close.. Solve.. Implement...)
+	# or mentioned otherwise
+	uri_start=Template('https://gitlab.com/${team}/${project}/-/issues/').substitute(team=team, project=project)
+	# The build system is on Python 3.5, so we're stuck with this mechanism
+	# print(uri_start)
+
+	last_fixed_in={}
+	last_mentioned_in={}
+	issues=set([])
+
+	for tag in tags:
+		log_raw=subprocess.run(["git", "-C", repo, "log", tag + ".."], stdout=subprocess.PIPE)
+		log=log_raw.stdout.decode('utf-8').split('\n')
+
+		for logline in log:
+			mentions=False
+			fixes=False
+			ref=None
+			if logline[0:4] == '    ':
+				for word in logline.split():
+					if word.startswith(uri_start):
+						ref = word[len(uri_start):]
+					elif word.startswith('#'):
+						ref = word[1:]
+					if not ref is None and RepresentsInt(ref):
+						ref=int(ref)
+						mentions = True
+						trimmed=logline.strip().upper()
+						if trimmed.startswith('FIX') or trimmed.startswith('IMPLEMENT') or trimmed.startswith('CLOSE') or trimmed.startswith('SOLVE'):
+							fixes = True						
+			if fixes:
+				last_fixed_in[ref] = tag
+			if mentions:
+				last_mentioned_in[ref] = tag
+				issues.add(ref)
+
+	#print(issues)
+	#print(last_fixed_in)
+	#print(last_mentioned_in)
+
+	fixed_after_tag={}
+	for issue in issues:
+		fixed_in = None
+		if issue in last_fixed_in:
+			fixed_in = last_fixed_in[issue]
+		if fixed_in == None and issue in last_mentioned_in:
+			fixed_in = last_mentioned_in[issue]
+		if fixed_in != None:
+			#print(issue, fixed_in)
+			fixed_after_tag.setdefault(fixed_in, []).append(issue)
+
+	#print(fixed_after_tag)
+	return fixed_after_tag
+
+# retrieves metadata for an issue from gitlab, composes markup patch note line
+def GetMarkupLine(team, project, issue):
+	uri=Template('https://gitlab.com/api/v4/projects/${team}%2F${project}/issues?scope=all&state=closed&iids[]=${issue}').substitute(team=team, project=project, issue=issue)
+	#print(uri)
+	with urllib.request.urlopen(uri) as content:
+		data = json.loads(content.read().decode())
+		#print(data)
+		if len(data) == 0:
+			return "", None
+		title = data[0]['title']
+		weblink = data[0]['web_url']
+		labels = data[0]['labels']
+		line = None
+		if data[0]['state'] == 'closed':
+			line = Template(' * ${title} ([#${issue}](${weblink}))').substitute(title=title.strip(), issue=issue, weblink=weblink)
+		#print(line, labels)
+		if 'Type::Bug' in labels:
+			return 'Fixed Bugs', line
+		elif 'Type::Feature' in labels:
+			return 'New Features', line
+		elif 'Type::Removed' in labels:
+			return 'Removed', line
+		elif 'Type::Breaking' in labels:
+			return 'Breaking Changes', line
+		else:
+			return 'Other Changes', line
+
+# parse given frozen changelog, look for last 'changes since' note, extract tag name
+def GetLastFrozenTag(frozen):
+	file = open(frozen, 'r')
+	begin = '#### Changes since '
+	for line in file:
+		if line.startswith(begin):
+			version=line[len(begin):]
+			version = version.strip(':\n ')
+			if len(version) > 2:
+				if version[0] != 'v':
+					version = 'v' + version
+			return version
+
+parser = argparse.ArgumentParser(description='Generates ChangeLog/Patch Notes')
+parser.add_argument('repository', help='Path to the local git repository')
+parser.add_argument('frozen_changelog', help='Path to a previous, now immutable changelog')
+parser.add_argument('gitlab_team', help='Team name on gitlab')
+parser.add_argument('gitlab_project', help='Project name on gitlab')
+parser.add_argument('-p', help='Just print patch notes', action='store_true')
+
+args = parser.parse_args()
+
+if len(sys.argv) < 5:
+	print("Not enough arguments")
+	exit(1)
+
+patchnotes = args.p
+repo = args.repository
+frozen = args.frozen_changelog
+team = args.gitlab_team
+project = args.gitlab_project
+
+# adapt for other branches
+tag_lower_limit=GetLastFrozenTag(frozen)
+# print(tag_lower_limit)
+
+# get all tags relevant to the current branch
+tags=GetTags(repo, tag_lower_limit)
+#print("tags =", tags)
+
+fixed_after_tag=FixedAfterTag(repo, team, project, tags)
+#print(fixed_after_tag)
+
+for tag in fixed_after_tag:
+	# print(tag)
+	fixed = fixed_after_tag[tag]
+	# luckily, the category names are alphabetically in the order we want them in :)
+	categories={}
+	#categories={'Fixed Bugs' : [], 'New Features' : [], 'Other Changes': []}
+	for issue in fixed:
+		category, line=GetMarkupLine(team, project, issue)
+		if not line is None:
+			categories.setdefault(category, []).append(line)
+	
+	if len(categories) > 0:
+		printtag=tag
+		if tag[0] == 'v':
+			printtag = tag[1:]
+		print()
+		print("#### Changes since", printtag + ":")
+		print()
+		for category in categories:
+			print("#####", category)
+			print()
+			for line in categories[category]:
+				print(line)
+			print()
+		if patchnotes:
+			exit(0)
+		print()
+
+file = open(frozen, 'r')
+print(file.read())
 
=== modified file 'batch/make/sortresources'
--- batch/make/sortresources	2007-11-04 03:21:24 +0000
+++ batch/make/sortresources	2020-07-03 06:03:19 +0000
@@ -27,7 +27,9 @@
 find ${destination}/ -name "*~" -exec rm -rf \{\} \;
 
 # rename them properly
-python ${sortresources} -v ${destination} || exit 1
+PYTHON=`which python3 python python2 2> /dev/null | head -n 1`
+echo python is ${PYTHON}
+${PYTHON} ${sortresources} -v ${destination} || exit 1
 
 # silently remove empty directories
 find ${destination} -type d -depth -exec rmdir \{\} \; > /dev/null 2>&1 
 
=== modified file 'batch/make/sortresources.py'
--- batch/make/sortresources.py	2012-07-21 19:16:26 +0000
+++ batch/make/sortresources.py	2020-07-03 06:03:19 +0000
@@ -8,9 +8,10 @@
 # sortresources.py <path_to_seach_and_sort>
 # use sortresources.py -h to get command line option help
 
+from __future__ import print_function
+
 from xml import sax
 from xml.sax import handler
-import string
 import os.path
 import os
 import sys
@@ -161,7 +162,7 @@
         return False
 
     if doPrint:
-        print("renaming " + oldFile + " -> " + newFile)
+        print("renaming", oldFile, "->", newFile)
 
 # move file oldFile to newFile, setting apache rewrite rules to keep the file
 # fetchable from its old position
@@ -183,8 +184,8 @@
             # open .htaccess file in the old directory for reading
             accessFile = open(htaccessPath)
             for line in accessFile:
-                splitLineLower = string.split(line.lower())
-                splitLine      = string.split(line)
+                splitLineLower = str.split(line.lower())
+                splitLine      = str.split(line)
                 if splitLineLower[0] == "rewriteengine":
                     # rewriting is already mentioned; we don't have to enable it laster.
                     needEngine = False
@@ -195,7 +196,7 @@
                         # nothing to do
                         return
                     else:
-                        print("Warning: There already is a different RewriteRule for " + oldFile + " in place.")
+                        print("Warning: There already is a different RewriteRule for", oldFile, "in place.")
         except: pass
 
         # open .htaccess file for appended writing
@@ -273,7 +274,7 @@
                 if arg[1] == "v":
                     doPrint = True
                     continue
-                print("\nUnknown option: " + arg)
+                print("\nUnknown option:", arg)
                 Options(-1)
             else:
                 Options(-1)
 
=== modified file 'batch/make/uninstall'
--- batch/make/uninstall	2011-07-19 12:09:41 +0000
+++ batch/make/uninstall	2020-07-03 06:03:19 +0000
@@ -69,7 +69,7 @@
 
 # compose uninstall script from file and directory list
 cat ${UNINSTALL}.files >> ${UNINSTALL}
-sort ${UNINSTALL}.dir --reverse --unique >> ${UNINSTALL}
+sort ${UNINSTALL}.dir -ru >> ${UNINSTALL}
 
 rm -rf ${DEST}
 
 
=== added file 'batch/make/update_changelog'
--- batch/make/update_changelog	1970-01-01 00:00:00 +0000
+++ batch/make/update_changelog	2020-07-03 06:03:19 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Updates CHANGELOG.md from CHANGELOG_FROZEN.md, git history and launchpad issues
+# usage: update_changelog
+
+set -x
+
+md=`dirname $0`
+top_srcdir=${md}/../../
+
+${md}/patchnotes.py ${top_srcdir} ${top_srcdir}/CHANGELOG_FROZEN.md armagetronad armagetronad > ${top_srcdir}/CHANGELOG.md
+
+sed < ${top_srcdir}/CHANGELOG.md > ${top_srcdir}/NEWS -e "s/^ \* /- /" -e "s/^   - /   /" -e "s/^   /  /" -e "s/^##### */  /" -e "s/^#### *//" -e "s/^##* *//" -e 's,(\[\(.*\)\](\(.*\))),(\1),'
+
 
=== modified file 'batch/make/version'
--- batch/make/version	2019-03-04 00:53:47 +0000
+++ batch/make/version	2020-07-03 06:03:19 +0000
@@ -2,10 +2,16 @@
 # determines the version of the sources
 # usage: version <source directory>
 
-#set -x
+# set -x
 
 srcdir="$1"
 
+# if we're building via CI from a protected tag, that is our version
+if test "${CI_COMMIT_REF_PROTECTED}" = "true" && ! test -z "${CI_COMMIT_TAG}"; then
+    echo "${CI_COMMIT_TAG}" | sed -e s/^v//
+    exit 0
+fi
+
 # set version parts to defaults for CVS snapshot
 major_version=`cat ${srcdir}/major_version`
 minor_version_proto=`cat ${srcdir}/minor_version`
@@ -97,7 +103,10 @@
     fi
 fi
 
-if test -d "${srcdir}/.git"; then
+# try to get a good guess about which branch we're on
+GIT_BRANCH="alpha"
+
+if test -e "${srcdir}/.git"; then
     # check for a tag
     cd $srcdir
     # todo: once we have make tags, consider just git describe --tags as version ID.
@@ -106,7 +115,8 @@
         minor_version=""
         DATE=""
     else
-        if git diff-index --quiet HEAD --; then
+      git update-index --refresh > /dev/null
+      if git diff-index --quiet HEAD --; then
             # local checkout clean, just use revno
             DATE=_z`git rev-list HEAD --count`
         else
@@ -114,11 +124,23 @@
             DATE=_z`git rev-list HEAD --count`_$DATE
         fi
     fi
+
+    GIT_BRANCH=`git -C ${srcdir} rev-parse --abbrev-ref HEAD`
 fi
+test -z "${CI_COMMIT_BRANCH}" || GIT_BRANCH=${CI_COMMIT_BRANCH}
 
 if test -z "$minor_version"
 then
     test -z "$DATE" || minor_version=`echo ${minor_version_proto} | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"`
 fi
 
+if test "${CI_COMMIT_REF_PROTECTED}" = "true"; then
+    # determine alpha/beta/rc status based on branch
+    if echo ${GIT_BRANCH} | grep -q "^beta"; then
+        minor_version=`echo ${minor_version} | sed -e s,alpha,beta,`
+    elif echo ${GIT_BRANCH} | grep -q "^release"; then
+        minor_version=`echo ${minor_version} | sed -e s,alpha,rc,`
+    fi
+fi
+
 echo $major_version$minor_version
 
=== modified file 'bootstrap.sh'
--- bootstrap.sh	2019-07-26 01:01:51 +0000
+++ bootstrap.sh	2020-07-03 06:03:19 +0000
@@ -10,7 +10,7 @@
     rm -f version
 fi
 echo "Copying license..."
-cp COPYING.txt COPYING
+test -r COPYING || cp COPYING.txt COPYING || exit $?
 echo "Running aclocal..."
 aclocal || { rm aclocal.m4; exit 1; }
 echo "Running autoheader..."
 
=== removed file 'config.guess'
=== modified file 'config/settings.cfg'
--- config/settings.cfg	2016-03-19 07:05:52 +0000
+++ config/settings.cfg	2020-07-03 06:03:19 +0000
@@ -434,6 +434,8 @@
 FILTER_NAME_ENDS 1          # Filter whitespace from beginning and end of player names.
 FILTER_NAME_MIDDLE 1        # Filter excess whitespace and other junk from the middle of player names.
 FILTER_COLOR_SERVER_NAMES 0 # Filter color codes from server names in the server browser. Only affects the client.
+VERIFY_COLOR_STRICT 1       # Verify color codes before interpreting them. Capital letters and anything not 0-9, a-f is not considered a color code then. If set to 0 (the in code default), out of range ascii characters are accepted and interpreted as 0.
+
 
 SILENCE_DEFAULT 0  # silence new players by default?
 ENABLE_CHAT 1      # allow public messages?
 
=== modified file 'config/settings_dedicated.cfg'
--- config/settings_dedicated.cfg	2014-03-30 06:31:13 +0000
+++ config/settings_dedicated.cfg	2020-07-03 06:03:19 +0000
@@ -235,7 +235,7 @@
 PING_FLOOD_TIME_100 100.0 # Minimum time for 100 ping packets to arrive.
 PING_FLOOD_GLOBAL   .1    # The same times, multiplied by this value, count for all pings from all machines. Negative values disable global flood protection.
 CONNECTION_FLOOD_SENSITIVITY .01 # The times PING_FLOOD_TIME_X, multiplied by this value, count for all incoming messages from clients not connected already. A flood here activates turtle mode. Negative values disable global flood protection.
-CONNECTION_LIMIT 100      # Maximum number of packets from unknown peers to handle at one 
+CONNECTION_LIMIT 5        # Maximum number of packets from unknown peers to handle at one 
 ANTI_SPOOF 0              # If set to 1, checks connecting clients for spoofed IPs are done. Only clients passing a connectivity test are allowed in. This is done in turtle mode automatically, but may be useful to have on at all times.
 
 
 
=== modified file 'configure.ac'
--- configure.ac	2019-08-21 22:59:09 +0000
+++ configure.ac	2020-07-03 06:03:19 +0000
@@ -1,4 +1,4 @@
-dnl I would like to do this to generate the version number...
+/dnl I would like to do this to generate the version number...
 dnl AC_DEFUN([AUTOMATIC_VERSION],syscmd([sh batch/make/version .]))
 
 dnl but have to do this with version generated in bootstrap.sh instead for some reason
@@ -29,7 +29,7 @@
 dnl AC_CANONICAL_HOST
 
 AC_PROG_RANLIB
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects tar-ustar])
 
 dnl detect which link commant to use
 AC_PROG_LN_S
@@ -38,14 +38,14 @@
 AC_CHECK_PROG(HAVE_M4,m4,true,false)
 AM_CONDITIONAL(HAVE_M4, test $HAVE_M4 = true)
 
-dnl check whether date accepts -r to refer to a file
-AM_CONDITIONAL(DATE_R, date +"%Y" -r $0 > /dev/null 2>&1)
+dnl dirty trick to allow verbatim output to Makefile.in -> Makefile
+dnl source: http://gnu-automake.7480.n7.nabble.com/ifdef-endif-issue-td2662.html
+AC_SUBST([protect], [""])
 
 dnl export version
 version=$VERSION
 AC_SUBST(version)
 
-AC_ARG_VAR(XML2_CONFIG,[Configuration script of libxml2 to use, defaults to xml2-config])
 AC_ARG_VAR(CXXFLAGS,Flags passed to the C++ compiler)
 AC_ARG_VAR(DEBUGLEVEL,[Debug level for developers, normal users can safely ignore it. Accepted values go from 0 to 5. See README-DEVELOPER for details.])
 AC_ARG_VAR(CODELEVEL,[Code checking strictness level for developers, normal users can safely ignore it. Accepted values go from 0 to 4. See README-DEVELOPER for details.])
@@ -61,6 +61,8 @@
 dnl a modern autoconf is required to process this
 AC_PREREQ(2.50)
 
+PKG_PROG_PKG_CONFIG
+
 build_regular=true
 
 have_lzma=false
@@ -131,7 +133,7 @@
 
 # flag to set when mockup versions of the executables should be built to save
 # compile time when testing the release process
-AM_CONDITIONAL(BUILDFAKERELEASE, test "$ARMAGETRONAD_FAKERELEASE" != "")
+AM_CONDITIONAL(BUILDFAKERELEASE, test "$ARMAGETRONAD_FAKERELEASE" != "" && test "$ARMAGETRONAD_FAKERELEASE" != "false" && test "$ARMAGETRONAD_FAKERELEASE" != "no")
 
 # set replacement variables for dedicated server
 progtitle_serverorclient=" Client"
@@ -330,12 +332,18 @@
 dnl	])
 dnl])
 
-
 if test $CODELEVEL -ge 1; then
     CXXFLAGS="$CXXFLAGS -Wall"
     
     dnl careful, only supported on GCC 4.2 and later
     AX_CXXFLAGS_GCC_OPTION(-Wno-strict-overflow)
+
+    dnl this one is from GCC 7 (change to 1 or 2 in the future,
+    dnl leave at default and use [[fallthrough]] (std C++ 17)
+    AX_CXXFLAGS_GCC_OPTION(-Wimplicit-fallthrough=1)
+
+
+
 fi
 
 dnl test $CODELEVEL -ge 2 && CXXFLAGS="$CXXFLAGS -Wshadow -Wpointer-arith -Wfloat-equal -W -Wcast-qual -Wcast-align -Wconversion -Wunreachable-code --pedantic -Winline"
@@ -572,29 +580,10 @@
 dnl *************************************************
 
 if test x$armamain = xtrue; then
-
-test -z "$XML2_CONFIG" && XML2_CONFIG=xml2-config
-
-if ! $XML2_CONFIG --libs > /dev/null; then
-  AC_MSG_ERROR([Fatal error: the libxml2 configuration script $XML2_CONFIG does not work/exist.])
-fi
-
-# if test x$armamain = xtrue; then
-AC_CHECK_LIB(xml2,xmlParseMemory,
-CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags`"
-LIBS="`$XML2_CONFIG --libs` $LIBS"
-AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the xml2 library (-lxml2).]),
-AC_MSG_ERROR([You need the library xml2 to compile ${progtitle}. Read the file doc/install_linux.html.])
-,`$XML2_CONFIG --libs`)
-
-AC_CHECK_FUNC(xmlParserInputBufferCreateFilenameDefault,
-,
-AC_MSG_ERROR([
-	Your xml2 library is obsolete!
-	Please upgrade to 2.6.11 or later
-])
-)
-# fi
+  PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.11])
+  CPPFLAGS="$CPPFLAGS $XML2_CFLAGS"
+  LIBS="$LIBS $XML2_LIBS"
+  AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
 
 dnl *************************************************
 dnl         Armathentication Threading
@@ -994,6 +983,10 @@
 resource/Makefile
 config/Makefile
 desktop/Makefile
+docker/build/Makefile
+docker/build/setup_ci_test.sh
+docker/build/context/version.sh
+docker/deploy/targets.sh
 desktop/armagetronad.desktop
 )
 
 
=== modified file 'desktop/armagetronad.desktop.in'
--- desktop/armagetronad.desktop.in	2015-04-01 11:44:48 +0000
+++ desktop/armagetronad.desktop.in	2020-07-03 06:03:19 +0000
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Type=Application
 Name=@progtitle@@progtitle_server@
-Exec=@progname@
+Exec=@progname@ %f
 Comment=3d light cycle game
 Comment[de]=dreidimensionales Lichtradspiel
 Icon=@progname@
 Terminal=@build_dedicated@
-Path=@prefix@/bin
 Categories=Game;ActionGame;
 StartupNotify=@build_dedicated@
 MimeType=application/x-armagetronad;
 
=== added directory 'docker'
=== added file 'docker/README.md'
--- docker/README.md	1970-01-01 00:00:00 +0000
+++ docker/README.md	2020-07-03 06:03:19 +0000
@@ -0,0 +1,103 @@
+# Docker Based Build System
+
+## You Need to Have Installed
+ * Everything needed for a dedicated server build, plus python packaging
+ * [docker in rootless mode](https://docs.docker.com/engine/security/rootless/)
+ * Optional: [docker in reglar mode](https://docs.docker.com/engine/install/ubuntu/) for steam SDK creation
+ * Optional: [x11docker](https://github.com/mviereck/x11docker) for Windows build system creation
+
+Ubuntu is recommended, as rootless docker supports the overlay2 driver there;
+pretty much everyone else only gets the vfs driver that always copies the whole
+image contents.
+
+For Ubuntu, to be on the safe side:
+
+    sudo apt install git wine-stable automake \
+    bison g++ make libboost-dev libboost-thread-dev \
+    libprotobuf-dev libzthread-dev python recode curl uidmap python3-packaging
+
+Then follow the instructions from the rootless docker and x11docker above.
+
+If you are not using Ubuntu on your main machine, you can run Rootless Docker inside
+an Ubuntu virtual machine and export the socket for use on your main machine. The safest way to run such a machine is with one NAT network connection that you enable
+a port forwarding [rule for SSH](https://bobcares.com/blog/virtualbox-ssh-nat/) for.
+Once that is set up, assuming your UID is 1000 on the host and 1001 on the host and you went with the example 2522 source port, connect to the guest with
+
+    ssh -p 2522 guest -L /run/user/1001/docker.sock:/run/user/1000/docker.sock
+
+as suggested [here](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface) and keep that running. Inform your local docker client about the socket with
+
+    export DOCKER_HOST=unix:///run/user/1000/docker.sock
+
+and off you go. Only your host user can access that socket and can only control a Docker daemon on a virtual machine running as a non-root user.
+
+To secure the VM some more, you may want to restrict its access to your LAN. You can use [ufw](https://linuxize.com/post/how-to-setup-a-firewall-with-ufw-on-ubuntu-20-04/) for that. Assuming 192.160.0.1 is your router's IP on the LAN, execute on the VM:
+
+    sudo ufw allow ssh                      # default is to block everything, so before we enable ufw, we better make sure ssh will keep working
+    sudo ufw enable
+    sudo ufw allow out to 192.168.0.1       # this allows traffic to your router and therefore the internet
+    sudo ufw deny out to 10.0.0.0/8         # these block all private subnets; LANs usually use these IPs. If yours does not, adapt.
+    sudo ufw deny out to 172.16.0.0/12
+    sudo ufw deny out to 192.168.0.0/16
+    sudo ufw deny in from 10.0.0.0/8
+    sudo ufw deny in from 172.16.0.0/12
+    sudo ufw deny in from 192.168.0.0/16
+
+The 'deny in' rules are redundant because the VM is behind a NAT anyway, but you never know. Maybe you switch it to 'bridged' one day.
+
+## Contents
+
+ * scripts/ contains helper scripts
+ * images/ contains everything else needed to build images from scratch
+ * build/ contains the actual build stuff
+ * deploy/ contains information about deployments; pre-filled with target definition; each requires certain secrets
+
+## How to Build
+
+Assuming the source is in armagetronad, do
+
+    cd armagetronad
+    ./bootstrap.sh
+    mkdir ../build
+    cd ../build
+    ../armagetronad/configure --disable-glout
+    cd docker/build
+    make <target>
+
+target can be
+
+   * *free*: Build everything relevant for free open source systems
+   * *closed*: Build steam and windows binaries
+   * *full*: Build all
+   * *clean*: Remove build results
+
+## Developer Notes
+To update to another branch, you may have to adapt related branch names in scripts/relevant_branches.sh.
+
+To make builds use up to date versions of additional git repositories, call scripts/update_gits.sh.
+
+All scripts can be invoked from any work directory as long as you invoke them with a relative or absoulte path, they find their relevant data directories and other scripts automatically.
+
+## GitLab CI
+
+The root .gitlab-ci.yml uses the files in this directory to do the builds. The building should work fine in any gitlab runner configured to use docker, especially the shared runners.
+
+For deployment, however, an own runner needs to be set up. A stadard setup will do fine, but then run as root. To run a rootless gitlab runner, you must do the following. Install gitlab runner normally, but disable the default service with
+
+    systemctl disable gitlab-runner
+
+As a regular user, register a runner with
+
+    gitlab-runner register
+
+the data to fill in is described on the GitLab CI configuration of the project. Then, normally, gitlab-runner uses docker-in-docker to run additional containers. That does not work rootless. Instead, you can just make the docker control socket available to gitlab's container by editing the volumes line in `~/.gitlab-runer/config.toml` to
+
+    volumes = ["/var/run/user/UID/docker.sock:/var/run/docker.sock", "/cache", "/home/USERNAME/secrets:/secrets:ro"]
+
+replacing UID with your user ID and USERNAME with your username. If you want to use the runner for deployment, the secrets folder then has to contain the credentials required to do so. Read deploy/targets.sh for details.
+
+Then, run the runner with
+
+    gitlab-runner run
+
+ Security and consistency implication: You then only have one docker instance. Jobs running on your runner can therefore modify the same docker images, for example apply tags. Therefore, all our CI scripts reference used images by their digest and use randomized names for containers so they don't get into one another's way.
 \ No newline at end of file
 
=== added directory 'docker/build'
=== added file 'docker/build/Makefile.am'
--- docker/build/Makefile.am	1970-01-01 00:00:00 +0000
+++ docker/build/Makefile.am	2020-07-03 06:03:19 +0000
@@ -0,0 +1,652 @@
+.PHONY: tarball clean distclean source free closed full all
+
+# We want everything deleted if something bad happens
+.DELETE_ON_ERROR:
+
+default:
+	echo "Nothing generic to do."
+
+# individual targets for split jobs
+CI_prepare: gits_artifacts.tag source make_ci.sh rootcontext.64
+CI_linux_server_32: appimage_server_32.tag apptar_server_32.tag
+CI_linux_client_32: appimage_client_32.tag apptar_client_32.tag
+CI_linux_server_64: appimage_server_64.tag apptar_server_64.tag
+CI_linux_client_64: appimage_client_64.tag apptar_client_64.tag
+CI_windows: winzip.tag windows.tag
+CI_debtest: debtest.tag
+CI_linux_steam: steamdirs/steam_linux
+CI_windows_steam: steamdirs/steam_windows
+
+# full open source builds
+free.tag: appimage.tag apptar.tag sourcetar.tag
+	touch $@
+free: free.tag
+
+# builds for non-open source systems/environments
+closed_regular.tag: windows.tag winzip.tag
+	touch $@
+closed_regular: closed.tag
+closed_steam.tag: steam_windows.tag steam_linux.tag
+	touch $@
+closed_steam: closed_steam.tag
+closed.tag: closed_steam.tag closed_regular.tag
+	touch $@
+closed: closed.tag
+
+# closed comes first because windows builds take the longest and are not internally parallelized
+full.tag: result.winsource_32 result.winsource_steam closed.tag free.tag
+	touch $@
+full: full.tag
+
+# what to build from GitLab CI, divided into stages
+CI_base.tag: gits.tag source.tag result.build_server_32 result.build_client_64 context.64
+	touch $@
+
+# minimal expected build to be packable
+CI_pack.tag: gits_artifacts.tag source.tag CI_base.tag free.tag upload/PATCHNOTES.md upload/CHANGELOG.md
+	touch $@
+
+# all windows builds
+CI_windows.tag: CI_base.tag steam_windows.tag closed_regular.tag
+	touch $@
+
+# all free linux builds (so, no steam)
+CI_free.tag: CI_base.tag free.tag
+	touch $@
+
+# (OBSOLETE) targets for CI merge tests, a bit leaner than a full build
+CI_merge.tag: windows.tag debtest.tag
+	touch $@
+CI_merge: CI_merge.tag
+CI_merge_nodeb.tag: windows.tag CI_base.tag
+	touch $@
+CI_merge_nodeb: CI_merge_nodeb.tag
+
+# all builds
+#CI.tag: CI_pack.tag apptar_server_64.tag
+CI.tag: CI_windows.tag CI_free.tag full.tag CI_pack.tag
+	touch $@
+
+CI_base: CI_base.tag
+CI: CI.tag
+
+all:	default
+
+dockertest.tag:
+	cp ${srcdir}/fakerelease_proto.sh .
+	@echo "Testing whether 'docker' works..."
+	docker help > /dev/null
+	echo > $@
+
+tarwrapper.sh: ${top_srcdir}/docker/scripts/tarwrapper.sh
+	ln -s $< $@
+
+#***************************************************************
+
+# variables
+
+# package metadata
+PACKAGE_VERSION:=$(shell grep "^PACKAGE_VERSION=" context/version.sh | sed -e "s,.*=,,")
+PACKAGE_NAME:=$(shell grep "^PACKAGE_NAME=" context/version.sh | sed -e "s,.*=,,")
+PACKAGE_TITLE:=$(shell grep "^PACKAGE_TITLE=" context/version.sh | sed -e "s,.*=,,")
+PACKAGE_NAME_SUFFIX:=$(shell echo $(PACKAGE_NAME) | sed -e "s,.*-,-,")
+PACKAGE_TITLE_SUFFIX:=$(shell echo $(PACKAGE_TITLE) | sed -e "s,.* , ,")
+STEAM_PACKAGE_NAME=retrocycles
+STEAM_PACKAGE_TITLE=Retrocycles
+
+# configurations for lean builds not supposed to be installed
+CONFIGURE_ARGUMENTS:=--disable-uninstall --disable-restoreold --enable-etc --enable-automakedefaults --disable-useradd --disable-sysinstall --disable-initscripts
+CONFIGURE_ARGUMENTS_SERVER:=--disable-glout --enable-armathentication
+
+# other directories
+SCRIPTDIR:=${srcdir}/../scripts
+GITS:=$(SCRIPTDIR)/.cache/gits
+
+# dump CI data and variables determined from it
+CI_INFO: ${srcdir}/../scripts/brand.sh
+	. ${srcdir}/../scripts/brand.sh @top_srcdir@ && \
+	echo SERIES=$${SERIES} > $@ && \
+	echo PROGRAM_NAME=$${PROGRAM_NAME} >> $@ && \
+	echo PROGRAM_TITLE=$${PROGRAM_TITLE} >> $@ && \
+	echo CI_COMMIT_REF_PROTECTED=$${CI_COMMIT_REF_PROTECTED} >> $@ && \
+	echo CI_COMMIT_SHA=$${CI_COMMIT_SHA} >> $@ && \
+	echo CI_COMMIT_REF_NAME=$${CI_COMMIT_REF_NAME} >> $@
+
+.PRECIOUS: CI_INFO
+
+#***************************************************************
+
+upload/.tag:
+	mkdir -p upload
+	echo > $@
+proto.tag:
+	mkdir -p proto
+	echo > $@
+
+make_ci.sh: ${srcdir}/make_ci.sh.in
+	cp $< $@
+
+context/version.sh: ${srcdir}/context/version.sh.in
+	cd ../../; ./config.status docker/build/context/version.sh
+
+../deploy/targets.sh: ${srcdir}/../deploy/targets.sh.in
+	cd ../../; ./config.status docker/deploy/targets.sh
+
+#***************************************************************
+
+# create source tarball
+TARBALL:=../../armagetronad-@version@.tar.gz
+$(TARBALL):
+	$(MAKE) -C ../../ dist GZIP_ENV=""
+tarball: $(TARBALL)
+
+# unpack source tarball
+source.tag: $(TARBALL) dockertest.tag
+	rm -rf source armagetronad-@version@
+	tar -xzf $(TARBALL)
+	mv armagetronad-@version@ source
+	echo > $@
+source: source.tag
+
+# rebranded tarball for upload
+upload/$(PACKAGE_NAME)-@version@.tbz: $(TARBALL) upload/.tag tarwrapper.sh
+	rm -rf $@ repack
+	mkdir -p repack_1 repack_2
+	cd repack_1; tar -xzf ../$(TARBALL)
+	mv repack_1/armagetronad-@version@ repack_2/$(PACKAGE_NAME)-@version@
+	cd repack_2; ../tarwrapper.sh -cjf repacked.tbz $(PACKAGE_NAME)-@version@
+	mv repack_2/repacked.tbz $@
+	rm -rf repack_1 repack_2
+
+sourcetar.tag: upload/$(PACKAGE_NAME)-@version@.tbz
+	touch $@
+
+# foreign gits (in the cache)
+gits.tag: $(SCRIPTDIR)/fix_gits.sh
+	$(SCRIPTDIR)/fix_gits.sh
+	echo > $@
+
+# bits of gits we need in artifacts
+gits_artifacts.tag: gits.tag
+	rm -rf gits
+	mkdir -p gits
+	cp -a ${GITS}/ubuntu/debian gits/
+	mkdir -p gits/steam
+	cp -a ${GITS}/steam-art/good/title.png gits/steam
+	echo > $@
+
+upload/PATCHNOTES.md: sourcetar.tag upload/.tag
+	${top_srcdir}/batch/make/patchnotes.py ${top_srcdir} ${top_srcdir}/CHANGELOG_FROZEN.md armagetronad armagetronad -p > $@
+
+upload/CHANGELOG.md: sourcetar.tag upload/.tag
+	${top_srcdir}/batch/make/patchnotes.py ${top_srcdir} ${top_srcdir}/CHANGELOG_FROZEN.md armagetronad armagetronad > $@
+
+#***************************************************************
+
+# generic context with source
+# technically everything here depends on the Makefile, but enforcing rebuilds on all
+# Makefile edits is too annoying during develop/test cycles.
+rootcontext.64: source.tag ${srcdir}/*.sh ${srcdir}/context/build.sh #Makefile
+	${srcdir}/prepare_context.sh $@.dir source ${srcdir}/context/build.sh
+	echo "armabuild_64" > $@.dir/image
+	echo > $@
+
+context.64: rootcontext.64
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	echo > $@
+
+#***************************************************************
+
+# switch container to use to 32 bit
+context.32: context.64
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	rm $@.dir/image
+	echo "armabuild_32" > $@.dir/image
+	echo > $@
+
+# switch container to use to steam SDK, rebrand
+context.steam: context.64 gits_artifacts.tag
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	rm $@.dir/image
+	echo "armasteam_64" > $@.dir/image
+#	rebrand
+	sed -i $@.dir/version.sh -e s/PACKAGE_NAME=armagetronad/PACKAGE_NAME=$(STEAM_PACKAGE_TITLE)/ -e s/PACKAGE_TITLE=\"Armagetron\ Advanced/PACKAGE_TITLE=\"$(STEAM_PACKAGE_TITLE)/ -e s/PACKAGE_TITLE=\"Armagetron/PACKAGE_TITLE=\"$(STEAM_PACKAGE_TITLE)/
+# 	no remotely adult stuff
+	sed -i $@.dir/source/src/engine/ePlayer.cpp -e "s/pr0n/cat videos/"
+#   install alternative title, adapt sources
+	cp gits/steam/title.png $@.dir/source/textures/
+	sed -i $@.dir/source/src/tron/gLogo.cpp $@.dir/source/Makefile.* -e "s,textures/title.jpg,textures/title.png,"
+	cd $@.dir/source; automake
+#   done
+	echo > $@
+
+# add debian/ubuntu build info for release %. Requires GPG key from ~/.gnupg
+context.debsrc_%: rootcontext.64 ${srcdir}/rebrand_debian_core.sh ${srcdir}/debian_source.sh gits_artifacts.tag $(TARBALL)
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' $(TARBALL) ${srcdir}/rebrand_debian_core.sh ${srcdir}/debian_source.sh ./gits/debian
+	if test -r  ../deploy/secrets/sec.gpg; then cp -lrf ../deploy/secrets/*.gpg $@.dir/; fi
+	echo "armadeb_64" > $@.dir/image
+	echo > $@
+result.debsrc_%: context.debsrc_%
+	+$(srcdir)/context_to_result.sh $@.dir ./debian_source.sh $*
+	echo > $@
+
+# test build a debian package (with a really old ubuntu codename)
+context.debsrc_test: context.debsrc_dapper
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+#	extract fake secrets
+	base64 -d < ${srcdir}/../deploy/anonymous_secrets.b64 | tar -xjf - --one-top-level=$@.dir
+	mv $@.dir/secrets/* $@.dir
+	rmdir $@.dir/secrets/
+	echo > $@
+context.debtest: result.debsrc_test
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	echo "cd source && debuild -i -us -uc -b && rm -rf *" > $@.dir/build_deb.sh
+	chmod +x $@.dir/build_deb.sh
+	echo > $@
+
+result.debtest: context.debtest
+	+$(srcdir)/context_to_result.sh $@.dir bash ./build_deb.sh
+	echo > $@
+
+debtest.tag: result.debtest
+	echo > $@
+
+# switch container to use alpine
+context.test: rootcontext.64
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	rm $@.dir/image
+	echo "armalpine_32" > $@.dir/image
+	echo > $@
+
+#***************************************************************
+
+context.build_server_%: context.%
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	echo "server" > $@.dir/serverclient
+	echo > $@
+
+context.build_client_%: context.%
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	echo "client" > $@.dir/serverclient
+	echo > $@
+
+.PRECIOUS: context.build_server_32 context.build_client_32  context.build_server_64 context.build_client_64
+
+#***************************************************************
+
+# server build for further processing
+result.build_server_%: context.build_server_%
+	+$(srcdir)/context_to_result.sh $@.dir ./build.sh $(CONFIGURE_ARGUMENTS) $(CONFIGURE_ARGUMENTS_SERVER)
+	echo > $@
+
+# client build for further processing
+result.build_client_%: context.build_client_%
+	+$(srcdir)/context_to_result.sh $@.dir ./build.sh $(CONFIGURE_ARGUMENTS)
+	echo > $@
+
+.PRECIOUS: result.build_server_32 result.build_client_32  result.build_server_64 result.build_client_64
+
+#***************************************************************
+
+# portable application directories
+context.appdir_%: result.build_% ${srcdir}/context/portable/* ${srcdir}/context/appdir.sh ${srcdir}/context/steam.sh
+	${srcdir}/prepare_context.sh $@.dir $<.dir/* ${srcdir}/context/portable ${srcdir}/context/appdir.sh ${srcdir}/context/steam.sh
+	echo > $@
+
+result.appdir_%: context.appdir_%
+	+$(srcdir)/context_to_result.sh $@.dir ./appdir.sh
+	echo > $@
+
+# use different script for steam builds, rearranging some things
+result.appdir_%_steam: context.appdir_%_steam
+	+$(srcdir)/context_to_result.sh $@.dir ./steam.sh
+	echo > $@
+
+# tarball of appdir
+APPTAR_SERVER_32=$(PACKAGE_NAME)-server_32-$(PACKAGE_VERSION).tbz
+APPTAR_SERVER_64=$(PACKAGE_NAME)-server_64-$(PACKAGE_VERSION).tbz
+APPTAR_CLIENT_32=$(PACKAGE_NAME)-client_32-$(PACKAGE_VERSION).tbz
+APPTAR_CLIENT_64=$(PACKAGE_NAME)-client_64-$(PACKAGE_VERSION).tbz
+apptar_server_32.tag: upload/$(APPTAR_SERVER_32)
+	echo > $@
+apptar_server_64.tag: upload/$(APPTAR_SERVER_64)
+	echo > $@
+apptar_client_32.tag: upload/$(APPTAR_CLIENT_32)
+	echo > $@
+apptar_client_64.tag: upload/$(APPTAR_CLIENT_64)
+	echo > $@
+
+upload/$(APPTAR_SERVER_32): result.appdir_server_32 upload/.tag tarwrapper.sh
+	cd $<.dir/appdir; ../../tarwrapper.sh -cjf ../../$@ .
+upload/$(APPTAR_CLIENT_32): result.appdir_client_32 upload/.tag tarwrapper.sh
+	cd $<.dir/appdir; ../../tarwrapper.sh -cjf ../../$@ .
+upload/$(APPTAR_SERVER_64): result.appdir_server_64 upload/.tag tarwrapper.sh
+	cd $<.dir/appdir; ../../tarwrapper.sh -cjf ../../$@ .
+upload/$(APPTAR_CLIENT_64): result.appdir_client_64 upload/.tag tarwrapper.sh
+	cd $<.dir/appdir; ../../tarwrapper.sh -cjf ../../$@ .
+
+apptar.tag: apptar_server_32.tag apptar_client_32.tag apptar_server_64.tag apptar_client_64.tag upload/$(APPTAR_SERVER_32) upload/$(APPTAR_SERVER_64) upload/$(APPTAR_CLIENT_32) upload/$(APPTAR_CLIENT_64)
+	echo > $@
+apptar: apptar.tag
+
+.PHONY: appdir apptar
+
+.PRECIOUS: context.apptar_server_32 context.apptar_client_32  context.apptar_server_64 context.apptar_client_64
+
+.PRECIOUS: context.appdir_server_32 context.appdir_client_32  context.appdir_server_64 context.appdir_client_64
+
+#***************************************************************
+
+# AppImages
+context.appimage_%: result.appdir_% ${srcdir}/context/appimage.sh
+	${srcdir}/prepare_context.sh $@.dir $<.dir/appdir $<.dir/image $<.dir/version.sh ${srcdir}/context/appimage.sh
+	echo > $@
+
+result.appimage_%: context.appimage_%
+	+$(srcdir)/context_to_result.sh $@.dir "./appimage.sh AppImage"
+	echo > $@
+
+APPIMAGE_BASENAME:=$(shell echo $(PACKAGE_TITLE) | sed -e "s, ,,g")
+APPIMAGE_CLIENT_64:=$(APPIMAGE_BASENAME)-$(PACKAGE_VERSION)
+APPIMAGE_SERVER_64:=$(APPIMAGE_BASENAME)Dedicated-$(PACKAGE_VERSION)
+APPIMAGE_CLIENT_32:=$(APPIMAGE_BASENAME)-32bit-$(PACKAGE_VERSION)
+APPIMAGE_SERVER_32:=$(APPIMAGE_BASENAME)Dedicated-32bit-$(PACKAGE_VERSION)
+
+upload/$(APPIMAGE_CLIENT_64): result.appimage_client_64 upload/.tag
+	cp $<.dir/AppImage $@
+upload/$(APPIMAGE_SERVER_64): result.appimage_server_64 upload/.tag
+	cp $<.dir/AppImage $@
+upload/$(APPIMAGE_CLIENT_32): result.appimage_client_32 upload/.tag
+	cp $<.dir/AppImage $@
+upload/$(APPIMAGE_SERVER_32): result.appimage_server_32 upload/.tag
+	cp $<.dir/AppImage $@
+
+appimage_client_64.tag: upload/$(APPIMAGE_CLIENT_64)
+	echo > $@
+appimage_server_64.tag: upload/$(APPIMAGE_SERVER_64)
+	echo > $@
+appimage_client_32.tag: upload/$(APPIMAGE_CLIENT_32)
+	echo > $@
+appimage_server_32.tag: upload/$(APPIMAGE_SERVER_32)
+	echo > $@
+
+appimage.tag: appimage_client_64.tag appimage_server_64.tag appimage_client_32.tag appimage_server_32.tag
+	echo > $@
+
+.PRECIOUS: context.appimage_server_32 context.appimage_client_32 context.appimage_server_64 context.appimage_client_64
+
+#***************************************************************
+
+# windows source
+context.winsource_%: result.build_server_% ${srcdir}/context/winsource.sh gits.tag
+	${srcdir}/prepare_context.sh $@.dir $<.dir/* ${srcdir}/context/winsource.sh $(GITS)/codeblocks
+	echo > $@
+result.winsource_%: context.winsource_%
+	+$(srcdir)/context_to_result.sh $@.dir ./winsource.sh
+	echo > $@
+
+# windows build
+context.winbuild_%: result.winsource_% ${srcdir}/context/winbuild.sh gits.tag
+	${srcdir}/prepare_context.sh $@.dir $<.dir/* ${srcdir}/context/winbuild.sh $(GITS)/winlibs
+	rm $@.dir/image
+	echo "armawineblocks" > $@.dir/image
+	echo > $@
+result.winbuild_%: context.winbuild_%
+	+$(srcdir)/context_to_result.sh $@.dir ./winbuild.sh
+	echo > $@
+
+# windows installers
+context.wininst_%: result.winbuild_% ${srcdir}/context/wininst.sh
+	${srcdir}/prepare_context.sh $@.dir $<.dir/* ${srcdir}/context/wininst.sh
+	rm $@.dir/image
+	echo "armawineblocks" > $@.dir/image
+	echo > $@
+result.wininst_%: context.wininst_%
+	+$(srcdir)/context_to_result.sh $@.dir ./wininst.sh
+	echo > $@
+
+# windows source zip
+WINZIP_SOURCE_NAME:=$(PACKAGE_NAME)-source-$(PACKAGE_VERSION)
+WINZIP_SOURCE_DIR:=proto/$(WINZIP_SOURCE_NAME)
+WINZIP_SOURCE:=upload/$(WINZIP_SOURCE_NAME).zip
+$(WINZIP_SOURCE_DIR): result.winsource_32 proto.tag Makefile
+	rm -rf $@.dir
+	cp -al $<.dir/winsource $@.dir
+	echo > $@
+$(WINZIP_SOURCE): $(WINZIP_SOURCE_DIR) upload/.tag
+	cd $(WINZIP_SOURCE_DIR).dir; zip -9 -r ../../$(WINZIP_SOURCE) *
+winzip_source.tag: $(WINZIP_SOURCE)
+	echo > $@
+
+# windows client zip
+WINZIP_CLIENT_NAME:=$(PACKAGE_NAME)-client-$(PACKAGE_VERSION)
+WINZIP_CLIENT_DIR:=proto/$(WINZIP_CLIENT_NAME)
+WINZIP_CLIENT:=upload/$(WINZIP_CLIENT_NAME).win32.zip
+$(WINZIP_CLIENT_DIR): result.winbuild_32 proto.tag Makefile
+	rm -rf $@.dir
+	cp -al $<.dir/dist $@.dir
+	rm $@.dir/$(PACKAGE_NAME)_dedicated.exe $@.dir/*.nsi $@.dir/banner* $@.dir/INSTALL.txt
+	echo > $@
+$(WINZIP_CLIENT): $(WINZIP_CLIENT_DIR) upload/.tag
+	cd $(WINZIP_CLIENT_DIR).dir; zip -9 -r ../../$(WINZIP_CLIENT) *
+winzip_client.tag: $(WINZIP_CLIENT)
+	echo > $@
+
+# windows server zip
+WINZIP_SERVER_NAME:=$(PACKAGE_NAME)-server-$(PACKAGE_VERSION)
+WINZIP_SERVER_DIR:=proto/$(WINZIP_SERVER_NAME)
+WINZIP_SERVER:=upload/$(WINZIP_SERVER_NAME).win32.zip
+$(WINZIP_SERVER_DIR): result.winbuild_32 proto.tag Makefile
+	rm -rf $@.dir
+	cp -al $<.dir/dist $@.dir
+	rm -r $@.dir/$(PACKAGE_NAME).exe $@.dir/*.nsi $@.dir/banner* \
+		$@.dir/INSTALL.txt $@.dir/models $@.dir/sound $@.dir/textures \
+		$@.dir/SDL* $@.dir/libpng* $@.dir/jpeg*
+	echo > $@
+$(WINZIP_SERVER): $(WINZIP_SERVER_DIR) upload/.tag
+	cd $(WINZIP_SERVER_DIR).dir; zip -9 -r ../../$(WINZIP_SERVER) *
+winzip_server.tag: $(WINZIP_SERVER)
+	echo > $@
+
+winzip.tag: winzip_server.tag winzip_client.tag winzip_source.tag
+	echo > $@
+
+
+# copy installers into upload
+WININST_CLIENT_NAME:=$(PACKAGE_NAME)-$(PACKAGE_VERSION).gcc.win32.exe
+WININST_SERVER_NAME:=$(PACKAGE_NAME)-dedicated-$(PACKAGE_VERSION).gcc.win32.exe
+WININST_CLIENT=upload/$(WININST_CLIENT_NAME)
+WININST_SERVER=upload/$(WININST_SERVER_NAME)
+$(WININST_CLIENT): result.wininst_32 upload/.tag
+	rm -f $@
+	cp $<.dir/$(WININST_CLIENT_NAME) $@
+$(WININST_SERVER): result.wininst_32 upload/.tag
+	rm -f $@
+	cp $<.dir/$(WININST_SERVER_NAME) $@
+windows.tag: $(WININST_CLIENT) $(WININST_SERVER)
+	echo > $@
+
+# prerequisites for zeroinstall
+zeroinstall.tag: winzip.tag apptar.tag
+	touch $@
+zeroinstall: zeroinstall.tag
+
+.PHONY: windows winzip_client winzip_server zeroinstall
+
+.PRECIOUS: context.wininst_32 context.winbuild_32 context.winsource_32
+
+#***************************************************************
+
+steamdirs/.tag:
+	mkdir -p steamdirs
+	echo > $@
+
+# steam packaging
+steamdirs/steam_linux: result.appdir_server_steam result.appdir_client_steam steamdirs/.tag
+	rm -rf $@.dir
+	cp -al $<.dir/appdir $@.dir
+	cp -al result.appdir_client_steam.dir/appdir/* $@.dir/
+	echo > $@
+
+steamdirs/steam_windows: result.winbuild_steam steamdirs/.tag
+	rm -rf $@.dir
+	cp -al $<.dir/dist $@.dir
+	mv $@.dir/*dedicated.exe $@.dir/DEDICATED.hex
+	mv $@.dir/*.exe $@.dir/CLIENT.hex
+	mv $@.dir/CLIENT.hex $@.dir/$(STEAM_PACKAGE_TITLE).exe
+	mv $@.dir/DEDICATED.hex $@.dir/$(STEAM_PACKAGE_TITLE)_Dedicated.exe
+	rm -rf $@.dir/*.nsi
+	rm -rf $@.dir/*.url
+	rm -rf $@.dir/banner*
+	echo > $@
+
+steam_linux.tag: steamdirs/steam_linux result.appdir_client_steam result.appdir_server_steam
+	echo > $@
+steam_windows.tag: steamdirs/steam_windows result.winbuild_steam
+	echo > $@
+
+steam.tag: steam_windows.tag steam_linux.tag
+	echo > $@
+.PHONY: steam steam_windows steam_linux
+
+.PRECIOUS:  context.build_client_steam result.build_client_steam context.appdir_client_steam result.build_server_steam context.build_server_steam context.appdir_server_steam context.winbuild_steam context.winsource_steam
+
+#***************************************************************
+
+# for testing, we want minimal builds before any deployment
+# in production, the CI solution is responsible for having built
+# everything not explicitly required here
+deploy_base.tag: CI_pack.tag debtest.tag ../deploy/targets.sh
+	echo > $@
+deploy_base: deploy_base.tag
+
+context.deploy_base_%: rootcontext.64 deploy_base.tag ${srcdir}/../deploy/deploy_%.sh ../deploy/* CI_INFO
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' upload ../deploy/'*' ${srcdir}/../deploy/deploy_$*.sh CI_INFO
+	echo > $@
+context.deploy_%: context.deploy_base_%
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*'
+	echo > $@
+result.deploy_%: context.deploy_%
+	+$(srcdir)/context_to_result.sh $@.dir ./deploy_$*.sh
+	echo > $@
+
+# special case steam: run in steamcmd image
+context.deploy_steam: context.deploy_base_steam ${srcdir}/../deploy/steamcontentbuilder/*/* steamdirs/*
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/steamcontentbuilder
+	sed -i $@.dir/steamcontentbuilder/scripts/app_build_1306180.vdf -e "s/BUILD_DESCRIPTION/$(STEAM_PACKAGE_TITLE)$(PACKAGE_TITLE_SUFFIX) $(PACKAGE_VERSION)/"
+	mkdir -p $@.dir/steamcontentbuilder/content $@.dir/steamcontentbuilder/output
+	cp -al steamdirs/steam_windows.dir $@.dir/steamcontentbuilder/content/steam_windows
+	cp -al steamdirs/steam_linux.dir $@.dir/steamcontentbuilder/content/steam_linux
+	rm -rf $@.dir/upload
+	rm -f $@.dir/image
+	echo "steamcmd" > $@.dir/image
+	echo > $@
+
+context.deploy_ppa_%: result.debsrc_% ${srcdir}/../deploy/deploy_ppa.sh ../deploy/targets.sh CI_INFO
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/deploy_ppa.sh ../deploy/targets.sh ../deploy/secrets/*.gpg CI_INFO
+	echo > $@
+result.deploy_ppa_%: context.deploy_ppa_%
+	+$(srcdir)/context_to_result.sh $@.dir ./deploy_ppa.sh $*
+	echo > $@
+
+# deploy for launchpad needs armadeb image
+context.deploy_lp: context.deploy_base_lp ${srcdir}/../deploy/lp-project-upload
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/lp-project-upload
+	rm -f $@.dir/image
+	echo "armadeb_64" > $@.dir/image
+	echo > $@
+
+context.update_zi: context.deploy_base_zeroinstall ${srcdir}/../deploy/*_zeroinstall.sh
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/*_zeroinstall.sh
+	rm -f $@.dir/image
+	echo "armadeploy_64" > $@.dir/image
+	echo > $@
+result.update_zi: context.update_zi
+	+$(srcdir)/context_to_result.sh $@.dir ./update_zeroinstall.sh
+	echo > $@
+context.deploy_zi: context.deploy_base_zeroinstall result.update_zi ${srcdir}/../deploy/*_zeroinstall.sh result.deploy_lp result.deploy_scp
+	${srcdir}/prepare_context.sh $@.dir $<.dir/'*' result.update_zi.dir/zeroinstall ${srcdir}/../deploy/*_zeroinstall.sh
+	rm -f $@.dir/image
+	echo "armadeploy_64" > $@.dir/image
+	echo > $@
+result.deploy_zi: context.deploy_zi
+	+$(srcdir)/context_to_result.sh $@.dir ./deploy_zeroinstall.sh
+	echo > $@
+
+# deploy to download site (additional dependency here only, standard rules apply)
+result.deploy_download: result.deploy_scp result.deploy_lp
+
+# individual deploy targets
+deploy_lp: result.deploy_lp
+deploy_scp: result.deploy_scp
+deploy_steam: result.deploy_steam
+deploy_zi: result.deploy_zi
+deploy_download: result.deploy_download
+
+deploy_ppa: \
+deploy_ppa_focal \
+deploy_ppa_eoan \
+deploy_ppa_bionic \
+deploy_ppa_xenial \
+deploy_ppa_trusty
+
+deploy_ppa_%: result.deploy_ppa_%
+	@echo Deployed $*
+
+deploy: deploy_lp deploy_scp deploy_ppa deploy_zi deploy_steam deploy_download
+#deploy: deploy_scp
+#deploy: deploy_zi
+#deploy: deploy_ppa
+
+unstaged_%:
+# disable staging, deploy for real
+	sed -i ../deploy/targets.sh -e "s/STAGING=true/STAGING=false/"
+	STAGING=false MAKE=$(MAKE) ${srcdir}/make_deploy.sh $*
+
+staged_%:
+# enforce staging
+	sed -i ../deploy/targets.sh -e "s/STAGING=false/STAGING=true/"
+	MAKE=$(MAKE) ${srcdir}/make_deploy.sh $*
+
+.PHONY: deploy deploy_ppa deploy_scp deploy_steam deploy_base deploy_download
+
+.PRECIOUS: context.debsrc_dapper \
+context.debsrc_bionic result.debsrc_bionic context.deploy_ppa_bionic result.deploy_ppa_bionic \
+context.debsrc_trusty result.debsrc_trusty context.deploy_ppa_trusty result.deploy_ppa_trusty \
+context.debsrc_xenial result.debsrc_xenial context.deploy_ppa_xenial result.deploy_ppa_xenial \
+context.debsrc_eoan   result.debsrc_eoan   context.deploy_ppa_eoan   result.deploy_ppa_eoan \
+context.debsrc_focal  result.debsrc_focal  context.deploy_ppa_focal  result.deploy_ppa_focal \
+context.deploy_base_scp context.deploy_scp \
+context.deploy_base_download result.deploy_download context.deploy_download
+
+#***************************************************************
+
+# base64 encode secrets so they can be passed in via a protected configuration variable
+../deploy/secrets.b64: ../deploy/secrets/* ../deploy/secrets/*/*
+	cd ../deploy; tar --exclude-backups -cjf - secrets | base64 > secrets.b64
+
+secrets: ../deploy/secrets.b64
+
+.PHONY: secrets
+
+#***************************************************************
+
+# test client build on lean alpine linux
+test: result.build_client_test result.build_server_test
+
+#***************************************************************
+
+intermediateclean:
+	rm -rf context.*
+
+# keep the artifacts clean of junk not needed in the next phase
+artifactclean:
+	rm -rf *.dir source proto/*.dir
+
+clean: intermediateclean
+	rm -rf upload source gits result.* *.tag proto
+	if git -C ${srcdir} rev-parse --abbrev-ref HEAD > /dev/null; then rm -f CI_INFO; fi
+distclean: clean
+	rm -rf $(TARBALL) CI_INFO
+	cd ${top_srcdir} && ./bootstrap.sh
+	cat ${top_srcdir}/version.m4
 
=== added file 'docker/build/build_in_container.sh'
--- docker/build/build_in_container.sh	1970-01-01 00:00:00 +0000
+++ docker/build/build_in_container.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Usage: build_in_container.sh <base_image> <result> <command>
+# Takes <base_image> as base, copies current directory into a build directory,
+# runs <commmand>, copies resulting build directory to ./<result>/
+
+base=$1
+shift
+result=$1
+shift
+
+if test -d ${result}; then
+    echo ${result} already exists.
+    exit 1
+fi
+
+set -x
+
+# make sure base image exists
+wd=`dirname $0`
+${wd}/../scripts/ensure_image.sh "${base}" -d
+. ${wd}/../images/digest.sh "${base}" || exit $?
+
+dockeruser=`docker inspect --format '{{.Config.User}}' ${REGISTRY}${base}${REFERENCE}` || exit $?
+home=/home/${dockeruser}
+if test -z "$dockeruser";then
+    dockeruser=root
+    home=/root
+fi
+
+# create dockerfile with prepared input files
+tmp=`mktemp`
+container_name=image_${PPID}_`basename ${tmp} | tr '[:upper:]' '[:lower:]'`
+function build(){
+docker build --no-cache -t ${container_name} -f - . <<EOF
+FROM ${REGISTRY}${base}${REFERENCE}
+RUN mkdir -p ${home}/BUILDDIR
+COPY --chown=${dockeruser} ./ ${home}/BUILDDIR
+WORKDIR ${home}/BUILDDIR
+EOF
+}
+
+build || exit $?
+
+# run command and extract output from container
+function run_and_extract(){
+    EXITCODE=0
+    cidfile=${result}.CID
+    rm -f ${cidfile}
+    docker run --cidfile ${cidfile} ${container_name} $@ || EXITCODE=$?
+    container_id=`cat ${cidfile}`
+    rm -f ${cidfile}
+    docker cp ${container_id}:${home}/BUILDDIR ${result} || EXITCODE=$?
+    docker rm -f ${container_id} || true
+    docker rmi -f ${container_name} || true
+    return ${EXITCODE}
+}
+
+if ! run_and_extract "$@"; then
+    # on failure, remove output
+    rm -rf ${tmp}
+    rm -rf ${result}.error
+    mv ${result} ${result}.error
+    exit 1
+fi
+
+rm -rf ${tmp}
+
+exit 0
+
+# save disk space by deduplicating source and destination
+set +x
+function link_identical_files(){
+    while read file; do
+        if test -r "${result}/${file}"; then
+            if diff "${file}" "${result}/${file}" > /dev/null; then
+                echo cp -lf "${file}" ...
+                cp -lf "${file}" "${result}/${file}"
+            else
+                echo NOT "${file}", differs
+            fi
+        fi
+    done
+}
+find . -type f | link_identical_files || exit $?
+set -x
+
 
=== added directory 'docker/build/context'
=== added file 'docker/build/context/appdir.sh'
--- docker/build/context/appdir.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/appdir.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# build a portable application dir
+test -x fakerelease.sh && . fakerelease.sh
+. version.sh || exit 1
+
+set -x
+
+SUFFIX=
+cat serverclient | grep "server" > /dev/null && SUFFIX=-dedicated
+make -C build install DESTDIR=`pwd`/appdir || exit
+APPDIR=appdir PACKAGE=${PACKAGE_NAME}${SUFFIX} portable/build || exit
+
+# comment out to inspect result for debug purposes
+rm -rf build source
 
=== added file 'docker/build/context/appimage.sh'
--- docker/build/context/appimage.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/appimage.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# pack portable application dir into AppImage
+set -x
+
+. ./version.sh
+
+# determine arch suffix
+ARCH=x86_64
+if test `getconf LONG_BIT` -eq 32; then
+  ARCH=i686
+fi
+
+# copy icon
+cp -l appdir/usr/local/share/games/${PACKAGE_NAME}*/desktop/icons/large/${PACKAGE_NAME}*.png appdir/
+
+#   pack it up. The appimagetool package is available here:
+#   https://github.com/AppImage/AppImageKit/releases
+
+rm -f $1
+ARCH=${ARCH} appimagetool-${ARCH}.AppImage --appimage-extract-and-run appdir $1
+
+# comment out to inspect result for debug purposes
+rm -rf appdir
 
=== added file 'docker/build/context/build.sh'
--- docker/build/context/build.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/build.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# do a build from source to build
+test -x fakerelease.sh && . fakerelease.sh
+. version.sh || exit $?
+
+set -x
+
+mkdir -p build
+pushd build
+progname="${PACKAGE_NAME}" progtitle="${PACKAGE_TITLE}" ../source/configure --prefix=/usr/local $@ || exit $?
+nice -n 19 make -j `nproc` || exit $?
+popd
+
 
=== added directory 'docker/build/context/portable'
=== added file 'docker/build/context/portable/AppRun'
--- docker/build/context/portable/AppRun	1970-01-01 00:00:00 +0000
+++ docker/build/context/portable/AppRun	2020-07-03 06:03:19 +0000
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#set -x
+
+root=$(dirname "${0}")
+EXEC=$(grep -h -m 1 -r Exec= ${root}/*.desktop | cut -d "=" -f 2 | cut -d % -f 1 | cut -d " " -f 1 | head -n 1)
+# append library path so system libraries are found first (if we put our libs into /usr/lib),
+# same for executables.
+
+# true portable app: create a .armagetronad directory in the current directory and
+# it'll be used to store your data.
+extraarg=
+test -d .${EXEC} && extraarg="--userdatadir .${EXEC} --vardir .${EXEC}/var --userconfigdir .${EXEC}/config"
+
+# for debugging: if LD_DEBUG_APP=true, use the included libraries first.
+# you can then use strace to check no non-standard external libraries are needed. 
+
+extralibs=
+if test "x${LD_DEBUG_APP}" = xtrue; then
+  echo "Library debug mode: ignore system libraries."
+else
+  CACHE=~/.${EXEC}/.syslibs
+  mkdir -p ~/.${EXEC}
+  if test ! -e ${CACHE} || test ${0} -nt ${CACHE}; then
+    # find all directories in ld's cache
+    for lib in $({ /sbin/ldconfig -p || ldconfig -p; } | tail -n +2 | sed -e "s,.* =>,," -e "s,/[^/]*$,," | sort -u); do
+      extralib=${extralib}:${lib}
+    done
+    echo ${extralib} > ${CACHE}
+  fi
+  extralib=$(cat ${CACHE})
+fi
+
+LD_LIBRARY_PATH="${root}/usr/local/lib${extralib}:${LD_LIBRARY_PATH}:${root}/usr/lib"
+PATH="${root}/usr/local/bin:${PATH}${root}/usr/bin" 
+export LD_LIBRARY_PATH
+export PATH
+exec $EXEC ${extraarg} $@
 
=== added file 'docker/build/context/portable/README'
--- docker/build/context/portable/README	1970-01-01 00:00:00 +0000
+++ docker/build/context/portable/README	2020-07-03 06:03:19 +0000
@@ -0,0 +1,2 @@
+Contains files for portable builds (AppImage/Steam)
+
 
=== added file 'docker/build/context/portable/build'
--- docker/build/context/portable/build	1970-01-01 00:00:00 +0000
+++ docker/build/context/portable/build	2020-07-03 06:03:19 +0000
@@ -0,0 +1,89 @@
+#!/bin/bash
+# builds portable client
+
+# set -x
+
+#   add AppRun and desktop file
+cp portable/AppRun ${APPDIR}/
+find ${APPDIR} -type f -name "*.desktop" -exec mv \{\} ${APPDIR}/ \;
+find ${APPDIR} -type l -name "*.desktop" -exec rm \{\} \;
+
+#   hack Icon
+for f in $(find ${APPDIR} -type d -name "desktop"); do
+  cp $f/icons/small/*.png ${APPDIR}/${PACKAGE}.png
+done
+
+# correct absolute symlinks
+APPDIR=${APPDIR} $(dirname $0)/fixlinks
+
+lastpath=/usr/lib/*linux-gnu
+otherpath=${lastpath}
+
+function copylib()
+{
+    baselib=$1
+    path=$(dirname ${baselib})
+    baselib=$(basename ${baselib})
+    echo "Found in ${path}."
+    if test "$lastpath" != "$path"; then
+        otherpath=$lastpath
+    fi
+    lastpath=$path
+    while test -n "${baselib}"; do
+      # copy libary
+      echo Copying ${baselib}...
+      cp -a "${path}/${baselib}" ${APPDIR}/usr/lib/
+      # resolve links
+      baselib=$(ls -l ${path}/${baselib} | grep -- "->" | sed -e "s,.*-> ,,")
+    done
+}
+
+#   include libraries
+mkdir -p ${APPDIR}/usr/lib/
+mkdir -p ${APPDIR}/usr/local/lib/
+for library in \
+libxml2 \
+libZThread \
+libSDL-1 \
+libboost_thread \
+libSDL_image libpng \
+libSDL_mixer \
+libGLEW \
+libfreetype \
+libftgl \
+libprotobuf \
+; do
+  echo "Checking for library ${library}...."
+  baselib=$(ldd ${APPDIR}/usr/local/bin/${PACKAGE} | grep "${library}" | sed -e "s,.*=> ,," -e "s, (.*,,")
+  if test -z "${baselib}"; then
+    echo "Not linked."
+  else
+    copylib ${baselib}
+  fi
+done
+
+if ! echo ${PACKAGE} | grep dedicated; then
+# libraries we know are dynamically loaded later, so they don't appear in ldd's output
+for library in \
+libjpeg.so.8 \
+; do
+    echo "Installing library ${library} anyway, we know it's needed."
+    if test -r ${lastpath}/${library}; then
+        copylib ${lastpath}/${library}
+    else
+        copylib ${otherpath}/${library}
+    fi
+done
+fi
+
+# more libraries for 0.4, later
+#libogg.so \
+#libogg.so.0 \
+#libvorbis.so \
+#libvorbis.so.0 \
+#libvorbisfile.so \
+#libvorbisfile.so.3 \
+#libmikmod.so \
+#libmikmod.so.2 \
+
+echo $lastpath
 
=== added file 'docker/build/context/portable/fixlinks'
--- docker/build/context/portable/fixlinks	1970-01-01 00:00:00 +0000
+++ docker/build/context/portable/fixlinks	2020-07-03 06:03:19 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash
+# fixes absolute symbolic links
+
+set -x
+
+# correct absolute symlinks
+pushd ${APPDIR}
+function processlinks()
+{
+    while read SOURCE; do
+        TARGET=$(ls -l "${SOURCE}" | sed -e "s,.*-> *,,")
+        RELATIVEUP=$(dirname ${SOURCE} | sed -e 's,^./,,' -e 's,[^/]*,..,g')
+        if  echo ${TARGET} | grep '^/' > /dev/null; then
+            NEWTARGET=${RELATIVEUP}${TARGET}
+            ln -sf ${NEWTARGET} ${SOURCE}
+        fi
+    done
+}
+
+find . -type l | processlinks
+popd
 
=== added file 'docker/build/context/steam.sh'
--- docker/build/context/steam.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/steam.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# build a portable application dir for the steam runtime
+test -x fakerelease.sh && . fakerelease.sh
+. version.sh || exit 1
+
+set -x
+
+STEAM_PACKAGE_NAME=`echo ${PACKAGE_NAME} | sed -e s/-.*//` || exit $?
+STEAM_PACKAGE_TITLE=`echo ${PACKAGE_TITLE} | sed -e s/-.*// -e "s/ .*//"` || exit $?
+
+# delegate
+./appdir.sh $@ || exit $?
+
+# move stuff around
+sed -i appdir/armagetronad.desktop -e s/armagetronad/${STEAM_PACKAGE_NAME}/g || exit $?
+if test `cat serverclient` = client; then
+    sed -i appdir/AppRun -e s/EXEC=.*\$/EXEC=${PACKAGE_NAME}/g || exit $?
+    mv appdir/AppRun appdir/${STEAM_PACKAGE_TITLE} || exit $?
+    mv appdir/armagetronad.desktop appdir/${STEAM_PACKAGE_NAME}.desktop || exit $?
+else
+    sed -i appdir/AppRun -e s/EXEC=.*\$/EXEC=${PACKAGE_NAME}-dedicated/g || exit $?
+    mv appdir/AppRun appdir/${STEAM_PACKAGE_TITLE}_Dedicated || exit $?
+    mv appdir/armagetronad.desktop appdir/${STEAM_PACKAGE_NAME}-dedicated.desktop || exit $?
+fi
+    
+# all in the steam runtime
+rm -f appdir/usr/lib/libSDL*
+rm -f appdir/usr/lib/libjpeg*
+rm -f appdir/usr/lib/libxml2*
+rm -f appdir/usr/lib/libpng*
+rm -f appdir/usr/lib/libfreetype*
 
=== added file 'docker/build/context/testbuild.sh'
--- docker/build/context/testbuild.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/testbuild.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# do a simple test server build
+test -x fakerelease.sh && . fakerelease.sh
+
+mkdir build
+cd build
+../source/configure "$*"
+make
+
 
=== added file 'docker/build/context/version.sh.in'
--- docker/build/context/version.sh.in	1970-01-01 00:00:00 +0000
+++ docker/build/context/version.sh.in	2020-07-03 06:03:19 +0000
@@ -0,0 +1,6 @@
+PACKAGE_VERSION=@version@
+PACKAGE_NAME=@prognamebase@
+PACKAGE_TITLE="@progtitle@"
+
+# depends on whether the current build is configured as client or server, maybe don't use?
+# PACKAGE_NAME_FULL=@progname@
 
=== added file 'docker/build/context/winbuild.sh'
--- docker/build/context/winbuild.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/winbuild.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+# makes windows build from source
+
+set -x
+
+Xvfb :99 -screen 1 640x480x8 -nolisten tcp &
+DISPLAY=:99
+sleep 1
+cd winsource
+./fromunix.sh || exit $?
+cd ..
+
+# comment out for debugging
+rm -rf winsource winlibs debug
 
=== added file 'docker/build/context/wininst.sh'
--- docker/build/context/wininst.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/wininst.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+# builds windows installer
+
+set -x
+
+if test -r ~/.wine/drive_c/Program\ Files\ \(x86\)/NSIS/makensis.exe; then
+    NSIS="C:\Program Files (x86)\NSIS\makensis.exe"
+else
+    NSIS="C:\Program Files\NSIS\makensis.exe"
+fi
+
+Xvfb :99 -screen 1 640x480x8 -nolisten tcp &
+DISPLAY=:99
+sleep 1
+cd dist
+wine "$NSIS" gcc.armagetronad.nsi || exit $?
+wine "$NSIS" gcc.armagetronad_dedicated.nsi || exit $?
+mv *.gcc.win32.exe ../ || exit $?
+cd ..
+
+# comment out for debugging
+rm -rf dist
 
=== added file 'docker/build/context/winsource.sh'
--- docker/build/context/winsource.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context/winsource.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,82 @@
+#!/bin/sh
+# packs windows sources
+
+set -x
+
+. ./version.sh
+
+WINDIR=winsource
+SRCDIR=source
+BUILDDIR=build
+DOCDIR=build/src/doc
+CODEBLOCKS=codeblocks
+
+# prepare windows sources
+rm -rf $WINDIR
+cp -a $SRCDIR $WINDIR || exit 1
+rm -rf $WINDIR/src/doc
+rm -rf $WINDIR/doc
+cp -r $DOCDIR $WINDIR/doc || exit 1
+cp -r $BUILDDIR/language/languages.txt $WINDIR/language || exit 1
+cp -r $BUILDDIR/config/aiplayers.cfg $WINDIR/config || exit 1
+
+# rename text files
+for f in $WINDIR/INSTALL $WINDIR/COPYING $WINDIR/AUTHORS $WINDIR/NEWS $WINDIR/ChangeLog `find $WINDIR -name "*README*"`; do
+    mv $f $f.txt || exit 1
+done
+
+# copy Code::Blocks build files
+if test -n "${CODEBLOCKS}" && test -d ${CODEBLOCKS}; then
+    cp -r ${CODEBLOCKS}/* ${WINDIR}/ || exit 1
+    
+    # adapt relative paths to source
+    for f in `ls ${CODEBLOCKS} -1 | egrep ".*\.cbp$|.*.\.bat$"`; do
+        echo $f
+	sed < ${CODEBLOCKS}/$f > ${WINDIR}/$f -e "s,=\.\.\\\\armagetronad,=.,g" -e "s,\.\./armagetronad[^_],,g" -e "s,\.\.\\\\armagetronad[^_],,g" -e "s,armagetronad,${PACKAGE_NAME},g"
+    done
+fi
+
+# transcribe nsi scripts
+for source in ${CODEBLOCKS}/*.nsi; do
+    f=`basename ${source}`
+    #echo Adapting installer script $f...
+    sed < ${source} > ${WINDIR}/$f \
+        -e "s,define PRODUCT_VERSION.*$,define PRODUCT_VERSION \"${PACKAGE_VERSION}\"," \
+        -e "s,define PRODUCT_BASENAME.*$,define PRODUCT_BASENAME \"${PACKAGE_TITLE}\"," \
+	-e "s,armagetronad,${PACKAGE_NAME},g" || exit 1
+	
+    for suffix in gcc; do
+	sed < ${source} > ${WINDIR}/${suffix}.$f \
+            -e "s,define PRODUCT_VERSION.*$,define PRODUCT_VERSION \"${PACKAGE_VERSION}.${suffix}\"," \
+            -e "s,define PRODUCT_BASENAME.*$,define PRODUCT_BASENAME \"${PACKAGE_TITLE}\"," \
+	    -e "s,armagetronad,${PACKAGE_NAME},g" || exit 1	    
+	
+        # generate special makedist script that copies only the wanted installer generators
+        MAKEDIST=${WINDIR}/makedist_${suffix}.bat
+        echo "call makedist.bat" > ${MAKEDIST}
+        echo "xcopy dist\\${suffix}.*.nsi . /Y" >> ${MAKEDIST}
+        echo "del dist\\*.nsi" >> ${MAKEDIST}
+        echo "xcopy ${suffix}.*.nsi dist /Y" >> ${MAKEDIST}
+        echo "del ${suffix}*.nsi" >> ${MAKEDIST}
+        echo "pause" >> ${MAKEDIST}
+    done
+done
+
+# transcode to windows CR/LF line mode
+for suffix in bat nsi nsi.m4 cfg txt dsp dsw h cpp dtd xml; do
+	find $WINDIR -name "*.$suffix" -exec recode latin1..latin1/CR-LF \{\} \;
+done
+
+rm -rf $WINDIR/config.* $WINDIR/configure* $WINDIR/*.m4 $WINDIR/*.kde* 
+rm -rf $WINDIR/bootstrap.sh $WINDIR/batch $WINDIR/missing $WINDIR/install-sh $WINDIR/textures/KGN*
+find $WINDIR -name "*.in" -exec rm \{\} \;
+find $WINDIR -name "*.am" -exec rm \{\} \;
+find $WINDIR -name "Makefile*" -exec rm \{\} \;
+find $WINDIR -name "*.ghost" -exec rm \{\} \;
+find $WINDIR -depth -name "CVS" -exec rm -rf \{\} \;
+find $WINDIR -depth -name "*~" -exec rm -rf \{\} \;
+
+chmod +x winsource/fromunix.sh || exit 1
+
+# comment out for debugging
+rm -rf ${CODEBLOCKS} ${SRCDIR} ${BUILDDIR}
 
=== added file 'docker/build/context_to_result.sh'
--- docker/build/context_to_result.sh	1970-01-01 00:00:00 +0000
+++ docker/build/context_to_result.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# runs a context through dockerbuild
+# usage: context_to_result.sh <image> <name> <command>
+# takes input: context.<name>
+# produces output: result.<name>
+# name can also carry a context. or result. prefix, it will be removed
+
+#echo -e "\e]2;Build $1\a"
+
+set -x
+
+wd="`dirname $0`"
+bic="`readlink -f ${wd}/build_in_container.sh`"
+
+name="$1"
+shift
+
+if echo ${name} | grep "^context\." > /dev/null; then
+    name=`echo ${name} | sed -e s,context\.,,`
+fi
+if echo ${name} | grep "^result\." > /dev/null; then
+    name=`echo ${name} | sed -e s,result\.,,`
+fi
+
+rm -rf result.${name}
+cd context.${name} || exit $?
+image=`cat image` || exit $?
+
+#sleep 1
+
+find . -name "*~" -exec rm \{\} \;
+
+set +x
+echo -e "\n\n********************************************************************"
+echo -e "Build ${name}"
+echo -e "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n\n"
+
+${bic} "${image}" ../result.${name} "$@" || exit $?
+
+echo -e "\n\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+echo -e "Done building ${name}"
+echo -e "********************************************************************"
 
=== added file 'docker/build/debian_source.sh'
--- docker/build/debian_source.sh	1970-01-01 00:00:00 +0000
+++ docker/build/debian_source.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# prepares debian sources
+# parameters: <series> (unstable/karmic/gutsy...)
+
+# import gpg keys
+EXIT=0
+gpg --import pub.gpg 2>&1 | tee importlog || EXIT=$?
+gpg --allow-secret-key-import --import sec.gpg || EXIT=$?
+rm -rf *.gpg
+test ${EXIT} = 0 || exit ${EXIT}
+
+set -x
+
+# determine email of key owner
+#grep "public key .* imported" importlog
+#grep "public key .* imported" importlog | sed -e 's/>".*$/>/' -e 's/^.*"//' 
+MAIL=`grep "public key .* imported" importlog | sed -e 's/>".*$/>/' -e 's/^.*"//'`
+
+SERIES=$1
+test -z ${SERIES} && SERIES=unstable
+
+. version.sh || exit $?
+
+DEBIAN_VERSION=`echo ${PACKAGE_VERSION} | sed -e s,_,~,g`~ppa1~${SERIES}
+
+mv debian/changelog changelog_orig || exit $?
+cat > debian/changelog <<EOF
+armagetronad (${DEBIAN_VERSION}) ${SERIES}; urgency=medium
+
+  * Updated to new upstream version
+
+ -- ${MAIL}  `date -R`
+
+EOF
+cat changelog_orig >> debian/changelog || exit $?
+
+. `dirname $0`/rebrand_debian_core.sh || exit $?
+
+mv *${PACKAGE_VERSION}.tar.gz ${PACKAGE_NAME}_${DEBIAN_VERSION}.orig.tar.gz || exit $?
+
+mv debian source/ || exit $?
+pushd source || exit $?
+debuild -S -sa || exit $?
+
+# cleanup (no, required for testing)
+#popd
+#rm -rf source
 
=== added file 'docker/build/fakerelease_proto.sh'
--- docker/build/fakerelease_proto.sh	1970-01-01 00:00:00 +0000
+++ docker/build/fakerelease_proto.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,3 @@
+# move to fakerelease.sh in configured directory to enable quick
+# compilation free test builds
+export ARMAGETRONAD_FAKERELEASE=true
 
=== added file 'docker/build/make_ci.sh.in'
--- docker/build/make_ci.sh.in	1970-01-01 00:00:00 +0000
+++ docker/build/make_ci.sh.in	2020-07-03 06:03:19 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Helper script for building, just calls make <args>
+# Optional first argument: -k, keeps intermediate directories
+# (default: delete intermediates)
+
+set -x
+
+keep=false
+if test "$1" = -k; then
+    keep=true
+    shift
+fi
+
+EXIT=0
+
+pushd `dirname $0` || exit $?
+
+# first make run
+if ! make $*; then
+    # try again with better debug output
+    make -d $* || EXIT=$?
+fi
+
+# remove heavy intermediate directories
+if test ${keep} = false; then
+    make artifactclean
+fi
+
+popd
+
+# communicate final make return
+exit ${EXIT}
+
 
=== added file 'docker/build/make_deploy.sh'
--- docker/build/make_deploy.sh	1970-01-01 00:00:00 +0000
+++ docker/build/make_deploy.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Helper script for deployment, used form (un)staged_% make targets
+# Usage: make_deploy.sh <target to make>
+# usually, <target to make> will be 'deploy'
+
+set -x
+
+EXIT=0
+
+# first make run
+if ! ${MAKE} $*; then
+    # deployment occasionally fails due to network problems, wait a bit and try again
+    sleep 300
+    if ! ${MAKE} $*; then
+	sleep 900
+	# last run without fancy arguments
+	make $* || EXIT=$?
+    fi
+fi
+
+# reset deployment targets
+rm -f ../deploy/targets.sh
+${MAKE} ../deploy/targets.sh
+
+# communicate final make return
+exit ${EXIT}
+
+
 
=== added file 'docker/build/prepare_context.sh'
--- docker/build/prepare_context.sh	1970-01-01 00:00:00 +0000
+++ docker/build/prepare_context.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# prepares a context for a docker based build
+# usage: prepare_context.sh <target_dir> <files and directories>
+
+target="$1"
+shift
+
+#echo -e "\e]2;Prepare ${target}\a"
+
+echo -e "\n\n********************************************************************"
+echo -e "Prepare ${target} from $1"
+echo -e "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n\n"
+
+set -x
+
+rm -rf ${target}
+mkdir -p ${target}
+
+if ! cp -lrf context/version.sh $@ ${target}/; then
+    rm -rf ${target}/version.sh
+    cp -lrf context/version.sh ${target}/ || { rm -rf ${target}; exit 1; }
+    
+    for f in $@; do
+	rm -rf ${target}/`basename $f`
+	cp -lrf $f ${target}/ || { rm -rf ${target}; exit 1; }
+    done
+fi
+
+if test -f fakerelease.sh; then
+    rm -rf ${target}/fakerelease.sh
+    cp -lrf fakerelease.sh ${target}/
+fi
 
=== added file 'docker/build/rebrand_debian_core.sh'
--- docker/build/rebrand_debian_core.sh	1970-01-01 00:00:00 +0000
+++ docker/build/rebrand_debian_core.sh	2020-07-03 06:03:19 +0000
@@ -0,0 +1,24 @@
+#/bin/bash
+
+#set -x
+
+
+
+PACKAGE=${PACKAGE_NAME}
+NAME=${PACKAGE_TITLE}
+
+
+pushd debian
+sed -i -e "s/Armagetron Advanced/${NAME}/g" rules
+for f in * man/* bin/* source/*; do
+    dest=$(echo $f | sed -e "s,armagetronad,${PACKAGE},g")
+    if test ! -d $f; then
+	echo $f "->" $dest
+	sed -e "s/armagetronad/${PACKAGE}/g" < $f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" -e "s/${PACKAGE}\.source/armagetronad.source/g" -e "s/${PACKAGE}-armagetronad/armagetronad-armagetronad/g" > $dest.out
+	rm -f $f $dest
+	mv $dest.out $dest
+    fi
+done
+chmod 755 rules
+popd
+
 
=== added file 'docker/build/setup_ci_test.sh.in'
--- docker/build/setup_ci_test.sh.in	1970-01-01 00:00:00 +0000
+++ docker/build/setup_ci_test.sh.in	2020-07-03 06:03:19 +0000
@@ -0,0 +1,45 @@
+# sets up build environemnt to match CI situation
+
+function test_targets(){
+	. ../deploy/targets.sh
+	echo LP_VERSION=${LP_VERSION}
+	echo SERIES=${SERIES}
+	echo SUFFIX=${SUFFIX}
+	echo SF_DIR=${SF_DIR}
+	echo LP_SERIES=${LP_SERIES}
+	echo ZI_SERIES=${ZI_SERIES}
+	echo STEAM_BRANCH=${STEAM_BRANCH}
+	echo UBUNTU_PPA=${UBUNTU_PPA}
+	echo UPLOAD_SCP${UPLOAD_SCP}
+	echo DOWNLOAD_URI_BASE=${DOWNLOAD_URI_BASE}
+}
+
+if @top_srcdir@/docker/scripts/setup_ci_variables_test.sh $*; then
+	. @top_srcdir@/docker/scripts/setup_ci_variables_test.sh $*
+	. @top_srcdir@/docker/scripts/brand.sh @top_srcdir@
+	pushd @top_builddir@
+	pushd @abs_top_srcdir@
+	./bootstrap.sh
+	popd
+	@abs_top_srcdir@/configure --disable-glout progname=${PROGRAM_NAME} progtitle="${PROGRAM_TITLE}"
+	popd
+	rm -f CI_INFO
+	make CI_INFO
+	echo ""
+	echo ""
+	echo '****** CI_INFO ********'
+	cat CI_INFO
+	OLD_STAGING=${STAGING}
+	echo ""
+	echo '****** STAGING=true ********'
+	STAGING=true
+	test_targets
+	echo ""
+	echo '****** STAGING=false ********'
+	STAGING=false
+	test_targets
+
+	echo ""
+	STAGING=${OLD_STAGING}
+fi
+
 
=== added directory 'docker/deploy'
=== added file 'docker/deploy/anonymous_secrets.b64'
--- docker/deploy/anonymous_secrets.b64	1970-01-01 00:00:00 +0000
+++ docker/deploy/anonymous_secrets.b64	2020-07-03 06:03:19 +0000
@@ -0,0 +1,104 @@
+QlpoOTFBWSZTWWGRinoADcT/hPiQAQBAG//iP///8H////AAAgAIYBNfb7NNd9PufPe3uu92va77
+d6fW1q29t7yznu689fffa71r1t89e7617fXbMvvfY+e+vb2n3ut9l7X0d3dryvdxviKp41MJiYjC
+aaYEwCMJgExMpQgAIqaYIyYCMmIwgwNGgJjUZNSRA0ephqpkyaYnqZI8EwEwTI0xNDRgmpioAAao
+Qyap7TADSaYIap+pmgxoBMmik0AAaqE8AmyNE1PIJsCaaaB6mRT9MCJIAAahAENGmmnqGj1J6aZT
+NDARop+jRNIT1PU8UtJ+WC/gDtxUipDLEIQA5ymWIQ65SNKpgKEJgIUhHAAlsTALh5Xf7lznHnFL
+nm1he8YrQtc3/FAaInXBjztCKwspm5wf/vWdmBV4v5UQfQ46R+9eZ0EjvUYeaIGmcdelrBfatPGi
+zlhuyHUy2QlCWB98fBxf3Dz8sY/i5loJSSAhiZwIJAVk5S+QFdu3R9u0OaY/+R7QfQqs1/H3upYv
+e8gePI3U7V0exxCYcubWJOT7z1O/Ax5NKFHDBim3aaglT+0Sm7xvn/1UsGUe2sXF9TJP5vxKMnbq
+Wg1AA2bgPwMDbFChVvYA1iarb95h86i3rl3ZLP1/B7MqbD4cVUAtYTnP4O0swKQxFqGUNWh76RLW
+h6p+3eHwaT1muDT+wl0GUTKKU8hSSaQMLXO4iUrz2jn8CTBG6VgewQZJZcoyElsQn/MQKoBk3jF5
+IAkCMmIYEby+/4j0JZmnrcmNNCuXh6jVlLgjpcYy8le2oejmiTOHB7+ZsMGhXlgWudB9ivr3dkBA
+KWgHstX0WkhubAC7plrhG8VFL8vguT4NtRwZY0MkqNiagwYSTjbJwMbg/lS6A4XGQzo+3j6iw/MQ
+9Ff0OVeIbGe/rdXb/T901/8/Ze04elAOfR+dHZP6uy1+RLS44KhxGJM4uuGoPDB8/CjxI4RWtaiO
+c1nIQ9bl/tJkCDpyMAgHG/mgq3mO6igiDBiRxE0ORFm9jjeEUf0kWUCM/GAUW3fi7gIFFwv1HBSx
+eTwD4vcWG45bBVrbuDj3M89m4iENP4U6pDT35Ky1x8CiHIsN14cXlAzRokAoU9DRZtYpwCiJnHK6
+84HUEK8rGeANG7NZ5MnJMSZHcJmkOoNH/AGYIqd/tIJBHtStXeHOHA9kHh+R7kRd8eMXJQMm03Wz
+2ExxogvzI0WgmRIbZsmwORDEgXsRBItS4gDlNZveESLunzJn/gHmrjmnyy8c1jLI91zPJgmv+r1X
+w5o371jp5xC7pXCivZ/HxZC/jC0PnJ42HEzu77usMqOgzXXg/hG8wJ6SXv+QXTZaiX5K1faPYXW0
+4jwIqGv1Rv0sH8neaZQ2P+hOUGxWLrjT9UQsBg3mJURCGvRZjVPtXPPvpD3E0eUm8+zIesXd07xJ
+p6DvJNMBSPdmfxcLcCLr1s/RKN8zfEaH2wtt/HwRR+uj9NnwK97kq6YPjjSHwqubReegLMs1McTr
+GaadwPvxH4b5grzNF0e4xto6BCkdbVdx1XwxrGqnv7L3JX6D32OmwL+65dfIF8nMEOti6sPGvvCf
+zrKZPQKRWnlx0vjshw7KviHAx573dbPSrZq1eCgROIdbTBL4JO7RvvQnYtB9gmfbsIYRxj30ZzdQ
+1rFWHBeZpNs6bP2tkEe3nULqoW7q3JI0ewKzJkOhnyzFefZZCUfCX1pPhUVOBspDuo6D8A0H/fBZ
+ylhEqWVfOwcofGe8USnA6vwLH2pR0L03BupPvLeGKxxUXk6ERSidw+1mWGqfgtQeeVc7jzbMl3b1
+i66iiI6zTPfeV/G4XCF3RJU1EkCL9s1AswdFBMCnp+Un6ssereu+WGeOXDFWpKGdQ9LywnIUbV5r
+c7vXqcr8V6XTv9JVgYGLdmoWrOPUOUoPvIoK1reynjVjVnWHjRbzZ71izMMTiGrzU6pQlT67m51I
+BQkbhUk6IS1rVvJBH77MkHjmsmwijxnYIf8KYKxxO7sK2kkIwikpHGoHkH/HdkzQnSXcxGWYwHp+
+cPcHb4qn5IgDMik/IY+i90uyqRGdj1WBlkqDplc231nz5ZQTd5DuKq8dWtI91Z4NI7x7+nctw6Fl
+rlcXeqr+dD/4D8wZMUPry6iWSEgq/IChAX10457GHATQchlPsmaYi8Kl3YUyacZWzaJwTJkeQ7jb
+YQVcU0sLTDTKIu/3mmtbwv0N/f2AM785X0Oe8+D1AMofBI4ZyVSmYL4ac9nq1m0HB8X65fqQWgEf
+k1ENjdoXzrFQj2iz9hoIwJraJK1LAzITPBb87Hxa4CKSqxUQInbp1lLHOeW9twJ/m64h3fA+M7fX
+Ppg+QX5qkh0C2izPBbb4qs84D/4xxRuxjindFOjFFRxISGQMC4Ny8m59MBcHd4sOjlGjiF4WtLp9
+XoSYWjur2nrebbI7AbhfFViEZk7srWF0T5jD+LwnNE2n7ChiSoOiEx4wXkqX8OGc78gwz25z4xP7
+0toRQ7hi1M+eXSlSiTRGsSQrcL3jWmSUhl2uQEuMO36fAI26qYBwADIMi19CKi3mkv0vtALdC1vu
+YeT4oMjzvl1NIF0q1VHnUdbQIdIwWa3JXwjzqu+RUmV2gr9T+r5UeWIYaUze2LKJ2GuL+2uiyVB0
+ZZ5b33L0EwJnczRogJxrFBZ1krtrXaIlWzyZ3kvWmsgvUXdELq/T1NFbSpPuZgN4At7FZNTN42Al
+9cnyMq3xEQVt8oACKb5yAGkkWmoScx697gt5kN4jcRu8Om4q5Z+0BxItuo54sM2TDaHM6r97Bk4b
+sC5uC9mCylhcmpVTLkVGblu0O5u4ISNwyA7bJED2rK3wUvrK5JxlMhy2BU4IHmKNa5YQ3OXM2iVU
+KGvrL22mZNku8rCpC7PsoMEqHYezJD2cvPsNxCB1bFJVQ+y3FKy1K4Zgf7loCt6mgFCmqJuD21JY
+Dd3q6IoXx8OpG01G3wI5cx2hc1ZT6/GgeII6JyA0nRZiXkdGMDYkE4H5/y6FJIh6C2/UwFaw+iBK
+xpitAgwFzAuxsLLyaB+g3L37jWB4SD41tfDa8jCgIFvCjgcmDX5OYaOhOoNqnvvzSDvpQqD9qvnq
+mHn0q/ThcqLVV+sx0KYp6palpCHpsuNSVA+ZixwbgegSmM5W+4rkSH3ZjEO5wV5v25DJwCFxQDU3
+353B0PVFzjtDNCfAq7Lz4dXCOYrgGxqmipHsBBfqje6Ml+IT+sX3gm1stgkQbmLIbvwG9AsQiaHU
+bQ+D7Lq3cabBfdCGb9tnr4WsnoHuNwRyAr5C+MRr99iB842FXkmsSupIGS9UJQ2Z2rmh6SyDHOEf
+Lolsb4x+TubR8Zera8j+1eY4OpDYhOk2+D1mekqg3DQ0MOlAiTZWT8PNTirJaG9A9ahYvHEDTSyj
+XDqcn183mTWYJWFkE2uQTvenZk9zRGz0sfrspjf2DnWPl9n/WcMcl6PcY3rMJooLBMOrV3fkXzeG
+sWBPD9bO8TSGlA+CquWZxrPZPYL64y+AYhytBONUXR/296AbdM6BgenHpGkld7Zm33EWcRF99MFh
+r4xqgQbV5FxZT6j43NfOixSRivI4+BsyXOMj4VjzYwW8Mb4wTR9/kDNZEzcbgOcp/1U+HoeVwxfD
+3nqzBgkQvWt9LLentBrHyobYWv1qVYv9Pv9rj4Qe27hTTIVVynPTtwqVV8pYRskhREkwBVfVzWqR
+tmZSD5hdzQx/q7EOenyBBz2ahLojO518Li+6kpe6qYPYJsNkL7gPlxQftbltckjupn3NwY2JB6Zd
+IWU8HKaRgq6PPaH6m9RRjA8uf5Gsg5BTtcg1wyPupHX2Lk5pb6i51xb5UVRU3vJ3zqUs0JdXN3tO
+jttxvlrKn2kEbC9P2vhaTUN2D3FeUJpiBIzhorZO3oAuwXxO7XmsUUJXH1h65k97KCIqUAciLykR
+W5ib6aI6ZX6GnIXStWiVzWoLX7Fg0ImskpoFrPY1Q9hxc+l/D8t47VEUqIHE7Lz5hMOfWliCl8gn