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: 02-Sep-2003 19:51:46
Branch: HEAD Handle: 2003090218514402
Modified files:
openpkg-src/pks pks.spec rc.pks
openpkg-web news.txt
Log:
Fix logging and implement features in ticket #202
Summary:
Revision Changes Path
1.24 +36 -24 openpkg-src/pks/pks.spec
1.17 +6 -3 openpkg-src/pks/rc.pks
1.6373 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 pks.spec
--- openpkg-src/pks/pks.spec 23 Jul 2003 10:09:32 -0000 1.23
+++ openpkg-src/pks/pks.spec 2 Sep 2003 17:51:46 -0000 1.24
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 0.9.6
-Release: 20030723
+Release: 20030902
# package options
%option with_fsl yes
@@ -72,15 +72,15 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/pks \
--localstatedir=%{l_prefix}/var/pks \
--datadir=%{l_prefix}/share/pks
- %{l_make} %{l_mflags} \
- LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
+ %{l_make} %{l_mflags}
# build suid wrapper for pks-mail
%{l_cc} %{l_cflags} %{l_ldflags} '-DL_PREFIX="%{l_prefix}"' \
@@ -151,6 +151,13 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} pks status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} pks stop 2>/dev/null
+ exit 0
+
%post
if [ $1 -eq 1 ]; then
# create initial database
@@ -174,28 +181,33 @@
if [ ".$aliases_update" != . ]; then
eval $aliases_update
fi
+ elif [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$pks_active" = .yes ] && %{l_rc} pks start
fi
+ exit 0
%preun
- if [ $1 -eq 0 ]; then
- # stop perhaps still running server
- $RPM_INSTALL_PREFIX/etc/rc pks stop >/dev/null 2>&1 || true
-
- # deactivate in MTA configuration
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
- aliases_update=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
- if [ ".$aliases_file" != . ]; then
- %{l_rpmtool} config -r -i "$RPM_INSTALL_PREFIX:pks" $aliases_file
- fi
- if [ ".$aliases_update" != . ]; then
- eval $aliases_update
- fi
-
- # remove generated files
- rm -f $RPM_INSTALL_PREFIX/var/pks/pksd.ctl >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/pks/pksd.log >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/pks/pks-queue-run.pid >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/pks/queue/* >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/pks/db/* >/dev/null 2>&1 || true
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} pks stop 2>/dev/null
+
+ # deactivate in MTA configuration
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ aliases_update=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
+ if [ ".$aliases_file" != . ]; then
+ %{l_rpmtool} config -r -i "$RPM_INSTALL_PREFIX:pks" $aliases_file
+ fi
+ if [ ".$aliases_update" != . ]; then
+ eval $aliases_update
fi
+
+ # remove generated files
+ rm -f $RPM_INSTALL_PREFIX/var/pks/pksd.ctl >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/pks.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/pks-queue-run.pid >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/queue/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/db/* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/rc.pks
============================================================================
$ cvs diff -u -r1.16 -r1.17 rc.pks
--- openpkg-src/pks/rc.pks 23 Jul 2003 10:09:32 -0000 1.16
+++ openpkg-src/pks/rc.pks 2 Sep 2003 17:51:46 -0000 1.17
@@ -28,6 +28,7 @@
%start -u @l_rusr@
rcService pks enable yes || exit 0
+ rcService pks active yes && exit 0
(nohup @l_prefix@/sbin/pksd \
@l_prefix@/etc/pks/pksd.conf \
</dev/null >/dev/null 2>&1 &) >/dev/null 2>&1
@@ -35,16 +36,18 @@
(nohup @l_prefix@/bin/pks-queue-run \
@l_prefix@/etc/pks/pksd.conf \
</dev/null >/dev/null 2>&1 &
- echo "$!" >@l_prefix@/var/pks/pks-queue-run.pid ) >/dev/null 2>&1
+ echo "$!" >$pks_pidfile ) >/dev/null 2>&1
%stop -u @l_rusr@
rcService pks enable yes || exit 0
+ rcService pks active no && exit 0
@l_prefix@/bin/pksdctl @l_prefix@/var/pks/pksd.ctl shutdown
pks_signal TERM
rm -f $pks_pidfile 2>/dev/null || true
%restart -u @l_rusr@
rcService pks enable yes || exit 0
+ rcService pks active no && exit 0
rc pks stop
sleep 2
rc pks start
@@ -53,8 +56,8 @@
rcService pks enable yes || exit 0
shtool rotate -f \
-n ${pks_log_numfiles} -s ${pks_log_minsize} -d \
- -z ${pks_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${pks_log_complevel} -o @l_rusr@ -g @l_mgrp@ -m 644 \
-P "${pks_log_prolog}" \
- -E "${pks_log_epilog}" \
+ -E "${pks_log_epilog} && rc pks restart" \
@l_prefix@/var/pks/pks.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6372 -r1.6373 news.txt
--- openpkg-web/news.txt 2 Sep 2003 14:26:25 -0000 1.6372
+++ openpkg-web/news.txt 2 Sep 2003 17:51:44 -0000 1.6373
@@ -1,3 +1,4 @@
+02-Sep-2003: Upgraded package: P<pks-0.9.6-20030902>
02-Sep-2003: Upgraded package: P<pb4sd-1.2-20030902>
02-Sep-2003: Upgraded package: P<pam-20030902-20030902>
02-Sep-2003: Upgraded package: P<oracle-20030902-20030902>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
