From f65bd3b079b3d30ee6bf60a6aaa217cf2cef573d Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Wed, 5 Oct 2016 09:28:23 +0200
Subject: [PATCH 1/5] disable logging of passwords. yikes

---
 process/sendreport.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/sendreport.sh b/process/sendreport.sh
index 003026f4a..1b9af1d35 100755
--- a/process/sendreport.sh
+++ b/process/sendreport.sh
@@ -14,7 +14,7 @@ GAME=$1
 EMAIL=$2
 FACTION=$3
 PASSWD=$4
-echo "$GAME $EMAIL $FACTION $PASSWD" >> /tmp/report.log
+#echo "$GAME $EMAIL $FACTION $PASSWD" >> /tmp/report.log
 
 function reply() {
   echo $@ | mutt -s "Reportnachforderung Partei ${FACTION}" $EMAIL

From 3d191b65732c9fb81b3fdc578a0e0944f20e3a5f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sun, 9 Oct 2016 10:01:31 +0200
Subject: [PATCH 2/5] not likely to get fixed

---
 src/kernel/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kernel/config.c b/src/kernel/config.c
index f7eb0e303..8df618aa5 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -690,7 +690,7 @@ static const char * relpath(char *buf, size_t sz, const char *path) {
 static const char *g_datadir;
 const char *datapath(void)
 {
-    static char zText[MAX_PATH]; // FIXME: static return value
+    static char zText[MAX_PATH];
     if (g_datadir)
         return g_datadir;
     return relpath(zText, sizeof(zText), "data");
@@ -704,7 +704,7 @@ void set_datapath(const char *path)
 static const char *g_reportdir;
 const char *reportpath(void)
 {
-    static char zText[MAX_PATH]; // FIXME: static return value
+    static char zText[MAX_PATH];
     if (g_reportdir)
         return g_reportdir;
     return relpath(zText, sizeof(zText), "reports");

From 75422e1ba630830b19030235db824a28d0df969f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sun, 9 Oct 2016 10:06:51 +0200
Subject: [PATCH 3/5] fix gcc conversion warnings

---
 src/util/unicode.test.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/util/unicode.test.c b/src/util/unicode.test.c
index f485808cb..410e8e68a 100644
--- a/src/util/unicode.test.c
+++ b/src/util/unicode.test.c
@@ -23,42 +23,42 @@ static void test_unicode_utf8_to_other(CuTest *tc)
     unsigned char ch;
     size_t sz;
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, '?', ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str+2, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, '?', ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str+4, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, '?', ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str + 6, &sz));
-    CuAssertIntEquals(tc, 1, sz);
+    CuAssertIntEquals(tc, 1, (int)sz);
     CuAssertIntEquals(tc, 'l', ch);
 
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, 216, ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str+2, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, 120, ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str + 4, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, 0x9d, ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str + 6, &sz));
-    CuAssertIntEquals(tc, 1, sz);
+    CuAssertIntEquals(tc, 1, (int)sz);
     CuAssertIntEquals(tc, 'l', ch);
 
     CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, '?', ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 2, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, '?', ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 4, &sz));
-    CuAssertIntEquals(tc, 2, sz);
+    CuAssertIntEquals(tc, 2, (int)sz);
     CuAssertIntEquals(tc, '?', ch);
     CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 6, &sz));
-    CuAssertIntEquals(tc, 1, sz);
+    CuAssertIntEquals(tc, 1, (int)sz);
     CuAssertIntEquals(tc, 'l', ch);
 }
 

From 0de30cd3768ac73cd54ce529fa23ca6835bee328 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sun, 16 Oct 2016 11:58:42 +0200
Subject: [PATCH 4/5] remove discontinued submodules if they are checked out

---
 s/build   | 1 +
 s/preview | 1 +
 2 files changed, 2 insertions(+)

diff --git a/s/build b/s/build
index b59804626..820e330f9 100755
--- a/s/build
+++ b/s/build
@@ -33,6 +33,7 @@ if [ ! -d $ROOT/$BUILD ]; then
   exit
 fi
 
+rm -rf crypto tolua
 git submodule update
 
 echo "build eressea"
diff --git a/s/preview b/s/preview
index 79411aea6..86a4f8918 100755
--- a/s/preview
+++ b/s/preview
@@ -22,6 +22,7 @@ exit $2 # otherwise
 function build() {
 assert_dir $SOURCE
 cd $SOURCE
+rm -rf crypto tolua
 git fetch || abort "failed to update source. do you have local changes?"
 [ -z $1 ] || git checkout $1
 git pull

From 919001fae0a8c4b3fafe68b3187602fe88a2fbe2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Sun, 16 Oct 2016 16:41:08 +0200
Subject: [PATCH 5/5] do not rmdir tolua, we need it

---
 s/build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/s/build b/s/build
index 820e330f9..b59804626 100755
--- a/s/build
+++ b/s/build
@@ -33,7 +33,6 @@ if [ ! -d $ROOT/$BUILD ]; then
   exit
 fi
 
-rm -rf crypto tolua
 git submodule update
 
 echo "build eressea"