- fixed sysconfig paths in *auth* post/preun scripts

- s/0\.0\.0\.0/0/ in sysconfig/* (0 works w/o IPv6 in kernel, 0.0.0.0 doesn't)
- release 2

Changed files:
    courier-imap-pop3.sysconfig -> 1.2
    courier-imap.spec -> 1.34
    courier-imap.sysconfig -> 1.3

diff --git a/courier-imap-pop3.sysconfig b/courier-imap-pop3.sysconfig
index e843ddc0404d900d69670bfa1695183a3fa4cb13..c353983f58bb651d76cd5611392b035b3bb157b7 100644 (file)
--- a/courier-imap-pop3.sysconfig
+++ b/courier-imap-pop3.sysconfig
@@ -22,7 +22,7 @@ MAILDIR="Maildir"
 
 # IP address to listen on.  0 means all IP addresses.
 #
-ADDRESS=0.0.0.0
+ADDRESS=0
 
 # Other couriertcpd(1) options.  The following defaults should be fine.
 #

diff --git a/courier-imap.spec b/courier-imap.spec
index 22ba6fd55a9d30cfb03ee6c7268bed116554d75c..74146d870df96a28a97f7331b43fb6e430506ee7 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -6,7 +6,7 @@ Summary:        Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
 Version:       1.3.10
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -160,6 +160,9 @@ gzip -9nf README* imap/BUGS AUTHORS COPYING
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
 /sbin/chkconfig --add courier-imap
 
@@ -214,7 +217,7 @@ fi
 
 %post authldap
 METHOD=plain
-. ./etc/sysconfig/authdaemon
+. /etc/sysconfig/authdaemon
 if [ "$METHOD" = "ldap" ]; then
        if [ -f /var/lock/subsys/authdaemon ]; then
                /etc/rc.d/init.d/authdaemon stop >&2
@@ -225,7 +228,7 @@ fi
 
 %preun authldap
 METHOD=plain
-. ./etc/sysconfig/authdaemon
+. /etc/sysconfig/authdaemon
 if [ "$1" = "$0" -a "$METHOD" = "ldap" ]; then
        if [ -f /var/lock/subsys/authdaemon ]; then
                /etc/rc.d/init.d/authdaemon stop >&2
@@ -234,7 +237,7 @@ fi
 
 %post authmysql
 METHOD=plain
-. ./etc/sysconfig/authdaemon
+. /etc/sysconfig/authdaemon
 if [ "$METHOD" = "mysql" ]; then
        if [ -f /var/lock/subsys/authdaemon ]; then
                /etc/rc.d/init.d/authdaemon stop >&2
@@ -245,16 +248,13 @@ fi
 
 %preun authmysql
 METHOD=plain
-. ./etc/sysconfig/authdaemon
+. /etc/sysconfig/authdaemon
 if [ "$1" = "$0" -a "$METHOD" = "mysql" ]; then
        if [ -f /var/lock/subsys/authdaemon ]; then
                /etc/rc.d/init.d/authdaemon stop >&2
        fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/imap

diff --git a/courier-imap.sysconfig b/courier-imap.sysconfig
index 42732a283c9599c727d5ff066298b09e7ec02b9d..7118ea3993820802f47519ad50a7f6b05257a836 100644 (file)
--- a/courier-imap.sysconfig
+++ b/courier-imap.sysconfig
@@ -1,6 +1,7 @@
 # Address to listen on, can be set to a single IP address.
+# 0 means all IP addresses.
 #
-ADDRESS=0.0.0.0
+ADDRESS=0
 
 # Maximum number of IMAP servers started
 #