Revert "separate out the rijndael libraries", instead doing this PROPERLY in a next commit

This reverts commit 75241b8410.

all

@@ -1287,14 +1287,7 @@ case "$cmd" in
 		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
-		# let's pass crypto import laws of some nasty countries
-		crypto_libs=`find Xonotic -name \*d0_rijndael\* -exec rm -f {} \;`
-		if [ -n "$crypto_libs" ]; then
-			verbose mkzip Xonotic-$stamp-crypto.zip \
-				$crypto_libs
-			rm -f $crypto_libs
-		fi
-		# build the archives
+		# need to use infozip for these (+x bits)
 		verbose mkzip Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
 			Xonotic/bin64/*.dll \

misc/builddeps/dp.linux32/include/d0_blind_id/d0_rijndael.h

@@ -0,0 +1,21 @@
+// from http://www.efgh.com/software/rijndael.htm (public domain)
+
+#ifndef H__RIJNDAEL
+#define H__RIJNDAEL
+
+#include "d0.h"
+
+D0_EXPORT int d0_rijndael_setup_encrypt(unsigned long *rk, const unsigned char *key,
+  int keybits);
+D0_EXPORT int d0_rijndael_setup_decrypt(unsigned long *rk, const unsigned char *key,
+  int keybits);
+D0_EXPORT void d0_rijndael_encrypt(const unsigned long *rk, int nrounds,
+  const unsigned char plaintext[16], unsigned char ciphertext[16]);
+D0_EXPORT void d0_rijndael_decrypt(const unsigned long *rk, int nrounds,
+  const unsigned char ciphertext[16], unsigned char plaintext[16]);
+
+#define D0_RIJNDAEL_KEYLENGTH(keybits) ((keybits)/8)
+#define D0_RIJNDAEL_RKLENGTH(keybits)  ((keybits)/8+28)
+#define D0_RIJNDAEL_NROUNDS(keybits)   ((keybits)/32+6)
+
+#endif

misc/builddeps/dp.linux32/lib/libd0_rijndael.la

@@ -0,0 +1,41 @@
+# libd0_rijndael.la - a libtool library file
+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# 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=''
+
+# Version information for libd0_rijndael.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/tmp/d0c/lib'

misc/builddeps/dp.linux32/lib/libd0_rijndael.so

@@ -0,0 +1 @@
+libd0_rijndael.so.0.0.0

misc/builddeps/dp.linux32/lib/libd0_rijndael.so.0

@@ -0,0 +1 @@
+libd0_rijndael.so.0.0.0

misc/builddeps/dp.linux32/lib/pkgconfig/d0_rijndael.pc

@@ -0,0 +1,11 @@
+prefix=/tmp/d0c
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Rijndael
+Description: Library for Rijndael encryption
+Requires: 
+Version: 0.1
+Libs: -L${libdir} -ld0_rijndael
+Cflags: -I${includedir}/d0_blind_id

misc/builddeps/dp.linux64/include/d0_blind_id/d0_rijndael.h

@@ -0,0 +1,21 @@
+// from http://www.efgh.com/software/rijndael.htm (public domain)
+
+#ifndef H__RIJNDAEL
+#define H__RIJNDAEL
+
+#include "d0.h"
+
+D0_EXPORT int d0_rijndael_setup_encrypt(unsigned long *rk, const unsigned char *key,
+  int keybits);
+D0_EXPORT int d0_rijndael_setup_decrypt(unsigned long *rk, const unsigned char *key,
+  int keybits);
+D0_EXPORT void d0_rijndael_encrypt(const unsigned long *rk, int nrounds,
+  const unsigned char plaintext[16], unsigned char ciphertext[16]);
+D0_EXPORT void d0_rijndael_decrypt(const unsigned long *rk, int nrounds,
+  const unsigned char ciphertext[16], unsigned char plaintext[16]);
+
+#define D0_RIJNDAEL_KEYLENGTH(keybits) ((keybits)/8)
+#define D0_RIJNDAEL_RKLENGTH(keybits)  ((keybits)/8+28)
+#define D0_RIJNDAEL_NROUNDS(keybits)   ((keybits)/32+6)
+
+#endif

misc/builddeps/dp.linux64/lib/libd0_rijndael.la

@@ -0,0 +1,41 @@
+# libd0_rijndael.la - a libtool library file
+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# 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.linux64.deps/lib /tmp/g/lib/libgmp.la'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libd0_rijndael.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/tmp/d0c/lib'

misc/builddeps/dp.linux64/lib/libd0_rijndael.so

@@ -0,0 +1 @@
+libd0_rijndael.so.0.0.0

misc/builddeps/dp.linux64/lib/libd0_rijndael.so.0

@@ -0,0 +1 @@
+libd0_rijndael.so.0.0.0

misc/builddeps/dp.linux64/lib/pkgconfig/d0_rijndael.pc

@@ -0,0 +1,11 @@
+prefix=/tmp/d0c
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Rijndael
+Description: Library for Rijndael encryption
+Requires: 
+Version: 0.1
+Libs: -L${libdir} -ld0_rijndael
+Cflags: -I${includedir}/d0_blind_id