OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 10-Oct-2003 08:40:00
Branch: HEAD Handle: 2003101007395703
Modified files:
openpkg-re/vcheck vc.sysmon
openpkg-src/sysmon sysmon.spec
openpkg-web news.txt
Log:
upgrade and fix SNMP support
Summary:
Revision Changes Path
1.10 +1 -1 openpkg-re/vcheck/vc.sysmon
1.37 +27 -4 openpkg-src/sysmon/sysmon.spec
1.6952 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.sysmon
============================================================================
$ cvs diff -u -r1.9 -r1.10 vc.sysmon
--- openpkg-re/vcheck/vc.sysmon 18 May 2003 06:53:44 -0000 1.9
+++ openpkg-re/vcheck/vc.sysmon 10 Oct 2003 06:39:57 -0000 1.10
@@ -2,7 +2,7 @@
}
prog sysmon = {
- version = 0.91.19
+ version = 0.91.20
url = ftp://puck.nether.net/pub/jared/
regex = sysmon-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sysmon/sysmon.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 sysmon.spec
--- openpkg-src/sysmon/sysmon.spec 22 Jul 2003 15:01:01 -0000 1.36
+++ openpkg-src/sysmon/sysmon.spec 10 Oct 2003 06:40:00 -0000 1.37
@@ -32,10 +32,11 @@
Distribution: OpenPKG [PLUS]
Group: Network
License: GPL
-Version: 0.91.19
-Release: 20030722
+Version: 0.91.20
+Release: 20031010
# package options
+%option with_snmp no
%option with_fsl yes
# list of sources
@@ -51,6 +52,10 @@
PreReq: OpenPKG, openpkg >= 20030718, MTA
BuildPreReq: ncurses, openssl
PreReq: ncurses, openssl
+%if "%{with_snmp}" == "yes"
+BuildPreReq: snmp
+PreReq: snmp
+%endif
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -67,25 +72,43 @@
%setup -q
%build
- # force pidfile path
+ # fix SNMP support
+%if "%{with_snmp}" == "yes"
+ %{l_shtool} subst \
+ -e 's;<ucd-snmp/ucd-snmp;<net-snmp/net-snmp;g' \
+ -e 's;RECEIVED_MESSAGE;NETSNMP_CALLBACK_OP_RECEIVED_MESSAGE;g' \
+ src/snmp.c
+ %{l_shtool} subst -e 's;-lsnmp;-lnetsnmp;g' configure
+%else
+ %{l_shtool} subst -e 's;test "$USABLE_SNMP" = "yes";false;g' configure
+%endif
+
+ # configure program
%{l_shtool} subst \
-e 's;\(#define PIDFILE\).*;\1 "%{l_prefix}/var/sysmon/sysmond.pid";' \
src/config.h
- # force use of ncurses
echo "ac_cv_lib_curses_refresh=no" >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags ncurses}" \
+ CPPFLAGS="%{l_cppflags ncurses}" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+%if "%{with_snmp}" == "yes"
+ LIBS="%{l_fsl_libs} `%{l_prefix}/bin/net-snmp-config --libs`" \
+%else
LIBS="%{l_fsl_libs}" \
+%endif
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix}
+
+ # build program
%{l_make} %{l_mflags -O} \
CPPFLAGS="%{l_cppflags ncurses}" \
LDFLAGS="%{l_ldflags}"
%install
+ # install program
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/sysmon \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6951 -r1.6952 news.txt
--- openpkg-web/news.txt 10 Oct 2003 06:16:26 -0000 1.6951
+++ openpkg-web/news.txt 10 Oct 2003 06:39:58 -0000 1.6952
@@ -1,3 +1,4 @@
+10-Oct-2003: Upgraded package: P<sysmon-0.91.20-20031010>
10-Oct-2003: Upgraded package: P<ghostscript-esp-7.07.1-20031010>
10-Oct-2003: Upgraded package: P<perl-gtk-20031010-20031010>
10-Oct-2003: Upgraded package: P<uudeview-0.5.19-20031010>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
