[packaging] Branch 'el5/feature-kolab-2.4' - 4 commits - cyrus-imapd.init cyrus-imapd.pam-config cyrus-imapd.spec cyrus-imapd.sysconfig

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun May 1 21:59:27 CEST 2011


 cyrus-imapd.init       |    3 ++-
 cyrus-imapd.pam-config |    6 +++---
 cyrus-imapd.spec       |    6 +++++-
 cyrus-imapd.sysconfig  |    4 ++++
 4 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit f62f71f25ea29141c16936cf8572d11b293ddb58
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun May 1 15:58:17 2011 -0400

    Bump release

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 4db5a34..b2a4384 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -14,7 +14,7 @@
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 Version:            2.4.8
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -540,6 +540,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun May 01 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.8-2
+- Add QUICK setting to sysconfig and make init.d honor it
+- Fix pam to include system-auth rather then password-auth
+
 * Fri Apr 15 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.8-1
 - New upstream release
 


commit 3a72a5cc50790b39271c8ad33e33a4c748d3bb90
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun May 1 15:56:18 2011 -0400

    Modify init.d script to actually honor sysconfig's QUICK setting

diff --git a/cyrus-imapd.init b/cyrus-imapd.init
index 214e435..8b97048 100644
--- a/cyrus-imapd.init
+++ b/cyrus-imapd.init
@@ -20,6 +20,8 @@ lockfile=/var/lock/subsys/cyrus-imapd
 pidfile=/var/run/cyrus-master.pid
 prog="cyrus-imapd"
 
+QUICK=0
+
 if [ -f /etc/sysconfig/$prog ]; then
     . /etc/sysconfig/$prog
 fi
@@ -46,7 +48,6 @@ ALWAYS_CONVERT=1
 
 RETVAL=0
 RETVAL2=1
-QUICK=0
 
 start() {
   [ $UID -eq 0 ] || exit 4


commit ad8bb0bb21be41b3e148da6f8325a6750cbaca8f
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun May 1 15:55:36 2011 -0400

    Add QUICK setting for init.d script to sysconfig

diff --git a/cyrus-imapd.sysconfig b/cyrus-imapd.sysconfig
index ad8bec5..5d83e25 100644
--- a/cyrus-imapd.sysconfig
+++ b/cyrus-imapd.sysconfig
@@ -1,5 +1,9 @@
 # Options to cyrus-master
 CYRUSOPTIONS=""
 
+# Export/import (0) the databases to assist with database conversions,
+# or use Cyrus IMAP 2.4's autoconversion upgrade capabilities (1)
+QUICK=1
+
 # Mailbox list dumps are rotated n times via cron.daily
 #ROTATE=6


commit 8a4e00e665d5b53bdea299fecbe3f3ce83a7521b
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun May 1 15:53:02 2011 -0400

    Fix cyrus-imapd pam configuration to use system-auth, not password-auth

diff --git a/cyrus-imapd.pam-config b/cyrus-imapd.pam-config
index 5b9f05f..ccb9105 100644
--- a/cyrus-imapd.pam-config
+++ b/cyrus-imapd.pam-config
@@ -1,5 +1,5 @@
 #%PAM-1.0
 auth       required     pam_nologin.so
-auth       include      password-auth
-account    include      password-auth
-session    include      password-auth
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth




More information about the packaging-commits mailing list