Author: ranger
Date: Tue Mar 25 16:37:22 2008
New Revision: 1159
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1159&repname=user%3a+ranger>
Log:
various package updates
Modified:
trunk/experimental/10.4/main/finkinfo/devel/ecj.info
trunk/experimental/common/main/finkinfo/database/iplike-pg.info
trunk/experimental/common/main/finkinfo/database/rrdtool-java.info
trunk/experimental/common/main/finkinfo/devel/ecj.info
trunk/experimental/common/main/finkinfo/libs/jicmp.info
trunk/experimental/common/main/finkinfo/libs/libidn.info
trunk/experimental/common/main/finkinfo/libs/libidn.patch
trunk/experimental/common/main/finkinfo/net/opennms.info
trunk/experimental/common/main/finkinfo/net/opennms.patch
trunk/experimental/common/main/finkinfo/utils/ack.info
Modified: trunk/experimental/10.4/main/finkinfo/devel/ecj.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/devel/ecj.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/devel/ecj.info (original)
+++ trunk/experimental/10.4/main/finkinfo/devel/ecj.info Tue Mar 25 16:37:22
2008
@@ -1,42 +1,56 @@
Package: ecj
-Version: 3.1.2
-Revision: 3
+Version: 3.2.2
+Revision: 1
Description: Eclipse Compiler for Java
-Type: java
+Type: java (1.5)
License: OSI-Approved
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: system-java (>= 1.4-1)
-BuildDepends: system-java-dev (>= 1.4-1)
+Depends: system-java (>= 1.5-0)
+BuildDepends: <<
+ ant-base,
+ system-java-dev (>= 1.5-0)
+<<
CustomMirror: <<
- Primary: http://ranger.users.finkproject.org/distfiles
- eur-NL: http://ranger.users.finkproject.org/distfiles
- nam-US: http://ranger.befunk.com/fink
- nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
- nam-CA: http://www.southofheaven.net/befunk
+ asi-CN: http://download.actuatechina.com/eclipse/eclipse/downloads/drops
+ asi-TW: http://ftp.cs.pu.edu.tw/pub/eclipse/downloads/drops
+ eur-MK: http://eclipse.netcetera.com.mk/downloads/drops
+ eur-MK: http://eclipse.panton.com.mk/downloads/drops
+ nam-US:
http://ftp.us.xemacs.org/pub/mirrors/eclipse/eclipse/downloads/drops
+ nam-US:
http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops
<<
NoSourceDirectory: true
-Source: mirror:custom:%n-%v.tar.bz2
-Source-MD5: c5790d3f1b5cc4f120ec0ce385672408
+Source: mirror:custom:R-%v-200702121330/%nsrc.zip
+Source-MD5: f9d7b548658c84231b00fada8d4b4f1b
+SourceRename: %n-%v.zip
CompileScript: <<
-#!/bin/sh -ev
+
+ # Compile the Java sources
+ find org -name *.java > files
+ mkdir classes
+ javac -d classes -classpath %p/lib/ant/lib/ant.jar @files
+ rm -f files
- ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -DjavacSource=1.4
-DjavacTarget=1.4
+ # Put the classes into a JAR
+ jar cf ecj.jar -C classes org
+
+ # Put the *.properties into the JAR
+ find org -name *.properties -exec jar uf ecj.jar '{}' \;
+
+ # Put the *.rsc into the JAR
+ find org -name *.rsc -exec jar uf ecj.jar '{}' \;
<<
InstallScript: <<
-#!/bin/sh -ev
-
install -d -m 755 %i/bin
-cat <<END >%i/bin/ecj
-#!/bin/sh -e
-java -cp %p/share/java/%n/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main
"\$@"
-END
+ echo \#\!'/bin/sh -e' >> %i/bin/ecj
+ echo 'java -Xmx768M -cp %p/share/java/%n/ecj.jar
org.eclipse.jdt.internal.compiler.batch.Main "$@"' >> %i/bin/ecj
chmod 755 %i/bin/ecj
<<
-JarFiles: jdtcoresrc/ecj.jar
+JarFiles: ecj.jar
+DocFiles: about.html
Homepage: http://www.eclipse.org/
DescDetail: Ecj is the Java bytecode compiler of the Eclipse Project.
Modified: trunk/experimental/common/main/finkinfo/database/iplike-pg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/iplike-pg.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/iplike-pg.info (original)
+++ trunk/experimental/common/main/finkinfo/database/iplike-pg.info Tue Mar 25
16:37:22 2008
@@ -1,6 +1,6 @@
Info3: <<
Package: iplike-pg%type_pkg[postgresql]
-Version: 1.0.6
+Version: 1.0.7
Revision: 1
Type: postgresql(7.4 8.0 8.1 8.2 8.3)
@@ -8,12 +8,12 @@
Replaces: opennms-pgsql74, opennms-pgsql80, opennms-pgsql81, opennms-pgsql82
Provides: opennms-pgsql
Source: mirror:sourceforge:opennms/iplike-%v.tar.gz
-Source-MD5: 2d98c2f6e08136f45f9740d4c129d171
+Source-MD5: 0fa4478d6d82ba1e9fcd453154879cef
BuildDepends: <<
autoconf (>= 2.60-1),
- automake1.9,
- libtool14 (>= 1.5.18-1),
+ automake1.10,
+ libtool2,
(%type_raw[postgresql] <= 8.0)
postgresql%type_pkg[postgresql]-unified-dev,
(%type_raw[postgresql] >= 8.1) postgresql%type_pkg[postgresql]-dev,
<<
@@ -29,7 +29,7 @@
perl -pi -e "s,iplike_la,iplike_${IPLIKE_VERSION}_la,g" Makefile.am
perl -pi -e 's,iplike[^_]la,iplike-%type_raw[postgresql].la,g'
Makefile.am install_iplike.sh.in
perl -pi -e 's,/psql,/psql-%type_raw[postgresql],' install_iplike.sh.in
- autoreconf -fvi
+ %p/bin/glibtoolize
<<
InstallScript: <<
Modified: trunk/experimental/common/main/finkinfo/database/rrdtool-java.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/rrdtool-java.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/rrdtool-java.info
(original)
+++ trunk/experimental/common/main/finkinfo/database/rrdtool-java.info Tue Mar
25 16:37:22 2008
@@ -1,11 +1,11 @@
Info3: <<
Package: rrdtool-java
-Version: 1.0.1
+Version: 1.0.2
Revision: 1
Type: java(1.4)
Source: mirror:sourceforge:opennms/jrrd-%v.tar.gz
-Source-MD5: 284714581b606bc56eb3dde99e19176e
+Source-MD5: 32c031e9e856103559bb2df5fc325548
BuildDepends: <<
freetype219 (>= 2.3.5-1),
Modified: trunk/experimental/common/main/finkinfo/devel/ecj.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/ecj.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/ecj.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/ecj.info Tue Mar 25 16:37:22
2008
@@ -1,36 +1,53 @@
Package: ecj
-Version: 3.1.2
-Revision: 3
+Version: 3.2.2
+Revision: 1
+Description: Eclipse Compiler for Java
+Type: java (1.5)
+License: OSI-Approved
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-CustomMirror: RangerMirror
-Source: mirror:custom:%n-%v.tar.bz2
-Source-MD5: c5790d3f1b5cc4f120ec0ce385672408
+Depends: system-java (>= 1.5)
+BuildDepends: ant-base, system-java-dev (>= 1.5)
+
+CustomMirror: <<
+ asi-CN: http://download.actuatechina.com/eclipse/eclipse/downloads/drops
+ asi-TW: http://ftp.cs.pu.edu.tw/pub/eclipse/downloads/drops
+ eur-MK: http://eclipse.netcetera.com.mk/downloads/drops
+ eur-MK: http://eclipse.panton.com.mk/downloads/drops
+ nam-US:
http://ftp.us.xemacs.org/pub/mirrors/eclipse/eclipse/downloads/drops
+ nam-US:
http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops
+<<
+Source: mirror:custom:R-%v-200702121330/%nsrc.zip
+SourceRename: %n-%v.zip
NoSourceDirectory: true
-BuildDepends: system-java-dev (>= 1.4-1)
-Depends: system-java (>= 1.4-1)
-Type: java
+Source-MD5: f9d7b548658c84231b00fada8d4b4f1b
+
+CompileScript: <<
+
+ # Compile the Java sources
+ find org -name *.java > files
+ mkdir classes
+ javac -d classes -classpath %p/lib/ant/lib/ant.jar @files
+ rm -f files
+
+ # Put the classes into a JAR
+ jar cf ecj.jar -C classes org
+
+ # Put the *.properties into the JAR
+ find org -name *.properties -exec jar uf ecj.jar '{}' \;
+
+ # Put the *.rsc into the JAR
+ find org -name *.rsc -exec jar uf ecj.jar '{}' \;
+<<
+
+InstallScript: <<
+ install -d -m 755 %i/bin
+ echo \#\!'/bin/sh -e' >> %i/bin/ecj
+ echo 'java -Xmx768M -cp %p/share/java/%n/ecj.jar
org.eclipse.jdt.internal.compiler.batch.Main "$@"' >> %i/bin/ecj
+ chmod 755 %i/bin/ecj
+<<
+JarFiles: ecj.jar
+DocFiles: about.html
+
Homepage: http://www.eclipse.org/
-Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Description: Eclipse Compiler for Java
-CompileScript: <<
-#!/bin/sh -ev
-
- ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -DjavacSource=1.4
-DjavacTarget=1.4
-<<
-InstallScript: <<
-#!/bin/sh -ev
-
- install -d -m 755 %i/bin
-cat <<END >%i/bin/ecj
-#!/bin/sh -e
-java -cp %p/share/java/%n/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main
"\$@"
-END
- chmod 755 %i/bin/ecj
-
-<<
-JarFiles: jdtcoresrc/ecj.jar
-
-DescDetail: <<
-Ecj is the Java bytecode compiler of the Eclipse Project.
-<<
-License: OSI-Approved
+DescDetail: Ecj is the Java bytecode compiler of the Eclipse Project.
Modified: trunk/experimental/common/main/finkinfo/libs/jicmp.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/jicmp.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/jicmp.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/jicmp.info Tue Mar 25 16:37:22
2008
@@ -1,11 +1,11 @@
Info3: <<
Package: jicmp
-Version: 1.0.6
+Version: 1.0.7
Revision: 1
Type: java(1.5)
Source: mirror:sourceforge:opennms/jicmp-%v.tar.gz
-Source-MD5: 4b3acca21bd45843135698edc20450cd
+Source-MD5: 93dfbdb0a92de7950df6e04ba09eb252
Depends: system-java (>= 1.5-1)
Modified: trunk/experimental/common/main/finkinfo/libs/libidn.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libidn.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libidn.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libidn.info Tue Mar 25
16:37:22 2008
@@ -1,21 +1,21 @@
Package: libidn
-Version: 0.6.14
+Version: 1.6
Revision: 1
CustomMirror: <<
nam-US: ftp://alpha.gnu.org/pub/gnu/%n
nam-US: http://josefsson.org/%n/releases
<<
Source: mirror:custom:%n-%v.tar.gz
-Source-MD5: 040f012a45feb56168853998bb87ad4d
+Source-MD5: d9ee124c1caa883e081486eafd9a1916
Patch: %n.patch
PatchScript: perl -pi -e 's,g_utf8,idn_utf8,g' lib/*.c
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
BuildDependsOnly: true
-BuildDepends: fink (>= 0.23.0-1), gettext-bin, gettext-tools, gtk-doc,
libiconv-dev, libgettext3-dev, pkgconfig (>= 0.21-1), system-java-dev (>= 1.4-1)
+BuildDepends: fink (>= 0.23.0-1), gettext-bin, gettext-tools, gtk-doc,
libiconv-dev, libgettext3-dev, pkgconfig (>= 0.21-1), system-java-dev (>= 1.5-1)
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.21-1)
ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
--enable-gtk-doc --enable-java
-Type: java(1.4)
+Type: java(1.5)
CompileScript: <<
#!/bin/sh -ex
@@ -51,7 +51,7 @@
<<
SplitOff2: <<
Package: %N-java
- Depends: system-java (>= 1.4-1)
+ Depends: system-java (>= 1.5-1)
Description: Java implementation of libidn
JarFiles: java/%N-%v.jar
<<
Modified: trunk/experimental/common/main/finkinfo/libs/libidn.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libidn.patch&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libidn.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/libidn.patch Tue Mar 25
16:37:22 2008
@@ -1,7 +1,7 @@
-diff -uNr libidn-0.6.14/Makefile.in libidn-0.6.14-new/Makefile.in
---- libidn-0.6.14/Makefile.in 2007-05-31 06:54:13.000000000 -0400
-+++ libidn-0.6.14-new/Makefile.in 2007-10-26 16:59:52.000000000 -0400
-@@ -373,7 +373,7 @@
+diff -Nurd libidn-1.6/Makefile.in libidn-1.6-new/Makefile.in
+--- libidn-1.6/Makefile.in 2008-03-19 12:35:07.000000000 -0400
++++ libidn-1.6-new/Makefile.in 2008-03-20 11:18:53.000000000 -0400
+@@ -430,7 +430,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -9,28 +9,16 @@
+SUBDIRS = gl lib/gl lib po src tests examples java csharp
ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/gl/m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- EXTRA_DIST = FAQ libc/README libc/getaddrinfo-idn.txt libc/example.c \
-diff -uNr libidn-0.6.14/java/misc/Makefile.in
libidn-0.6.14-new/java/misc/Makefile.in
---- libidn-0.6.14/java/misc/Makefile.in 2007-05-31 06:54:12.000000000
-0400
-+++ libidn-0.6.14-new/java/misc/Makefile.in 2007-10-26 16:59:52.000000000
-0400
-@@ -333,7 +333,7 @@
+
+diff -Nurd libidn-1.6/java/misc/Makefile.in
libidn-1.6-new/java/misc/Makefile.in
+--- libidn-1.6/java/misc/Makefile.in 2008-03-19 12:35:07.000000000 -0400
++++ libidn-1.6-new/java/misc/Makefile.in 2008-03-20 11:19:14.000000000
-0400
+@@ -392,7 +392,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
JAVAROOT = $(top_builddir)/java/misc
-AM_JAVACFLAGS = -classpath $(top_builddir)/java/[EMAIL
PROTECTED]@.jar:$(top_srcdir)/java/[EMAIL PROTECTED]@.jar
-+AM_JAVACFLAGS = -classpath $(top_builddir)/java/[EMAIL
PROTECTED]@.jar:$(top_srcdir)/java/[EMAIL PROTECTED]@.jar -target 1.4 -source
1.4
++AM_JAVACFLAGS = -classpath $(top_builddir)/java/[EMAIL
PROTECTED]@.jar:$(top_srcdir)/java/[EMAIL PROTECTED]@.jar -target 1.5 -source
1.5
@[EMAIL PROTECTED] = GenerateRFC3454.java GenerateNFKC.java \
@JAVA_TRUE@ TestIDNA.java TestNFKC.java
-diff -uNr libidn-0.6.14/lib/gl/stdint_.h libidn-0.6.14-new/lib/gl/stdint_.h
---- libidn-0.6.14/lib/gl/stdint_.h 2007-05-31 06:31:00.000000000 -0400
-+++ libidn-0.6.14-new/lib/gl/stdint_.h 2007-10-26 17:00:37.000000000 -0400
-@@ -46,7 +46,7 @@
- # if @HAVE_INCLUDE_NEXT@
- # include_next <stdint.h>
- # else
--# include @ABSOLUTE_STDINT_H@
-+# include "/usr/include/stdint.h"
- # endif
- #endif
-
Modified: trunk/experimental/common/main/finkinfo/net/opennms.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/opennms.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/opennms.info (original)
+++ trunk/experimental/common/main/finkinfo/net/opennms.info Tue Mar 25
16:37:22 2008
@@ -1,9 +1,9 @@
Package: opennms
-Version: 1.3.11
+Version: 1.5.90
Revision: 1
Source: mirror:sourceforge:%n/%n-source-%v-1.tar.gz
-Source-MD5: e9784f4ebc44b73f5d55614c9e620a21
+Source-MD5: 2568825b8f33533166fd360a2c8b2602
SourceDirectory: %n-%v-1/source
Distribution: 10.4, 10.5
@@ -34,7 +34,6 @@
%p/var/opennms/etc/actiond-configuration.xml
%p/var/opennms/etc/c3p0.properties
%p/var/opennms/etc/capsd-configuration.xml
- %p/var/opennms/etc/castor.properties
%p/var/opennms/etc/categories.xml
%p/var/opennms/etc/chart-configuration.xml
%p/var/opennms/etc/collectd-configuration.xml
@@ -46,22 +45,26 @@
%p/var/opennms/etc/discovery-configuration.xml
%p/var/opennms/etc/eventconf.xml
%p/var/opennms/etc/eventd-configuration.xml
+ %p/var/opennms/etc/events-archiver-configuration.xml
+ %p/var/opennms/etc/events.archiver.properties
%p/var/opennms/etc/events/3Com.events.xml
%p/var/opennms/etc/events/ADIC-v2.events.xml
%p/var/opennms/etc/events/APC.Best.events.xml
%p/var/opennms/etc/events/APC.Exide.events.xml
%p/var/opennms/etc/events/APC.events.xml
+ %p/var/opennms/etc/events/AdaptecRaid.events.xml
%p/var/opennms/etc/events/Adtran.Atlas.events.xml
%p/var/opennms/etc/events/Adtran.events.xml
%p/var/opennms/etc/events/AirDefense.events.xml
%p/var/opennms/etc/events/Alteon.events.xml
%p/var/opennms/etc/events/Altiga.events.xml
+ %p/var/opennms/etc/events/Audiocodes.events.xml
%p/var/opennms/etc/events/BEA.events.xml
%p/var/opennms/etc/events/BGP4.events.xml
%p/var/opennms/etc/events/BackupExec.events.xml
%p/var/opennms/etc/events/BlackBerryServer.events.xml
%p/var/opennms/etc/events/Brocade.events.xml
- %p/var/opennms/etc/events/CIM.events.xml
+ %p/var/opennms/etc/events/CA.ArcServe.events.xml
%p/var/opennms/etc/events/CPQHPIM.README.txt
%p/var/opennms/etc/events/CPQHPIM.events.xml
%p/var/opennms/etc/events/Cisco.5300dchan.events.xml
@@ -73,15 +76,21 @@
%p/var/opennms/etc/events/Colubris.events.xml
%p/var/opennms/etc/events/Covergence.events.xml
%p/var/opennms/etc/events/Cricket.events.xml
+ %p/var/opennms/etc/events/Crossbeam.events.xml
%p/var/opennms/etc/events/DPS.events.xml
%p/var/opennms/etc/events/Dell-DRAC2.events.xml
+ %p/var/opennms/etc/events/Dell.events.xml
+ %p/var/opennms/etc/events/DellArrayManager.events.xml
%p/var/opennms/etc/events/DellOpenManage.events.xml
+ %p/var/opennms/etc/events/DellRacHost.events.xml
+ %p/var/opennms/etc/events/DellStorageManagement.events.xml
%p/var/opennms/etc/events/F5.events.xml
%p/var/opennms/etc/events/Fore.events.xml
%p/var/opennms/etc/events/FoundryNetworks.events.xml
%p/var/opennms/etc/events/FujitsuSiemens.events.xml
%p/var/opennms/etc/events/Groupwise.events.xml
%p/var/opennms/etc/events/HP.events.xml
+ %p/var/opennms/etc/events/Hyperic.events.xml
%p/var/opennms/etc/events/IBM-UMS.events.xml
%p/var/opennms/etc/events/IBM.events.xml
%p/var/opennms/etc/events/IBMRSA2.events.xml
@@ -89,6 +98,8 @@
%p/var/opennms/etc/events/IPUnity-SES-MIB.events.xml
%p/var/opennms/etc/events/ISS.events.xml
%p/var/opennms/etc/events/Intel.events.xml
+ %p/var/opennms/etc/events/IronPort.events.xml
+ %p/var/opennms/etc/events/Juniper.events.xml
%p/var/opennms/etc/events/K5Systems.events.xml
%p/var/opennms/etc/events/Liebert.600SM.events.xml
%p/var/opennms/etc/events/Liebert.events.xml
@@ -107,6 +118,7 @@
%p/var/opennms/etc/events/Novell.events.xml
%p/var/opennms/etc/events/OSPF.events.xml
%p/var/opennms/etc/events/Oracle.events.xml
+ %p/var/opennms/etc/events/Overland.events.xml
%p/var/opennms/etc/events/Patrol.events.xml
%p/var/opennms/etc/events/Pixelmetrix.events.xml
%p/var/opennms/etc/events/Primecluster.events.xml
@@ -132,8 +144,6 @@
%p/var/opennms/etc/events/Xerox.events.xml
%p/var/opennms/etc/events/default.events.xml
%p/var/opennms/etc/events/ia.events.xml
- %p/var/opennms/etc/events-archiver-configuration.xml
- %p/var/opennms/etc/events.archiver.properties
%p/var/opennms/etc/exclude-ueis.properties
%p/var/opennms/etc/getManagePercentAvailIntfWindow.sql
%p/var/opennms/etc/getManagePercentAvailNodeWindow.sql
@@ -145,10 +155,12 @@
%p/var/opennms/etc/getPercentAvailabilityInWindow.sql
%p/var/opennms/etc/groups.xml
%p/var/opennms/etc/http-datacollection-config.xml
+ %p/var/opennms/etc/java.conf
%p/var/opennms/etc/javamail-configuration.properties
%p/var/opennms/etc/jcifs.properties
%p/var/opennms/etc/jmx-datacollection-config.xml
%p/var/opennms/etc/ksc-performance-reports.xml
+ %p/var/opennms/etc/libraries.properties
%p/var/opennms/etc/linkd-configuration.xml
%p/var/opennms/etc/log4j-controller.properties
%p/var/opennms/etc/log4j.properties
Modified: trunk/experimental/common/main/finkinfo/net/opennms.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/opennms.patch&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/opennms.patch (original)
+++ trunk/experimental/common/main/finkinfo/net/opennms.patch Tue Mar 25
16:37:22 2008
@@ -1,7 +1,7 @@
-diff -Nurd
opennms-1.3.8-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
opennms-1.3.8-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
----
opennms-1.3.8-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
2007-10-25 13:08:21.000000000 -0400
-+++
opennms-1.3.8-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
2007-11-07 21:44:57.000000000 -0500
-@@ -756,7 +756,7 @@
+diff -Nurd
opennms-1.5.90-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
opennms-1.5.90-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
+---
opennms-1.5.90-1/source/opennms-install/src/main/java/org/opennms/install/Installer.java
2008-03-21 16:02:14.000000000 -0400
++++
opennms-1.5.90-1-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
2008-03-25 11:21:22.000000000 -0400
+@@ -784,7 +784,7 @@
}
if (!System.getProperty("os.name").contains("Windows")) {
@@ -10,3 +10,89 @@
for (String entry : defaults) {
searchPaths.add(entry);
}
+diff -Nurd
opennms-1.5.90-1/source/opennms-services/src/main/java/org/opennms/netmgt/utils/IfLabel.java
opennms-1.5.90-1-new/source/opennms-services/src/main/java/org/opennms/netmgt/utils/IfLabel.java
+---
opennms-1.5.90-1/source/opennms-services/src/main/java/org/opennms/netmgt/utils/IfLabel.java
2007-10-25 13:08:15.000000000 -0400
++++
opennms-1.5.90-1-new/source/opennms-services/src/main/java/org/opennms/netmgt/utils/IfLabel.java
2008-03-25 11:33:33.000000000 -0400
+@@ -254,19 +254,24 @@
+ return label;
+ }
+
+- public static String getIfLabelfromIfIndex(int nodeId, String ipAddr,
String ifIndex) throws SQLException {
++ public static String getIfLabelfromIfIndex(int nodeId, String ipAddr, int
ifIndex) throws SQLException, NumberFormatException {
+ if (ipAddr == null) {
+ throw new IllegalArgumentException("Cannot take null
parameters.");
+ }
+
++ if (ifIndex == -1) {
++ return getIfLabel(nodeId, ipAddr);
++ }
++
+ String label = null;
+ Connection conn = Vault.getDbConnection();
+
+ try {
++ Integer intIfIndex = Integer.valueOf(ifIndex);
+ PreparedStatement stmt = conn.prepareStatement("SELECT DISTINCT
snmpifname, snmpifdescr,snmpphysaddr from snmpinterface, ipinterface where
(ipinterface.ismanaged!='D') AND ipinterface.nodeid=snmpinterface.nodeid AND
ifindex=snmpifindex AND ipinterface.nodeid=? AND ipinterface.ipaddr=? AND
ipinterface.ifindex=?");
+ stmt.setInt(1, nodeId);
+ stmt.setString(2, ipAddr);
+- stmt.setString(3, ifIndex);
++ stmt.setInt(3, intIfIndex);
+
+ ResultSet rs = stmt.executeQuery();
+
+diff -Nurd
opennms-1.5.90-1/source/opennms-webapp/src/main/webapp/element/interface.jsp
opennms-1.5.90-1-new/source/opennms-webapp/src/main/webapp/element/interface.jsp
+---
opennms-1.5.90-1/source/opennms-webapp/src/main/webapp/element/interface.jsp
2007-10-25 13:08:34.000000000 -0400
++++
opennms-1.5.90-1-new/source/opennms-webapp/src/main/webapp/element/interface.jsp
2008-03-25 11:33:33.000000000 -0400
+@@ -89,9 +89,9 @@
+ Interface intf_db = ElementUtil.getInterfaceByParams(request);
+ int nodeId = intf_db.getNodeId();
+ String ipAddr = intf_db.getIpAddress();
+- String ifindexString = "";
++ int ifIndex = -1;
+ if (intf_db.getIfIndex() > 0) {
+- ifindexString = Integer.toString(intf_db.getIfIndex());
++ ifIndex = intf_db.getIfIndex();
+ }
+
+ AtInterface atif_db = NetworkElementFactory.getAtInterface(nodeId,
ipAddr);
+@@ -152,14 +152,17 @@
+ %>
+
+
+- <h2>Interface: <%=intf_db.getIpAddress()%>
<%=intf_db.getIpAddress().equals(intf_db.getHostname()) ? "" : "(" +
intf_db.getHostname() + ")"%></h2>
++ <h2>Interface: <%=intf_db.getIpAddress()%>
++ <% if (intf_db.getHostname() != null &&
!intf_db.getIpAddress().equals(intf_db.getHostname())) { %>
++ <%= intf_db.getHostname() %>
++ <% } %>
+
+ <%
+ if (request.isUserInRole( Authentication.ADMIN_ROLE )) {
+ %>
+ <form method="post" name="delete" action="admin/deleteInterface">
+ <input type="hidden" name="node" value="<%=nodeId%>"/>
+- <input type="hidden" name="ifindex" value="<%=(ifindexString == null ?
"" : ifindexString)%>"/>
++ <input type="hidden" name="ifindex" value="<%=(ifIndex != -1 ? "" :
ifIndex)%>"/>
+ <input type="hidden" name="intf" value="<%=ipAddr%>"/>
+ <%
+ }
+@@ -193,8 +196,8 @@
+
+ <%
+ String ifLabel;
+- if (ifindexString != null) {
+- ifLabel = IfLabel.getIfLabelfromIfIndex(nodeId,
ipAddr, ifindexString);
++ if (ifIndex != -1) {
++ ifLabel = IfLabel.getIfLabelfromIfIndex(nodeId,
ipAddr, ifIndex);
+ } else {
+ ifLabel = IfLabel.getIfLabel(nodeId, ipAddr);
+ }
+@@ -263,8 +266,7 @@
+ <tr>
+ <th>Interface Index</th>
+ <td>
+- <% int ifIndex = intf_db.getIfIndex(); %>
+- <% if( ifIndex > 0 ) { %>
++ <% if( ifIndex != -1 ) { %>
+ <%=ifIndex%>
+ <% } else { %>
+
Modified: trunk/experimental/common/main/finkinfo/utils/ack.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/utils/ack.info&rev=1159&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/utils/ack.info (original)
+++ trunk/experimental/common/main/finkinfo/utils/ack.info Tue Mar 25 16:37:22
2008
@@ -1,5 +1,5 @@
Package: ack
-Version: 1.76
+Version: 1.78
Revision: 1
Description: Grep-like text finder
Depends: file-next-pm, system-perl
@@ -11,7 +11,7 @@
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Source: mirror:cpan:modules/by-module/App/%n-%v.tar.gz
-Source-MD5: c6ac41f943c36b826b7cbe27194ce5aa
+Source-MD5: a7072e4e05a21422a87478ad50c7ecfe
DocFiles: Changes MANIFEST META.yml README TODO
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
