Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

diff --git a/misc/builddeps/dp.linux32/bin/blind_id b/misc/builddeps/dp.linux32/bin/blind_id
index 88d5701dcb7c3ff778a9a84c52540118bf181f01..80cb77b6f80a4c2c434a9a83011ccb02f10c4663 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/bin/blind_id and b/misc/builddeps/dp.linux32/bin/blind_id differ

diff --git a/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h b/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h
index 858b020b2a17378b75897720c1eb1c2e823ef64b..f6082d261f65b6a40606122f50c92b2d4f564a18 100644 (file)
--- a/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h
+++ b/misc/builddeps/dp.linux32/include/d0_blind_id/d0.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Format:commit %H$
- * $Id: 8bcedf6746fc5fd1cd5709800f5ce5bcb5532a87 $
+ * $Id: 9a7b912057b836675f4e24f08514cad53fa46d2a $
  */
 
 #ifndef __D0_H__
@@ -44,6 +44,6 @@
 
 extern void *(*d0_malloc)(size_t len);
 extern void (*d0_free)(void *p);
-extern const char *d0_bsd_license_notitce;
+extern const char *d0_bsd_license_notice;
 
 #endif

diff --git a/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h b/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h
index a2ac822de2c33f9ba821b08cb0670f3b6e71cf20..8f4da00799347d188c325e76c0e33971e5e4c194 100644 (file)
--- a/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h
+++ b/misc/builddeps/dp.linux32/include/d0_blind_id/d0_blind_id.h
@@ -71,7 +71,9 @@ D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id
 D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id_verify(d0_blind_id_t *ctx, const char *inbuf, size_t inbuflen, char *msg, size_t *msglen, D0_BOOL *status);
 D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id_generate_missing_signature(d0_blind_id_t *ctx);
 D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_sign(d0_blind_id_t *ctx, D0_BOOL is_first, D0_BOOL send_modulus, const char *message, size_t msglen, char *outbuf, size_t *outbuflen);
+D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_sign_detached(d0_blind_id_t *ctx, D0_BOOL is_first, D0_BOOL send_modulus, const char *message, size_t msglen, char *outbuf, size_t *outbuflen);
 D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_verify(d0_blind_id_t *ctx, D0_BOOL is_first, D0_BOOL recv_modulus, const char *inbuf, size_t inbuflen, char *msg, size_t *msglen, D0_BOOL *status);
+D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_verify_detached(d0_blind_id_t *ctx, D0_BOOL is_first, D0_BOOL recv_modulus, const char *inbuf, size_t inbuflen, const char *msg, size_t msglen, D0_BOOL *status);
 D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_fingerprint64_public_id(const d0_blind_id_t *ctx, char *outbuf, size_t *outbuflen);
 D0_EXPORT D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sessionkey_public_id(const d0_blind_id_t *ctx, char *outbuf, size_t *outbuflen); // can only be done after successful key exchange, this performs a modpow; key length is limited by SHA_DIGESTSIZE for now; also ONLY valid after successful d0_blind_id_authenticate_with_private_id_verify/d0_blind_id_fingerprint64_public_id
 

diff --git a/misc/builddeps/dp.linux32/lib/libd0_blind_id.a b/misc/builddeps/dp.linux32/lib/libd0_blind_id.a
index ffece566bcb507d40c93a85853c696e6268133dc..8569902d7d114f5d59b316b1a34070a233479ba3 100644 (file)
Binary files a/misc/builddeps/dp.linux32/lib/libd0_blind_id.a and b/misc/builddeps/dp.linux32/lib/libd0_blind_id.a differ

diff --git a/misc/builddeps/dp.linux32/lib/libd0_blind_id.la b/misc/builddeps/dp.linux32/lib/libd0_blind_id.la
index a847c12d19f16bacf80fe5c7c10ea9818ff5b907..baa4ef7bfaed56ea5c68e95207f1638f9f1dfb8d 100755 (executable)
--- a/misc/builddeps/dp.linux32/lib/libd0_blind_id.la
+++ b/misc/builddeps/dp.linux32/lib/libd0_blind_id.la
@@ -1,26 +1,20 @@
 # libd0_blind_id.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4+lenny1 (1.1220.2.493 2008/02/01 16:58:18)
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname=''
+dlname='libd0_blind_id.so.0'
 
 # Names of this library.
