OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Dec-2004 15:35:57
Branch: OPENPKG_2_2_SOLID Handle: 2004121414355600
Modified files: (Branch: OPENPKG_2_2_SOLID)
openpkg-src/kolab kolab.spec rc.kolab
Log:
MFC: import "better password creation" from vendor and improve %stop
priority
Summary:
Revision Changes Path
1.31.2.2 +5 -1 openpkg-src/kolab/kolab.spec
1.4.6.1 +1 -1 openpkg-src/kolab/rc.kolab
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.31.2.1 -r1.31.2.2 kolab.spec
--- openpkg-src/kolab/kolab.spec 11 Oct 2004 18:56:16 -0000 1.31.2.1
+++ openpkg-src/kolab/kolab.spec 14 Dec 2004 14:35:56 -0000 1.31.2.2
@@ -39,7 +39,7 @@
Group: Mail
License: GPL
Version: 20040503
-Release: 2.2.0
+Release: 2.2.1
# package options
%option with_genuine no
@@ -140,6 +140,10 @@
-e 's;var/openldap/\(sl[aur]*pd.pid\);var/openldap/run/\1;' \
-e 's;^lastmod.*on$;;' \
slapd.conf.template
+ %{l_shtool} subst \
+ -e 's;openssl passwd kolab;openssl rand -base64 12;' \
+ -e 's;openssl passwd nobody;openssl rand -base64 30;' \
+ kolab_bootstrap
%build
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/rc.kolab
============================================================================
$ cvs diff -u -r1.4 -r1.4.6.1 rc.kolab
--- openpkg-src/kolab/rc.kolab 29 Jan 2004 13:30:07 -0000 1.4
+++ openpkg-src/kolab/rc.kolab 14 Dec 2004 14:35:56 -0000 1.4.6.1
@@ -27,7 +27,7 @@
@l_prefix@@kolab_daemon@ &
sleep 5
-%stop -p 600 -u @l_susr@
+%stop -p 400 -u @l_susr@
rcService kolab enable yes || exit 0
rcService kolab active no && exit 0
kolab_signal TERM
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
