diff -uNr opennms-1.1.4-1/source/etc/rrd-configuration.properties opennms-1.1.4-1-new/source/etc/rrd-configuration.properties --- opennms-1.1.4-1/source/etc/rrd-configuration.properties Mon Oct 25 14:24:54 2004 +++ opennms-1.1.4-1-new/source/etc/rrd-configuration.properties Wed Oct 27 11:33:42 2004 @@ -13,7 +13,7 @@ # to Tomcat start up so that the JRobin code can properly generate the graphs. # # The default setting is true (use the JNI code) -#org.opennms.rrd.usejni=true +org.opennms.rrd.usejni=false # # This property defines whether or not to use the write queuing system. diff -uNr opennms-1.1.4-1/source/src/services/org/opennms/protocols/icmp/IcmpSocket.c opennms-1.1.4-1-new/source/src/services/org/opennms/protocols/icmp/IcmpSocket.c --- opennms-1.1.4-1/source/src/services/org/opennms/protocols/icmp/IcmpSocket.c Mon Oct 25 14:24:53 2004 +++ opennms-1.1.4-1-new/source/src/services/org/opennms/protocols/icmp/IcmpSocket.c Wed Oct 27 16:31:20 2004 @@ -10,6 +10,7 @@ Modifications: + 2004 Oct 27: Handle Darwin 10.2 gracefully. 2003 Sep 07: More Darwin tweaks. 2003 Apr 26: Fixes byteswap issues on Solaris x86. 2003 Mar 25: Used unt64_t instead of unsigned long long. @@ -50,9 +51,14 @@ #include #include #include +#include #include #if defined(__DARWIN__) || defined(__SOLARIS__) || defined (__FreeBSD__) -#include +# include +# include +# ifndef MAC_OS_X_VERSION_10_3 +# define socklen_t int +# endif #endif #include #include diff -uNr opennms-1.1.4-1/source/tools/packages/fink/README.Darwin opennms-1.1.4-1-new/source/tools/packages/fink/README.Darwin --- opennms-1.1.4-1/source/tools/packages/fink/README.Darwin Mon Oct 25 14:24:52 2004 +++ opennms-1.1.4-1-new/source/tools/packages/fink/README.Darwin Wed Oct 27 11:33:42 2004 @@ -32,9 +32,11 @@ /etc/rc -You should do something similar to the limits above (multiply by 4 and reboot) -for OpenNMS to run properly. Your mileage may vary, you may need to raise -them higher, depending on how large your network is. +You should probably do something similar to the limits above (multiply by 4 +and reboot) for OpenNMS to run properly, although it seems to work out of the +box on a reasonably full class-C network with recent Fink packages. Your +mileage may vary, you may need to raise them higher, depending on how large +your network is. ------------------------------------------------------------------------------ PostgreSQL Limits -- All Platforms @@ -48,13 +50,18 @@ max_connections = 192 shared_buffers = 384 +Again, on a reasonably small network, the defaults from Fink seem to work +alright now. + ------------------------------------------------------------------------------ Database Setup -- All Platforms ------------------------------------------------------------------------------ -Then you can run the java installer to configure the database, like so: +Make sure PostgreSQL is started before you install. If it isn't, you will +have to start it ("sudo @PREFIX@/bin/pgsql.sh start") and try again. To run +the installer manually, run: - sudo java -Xmx256m -jar @PREFIX@/var/opennms/lib/opennms_install.jar -disU + sudo @PREFIX@/var/opennms/bin/install -r -disU ------------------------------------------------------------------------------ Startup @@ -62,9 +69,9 @@ Now you're ready to start everything up! Check the configuration files in @PREFIX@/var/opennms/etc and set them up for your network (as per the -quick start guide at http://www.opennms.org/users/docs/) and run: +quick start guide at http://sourceforge.net/docman/?group_id=4141) and run: sudo @PREFIX@/bin/pgsql.sh start - sudo @PREFIX@/var/opennms/bin/opennms.sh start - sudo -u tomcat @PREFIX@/bin/tomcat4 start + sudo @PREFIX@/bin/opennms start + sudo @PREFIX@/bin/tomcat4 start diff -uNr opennms-1.1.4-1/source/tools/run/runjava opennms-1.1.4-1-new/source/tools/run/runjava --- opennms-1.1.4-1/source/tools/run/runjava Mon Oct 25 14:24:52 2004 +++ opennms-1.1.4-1-new/source/tools/run/runjava Wed Oct 27 16:51:30 2004 @@ -94,7 +94,7 @@ # javaCheck() { ret="`$JP -version 2>&1 | grep '^java version' | sed 's/^java version \"//;s/\".*//'`" - if echo "$ret" | egrep '^1\.4\.[2-9]' > /dev/null; then + if echo "$ret" | egrep '^1\.4\.[1-9]' > /dev/null; then return 0 else return 1 @@ -246,7 +246,7 @@ if [ $? -ne 0 ]; then warn "error: bad version for configured Java runtime environment" - warn "\"$JP -version\" does not report that is version 1.4.2+" + warn "\"$JP -version\" does not report that is version 1.4.1+" warn "$mantra" return 1