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

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

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
 

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'

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'

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

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