Merge remote branch 'origin/master' into divVerent/crypto2

Conflicts:
	all

diff --git a/.gitignore b/.gitignore
index d100827319d8ba28a9784ec2ccd46e24088b74bc..6711a9911779b5a18426ea63a92e08b9fef04d79 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ fteqcc
 div0-gittools
 netradiant
 mediasource
+d0_blind_id
+*.d0si

diff --git a/all b/all
index 933a51b6e78259583b56f9e06e2ca6ef1000d6e4..d85c09701ec77e6c6f76fb28d4c6098e383693b8 100755 (executable)
--- a/all
+++ b/all
@@ -119,6 +119,7 @@ darkplaces                    |
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
 netradiant                    |                                                   | master      |
+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -440,18 +441,21 @@ case "$cmd" in
                fi
                case "$1" in
                        -c)
+                               cleand0=true
                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        -n)
+                               cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
                                shift
                                ;;
                        *)
+                               cleand0=false
                                cleandp=false
                                cleanqcc=false
                                cleanqc=true # version info
@@ -491,6 +495,16 @@ case "$cmd" in
                        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
@@ -516,12 +530,13 @@ case "$cmd" in
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
-                       export PATH="$d0/misc/buildfiles/w32:$PATH"
+                       export PATH="$d0/misc/buildfiles/w32:$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

diff --git a/key_0.d0pk b/key_0.d0pk
new file mode 100644 (file)
index 0000000..5c47257
Binary files /dev/null and b/key_0.d0pk differ

diff --git a/key_15.d0pk b/key_15.d0pk
new file mode 100644 (file)
index 0000000..6ebe0f1
Binary files /dev/null and b/key_15.d0pk differ

diff --git a/misc/pki/key_0.d0sk.asc b/misc/pki/key_0.d0sk.asc
new file mode 100644 (file)
index 0000000..0b5a31d
--- /dev/null
+++ b/misc/pki/key_0.d0sk.asc
@@ -0,0 +1,48 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+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
+=fUzL
+-----END PGP MESSAGE-----

diff --git a/misc/pki/key_15.d0sk.asc b/misc/pki/key_15.d0sk.asc
new file mode 100644 (file)
index 0000000..6b087fd
--- /dev/null
+++ b/misc/pki/key_15.d0sk.asc
@@ -0,0 +1,48 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+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
+=mwpt
+-----END PGP MESSAGE-----

diff --git a/misc/pki/key_15.txt b/misc/pki/key_15.txt
new file mode 100644 (file)
index 0000000..1363c14
--- /dev/null
+++ b/misc/pki/key_15.txt
@@ -0,0 +1 @@
+This is the TESTING key, and will NOT be accepted by official Xonotic releases.