OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Sep-2003 19:39:59
Branch: HEAD Handle: 2003091618395701
Modified files:
openpkg-src/spread rc.spread spread.spec
openpkg-web news.txt
Log:
Finish configuration of spread daemon
Summary:
Revision Changes Path
1.2 +3 -2 openpkg-src/spread/rc.spread
1.21 +22 -7 openpkg-src/spread/spread.spec
1.6585 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spread/rc.spread
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.spread
--- openpkg-src/spread/rc.spread 10 Sep 2003 15:07:42 -0000 1.1
+++ openpkg-src/spread/rc.spread 16 Sep 2003 17:39:58 -0000 1.2
@@ -29,7 +29,8 @@
%start -u @l_susr@
rcService spread enable yes || exit 0
rcService spread active yes && exit 0
- @l_prefix@/sbin/spread
+ @l_prefix@/sbin/spread &
+ echo $! >$spread_pidfile
%stop -u @l_susr@
rcService spread enable yes || exit 0
@@ -50,7 +51,7 @@
# rotate logfile
shtool rotate -f \
-n ${spread_log_numfiles} -s ${spread_log_minsize} -d \
- -z ${spread_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -z ${spread_log_complevel} -o @l_rusr@ -g @l_mgrp@ -m 644 \
-P "${spread_log_prolog}" \
-E "${spread_log_epilog} && rc spread restart" \
@l_prefix@/var/spread/spread.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spread/spread.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 spread.spec
--- openpkg-src/spread/spread.spec 10 Sep 2003 15:07:42 -0000 1.20
+++ openpkg-src/spread/spread.spec 16 Sep 2003 17:39:58 -0000 1.21
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 3.17.1
-Release: 20030910
+Release: 20030916
# package options
%option with_perl no
@@ -45,7 +45,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl, gcc, flex, bison
+BuildPreReq: OpenPKG, openpkg >= 20020206, perl, gcc, flex, bison, sed
PreReq: OpenPKG, openpkg >= 20020206
AutoReq: no
AutoReqProv: no
@@ -59,11 +59,20 @@
%prep
%setup -q -n spread-src-%{version}
+ %{l_shtool} subst \
+ -e "s;.*\(DaemonUser\).*;\1 = %{l_rusr};" \
+ -e "s;.*\(DaemonGroup\).*;\1 = %{l_mgrp};" \
+ -e "s;.*\(RuntimeDir\).*;\1 = %{l_prefix}/var/spread;" \
+ -e "s;^[ \t]*localhost[ \t]*127.0.0.1;\t`%{l_shtool} echo -e %h%d`;" \
+ sample.spread.conf
+ %{l_shtool} subst \
+ -e "s;/etc\(/spread.access_ip\);%{l_prefix}/etc/spread\1;g" \
+ auth-ip.c
%build
- %{l_shtool} subst -e 's;if test ! -d \$piddir;if false;' configure
+ %{l_shtool} subst -e "s;if test ! -d \$piddir;if false;" configure
%{l_shtool} subst \
- -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+ -e "s;/usr/bin/perl;%{l_prefix}/bin/perl;g" \
buildtools/fixpaths \
buildtools/mdoc2man.pl
CC="%{l_cc}" \
@@ -86,10 +95,15 @@
%{l_prefix}/bin/perl-openpkg epilog
) || exit $?
%endif
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/spread
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so* >/dev/null 2>&1 || true
+ # install the IP address acl
+ %{l_shtool} install -c -m 644 \
+ sample.spread.access_ip \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/spread/spread.access_ip
+
# install the run command file
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ -100,8 +114,9 @@
eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib
-V:installsitearch -V:installsitelib`
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%not %dir %{l_prefix}/lib/perl' \
- '%not %dir %{l_prefix}/lib/perl/*' \
+ "%config %attr(644) %{l_prefix}/etc/spread/*" \
+ "%not %dir %{l_prefix}/lib/perl" \
+ "%not %dir %{l_prefix}/lib/perl/*" \
"%not %dir $installarchlib" \
"%not %dir $installprivlib" \
"%not %dir $installsitearch" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6584 -r1.6585 news.txt
--- openpkg-web/news.txt 16 Sep 2003 16:26:27 -0000 1.6584
+++ openpkg-web/news.txt 16 Sep 2003 17:39:57 -0000 1.6585
@@ -1,3 +1,4 @@
+16-Sep-2003: Upgraded package: P<spread-3.17.1-20030916>
16-Sep-2003: Upgraded package: P<kerberos-1.3.1-20030916>
16-Sep-2003: Upgraded package: P<openpkg-20030916-20030916>
16-Sep-2003: Upgraded package: P<xmame-0.74.1-20030916>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
