OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Sep-2003 18:24:37
Branch: HEAD Handle: 2003092317243600
Modified files:
openpkg-src/monit monit.spec monitrc
Log:
fixed build of Solaris 2.6; use shtool install; fixed default config
Summary:
Revision Changes Path
1.24 +13 -3 openpkg-src/monit/monit.spec
1.3 +2 -2 openpkg-src/monit/monitrc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 monit.spec
--- openpkg-src/monit/monit.spec 23 Sep 2003 10:13:46 -0000 1.23
+++ openpkg-src/monit/monit.spec 23 Sep 2003 16:24:36 -0000 1.24
@@ -77,11 +77,19 @@
configure
%build
+ cppflags=""
+ libs=""
+ case "%{l_platform -t}" in
+ *-sunos5.6 )
+ cppflags="-Dsocklen_t=int"
+ libs="-lkstat"
+ ;;
+ esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
+ CPPFLAGS="%{l_cppflags} $cppflags" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
- LIBS="%{l_fsl_libs}" \
+ LIBS="%{l_fsl_libs} $libs" \
piddir="%{l_prefix}/var/monit" \
./configure \
--prefix=%{l_prefix} \
@@ -94,7 +102,9 @@
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ %{l_make} %{l_mflags} install \
+ DESTDIR="$RPM_BUILD_ROOT" \
+ INSTALL="%{l_shtool} install -c"
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monitrc
============================================================================
$ cvs diff -u -r1.2 -r1.3 monitrc
--- openpkg-src/monit/monitrc 8 May 2003 08:34:08 -0000 1.2
+++ openpkg-src/monit/monitrc 23 Sep 2003 16:24:36 -0000 1.3
@@ -23,7 +23,7 @@
#check mysql4 with pidfile @l_prefix@/var/mysql4/mysqld.pid
# start program = "@l_prefix@/etc/rc.d/rc.mysql4 start"
# stop program = "@l_prefix@/etc/rc.d/rc.mysql4 stop"
-# host 127.0.0.1 port 3306
-# timeout(5, 5)
+# if failed host 127.0.0.1 port 3306 type TCP then restart
+# if 5 restarts within 5 cycles then timeout
# alert [EMAIL PROTECTED]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
