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 Date: 28-Mar-2003 11:48:54
Branch: HEAD Handle: 2003032810485102
Modified files:
openpkg-src/bs bs.spec bsapache.conf bsapachectl rc.bs
openpkg-web news.txt
Removed files:
openpkg-src/bs rc.rt
Log:
major cleanups to this new package, but it still needs more work, I
think
Summary:
Revision Changes Path
1.3 +58 -101 openpkg-src/bs/bs.spec
1.4 +4 -4 openpkg-src/bs/bsapache.conf
1.3 +0 -1 openpkg-src/bs/bsapachectl
1.3 +22 -26 openpkg-src/bs/rc.bs
1.2 +0 -59 openpkg-src/bs/rc.rt
1.3853 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bs/bs.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 bs.spec
--- openpkg-src/bs/bs.spec 26 Mar 2003 15:38:37 -0000 1.2
+++ openpkg-src/bs/bs.spec 28 Mar 2003 10:48:53 -0000 1.3
@@ -23,10 +23,9 @@
## SUCH DAMAGE.
##
-# pakckage version
-
-%define V_version 0.97
-%define V_patch p2
+# package version
+%define V_major 0.97
+%define V_patch p2
# package information
Name: bs
@@ -34,14 +33,14 @@
URL: http://bigsister.graeff.com/
Vendor: Thomas Aeby
Packager: The OpenPKG Project
-Distribution: OpenPKG [EVAL]
+Distribution: OpenPKG [JUNK]
Group: Network
-License: GNU
-Version: %{V_version}%{V_patch}
-Release: 20030226
+License: GNU
+Version: %{V_major}%{V_patch}
+Release: 20030328
# list of sources
-Source0:
http://easynews.dl.sorceforge.net/sourceforge/bigsister/big-sister-%{version}.tar.gz
+Source0:
http://osdn.dl.sorceforge.net/sourceforge/bigsister/big-sister-%{version}.tar.gz
Source1: rc.bs
Source2: bsapache.conf
Source3: bsapachectl
@@ -50,117 +49,75 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, perl
-PreReq: OpenPKG, openpkg >= 20020206, perl
+PreReq: OpenPKG, openpkg >= 20020206, perl, apache
AutoReq: no
AutoReqProv: no
%description
- Big Sister is a clone of Sean MacGuire's Big Brother. Its primary functions are:
- * monitor networked systems
- * provide a simple view of the current network status
- * generate alarms on status changes
- * generate a history of status changes
- * interoperate with other Big Sister or Big Brother instances or
- foreign network monitors (such as HP Openview)
+ Big Sister is a clone of Sean MacGuire's Big Brother. Its primary
+ functions are: monitor networked systems; provide a simple view
+ of the current network status; generate alarms on status changes;
+ generate a history of status changes; interoperate with other Big
+ Sister instances or foreign network monitors.
%prep
- %setup -q -n bs-%{V_version}
-
- %{l_shtool} subst \
- -e '33s# *-I\([^ |]*\)#\\nuse lib q{\1};#g' \
- Makefile
-
- %{l_shtool} subst \
- -e 's;chmod;true;' \
- -e 's;chown;true;' \
- install.sh
-
- %{l_shtool} subst \
- -e 's;main::root/adm/;main::root/var/;' \
- common.pm
+ %setup -q -n bs-%{V_major}
%build
%install
rm -rf $RPM_BUILD_ROOT
+ # patch sources
+ %{l_shtool} subst \
+ -e '33s# *-I\([^ |]*\)#\\nuse lib q{\1};#g' \
+ Makefile
+ %{l_shtool} subst \
+ -e 's;chmod;true;' \
+ -e 's;chown;true;' \
+ install.sh
+ %{l_shtool} subst \
+ -e 's;main::root/adm/;main::root/var/;' \
+ common.pm
+
+ # create installation hierarchie
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/bs/cgi \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/var/bs \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/alt_contentsicons \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/bigbro13 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/bsdoc \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/default \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/frames \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/static_lamps \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/structured_bg \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/title_in_table \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/twocolumn \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/webadmin \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/white_bg
-
- %{l_shtool} install -c -m 755 \
- skins/alt_contentsicons/*
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/alt_contentsicons
-
- %{l_shtool} install -c -m 755 \
- skins/bigbro13/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/bigbro13
-
- %{l_shtool} install -c -m 755 \
- skins/bsdoc/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/bsdoc
-
- %{l_shtool} install -c -m 755 \
- skins/default/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/default
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins
- %{l_shtool} install -c -m 755 \
- skins/frames/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/frames
+ # install skins manually
+ (cd skins && tar cf - *) |\
+ (cd $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins && tar xf -)
+ find $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins -type d -exec chmod 755 {}
\;
+ find $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins -type f -exec chmod 644 {}
\;
- %{l_shtool} install -c -m 755 \
- skins/static_lamps/*
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/static_lamps
-
- %{l_shtool} install -c -m 755 \
- skins/structured_bg/*
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/structured_bg
-
- %{l_shtool} install -c -m 755 \
- skins/title_in_table/*
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/title_in_table
-
- %{l_shtool} install -c -m 755 \
- skins/twocolumn/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/twocolumn
-
- %{l_shtool} install -c -m 755 \
- skins/webadmin/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/webadmin
-
- %{l_shtool} install -c -m 755 \
- skins/white_bg/* $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/www/skins/white_bg
-
- make install \
+ # perform standard installation procedure
+ %{l_make} %{l_mflags} install \
DEST=$RPM_BUILD_ROOT%{l_prefix}/libexec/bs \
- PERL=%{l_prefix}/bin/perl \
- CGIPATH=/bs-cgi \
+ PERL=%{l_prefix}/bin/perl \
+ CGIPATH=/bs-cgi \
WEBROOT=%{prefix}/share/bs \
- EXEC=%{l_prefix}/libexec/bs
+ EXEC=%{l_prefix}/libexec/bs \
+ USER=%{l_rusr}
- # move var to var
- rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/var
- ln -s \
- %{l_prefix}/var/bs \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/var
-
- # we are not on win 32. remove eventlog
- rm $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/uxmon/Config/eventlog
- rm $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/uxmon/Config/logfile
+ # move var to var
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/var
+ ln -s %{l_prefix}/var/bs $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/var
+
+ # we are not on win32, so remove eventlog
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/uxmon/Config/eventlog
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/bs/uxmon/Config/logfile
- # install rc file
+ # install rc file
%{l_shtool} install -c -m 755 \
- -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_rusr@;%{l_rusr};g' \
- -e 's;@l_bsdir@;%{l_prefix}/libexec/bs;g' \
- %{SOURCE rc.bs} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-
- # install apache environment
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_bsdir@;%{l_prefix}/libexec/bs;g' \
+ %{SOURCE rc.bs} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # apachectl wrapper
+ # install apachectl wrapper
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/tools
%{l_shtool} install -c -m 755 \
@@ -168,7 +125,7 @@
%{SOURCE bsapachectl} \
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/tools/
- # apache config
+ # install apache config
l_hostname=`%{l_shtool} echo -e %h`
l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
%{l_shtool} install -c -m 755 \
@@ -180,17 +137,17 @@
%{SOURCE bsapache.conf} \
$RPM_BUILD_ROOT%{l_prefix}/libexec/bs/etc
- # apache data
+ # install apache data
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/bs/run
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/bs/log
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%attr(0755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bs'
-
-%files -f files
+ '%attr(0755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bs'
+%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bs/bsapache.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 bsapache.conf
--- openpkg-src/bs/bsapache.conf 27 Mar 2003 08:25:50 -0000 1.3
+++ openpkg-src/bs/bsapache.conf 28 Mar 2003 10:48:53 -0000 1.4
@@ -1,6 +1,5 @@
##
-## bsapache.conf -- big sister Apache Custom Configuration
-## _______________________________________________________
+## bsapache.conf -- Big Sister Apache Custom Configuration
##
ServerType standalone
@@ -13,8 +12,8 @@
Port 8381
# runtime files
-PidFile @l_prefix@/var/bs/run/apache.pid
-ScoreBoardFile @l_prefix@/var/bs/run/apache.sb
+PidFile @l_prefix@/var/bs/run/apache.pid
+ScoreBoardFile @l_prefix@/var/bs/run/apache.sb
# server behaviour
Timeout 300
@@ -65,3 +64,4 @@
Allow from all
</Directory>
</IfModule>
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bs/bsapachectl
============================================================================
$ cvs diff -u -r1.2 -r1.3 bsapachectl
--- openpkg-src/bs/bsapachectl 26 Mar 2003 15:38:37 -0000 1.2
+++ openpkg-src/bs/bsapachectl 28 Mar 2003 10:48:53 -0000 1.3
@@ -1,5 +1,4 @@
#!/bin/sh
-
sed \
-e "s;^\(PIDFILE=\).*;[EMAIL PROTECTED]@/var/bs/run/apache.pid;" \
-e "s;^\(HTTPD=\)\(.*\);\1\"\2 -f @l_prefix@/libexec/bs/etc/bsapache.conf\";" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bs/rc.bs
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.bs
--- openpkg-src/bs/rc.bs 26 Mar 2003 15:38:37 -0000 1.2
+++ openpkg-src/bs/rc.bs 28 Mar 2003 10:48:53 -0000 1.3
@@ -1,37 +1,36 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
##
-## rc.bs -- Run-Commands for bs
+## rc.bs -- Run-Commands for Big Sister
##
%config
bs_enable="yes"
- [EMAIL PROTECTED]@/libexec/bs/tools/bsapachectl
+ bs_apachectl="@l_prefix@/libexec/bs/tools/bsapachectl"
%start -p 200 -u @l_rusr@
opServiceEnabled bs || exit 0
if [ -f @l_bsdir@/bin/bsmon -a -f @l_bsdir@/etc/bsmon.cfg ]; then
- @l_prefix@/bin/perl @l_bsdir@/bin/bsmon -f @l_bsdir@/etc/bsmon.cfg
-
+ @l_prefix@/bin/perl @l_bsdir@/bin/bsmon -f @l_bsdir@/etc/bsmon.cfg
fi
if [ -f @l_bsdir@/bin/bbd -a -f @l_bsdir@/adm/bb-display.cfg ]; then
- @l_prefix@/bin/perl @l_bsdir@/bin/bbd -b @l_bsdir@
+ @l_prefix@/bin/perl @l_bsdir@/bin/bbd -b @l_bsdir@
fi
for f in @l_bsdir@/adm/uxmon-net*; do
- set `basename $f`
- case $1 in
- *bak|*%)
- continue
- ;;
- *)
- @l_prefix@/bin/perl @l_bsdir@/uxmon/uxmon -r
@l_bsdir@/uxmon/uxmon-rules.pl -b @l_bsdir@ -c $1
- ;;
+ set `basename $f`
+ case $1 in
+ *bak | *% )
+ continue
+ ;;
+ *)
+ @l_prefix@/bin/perl @l_bsdir@/uxmon/uxmon -r
@l_bsdir@/uxmon/uxmon-rules.pl -b @l_bsdir@ -c $1
+ ;;
esac
done
((ps ax 2>/dev/null) || \
(ps -e -o pid,comm,args 2>/dev/null) || \
(ps -e 2>/dev/null)) \
- |grep "bsmon"|grep -v "PID"|grep "perl"|awk '{printf("%d ",$1)}' \
- > @l_prefix@/var/bs/bs.pid
+ | grep "bsmon"|grep -v "PID"|grep "perl"|awk '{printf("%d ",$1)}' \
+ >@l_prefix@/var/bs/bs.pid
${bs_apachectl} start
%stop -p 200 -u @l_rusr@
@@ -53,7 +52,6 @@
rm @l_prefix@/var/bs/run/apache.pid
fi
-
%restart -u @l_rusr@
opServiceEnabled bs || exit 0
if [ -f @l_prefix@/var/bs/bs.pid ]; then
@@ -71,9 +69,8 @@
rm @l_prefix@/var/bs/uxmon.pid
sleep 2
fi
- [ -f @l_bsdir@/bin/bsmon -a -f @l_bsdir@/etc/bsmon.cfg ]; then
+ if [ -f @l_bsdir@/bin/bsmon -a -f @l_bsdir@/etc/bsmon.cfg ]; then
@l_prefix@/bin/perl @l_bsdir@/bin/bsmon -f @l_bsdir@/etc/bsmon.cfg
-
fi
${bs_apachectl} stop
if [ -f @l_bsdir@/bin/bbd -a -f @l_bsdir@/adm/bb-display.cfg ]; then
@@ -82,17 +79,16 @@
for f in @l_bsdir@/adm/uxmon-net*; do
set `basename $f`
case $1 in
- *bak|*%)
- continue
- ;;
- *)
- @l_prefix@/bin/perl @l_bsdir@/uxmon/uxmon -r
@l_bsdir@/uxmon/uxmon-rules.pl -b @l_bsdir@ -c $1
- ;;
+ *bak | *%)
+ continue
+ ;;
+ *)
+ @l_prefix@/bin/perl @l_bsdir@/uxmon/uxmon -r
@l_bsdir@/uxmon/uxmon-rules.pl -b @l_bsdir@ -c $1
+ ;;
esac
done
- fi
ps ax 2>/dev/null| grep -w "bs" 2>/dev/null|grep -v "PID"| grep "perl" | awk
'{printf("%d ",$1)}' \
- > @l_prefix@/var/bs/bs.pid
+ >@l_prefix@/var/bs/bs.pid
${bs_apachectl} start
%reload -u @l_rusr@
@@ .
rm -f openpkg-src/bs/rc.rt <<'@@ .'
Index: openpkg-src/bs/rc.rt
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3852 -r1.3853 news.txt
--- openpkg-web/news.txt 28 Mar 2003 10:33:48 -0000 1.3852
+++ openpkg-web/news.txt 28 Mar 2003 10:48:51 -0000 1.3853
@@ -1,3 +1,4 @@
+28-Mar-2003: Upgraded package: P<bs-0.97p2-20030328>
28-Mar-2003: Upgraded package: P<gtk2-2.2.1-20030328>
28-Mar-2003: Upgraded package: P<imlib-1.9.14-20030328>
28-Mar-2003: Upgraded package: P<linc-1.1.0-20030328>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
