[CVS] OpenPKG: openpkg-src/pks/ pks.spec rc.pks openpkg-web/ news.txt
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:
RevisionChanges 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 - 1.23
+++ openpkg-src/pks/pks.spec 2 Sep 2003 17:51:46 - 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 21 || 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 21 || true
-rm -f $RPM_INSTALL_PREFIX/var/pks/pksd.log /dev/null 21 || true
-rm -f $RPM_INSTALL_PREFIX/var/pks/pks-queue-run.pid /dev/null 21 || true
-rm -f $RPM_INSTALL_PREFIX/var/pks/queue/* /dev/null 21 || true
-rm -f $RPM_INSTALL_PREFIX/var/pks/db/* /dev/null 21 || 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 21 || true
+rm -f $RPM_INSTALL_PREFIX/var/pks/pks.log* /dev/null 21 || true
+rm -f $RPM_INSTALL_PREFIX/var/pks/pks-queue-run.pid /dev/null 21 || true
+rm -f $RPM_INSTALL_PREFIX/var/pks/queue/* /dev/null 21 || true
+rm -f $RPM_INSTALL_PREFIX/var/pks/db/* /dev/null 21 || true
+exit 0
@@ .
patch -p0 '@@ .'
Index: openpkg-src/pks/rc.pks
$ cvs diff -u -r1.16 -r1.17 rc.pks
--- openpkg-src/pks/rc.pks23 Jul 2003 10:09:32 - 1.16
+++ openpkg-src/pks/rc.pks2 Sep 2003 17:51:46 - 1.17
@@ -28,6 +28,7 @@
[CVS] OpenPKG: openpkg-src/pks/ pks.spec rc.pks openpkg-web/ news.txt
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: 23-Jul-2003 12:09:33
Branch: HEAD Handle: 2003072311093101
Modified files:
openpkg-src/pks pks.spec rc.pks
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
RevisionChanges Path
1.23+1 -1 openpkg-src/pks/pks.spec
1.16+23 -4 openpkg-src/pks/rc.pks
1.5744 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/pks/pks.spec
$ cvs diff -u -r1.22 -r1.23 pks.spec
--- openpkg-src/pks/pks.spec 22 Jul 2003 08:10:59 - 1.22
+++ openpkg-src/pks/pks.spec 23 Jul 2003 10:09:32 - 1.23
@@ -33,7 +33,7 @@
Group:Cryptography
License: GPL
Version: 0.9.6
-Release: 20030722
+Release: 20030723
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/pks/rc.pks
$ cvs diff -u -r1.15 -r1.16 rc.pks
--- openpkg-src/pks/rc.pks22 Jul 2003 08:10:59 - 1.15
+++ openpkg-src/pks/rc.pks23 Jul 2003 10:09:32 - 1.16
@@ -11,6 +11,21 @@
pks_log_minsize=1M
pks_log_complevel=9
+%common
+pks_pidfile=@l_prefix@/var/pks/pks-queue-run.pid
+pks_signal () {
+[ -f $pks_pidfile ] kill -$1 `cat $pks_pidfile`
+}
+
+%status -u @l_rusr@ -o
+pks_usable=unknown
+pks_active=no
+rcService pks enable yes \
+pks_signal 0 pks_active=yes
+echo pks_enable=\$pks_enable\
+echo pks_usable=\$pks_usable\
+echo pks_active=\$pks_active\
+
%start -u @l_rusr@
rcService pks enable yes || exit 0
(nohup @l_prefix@/sbin/pksd \
@@ -25,10 +40,14 @@
%stop -u @l_rusr@
rcService pks enable yes || exit 0
@l_prefix@/bin/pksdctl @l_prefix@/var/pks/pksd.ctl shutdown
-if [ -f @l_prefix@/var/pks/pks-queue-run.pid ]; then
-kill `cat @l_prefix@/var/pks/pks-queue-run.pid` /dev/null 21
-rm -f @l_prefix@/var/pks/pks-queue-run.pid
-fi
+pks_signal TERM
+rm -f $pks_pidfile 2/dev/null || true
+
+%restart -u @l_rusr@
+rcService pks enable yes || exit 0
+rc pks stop
+sleep 2
+rc pks start
%daily -u @l_rusr@
rcService pks enable yes || exit 0
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5743 -r1.5744 news.txt
--- openpkg-web/news.txt 23 Jul 2003 09:56:53 - 1.5743
+++ openpkg-web/news.txt 23 Jul 2003 10:09:31 - 1.5744
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: Ppks-0.9.6-20030723
23-Jul-2003: Upgraded package: Ppb4sd-1.2-20030723
23-Jul-2003: Upgraded package: Pmonit-3.2-20030723
23-Jul-2003: Upgraded package: Pbogofilter-0.14.0-20030723
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/pks/ pks.spec rc.pks openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jun-2003 16:08:39
Branch: HEAD Handle: 2003062815083701
Modified files:
openpkg-src/pks pks.spec rc.pks
openpkg-web news.txt
Log:
fix introduced logfile path
Summary:
RevisionChanges Path
1.9 +1 -1 openpkg-src/pks/pks.spec
1.7 +1 -1 openpkg-src/pks/rc.pks
1.5053 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/pks/pks.spec
$ cvs diff -u -r1.8 -r1.9 pks.spec
--- openpkg-src/pks/pks.spec 24 Jun 2003 16:36:43 - 1.8
+++ openpkg-src/pks/pks.spec 28 Jun 2003 14:08:38 - 1.9
@@ -33,7 +33,7 @@
Group:Cryptography
License: GPL
Version: 0.9.6
-Release: 20030624
+Release: 20030628
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/pks/rc.pks
$ cvs diff -u -r1.6 -r1.7 rc.pks
--- openpkg-src/pks/rc.pks24 Jun 2003 16:36:43 - 1.6
+++ openpkg-src/pks/rc.pks28 Jun 2003 14:08:38 - 1.7
@@ -39,4 +39,4 @@
-z${pks_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
-P ${pks_log_prolog} \
-E ${pks_log_epilog} \
-@l_prefix@/var/pks/log/pksd.log
+@l_prefix@/var/pks/pksd.log
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5052 -r1.5053 news.txt
--- openpkg-web/news.txt 28 Jun 2003 14:07:40 - 1.5052
+++ openpkg-web/news.txt 28 Jun 2003 14:08:37 - 1.5053
@@ -1,3 +1,4 @@
+28-Jun-2003: Upgraded package: Ppks-0.9.6-20030628
28-Jun-2003: Upgraded package: Ppetidomo-4.0b1-20030628
28-Jun-2003: Upgraded package: Popenssh-3.6.1p2-20030628
28-Jun-2003: Upgraded package: Pnsd-1.1.0b-20030628
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/pks/ pks.spec rc.pks openpkg-web/ news.txt
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: 24-Jun-2003 15:27:44
Branch: HEAD Handle: 2003062414274301
Modified files:
openpkg-src/pks pks.spec rc.pks
openpkg-web news.txt
Log:
add/unify log file trimming
Summary:
RevisionChanges Path
1.7 +1 -1 openpkg-src/pks/pks.spec
1.5 +15 -0 openpkg-src/pks/rc.pks
1.4991 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/pks/pks.spec
$ cvs diff -u -r1.6 -r1.7 pks.spec
--- openpkg-src/pks/pks.spec 23 Jun 2003 20:51:13 - 1.6
+++ openpkg-src/pks/pks.spec 24 Jun 2003 13:27:44 - 1.7
@@ -33,7 +33,7 @@
Group:Cryptography
License: GPL
Version: 0.9.6
-Release: 20030623
+Release: 20030624
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/pks/rc.pks
$ cvs diff -u -r1.4 -r1.5 rc.pks
--- openpkg-src/pks/rc.pks24 Jun 2003 12:07:59 - 1.4
+++ openpkg-src/pks/rc.pks24 Jun 2003 13:27:44 - 1.5
@@ -5,6 +5,11 @@
%config
pks_enable=yes
+pks_log_prolog=true
+pks_log_epilog=true
+pks_log_numfiles=10
+pks_log_minsize=1M
+pks_log_complevel=9
%start -p 200 -u @l_rusr@
opServiceEnabled pks || exit 0
@@ -25,3 +30,13 @@
rm -f @l_prefix@/var/pks/pks-queue-run.pid
fi
+%daily -u @l_susr@
+opServiceEnabled pks || exit 0
+
+# rotate logfile
+shtool rotate -f \
+-n${pks_log_numfiles} -s${pks_log_minsize} -d \
+-z${pks_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+-P ${pks_log_prolog} \
+-E ${pks_log_epilog} \
+@l_prefix@/var/pks/log/pksd.log
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4990 -r1.4991 news.txt
--- openpkg-web/news.txt 24 Jun 2003 13:27:34 - 1.4990
+++ openpkg-web/news.txt 24 Jun 2003 13:27:43 - 1.4991
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: Ppks-0.9.6-20030624
24-Jun-2003: Upgraded package: Ppetidomo-4.0b1-20030624
24-Jun-2003: Upgraded package: Popenssh-3.6.1p2-20030624
24-Jun-2003: Upgraded package: Pnsd-1.1.0b-20030624
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
