From 7e1a107aa80588452c966c20be104ea15f053dc2 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Wed, 22 May 2013 19:13:49 +0200
Subject: [PATCH 1/3] fixed typo

---
 arangod/V8Server/ApplicationV8.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arangod/V8Server/ApplicationV8.cpp b/arangod/V8Server/ApplicationV8.cpp
index 37f6dd4f96..c0137c783c 100644
--- a/arangod/V8Server/ApplicationV8.cpp
+++ b/arangod/V8Server/ApplicationV8.cpp
@@ -527,7 +527,7 @@ void ApplicationV8::setupOptions (map<string, basics::ProgramOptionsDescription>
     ("javascript.gc-frequency", &_gcFrequency, "JavaScript time-based garbage collection frequency (each x seconds)")
     ("javascript.action-directory", &_actionPath, "path to the JavaScript action directory")
     ("javascript.app-path", &_appPath, "one directory for applications")
-    ("javascript.dev-app-path", &_devAppPath, "one directory for dev aaplications")
+    ("javascript.dev-app-path", &_devAppPath, "one directory for dev applications")
     ("javascript.modules-path", &_modulesPath, "one or more directories separated by semi-colons")
     ("javascript.package-path", &_packagePath, "one or more directories separated by semi-colons")
     ("javascript.startup-directory", &_startupPath, "path to the directory containing alternate JavaScript startup scripts")

From af413c3cf0b4ab7b7f7413d76857200611cb0100 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Wed, 22 May 2013 19:14:35 +0200
Subject: [PATCH 2/3] unified case

---
 lib/HttpServer/ApplicationEndpointServer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/HttpServer/ApplicationEndpointServer.cpp b/lib/HttpServer/ApplicationEndpointServer.cpp
index 5065a4b356..23c4f44c44 100644
--- a/lib/HttpServer/ApplicationEndpointServer.cpp
+++ b/lib/HttpServer/ApplicationEndpointServer.cpp
@@ -230,8 +230,8 @@ void ApplicationEndpointServer::setupOptions (map<string, ProgramOptionsDescript
     ("server.cafile", &_cafile, "file containing the CA certificates of clients")
     ("server.ssl-protocol", &_sslProtocol, "1 = SSLv2, 2 = SSLv23, 3 = SSLv3, 4 = TLSv1")
     ("server.ssl-cache", &_sslCache, "use SSL session caching")
-    ("server.ssl-options", &_sslOptions, "ssl options, see OpenSSL documentation")
-    ("server.ssl-cipher-list", &_sslCipherList, "ssl cipher list, see OpenSSL documentation")
+    ("server.ssl-options", &_sslOptions, "SSL options, see OpenSSL documentation")
+    ("server.ssl-cipher-list", &_sslCipherList, "SSL cipher list, see OpenSSL documentation")
   ;
 }
 

From dcf113ca9912693b0640000e7165b7aac1406ac6 Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Wed, 22 May 2013 21:46:02 +0200
Subject: [PATCH 3/3] issue #536: 1.3 fails to compile
 (lib_libarango_a-Logger.o)

Added solution for GENTOO from

http://code.google.com/p/fritzing/issues/detail?id=1854
---
 lib/Zip/ioapi.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Zip/ioapi.h b/lib/Zip/ioapi.h
index 8dcbdb06e3..014737b6f0 100644
--- a/lib/Zip/ioapi.h
+++ b/lib/Zip/ioapi.h
@@ -21,6 +21,11 @@
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 
+#ifdef _Z_OF
+#undef OF
+#define OF _Z_OF
+#endif
+
 #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
 
   // Linux needs this to support file operation on files larger then 4+GB