OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Jul-2003 11:09:31
Branch: HEAD Handle: 2003071810092901
Modified files:
openpkg-src/inn inn.spec rc.inn
openpkg-web news.txt
Log:
fix running as restricted user, add %status section
Summary:
Revision Changes Path
1.74 +45 -16 openpkg-src/inn/inn.spec
1.15 +8 -0 openpkg-src/inn/rc.inn
1.5633 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.spec
============================================================================
$ cvs diff -u -r1.73 -r1.74 inn.spec
--- openpkg-src/inn/inn.spec 17 Jul 2003 15:32:44 -0000 1.73
+++ openpkg-src/inn/inn.spec 18 Jul 2003 09:09:30 -0000 1.74
@@ -33,7 +33,7 @@
Group: News
License: ISC
Version: 2.4.0
-Release: 20030717
+Release: 20030718
# package options
%option with_fsl yes
@@ -98,9 +98,9 @@
--with-tmp-dir=%{l_prefix}/var/inn/tmp \
--with-openssl=%{l_prefix} \
--with-berkeleydb=%{l_prefix} \
- --with-news-user=%{l_musr} \
- --with-news-group=%{l_musr} \
- --with-news-master=%{l_musr} \
+ --with-news-user=%{l_rusr} \
+ --with-news-group=%{l_rgrp} \
+ --with-news-master=%{l_rusr} \
--with-sendmail=%{l_prefix}/sbin/sendmail \
--enable-uucp-rnews \
--with-perl
@@ -135,7 +135,7 @@
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
for bin in controlbatch controlchan news2mail startinnfeed overchan \
archive innmail innconfval ctlinnd inews rnews nntpsend; do
- ln $RPM_BUILD_ROOT%{l_prefix}/libexec/inn/$bin \
+ ln -s %{l_prefix}/libexec/inn/$bin \
$RPM_BUILD_ROOT%{l_prefix}/bin/$bin
done
@@ -163,12 +163,7 @@
) >>$RPM_BUILD_ROOT%{l_prefix}/etc/inn/storage.conf
# create initial history database
- ( cd $RPM_BUILD_ROOT%{l_prefix}/var/inn/db
- touch history
- INNCONF=$RPM_BUILD_ROOT%{l_prefix}/etc/inn/inn.conf \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/inn/makedbz -i -f ./history
- chmod 644 history*
- )
+ touch $RPM_BUILD_ROOT%{l_prefix}/var/inn/db/history
# adjust permissions
chmod 664 $RPM_BUILD_ROOT%{l_prefix}/var/inn/db/active
@@ -200,12 +195,40 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
- '%config %{l_prefix}/etc/fsl/fsl.inn' \
- '%config %{l_prefix}/etc/inn/*' \
- '%attr(4550,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/rnews' \
- '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/inn/inndstart' \
- '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/inn/startinnfeed' \
+ '%config %attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/fsl/fsl.inn' \
+ '%config %attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/inn/*' \
+ '%attr(6550,%{l_rusr},%{l_rgrp}) %{l_prefix}/libexec/inn/rnews' \
+ '%attr(6750,%{l_susr},%{l_rgrp}) %{l_prefix}/libexec/inn/inndstart' \
+ '%attr(6750,%{l_susr},%{l_rgrp}) %{l_prefix}/libexec/inn/startinnfeed' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/cnfsheadconf' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/ctlinnd' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/expire' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/expireover' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/expirerm' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/imapfeed' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/inews' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/inncheck' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/innd' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/innfeed' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/innreport' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/innstat' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/innupgrade' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/innwatch' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/makedbz' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/makehistory' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/mod-active' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/news.daily' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/ovdb_*' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/overchan' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/procbatch' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/prunehistory' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/rc.news' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/scanlogs' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/tally.control' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/tdx-util' \
+ '%attr(750,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/inn/writelog' \
'%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/inn/db' \
+ '%attr(664,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/inn/db/*' \
'%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/inn/log' \
'%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/inn/run' \
'%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/inn/spool' \
@@ -216,4 +239,10 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ if [ $1 -eq 1 ]; then
+ # create history db as restricted user
+ su - %{l_rusr} -c "%{l_prefix}/libexec/inn/makedbz -i -o"
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/rc.inn
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.inn
--- openpkg-src/inn/rc.inn 17 Jul 2003 21:34:43 -0000 1.14
+++ openpkg-src/inn/rc.inn 18 Jul 2003 09:09:30 -0000 1.15
@@ -7,6 +7,14 @@
inn_enable="$openpkg_rc_def"
inn_nntpsend_enable="$openpkg_rc_def"
+%status -p 200 -u @l_rusr@ -o
+ inn_usable="unknown"
+ inn_active="no"
+ @l_prefix@/bin/ctlinnd mode 2>/dev/null && inn_active="yes"
+ echo "inn_enable=\"$inn_enable\""
+ echo "inn_usable=\"$inn_usable\""
+ echo "inn_active=\"$inn_active\""
+
%start -p 200 -u @l_rusr@
opService inn enable yes || exit 0
@l_prefix@/libexec/inn/rc.news
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5632 -r1.5633 news.txt
--- openpkg-web/news.txt 18 Jul 2003 07:56:44 -0000 1.5632
+++ openpkg-web/news.txt 18 Jul 2003 09:09:29 -0000 1.5633
@@ -1,3 +1,4 @@
+18-Jul-2003: Upgraded package: P<inn-2.4.0-20030718>
18-Jul-2003: Upgraded package: P<lesstif-0.93.46-20030718>
18-Jul-2003: Upgraded package: P<rt-3.0.4-20030718>
18-Jul-2003: Upgraded package: P<perl-sys-20030718-20030718>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
