OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Jul-2003 14:00:49
Branch: HEAD Handle: 2003070813004701
Added files:
openpkg-src/cfengine fsl.cfengine rc.cfengine
Modified files:
openpkg-src/cfengine cfengine.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.22 +39 -5 openpkg-src/cfengine/cfengine.spec
1.1 +16 -0 openpkg-src/cfengine/fsl.cfengine
1.1 +24 -0 openpkg-src/cfengine/rc.cfengine
1.5439 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/cfengine.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 cfengine.spec
--- openpkg-src/cfengine/cfengine.spec 6 Jul 2003 10:17:51 -0000 1.21
+++ openpkg-src/cfengine/cfengine.spec 8 Jul 2003 12:00:48 -0000 1.22
@@ -33,16 +33,25 @@
Group: System
License: GPL
Version: 2.0.7
-Release: 20030706
+Release: 20030708
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-%{version}.tar.gz
+Source1: rc.cfengine
+Source2: fsl.cfengine
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, db, openssl, bison, flex
-PreReq: OpenPKG, openpkg >= 20020206, db, openssl
+BuildPreReq: OpenPKG, openpkg >= 20030415, db, openssl, bison, flex
+PreReq: OpenPKG, openpkg >= 20030415, db, openssl
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -63,7 +72,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--with-berkeleydb=%{l_prefix} \
@@ -73,11 +83,35 @@
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/cfengine
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+ # install run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_susr@;%{l_susr};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{SOURCE rc.cfengine} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.cfengine} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.cfengine'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/fsl.cfengine
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.cfengine
--- /dev/null 2003-07-08 14:00:49.000000000 +0200
+++ fsl.cfengine 2003-07-08 14:00:49.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.cfengine -- OSSP fsl configuration
+##
+
+ident (cfagent|cfenvd|cfexecd|cfkey|cfrun|cfservd)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/cfengine/cfengine.log",
+ append=1, perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/rc.cfengine
============================================================================
$ cvs diff -u -r0 -r1.1 rc.cfengine
--- /dev/null 2003-07-08 14:00:49.000000000 +0200
+++ rc.cfengine 2003-07-08 14:00:49.000000000 +0200
@@ -0,0 +1,24 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.cfengine -- Run-Commands
+##
+
+%config
+ cfengine_enable="yes"
+ cfengine_log_prolog="true"
+ cfengine_log_epilog="true"
+ cfengine_log_numfiles="10"
+ cfengine_log_minsize="1M"
+ cfengine_log_complevel="9"
+
+%daily -u @l_susr@
+ opServiceEnabled cfengine || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${cfengine_log_numfiles} -s${cfengine_log_minsize} -d \
+ -z${cfengine_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${cfengine_log_prolog}" \
+ -E "${cfengine_log_epilog}" \
+ @l_prefix@/var/cfengine/cfengine.log
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5438 -r1.5439 news.txt
--- openpkg-web/news.txt 8 Jul 2003 11:48:21 -0000 1.5438
+++ openpkg-web/news.txt 8 Jul 2003 12:00:47 -0000 1.5439
@@ -1,3 +1,4 @@
+08-Jul-2003: Upgraded package: P<cfengine-2.0.7-20030708>
08-Jul-2003: Upgraded package: P<gnuplot-3.7.3-20030708>
08-Jul-2003: New package: P<kcd-7.0.0-20030708>
08-Jul-2003: Upgraded package: P<ghostscript-8.10-20030708>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
