2005-09-17 jrandom

* Added the natively compiled jbigi and patched java service wrapper for
      OS X.  Thanks Bill Dorsey for letting me use your machine!
    * Don't build i2p.exe or i2pinstall.exe when run on OS X machines, as we
      don't bundle the binutils necessary (and there'd be a naming conflict
      if we did).
    * Added 'single user' functionality to syndie - if the single user
      checkbox on the admin page is checked, all users are allowed to control
      the instance and sync up with remote syndie nodes.
    * Temporarily disable the x-i2p-gzip in i2ptunnel until it is more closely
      debugged.

installer/lib/jbigi/README.txt

@@ -1,4 +1,7 @@
 jbigi.jar was built by jrandom on Aug 21, 2004 with the jbigi and jcpuid 
 native libraries compiled on linux, winXP (w/ MinGW), and freebsd (4.8).  
 The GMP code in jbigi is from GMP-4.1.3 (http://www.swox.com/gmp/), and 
-was optimized for a variety of CPU architectures.
+was optimized for a variety of CPU architectures.
+
+On Sep 16, 2005, libjbigi-osx-none.jnilib was added to jbigi.jar after
+being compiled by jrandom on osx/ppc with GMP-4.1.4.

installer/lib/wrapper/macosx/readme.txt

@@ -0,0 +1,6 @@
+The wrapper in here is built with an osx patch, backported from
+the 3.1.2 per 
+ http://sourceforge.net/tracker/index.php?func=detail&
+                                          aid=1262323&
+					  group_id=39428&
+					  atid=425187

installer/lib/wrapper/macosx/wrapper.c.diff

@@ -0,0 +1,78 @@
+--- wrapper_3.1.1_src/src/c/wrapper.c	Fri Jul 16 10:29:10 2004
++++ wrapper_3.1.1_src_modified/src/c/wrapper.c	Fri Sep 16 14:55:23 2005
+@@ -312,7 +312,13 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
++
++#ifdef MACOSX
++#include <sys/time.h>
++#else
+ #include <sys/timeb.h>
++#endif
++
+ #include <sys/stat.h>
+ #include "wrapperinfo.h"
+ #include "wrapper.h"
+@@ -760,16 +766,28 @@
+     int len;
+     int pos;
+     int err;
++
++    #ifdef MACOSX
++    struct timeval timeBuffer;
++    #else 
+     struct timeb timeBuffer;
++    #endif
++
+     long startTime;
+     int startTimeMillis;
+     long now;
+     int nowMillis;
+     long durr;
+     
++#ifdef MACOSX
++    gettimeofday(&timeBuffer, NULL);
++    startTime = now = timeBuffer.tv_sec;
++    startTimeMillis = nowMillis = timeBuffer.tv_usec / 1000;
++#else
+     ftime( &timeBuffer );
+     startTime = now = timeBuffer.time;
+     startTimeMillis = nowMillis = timeBuffer.millitm;
++#endif
+ 
+     /*
+     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "now=%ld, nowMillis=%d", now, nowMillis);
+@@ -900,9 +918,15 @@
+         }
+ 
+         /* Get the time again */
++#ifdef MACOSX
++        gettimeofday(&timeBuffer, NULL);
++        now = timeBuffer.tv_sec;
++        nowMillis = timeBuffer.tv_usec / 1000;
++#else
+         ftime( &timeBuffer );
+         now = timeBuffer.time;
+         nowMillis = timeBuffer.millitm;
++#endif
+     }
+     /*
+     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "done durr=%ld", durr);
+@@ -2250,10 +2274,15 @@
+  * Calculates a tick count using the system time.
+  */
+ DWORD wrapperGetSystemTicks() {
++#ifdef MACOSX
++    struct timeval timeBuffer;
++    gettimeofday(&timeBuffer, NULL);
++    return (timeBuffer.tv_sec * 1000 + timeBuffer.tv_usec/1000) / WRAPPER_TICK_MS;
++#else
+     struct timeb timeBuffer;
+-
+     ftime( &timeBuffer );
+     return (timeBuffer.time * 1000 + timeBuffer.millitm) / WRAPPER_TICK_MS;
++#endif
+ }
+ 
+ /**

installer/lib/wrapper/macosx/wrapper_unix.c.diff

@@ -0,0 +1,60 @@
+--- wrapper_3.1.1_src/src/c/wrapper_unix.c	Fri Jul 16 10:29:10 2004
++++ wrapper_3.1.1_src_modified/src/c/wrapper_unix.c	Fri Sep 16 14:45:48 2005
+@@ -309,7 +309,13 @@
+ #include <limits.h>
+ #include <pthread.h>
+ #include <pwd.h>
++
++#ifdef MACOSX
++#include <sys/time.h>
++#else
+ #include <sys/timeb.h>
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+@@ -1056,7 +1062,11 @@
+     ssize_t bytesRead;
+     char readBuf [1025];
+     int readBufPos, childOutputBufferPos;
++#ifdef MACOSX
++    struct timeval timeBuffer;
++#else
+     struct timeb timeBuffer;
++#endif
+     long startTime;
+     int startTimeMillis;
+     long now;
+@@ -1064,9 +1074,15 @@
+     long durr;
+     
+     if (jvmOut != -1) {
++#ifdef MACOSX
++        gettimeofday(&timeBuffer, NULL);
++        startTime = now = timeBuffer.tv_sec;
++        startTimeMillis = nowMillis = timeBuffer.tv_usec / 1000;
++#else
+         ftime( &timeBuffer );
+         startTime = now = timeBuffer.time;
+         startTimeMillis = nowMillis = timeBuffer.millitm;
++#endif
+ 
+         /*
+         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "now=%ld, nowMillis=%d", now, nowMillis);
+@@ -1159,9 +1175,15 @@
+             }
+ 
+             /* Get the time again */
++#ifdef MACOSX
++            gettimeofday(&timeBuffer, NULL);
++            now = timeBuffer.tv_sec;
++            nowMillis = timeBuffer.tv_usec / 1000;
++#else
+             ftime( &timeBuffer );
+             now = timeBuffer.time;
+             nowMillis = timeBuffer.millitm;
++#endif
+         }
+     }
+