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 16:26:43
Branch: HEAD Handle: 2003070815264102
Added files:
openpkg-src/rdist fsl.rdist rc.rdist
Modified files:
openpkg-src/rdist rdist.spec
openpkg-web news.txt
Log:
add fsl support; fix indentation
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/rdist/fsl.rdist
1.1 +24 -0 openpkg-src/rdist/rc.rdist
1.5 +50 -16 openpkg-src/rdist/rdist.spec
1.5449 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/fsl.rdist
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.rdist
--- /dev/null 2003-07-08 16:26:43.000000000 +0200
+++ fsl.rdist 2003-07-08 16:26:43.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.rdist -- OSSP fsl configuration
+##
+
+ident (rdist)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/rdist/rdist.log",
+ append=1, perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rc.rdist
============================================================================
$ cvs diff -u -r0 -r1.1 rc.rdist
--- /dev/null 2003-07-08 16:26:43.000000000 +0200
+++ rc.rdist 2003-07-08 16:26:43.000000000 +0200
@@ -0,0 +1,24 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.rdist -- Run-Commands
+##
+
+%config
+ rdist_enable="yes"
+ rdist_log_prolog="true"
+ rdist_log_epilog="true"
+ rdist_log_numfiles="10"
+ rdist_log_minsize="1M"
+ rdist_log_complevel="9"
+
+%daily -u @l_susr@
+ opServiceEnabled rdist || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${rdist_log_numfiles} -s${rdist_log_minsize} -d \
+ -z${rdist_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${rdist_log_prolog}" \
+ -E "${rdist_log_epilog}" \
+ @l_prefix@/var/rdist/rdist.log
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rdist.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 rdist.spec
--- openpkg-src/rdist/rdist.spec 7 Jul 2003 13:52:45 -0000 1.4
+++ openpkg-src/rdist/rdist.spec 8 Jul 2003 14:26:43 -0000 1.5
@@ -40,16 +40,25 @@
Group: Filesystem
License: BSD
Version: %{V_opkg}
-Release: 20030707
+Release: 20030708
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://www.magnicomp.com/download/rdist/rdist-%{V_base}-%{V_pl}.tar.gz
+Source1: rc.rdist
+Source2: fsl.rdist
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, gcc, bison
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415, make, gcc, bison
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -65,6 +74,8 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags}
@@ -72,23 +83,46 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ $RPM_BUILD_ROOT%{l_prefix}/sbin \
+ $RPM_BUILD_ROOT%{l_prefix}/var/rdist
%{l_shtool} install -c -s -m 755 \
- src/rdist \
- $RPM_BUILD_ROOT%{l_prefix}/bin/
+ src/rdist \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -s -m 755 \
- src/rdistd \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/
+ src/rdistd \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/
+ %{l_shtool} install -c -m 644 \
+ doc/rdist.man \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/rdist.1
%{l_shtool} install -c -m 644 \
- doc/rdist.man \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1/rdist.1
+ doc/rdistd.man \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8/rdistd.8
+
+ # 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.rdist} $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 \
- doc/rdistd.man \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8/rdistd.8
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.rdist} \
+ $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.rdist'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5448 -r1.5449 news.txt
--- openpkg-web/news.txt 8 Jul 2003 14:26:21 -0000 1.5448
+++ openpkg-web/news.txt 8 Jul 2003 14:26:41 -0000 1.5449
@@ -1,3 +1,4 @@
+08-Jul-2003: Upgraded package: P<rdist-7.0.0a10-20030708>
08-Jul-2003: Upgraded package: P<tripwire-2.3.1.2-20030708>
08-Jul-2003: Upgraded package: P<xplanet-0.94-20030708>
08-Jul-2003: Upgraded package: P<xmms-1.2.7-20030708>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