-library_names=''
+library_names='libd0_blind_id.so.0.0.0 libd0_blind_id.so.0 libd0_blind_id.so'
 
 # The name of the static archive.
 old_library='libd0_blind_id.a'
 
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
 # Libraries that this one depends upon.
-dependency_libs=' -L/tmp/Darkplaces.build.linux32.deps/lib /tmp/gg/lib/libgmp.la'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
+dependency_libs=' /usr/lib/libgmp.la'
 
 # Version information for libd0_blind_id.
 current=0
@@ -38,4 +32,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/d0c/lib'
+libdir='/usr/local/lib'

diff --git a/misc/builddeps/dp.linux32/lib/libd0_blind_id.so.0.0.0 b/misc/builddeps/dp.linux32/lib/libd0_blind_id.so.0.0.0
index 11df4eccfa556390850ecb9fe0fd18535c974849..d17b4e57939a31a10846255db770a8be3a76ad32 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/lib/libd0_blind_id.so.0.0.0 and b/misc/builddeps/dp.linux32/lib/libd0_blind_id.so.0.0.0 differ

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.a b/misc/builddeps/dp.linux32/lib/libd0_rijndael.a
index eea4c9069c7c403f937bd303c85a5f3f622c6a48..be2ccc6c4d4288c04f595e48446c58cd91d3ac16 100644 (file)
Binary files a/misc/builddeps/dp.linux32/lib/libd0_rijndael.a and b/misc/builddeps/dp.linux32/lib/libd0_rijndael.a differ

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.la b/misc/builddeps/dp.linux32/lib/libd0_rijndael.la
index 8ac188184d68e537365b98c438b8e0e14305fa50..d138b30b589788322a7bce0b1dfef2bba2d0338f 100755 (executable)
--- a/misc/builddeps/dp.linux32/lib/libd0_rijndael.la
+++ b/misc/builddeps/dp.linux32/lib/libd0_rijndael.la
@@ -1,26 +1,20 @@
 # libd0_rijndael.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4+lenny1 (1.1220.2.493 2008/02/01 16:58:18)
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname=''
+dlname='libd0_rijndael.so.0'
 
 # Names of this library.
-library_names=''
+library_names='libd0_rijndael.so.0.0.0 libd0_rijndael.so.0 libd0_rijndael.so'
 
 # The name of the static archive.
 old_library='libd0_rijndael.a'
 
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
 # Libraries that this one depends upon.
-dependency_libs=' -L/tmp/Darkplaces.build.linux32.deps/lib /tmp/gg/lib/libgmp.la'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
+dependency_libs=' /usr/lib/libgmp.la'
 
 # Version information for libd0_rijndael.
 current=0
@@ -38,4 +32,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/d0c/lib'
+libdir='/usr/local/lib'

diff --git a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0 b/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0
index 7c59e5cc3e8ec1df6b5a6f0ee75e467107402447..b98c986b4651a1bcbe3e3605ca02ddd026624aac 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0 and b/misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0.0.0 differ

diff --git a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc
index 6b2a2e1a9c4fbbd9ff6e6348fe42da99e37f5ec6..8d5601524571e8502daa0e14bbffe57f824021b9 100644 (file)
--- a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc
+++ b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_blind_id.pc
@@ -1,4 +1,4 @@
-prefix=/tmp/d0c
+prefix=/home/rpolzer/xonotic/misc/builddeps/dp.linux32
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

diff --git a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc
index 20d0d8f1c887fcde16e533492837998de7bef003..7582fb83dc075f711dac46eeecdc0d44a806c172 100644 (file)
--- a/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc
+++ b/misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc
@@ -1,4 +1,4 @@
-prefix=/tmp/d0c
+prefix=/home/rpolzer/xonotic/misc/builddeps/dp.linux32
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include