Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv9424/main/finkinfo/net
Modified Files:
Tag: pangocairo-branch
libcurl4.info mrtg.info nut.info opennms.info opennms.patch
wireshark.info wireshark.patch
Added Files:
Tag: pangocairo-branch
net-snmp-unified.info
Log Message:
merge from trunk (pangocairo-root-31)
Index: nut.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/nut.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- nut.info 14 Mar 2007 14:13:09 -0000 1.2.2.1
+++ nut.info 15 Jul 2007 15:10:40 -0000 1.2.2.2
@@ -1,19 +1,27 @@
Package: nut
-Version: 2.0.5
+Version: 2.2.0
Revision: 1
# (See splitoffs)
Depends:
-BuildDepends: pkgconfig, gd2, libusb
+BuildDepends: pkgconfig, gd2, libusb, system-openssl-dev
Recommends: nut-cgi, nut-usb
Suggests: nut-snmp
-Source: http://random.networkupstools.org/source/2.0/%n-%v.tar.gz
-Source-MD5: b08fde86191154bbcfda860f95a5dca2
+Source: http://random.networkupstools.org/source/2.2/%n-%v.tar.gz
+Source-MD5: a3570515d80804051d4e7631e8a3eb12
-DocFiles: ChangeLog COPYING CREDITS INSTALL NEWS README UPGRADING
+DocFiles: AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README UPGRADING
+
+# From http://wiki.finkproject.org/index.php/Fink:Policy:system-openssl
+SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetCFLAGS: -I%p/lib/system-openssl/include
+SetCXXFLAGS: -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+
ConfigureParams: <<
+ --with-ssl \
--with-cgi \
--with-cgipath=%p/lib/nut-cgi-bin \
--with-gd-includes=-I%p/include \
@@ -31,14 +39,11 @@
CompileScript: <<
./configure %c
- make all usb
+ make
<<
InstallScript: <<
make DESTDIR=%d install
- make DESTDIR=%d install-conf
- make DESTDIR=%d install-cgi
- make DESTDIR=%d install-usb
install -d -m 755 %i/share/doc/%n
cp -pr docs %i/share/doc/%n
install -d -m 775 %i/var/run/ups
@@ -69,16 +74,28 @@
Package: %N-usb
Depends: libusb-shlibs, %N
Files: <<
- lib/nut/newhidups
- lib/nut/tripplite_usb
lib/nut/bcmxcp_usb
- share/man/man8/newhidups.8
- share/man/man8/tripplite_usb.8
+ lib/nut/megatec_usb
+ lib/nut/tripplite_usb
+ lib/nut/usbhid-ups
share/man/man8/bcmxcp_usb.8
+ share/man/man8/megatec_usb.8
+ share/man/man8/tripplite_usb.8
+ share/man/man8/usbhid-ups.8
<<
Description: Network UPS Tools - USB drivers
<<
+SplitOff3: <<
+ Package: %N-snmp
+ Depends: %N
+ Files: <<
+ lib/nut/snmp-ups
+ share/man/man8/snmp-ups.8
+ <<
+ Description: Network UPS Tools - SNMP driver
+<<
+
Description: Network UPS Tools - core
DescDetail: <<
NUT is a client/server uninterruptible power supply (UPS) monitoring system
@@ -109,14 +126,8 @@
may have trouble interoperating.
<<
-DescPort:<<
-I looked at making this work with net-snmp, but currently (July 2006) the
-net-snmp in unstable does not compile, and there is no virtual package for the
-Tiger net-snmp.
-<<
-
DescPackaging:<<
-$LastChangedRevision: 365 $ in my local repository.
+$LastChangedRevision: 371 $ in my local repository.
<<
License: GPL
Index: opennms.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/opennms.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- opennms.patch 19 Jun 2007 21:17:50 -0000 1.1.2.2
+++ opennms.patch 15 Jul 2007 15:10:40 -0000 1.1.2.3
@@ -6,28 +6,27 @@
+ <interactiveMode>false</interactiveMode>
+ <offline>true</offline>
+</settings>
----
opennms-1.3.3-1/source/opennms-daemon/src/main/filtered/etc/snmp-graph.properties
(revision 6506)
-+++
opennms-1.3.3-1/source/opennms-daemon/src/main/filtered/etc/snmp-graph.properties
(revision 6507)
-@@ -235,6 +235,10 @@
- CDEF:bitsIn=octIn,8,* \
- CDEF:bitsOut=octOut,8,* \
- CDEF:bitsOutNeg=0,bitsOut,- \
-+ CDEF:outSum=bitsOut,{diffTime},* \
-+ CDEF:inSum=bitsIn,{diffTime},* \
-+ CDEF:totBits=octIn,octOut,+,8,* \
-+ CDEF:totSum=totBits,{diffTime},* \
- AREA:bitsIn#00ff00:"In " \
- GPRINT:bitsIn:AVERAGE:"Avg \\: %8.2lf %s" \
- GPRINT:bitsIn:MIN:"Min \\: %8.2lf %s" \
-@@ -242,7 +246,10 @@
- AREA:bitsOutNeg#0000ff:"Out" \
- GPRINT:bitsOut:AVERAGE:"Avg \\: %8.2lf %s" \
- GPRINT:bitsOut:MIN:"Min \\: %8.2lf %s" \
-- GPRINT:bitsOut:MAX:"Max \\: %8.2lf %s\\n"
-+ GPRINT:bitsOut:MAX:"Max \\: %8.2lf %s\\n" \
-+ GPRINT:inSum:AVERAGE:" Tot In \\: %8.2lf %s" \
-+ GPRINT:outSum:AVERAGE:" Tot Out \\: %8.2lf %s" \
-+ GPRINT:totSum:AVERAGE:" Tot \\: %8.2lf %s\\n"
+--- opennms-1.3.5-1/source/tools/packages/fink/README.Darwin
(.../tags/opennms-1.3.5/tools/packages/fink/README.Darwin) (revision 6733)
++++ opennms-1.3.5-1/source/tools/packages/fink/README.Darwin
(.../trunk/tools/packages/fink/README.Darwin) (revision 6733)
+@@ -64,12 +64,17 @@
+ ------------------------------------------------------------------------------
- report.mib2.octets.name=Bytes In/Out
- report.mib2.octets.columns=ifInOctets,ifOutOctets
+ 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
+-finish the installation, run:
++have to start it ("sudo @PREFIX@/bin/pgsql.sh start") and try again.
+
+- sudo @PREFIX@/var/opennms/bin/install -disU
++Then, create an "opennms" database user, like so:
+
+-Note that the "opennms-pgsqlXX" package must match the version of PostgreSQL
++ sudo @PREFIX@/bin/createuser -s -d -r -l -e -U postgres opennms
++
++And finally, to finish the installation, run:
++
++ sudo @PREFIX@/var/opennms/bin/install -disU -u opennms
++
++Note that the "iplike-pgsqlXX" package must match the version of PostgreSQL
+ you have installed through fink, or this will fail!
+
+ ------------------------------------------------------------------------------
Index: mrtg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/mrtg.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mrtg.info 16 Jan 2007 16:03:01 -0000 1.1.2.1
+++ mrtg.info 15 Jul 2007 15:10:40 -0000 1.1.2.2
@@ -1,11 +1,11 @@
Package: mrtg
-Version: 2.10.14
+Version: 2.15.2
Revision: 1
Maintainer: Jeremy Higgs <[EMAIL PROTECTED]>
-Depends: gd-shlibs
-BuildDepends: gd, gd-bin, libpng3
-Source: http://people.ee.ethz.ch/~oetiker/webtools/%n/pub/%n-%v.tar.gz
-Source-MD5: f5c8acfd7cef7a8894ee65e573819cc4
+Depends: gd2-shlibs, libpng3-shlibs
+BuildDepends: gd2, gd2-bin, libpng3
+Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
+Source-MD5: 5827175dd5ee941c2ae894369f0c9071
ConfigureParams: -prefix=%p --mandir='${prefix}/share/man'
--with-gd-lib=%p/lib --with-gd-inc=%p/include
Description: Network interface traffic load monitor
DescDetail: <<
@@ -17,4 +17,4 @@
likely to conflict with other packages.
<<
License: GPL
-Homepage: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/
+Homepage: http://oss.oetiker.ch/mrtg/
Index: opennms.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/opennms.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- opennms.info 19 Jun 2007 21:17:50 -0000 1.1.2.2
+++ opennms.info 15 Jul 2007 15:10:40 -0000 1.1.2.3
@@ -1,14 +1,14 @@
Package: opennms
-Version: 1.3.3
-Revision: 2
+Version: 1.3.5
+Revision: 1
Source: mirror:sourceforge:%n/%n-source-%v-1.tar.gz
-Source-MD5: 5f211f6021afdbf2d69480df5ef9f712
-SourceDirectory: %n-source-%v-1/source
+Source-MD5: a83ec61e0cfa4ee2cfdf2e39543514f3
+SourceDirectory: %n-%v-1/source
Source2: mirror:sourceforge:%n/%n-m2-repository-1.3.2.tar.gz
Source2-MD5: 14fcad02d3e766d77d197745289152c3
-Source3: mirror:sourceforge:%n/%n-m2-repository-1.3.2-to-1.3.3-delta.tar.gz
-Source3-MD5: 29105bfd534c60809f3ab8e40eaabce7
+Source3: mirror:sourceforge:%n/%n-m2-repository-1.3.2-to-1.3.5-delta.tar.gz
+Source3-MD5: 1757ec2f2ac0becac276345a79b6caa5
Distribution: 10.4, 10.5
Recommends: mib2opennms (>= %v-1)
@@ -136,25 +136,6 @@
%p/var/opennms/etc/events/Waverider.3000.events.xml
%p/var/opennms/etc/events/Xerox-V2.events.xml
%p/var/opennms/etc/events/Xerox.events.xml
- %p/var/opennms/etc/examples/capsd-configuration.xml
- %p/var/opennms/etc/examples/collectd-configuration.xml
- %p/var/opennms/etc/examples/destinationPaths.xml
- %p/var/opennms/etc/examples/groups.xml
- %p/var/opennms/etc/examples/javamail-configuration.properties
- %p/var/opennms/etc/examples/monitoring-locations.xml
- %p/var/opennms/etc/examples/notifications.xml
- %p/var/opennms/etc/examples/nsclient-config.xml
- %p/var/opennms/etc/examples/opennms-server.xml
- %p/var/opennms/etc/examples/poll-outages.xml
- %p/var/opennms/etc/examples/poller-configuration.xml
- %p/var/opennms/etc/examples/scriptd-configuration.xml
- %p/var/opennms/etc/examples/snmp-config.xml
- %p/var/opennms/etc/examples/store-by-group-snmp-graph.properties
- %p/var/opennms/etc/examples/surveillance-views.xml
- %p/var/opennms/etc/examples/threshd-configuration.xml
- %p/var/opennms/etc/examples/thresholds.xml
- %p/var/opennms/etc/examples/viewsdisplay.xml
- %p/var/opennms/etc/examples/web-app-config.xml
%p/var/opennms/etc/exclude-ueis.properties
%p/var/opennms/etc/getManagedOutageForIntfInWindow.sql
%p/var/opennms/etc/getManagedOutageForNodeInWindow.sql
--- NEW FILE: net-snmp-unified.info ---
Package: net-snmp-unified
Version: 5.4
Revision: 1
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: <<
daemonic,
%N15-shlibs (>= %v-%r)
<<
BuildDepends: <<
fink (>= 0.24.12-1),
gawk,
expat1,
system-perl
<<
Conflicts: net-snmp (<< 5.4-1), net-snmp-ssl (<< 5.4-1), ucd-snmp (<< 5.4-1)
Replaces: net-snmp (<< 5.4-1), net-snmp-ssl (<< 5.4-1), ucd-snmp (<< 5.4-1)
Source: mirror:sourceforge:net-snmp/net-snmp-%v.tar.gz
Source-MD5: 46d893281056ff476e597659cb91574d
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: <<
--with-install-prefix='%d' \
--enable-ipv6 \
--with-out-mib-modules=mibII/ipv6 \
--mandir='${prefix}/share/man' \
--with-logfile=%p/var/log/snmpd.log \
--with-persistent-directory=%p/var/%N \
--with-default-snmp-version="3" \
--enable-shared \
--with-openssl=%p/lib/system-openssl \
--with-mibdirs='$HOME/.snmp/mibs:%p/share/snmp/mibs:/usr/share/snmp/mibs' \
--with-sys-contact='[EMAIL PROTECTED]' \
--with-sys-location=Unknown \
--without-kmem-usage \
--without-python-modules \
--with-perl-modules='PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5
INSTALLARCHLIB=%p/lib/perl5/darwin INSTALLSITELIB=%p/lib/perl5
INSTALLSITEARCH=%p/lib/perl5/darwin INSTALLMAN1DIR=%p/share/man/man1
INSTALLMAN3DIR=%p/share/man/man3 INSTALLSITEMAN1DIR=%p/share/man/man1
INSTALLSITEMAN3DIR=%p/share/man/man3 INSTALLBIN=%p/bin INSTALLSITEBIN=%p/bin
INSTALLSCRIPT=%p/bin'
<<
CompileScript: <<
PERLPROG=/usr/bin/perl ./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/var/log
<<
DocFiles: AGENT.txt CHANGES COPYING ChangeLog CodingStyle EXAMPLE.conf.def FAQ
NEWS PORTING README* TODO
Splitoff: <<
Package: %N15-shlibs
Files: lib/libnetsnmp*.15*.dylib
Shlibs: <<
%p/lib/libnetsnmp.15.dylib 16.0.0
net-snmp-unified15-shlibs (>= 5.4-1)
%p/lib/libnetsnmpagent.15.dylib 16.0.0
net-snmp-unified15-shlibs (>= 5.4-1)
%p/lib/libnetsnmphelpers.15.dylib 16.0.0
net-snmp-unified15-shlibs (>= 5.4-1)
%p/lib/libnetsnmpmibs.15.dylib 16.0.0
net-snmp-unified15-shlibs (>= 5.4-1)
%p/lib/libnetsnmptrapd.15.dylib 16.0.0
net-snmp-unified15-shlibs (>= 5.4-1)
<<
DocFiles: COPYING
<<
SplitOff2: <<
Package: %N-dev
Depends: %N (>= %v-%r)
Replaces: net-snmp-dev (<< 5.4-1), net-snmp (<< 5.4-1),
net-snmp-ssl-dev (<< 5.4-1), net-snmp-ssl (<< 5.4-1)
Conflicts: net-snmp-dev (<< 5.4-1), net-snmp-ssl-dev (<< 5.4-1)
Files: include lib/*.a lib/*.dylib bin/net-snmp-config
DocFiles: COPYING
<<
SplitOff3: <<
Package: net-snmp
Description: upgrade package for net-snmp-unified
Depends: <<
%N (>= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
<<
SplitOff4: <<
Package: net-snmp-ssl
Description: upgrade package for net-snmp-unified
Depends: <<
%N (>= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
<<
SplitOff7: <<
Package: net-snmp-dev
Description: upgrade package for net-snmp-unified-dev
Depends: <<
%N-dev (>= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
<<
SplitOff8: <<
Package: net-snmp-ssl-dev
Description: upgrade package for net-snmp-unified-dev
Depends: <<
%N-dev (>= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
daemonic disable %N
fi
<<
PostRmScript: <<
if [ $1 = "remove" ]; then
rm -rf %p/share/snmp
rm -rf %p/var/%n
fi
<<
DaemonicFile: <<
<service>
<description>An SNMP daemon to respond to SNMP request packets.</description>
<message>snmpd</message>
<daemon name="snmpd">
<executable checkexit="true">%p/sbin/snmpd</executable>
</daemon>
</service>
<<
Description: SNMP tools and libraries
DescDetail: <<
The net-snmp package, previously known as ucd-snmp, provides tools
and libraries relating to SNMP. It provides SNMP libraries, tools
to request and set information, an SNMP daemon, among other features.
<<
DescPackaging: <<
Customised install script to put files in correct directories.
Logfile set to PREFIX/var/log/snmpd.log
Persistent directory set to PREFIX/var/net-snmp
Default snmp version set to 3, but can be overridden using the '-v' flag for
the command tools, or alternatively using the 'defVersion' option in the
snmp.conf file.
<<
DescUsage: <<
In order to run net-snmp correctly, the community name needs to be set. The
easiest way to set this is to run the 'snmpconf' program, allowing you to
setup the various net-snmp configuration files.
<<
DescPort: <<
Based on the net-snmp package developed by Justin Hallett and Jeremy Higgs.
<<
License: BSD
Homepage: http://net-snmp.sourceforge.net/
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -d -r1.2.2.5 -r1.2.2.6
--- libcurl4.info 30 Apr 2007 02:48:27 -0000 1.2.2.5
+++ libcurl4.info 15 Jul 2007 15:10:40 -0000 1.2.2.6
@@ -1,6 +1,6 @@
Package: libcurl4
-Version: 7.16.2
-Revision: 1
+Version: 7.16.4
+Revision: 102
Description: Lib. for transferring files with URL syntax
DescPackaging: <<
Now use System's OpenSSL.
@@ -24,7 +24,7 @@
License: OSI-Approved
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
-Source-MD5: 37a1de15c4300ca9413d39d2bcea9b36
+Source-MD5: ffa6d1f4e28ca493a43f9dc17882c4d8
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2
Index: wireshark.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/wireshark.info,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -d -r1.3.2.10 -r1.3.2.11
--- wireshark.info 2 Mar 2007 17:42:14 -0000 1.3.2.10
+++ wireshark.info 15 Jul 2007 15:10:40 -0000 1.3.2.11
@@ -15,7 +15,7 @@
# maintainership of) the affected package.
Package: wireshark
-Version: 0.99.5
+Version: 0.99.6
Revision: 1012
Maintainer: Max Horn <[EMAIL PROTECTED]>
BuildDepends: <<
@@ -51,7 +51,7 @@
Conflicts: wireshark-ssl, ethereal, ethereal-ssl
Replaces: wireshark-ssl, ethereal, ethereal-ssl
Source: mirror:sourceforge:wireshark/wireshark-%v.tar.bz2
-Source-MD5: ff067e0f2a0e0e53362bc6a943ff8622
+Source-MD5: e57a8c8b364c38df3da97e2ee9f0d0bc
Patch: %n.patch
ConfigureParams: <<
--mandir=%p/share/man \
@@ -83,8 +83,6 @@
PATCH: A patch is used to force gnutls and libgcrypt checks to always
fail for the non-SSL variant of this package.
-PATCH: Building idl2wrs is broken in the base package, we fix this.
-
PATCH: Modify PLUGIN_LIBS to ensure that we link against the freshly
built (but not yet installed) version of libwireshark, instead of
linking to a previously installed version of it.
Index: wireshark.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/wireshark.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- wireshark.patch 4 Feb 2007 15:37:19 -0000 1.2.2.1
+++ wireshark.patch 15 Jul 2007 15:10:40 -0000 1.2.2.2
@@ -1,16 +1,16 @@
-diff -ru wireshark-0.99.2/configure wireshark-0.99.2-patched/configure
---- wireshark-0.99.2/configure 2006-07-17 22:01:53.000000000 +0200
-+++ wireshark-0.99.2-patched/configure 2006-08-19 21:30:45.000000000 +0200
-@@ -19953,7 +19953,7 @@
+diff -ru wireshark-0.99.6/configure wireshark-0.99.6-patched/configure
+--- wireshark-0.99.6/configure 2007-07-05 21:26:25.000000000 +0200
++++ wireshark-0.99.6-patched/configure 2007-07-08 19:21:08.000000000 +0200
+@@ -20149,7 +20149,7 @@
LIBS="$ac_save_LIBS"
fi
- if test "x$no_libgnutls" = x ; then
+ if test "x$no_libgnutls" = xXXXX ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
-@@ -20193,7 +20193,7 @@
+@@ -20388,7 +20388,7 @@
fi
fi
fi
@@ -19,7 +19,7 @@
LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-@@ -31509,7 +31509,7 @@
+@@ -33019,7 +33019,7 @@
#
# The plugin dissectors reside in ./plugins/PROTO/
#
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
