Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6126/10.4-pangocairo/unstable/main/finkinfo/net

Modified Files:
      Tag: pangocairo-branch
        opennms.info opennms.patch 
Log Message:
head->pc


Index: opennms.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/opennms.patch,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- opennms.patch       20 Apr 2008 18:53:10 -0000      1.1.2.7
+++ opennms.patch       25 Jun 2008 15:39:10 -0000      1.1.2.8
@@ -1,98 +1,13 @@
-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")) {
--          String[] defaults = { "/usr/lib/jni", "/usr/lib", "/usr/local/lib" 
};
-+          String[] defaults = { "@FINKPREFIX@/lib", "/usr/lib/jni", 
"/usr/lib", "/usr/local/lib" };
-           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.");
+diff -Nurd 
opennms/source/opennms-install/src/main/java/org/opennms/install/Installer.java 
opennms-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
+--- 
opennms/source/opennms-install/src/main/java/org/opennms/install/Installer.java 
   2008-06-24 15:37:17.000000000 -0400
++++ 
opennms-new/source/opennms-install/src/main/java/org/opennms/install/Installer.java
        2008-06-24 16:32:58.000000000 -0400
+@@ -855,8 +855,7 @@
          }
  
-+        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 { %>
-                     &nbsp;
+         if (!System.getProperty("os.name").contains("Windows")) {
+-            String[] defaults = { "/usr/lib/jni", "/usr/lib",
+-                    "/usr/local/lib" };
++            String[] defaults = { "@FINKPREFIX@/lib", "/usr/lib/jni", 
"/usr/lib", "/usr/local/lib" };
+             for (String entry : defaults) {
+                 searchPaths.add(entry);
+             }

Index: opennms.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/opennms.info,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- opennms.info        20 Apr 2008 18:53:10 -0000      1.1.2.8
+++ opennms.info        25 Jun 2008 15:39:10 -0000      1.1.2.9
@@ -1,16 +1,18 @@
 Package: opennms
-Version: 1.5.90
+Version: 1.5.93
 Revision: 1
 
 Source: mirror:sourceforge:%n/%n-source-%v-1.tar.gz
-Source-MD5: 2568825b8f33533166fd360a2c8b2602
+Source-MD5: fb71ab9158a40978bc800505088b7d72
 SourceDirectory: %n-%v-1/source
+Source2: mirror:sourceforge:%n/%n-maven-dependencies-%v.tar.bz2
+Source2-MD5: e51a87d931ba24095c3a66ad534da30a
 
 Distribution: 10.4, 10.5
 Recommends: mib2opennms
 PatchScript: <<
-       install -d -m 755 "%b/../../repository"
        sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p2
+       sed -e 's,@PREFIX@,%p,g' tools/packages/fink/README.Darwin > 
README.Darwin
 <<
 
 Type: java(1.5)
@@ -129,6 +131,7 @@
        %p/var/opennms/etc/events/Sensaphone.events.xml
        %p/var/opennms/etc/events/Snort.events.xml
        %p/var/opennms/etc/events/SonicWall.events.xml
+       %p/var/opennms/etc/events/Sonus.events.xml
        %p/var/opennms/etc/events/Standard.events.xml
        %p/var/opennms/etc/events/Symbol.events.xml
        %p/var/opennms/etc/events/Syslogd.events.xml
@@ -210,16 +213,20 @@
        %p/var/opennms/etc/xmlrpcd-configuration.xml
        %p/var/opennms/etc/xmpp-configuration.properties
 <<
-CompileScript: <<
-#!/bin/sh -ex
-       rm -rf work dist
-       sed -e 's,@PREFIX@,%p,g' tools/packages/fink/README.Darwin > 
README.Darwin
-       sh ./build.sh clean
-<<
+CompileScript: echo "none needed"
 InstallScript: <<
 #!/bin/sh -ex
+
+       # set up local maven repo
+       cat <<END >settings.xml
+<settings xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
+  <localRepository>`pwd`/../../repository</localRepository>
+  <offline>true</offline>
+</settings>
+END
+
        # main install
-       sh ./build.sh -Ddist.name=opennms -Ddist.dir=%i/var 
-Dopennms.home=%p/var/opennms install assembly:directory-inline
+       sh ./build.sh -e -s `pwd`/settings.xml -Ddist.name=opennms 
-Ddist.dir=%i/var -Dopennms.home=%p/var/opennms install 
assembly:directory-inline
 
        # some convenience symlinks
        /usr/bin/install -d -m 755 %i/bin %i/etc %i/var/log


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to