Merge branch 'master' into divVerent/crypto2

diff --combined all
index a4d195484e8d40245bd4b135b64a0c2ddcd213d9,c09c7161bbf6c1467b015d05c528b7f8a056daa5..12d312afbc8ffca5b09203bc66687b9f1da4335a
--- 1/all
--- 2/all
+++ b/all
@@@ -116,7 -116,6 +116,7 @@@ data/xonotic-nexcompat.pk3dir 
  darkplaces                    |                                                   | div0-stable | svn
  netradiant                    |                                                   | master      |
  div0-gittools                 |                                                   | master      | no
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  data/xonotic-maps.pk3dir      |                                                   | master      |
  mediasource                   |                                                   | master      | no
  fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
@@@ -521,11 -520,11 +521,11 @@@ case "$cmd" i
                done
                ;;
        compile)
+               if [ -z "$CC" ]; then
+                       export CC="gcc -DSUPPORT_IPV6"
+               fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-debug cl-debug"
-                       if [ -z "$CC" ]; then
-                               export CC=gcc
-                       fi
                elif [ x"`uname`" = x"Darwin" ]; then
                        case "`uname -r`" in
                                ?.*)
@@@ -536,20 -535,18 +536,20 @@@
                                        TARGETS="sv-debug sdl-debug"
                                        ;;
                        esac
-                       export CC="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+                       export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi
                case "$1" in
                        -c)
 +                              cleand0=true
                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        *)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
@@@ -599,16 -596,6 +599,16 @@@
                        fi
                fi
  
 +              enter "$d0/d0_blind_id" verbose
 +              if ! [ -f Makefile ]; then
 +                      verbose sh autogen.sh
 +                      verbose ./configure
 +              fi
 +              if $cleand0; then
 +                      verbose make $MAKEFLAGS clean
 +              fi
 +              verbose make $MAKEFLAGS
 +
                enter "$d0/fteqcc" verbose
                if $cleanqcc; then
                        verbose make $MAKEFLAGS clean
@@@ -640,13 -627,12 +640,13 @@@
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
 -                      export PATH="$d0/misc/buildfiles/win32:$PATH"
 +                      export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
 -                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 +                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else
 +                      export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
                        client=-sdl
                fi
                case "$1" in
@@@ -1052,7 -1038,7 +1052,7 @@@
                else
                        verbose date +%Y%m%d > Xonotic/stamp.txt
                fi
 -              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 +              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc
                        verbose tar xvf -
@@@ -1061,7 -1047,6 +1061,7 @@@
                        verbose mv misc/buildfiles/win64 bin64 || true
                        verbose mv misc/buildfiles/osx/* . || true
                        verbose rm -rf misc/buildfiles
 +                      verbose rm -rf misc/pki
                }
                {
                        verbose cd darkplaces
@@@ -1084,7 -1069,6 +1084,7 @@@
                        verbose cd Xonotic/source
                        verbose tar xvf -
                }
 +              rm -f Xonotic/key_15.d0pk
                ;;
        release-compile-run)
                host=$1
@@@ -1184,13 -1168,13 +1184,13 @@@
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
 -                      'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
 +                      'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
                ;;
        release-engine-linux64)
                verbose "$SELF" release-compile linux64 \
 -                      'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
 +                      'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;
@@@ -1369,14 -1353,7 +1369,14 @@@
                stamp=`cat Xonotic/stamp.txt`
                # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
                chmod a-x Xonotic/*.exe Xonotic/*.dll || true
 -              # need to use infozip for these (+x bits)
 +              # let's pass crypto import laws of some nasty countries
 +              crypto_libs=`find Xonotic -name \*d0_rijndael\*`
 +              if [ -n "$crypto_libs" ]; then
 +                      verbose mkzip Xonotic-$stamp-crypto.zip \
 +                              $crypto_libs
 +                      rm -f $crypto_libs
 +              fi
 +              # build the archives
                verbose mkzip Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
                        Xonotic/bin64/*.dll \
@@@ -1392,7 -1369,6 +1392,7 @@@
                        Xonotic/misc \
                        Xonotic/fteqcc \
                        Xonotic/server \
 +                      Xonotic/key_0.d0pk \
                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \