Group :: Sistema/Servidores
RPM: courier-imap
Navegação
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: courier-imap-4.0.6-alt-pkgname.patch
Download
Download
diff -ruN courier-imap-4.0.6.orig/courier-imap.sysvinit.in courier-imap-4.0.6/courier-imap.sysvinit.in
--- courier-imap-4.0.6.orig/courier-imap.sysvinit.in 2005-05-09 05:08:37 +1100
+++ courier-imap-4.0.6/courier-imap.sysvinit.in 2005-11-26 22:23:34 +1000
@@ -16,7 +16,7 @@
case "$1" in
start)
cd /
- . @sysconfdir@/imapd
+ . @sysconfdir@/@PACKAGE@/imapd
touch /var/lock/subsys/courier-imap
echo -n "Starting Courier-IMAP server:"
@@ -24,12 +24,12 @@
case x$IMAPDSTART in
x[yY]*)
# Start daemons.
- @libexecdir@/imapd.rc start
+ @libexecdir@/@PACKAGE@/imapd.rc start
echo -n " imap"
;;
esac
- . @sysconfdir@/imapd-ssl
+ . @sysconfdir@/@PACKAGE@/imapd-ssl
case x$IMAPDSSLSTART in
x[yY]*)
if test -x $COURIERTLS
@@ -42,7 +42,7 @@
echo -n " generating-SSL-certificate..."
@datadir@/mkimapdcert >/dev/null 2>&1
fi
- @libexecdir@/imapd-ssl.rc start
+ @libexecdir@/@PACKAGE@/imapd-ssl.rc start
echo -n " imap-ssl"
fi
;;
@@ -51,22 +51,22 @@
POP3DSTART=""
POP3DSSLSTART=""
- if test -f @sysconfdir@/pop3d
+ if test -f @sysconfdir@/@PACKAGE@/pop3d
then
- . @sysconfdir@/pop3d
+ . @sysconfdir@/@PACKAGE@/pop3d
fi
case x$POP3DSTART in
x[yY]*)
# Start daemons.
- @libexecdir@/pop3d.rc start
+ @libexecdir@/@PACKAGE@/pop3d.rc start
echo -n " pop3"
;;
esac
- if test -f @sysconfdir@/pop3d-ssl
+ if test -f @sysconfdir@/@PACKAGE@/pop3d-ssl
then
- . @sysconfdir@/pop3d-ssl
+ . @sysconfdir@/@PACKAGE@/pop3d-ssl
fi
case x$POP3DSSLSTART in
@@ -81,7 +81,7 @@
echo -n " generating-SSL-certificate..."
@datadir@/mkpop3dcert >/dev/null 2>&1
fi
- @libexecdir@/pop3d-ssl.rc start
+ @libexecdir@/@PACKAGE@/pop3d-ssl.rc start
echo -n " pop3-ssl"
fi
;;
@@ -91,24 +91,24 @@
;;
stop)
echo -n "Stopping Courier-IMAP server:"
- . @sysconfdir@/imapd
- . @sysconfdir@/imapd-ssl
- @libexecdir@/imapd.rc stop
+ . @sysconfdir@/@PACKAGE@/imapd
+ . @sysconfdir@/@PACKAGE@/imapd-ssl
+ @libexecdir@/@PACKAGE@/imapd.rc stop
echo -n " imap"
if test -x $COURIERTLS
then
- @libexecdir@/imapd-ssl.rc stop
+ @libexecdir@/@PACKAGE@/imapd-ssl.rc stop
echo -n " imap-ssl"
fi
- if test -f @sysconfdir@/pop3d
+ if test -f @sysconfdir@/@PACKAGE@/pop3d
then
- @libexecdir@/pop3d.rc stop
+ @libexecdir@/@PACKAGE@/pop3d.rc stop
echo -n " pop3"
if test -x $COURIERTLS
then
- @libexecdir@/pop3d-ssl.rc stop
+ @libexecdir@/@PACKAGE@/pop3d-ssl.rc stop
echo -n " pop3-ssl"
fi
fi
diff -ruN courier-imap-4.0.6.orig/imap/courierpop3d.8.in courier-imap-4.0.6/imap/courierpop3d.8.in
--- courier-imap-4.0.6.orig/imap/courierpop3d.8.in 2004-02-20 12:31:16 +1000
+++ courier-imap-4.0.6/imap/courierpop3d.8.in 2005-11-26 22:23:34 +1000
@@ -12,7 +12,7 @@
courierpop3d \- Courier POP3 server
.SH SYNOPSIS
-\fB@sbindir@/couriertcpd\fR \fB-nodnslookup\fR \fB-stderr=syslog\fR \fB110\fR \fB@libexecdir@/courier/courierpop3login\fR [ \fB\fImodules\fB\fR\fI ...\fR ] \fB@libexecdir@/courier/courierpop3d\fR \fB\&./Maildir\fR
+\fB@sbindir@/couriertcpd\fR \fB-nodnslookup\fR \fB-stderr=syslog\fR \fB110\fR \fB@libexecdir@/@PACKAGE@/courierpop3login\fR [ \fB\fImodules\fB\fR\fI ...\fR ] \fB@libexecdir@/@PACKAGE@/courierpop3d\fR \fB\&./Maildir\fR
.SH "DESCRIPTION"
.PP
diff -ruN courier-imap-4.0.6.orig/imap/courierpop3d.html.in courier-imap-4.0.6/imap/courierpop3d.html.in
--- courier-imap-4.0.6.orig/imap/courierpop3d.html.in 2004-10-21 11:58:06 +1100
+++ courier-imap-4.0.6/imap/courierpop3d.html.in 2005-11-26 22:23:34 +1000
@@ -43,10 +43,10 @@
><B
CLASS="COMMAND"
>@sbindir@/couriertcpd</B
-> {-nodnslookup} {-stderr=syslog} {110} {@libexecdir@/courier/courierpop3login} [<VAR+> {-nodnslookup} {-stderr=syslog} {110} {@libexecdir@/@PACKAGE@/courierpop3login} [<VARCLASS="REPLACEABLE"
>modules</VAR
->...] {@libexecdir@/courier/courierpop3d} {./Maildir}</P+>...] {@libexecdir@/@PACKAGE@/courierpop3d} {./Maildir}</P></DIV
><DIV
CLASS="REFSECT1"
diff -ruN courier-imap-4.0.6.orig/imap/imapd.8.in courier-imap-4.0.6/imap/imapd.8.in
--- courier-imap-4.0.6.orig/imap/imapd.8.in 2004-02-20 12:31:08 +1000
+++ courier-imap-4.0.6/imap/imapd.8.in 2005-11-26 22:23:34 +1000
@@ -12,7 +12,7 @@
imapd \- Courier-IMAP server
.SH SYNOPSIS
-\fB@libexecdir@/couriertcpd\fR \fBcouriertcpd options\fR \fB@prefix@/sbin/imaplogin\fR [ \fB\fImodules\fB\fR\fI ...\fR ] \fB@prefix@/bin/imapd\fR \fB\&./Maildir\fR
+\fB@libexecdir@/@PACKAGE@/couriertcpd\fR \fBcouriertcpd options\fR \fB@prefix@/sbin/imaplogin\fR [ \fB\fImodules\fB\fR\fI ...\fR ] \fB@prefix@/bin/imapd\fR \fB\&./Maildir\fR
\fB@prefix@/bin/imapd\fR \fB\&./Maildir\fR
@@ -81,15 +81,15 @@
tmp, new, cur, etc...
.PP
Other environment variables are initialized from the
-\fI@sysconfdir@/imapd\fR and
-\fI@sysconfdir@/imapd-ssl\fR configuration files.
+\fI@sysconfdir@/@PACKAGE@/imapd\fR and
+\fI@sysconfdir@/@PACKAGE@/imapd-ssl\fR configuration files.
These files are loaded into the environment by the system startup script
that runs \fBcouriertcpd\fR\&.
.SS "REALTIME CONCURRENT FOLDER STATUS UPDATES"
.PP
Setting the IMAP_ENHANCEDIDLE to
1 in
-\fI@sysconfdir@/imapd\fR enables realtime concurrent folder
+\fI@sysconfdir@/@PACKAGE@/imapd\fR enables realtime concurrent folder
status updates.
When relatime folder status updates are enabled all IMAP mail clients
that have the same folder open will be
@@ -154,7 +154,7 @@
IDLE
must be listed in the
\fBIMAP_CAPABILITY\fR
-setting in the \fI@sysconfdir@/imapd\fR
+setting in the \fI@sysconfdir@/@PACKAGE@/imapd\fR
configuration file.
This is the default setting in new Courier-IMAP 1.6.0/Courier 0.40 installs.
The default setting in previous versions of the server does not include
@@ -163,7 +163,7 @@
capability must be manually added.
.TP
\fBIMAP_USELOCKS\fR
-This setting in \fI@sysconfdir@/imapd\fR
+This setting in \fI@sysconfdir@/@PACKAGE@/imapd\fR
must be enabled.
This setting uses dot-lock files to synchronize updates to folder indexes
between multiple IMAP clients that have the same folder opened.
@@ -179,7 +179,7 @@
in most IMAP mail clients is not known.
.TP
\fBIMAP_ENHANCEDIDLE\fR
-This setting in \fI@sysconfdir@/imapd\fR
+This setting in \fI@sysconfdir@/@PACKAGE@/imapd\fR
actually enables concurrent realtime folder status updates using the
IDLE extension.
Note that it is possible to enable the IDLE extension
@@ -255,7 +255,7 @@
The default Courier-IMAP server configuration permits a maximum of four
connections from the same IP address.
It may be necessary to adjust this setting in
-\fI@sysconfdir@/imapd\fR
+\fI@sysconfdir@/@PACKAGE@/imapd\fR
for the duration of this test.
.RE
.TP 3
@@ -267,7 +267,7 @@
Courier-IMAP (use \fBldd\fR(1)
to verify that the \fBimapd\fR executable is linked with
the \fIlibfam\fR library), and verify the settings in the
-\fI@sysconfdir@/imapd\fR\&.
+\fI@sysconfdir@/@PACKAGE@/imapd\fR\&.
.TP 3
3.
Open another terminal window, connect to the server, and modify the flags
diff -ruN courier-imap-4.0.6.orig/imap/imapd.cnf.in courier-imap-4.0.6/imap/imapd.cnf.in
--- courier-imap-4.0.6.orig/imap/imapd.cnf.in 2001-03-24 14:59:55 +1000
+++ courier-imap-4.0.6/imap/imapd.cnf.in 2005-11-26 22:23:34 +1000
@@ -1,5 +1,5 @@
-RANDFILE = @datadir@/imapd.rand
+RANDFILE = @localstatedir@/ssl/certs/imapd.rand
[ req ]
default_bits = 1024
diff -ruN courier-imap-4.0.6.orig/imap/imapd.dist.in courier-imap-4.0.6/imap/imapd.dist.in
--- courier-imap-4.0.6.orig/imap/imapd.dist.in 2005-07-05 23:31:27 +1100
+++ courier-imap-4.0.6/imap/imapd.dist.in 2005-11-26 22:23:34 +1000
@@ -256,7 +256,7 @@
# you know what you're doing. See README.sharedfolders for additional
# information.
-IMAP_SHAREDINDEXFILE=@sysconfdir@/shared/index
+IMAP_SHAREDINDEXFILE=@sysconfdir@/@PACKAGE@/shared/index
##NAME: IMAP_ENHANCEDIDLE:0
#
@@ -382,11 +382,11 @@
# IMAPDSTART is not used directly. Rather, this is a convenient flag to
# be read by your system startup script in /etc/rc.d, like this:
#
-# . @sysconfdir@/imapd
+# . @sysconfdir@/@PACKAGE@/imapd
#
# case x$IMAPDSTART in
# x[yY]*)
-# @libexecdir@/imapd.rc start
+# @libexecdir@/@PACKAGE@/imapd.rc start
# ;;
# esac
#
diff -ruN courier-imap-4.0.6.orig/imap/imapd.html.in courier-imap-4.0.6/imap/imapd.html.in
--- courier-imap-4.0.6.orig/imap/imapd.html.in 2004-10-21 11:58:04 +1100
+++ courier-imap-4.0.6/imap/imapd.html.in 2005-11-26 22:23:34 +1000
@@ -42,7 +42,7 @@
><P
><B
CLASS="COMMAND"
->@libexecdir@/couriertcpd</B
+>@libexecdir@/@PACKAGE@/couriertcpd</B
> {couriertcpd options} {@prefix@/sbin/imaplogin} [<VARCLASS="REPLACEABLE"
>modules</VAR
@@ -252,11 +252,11 @@
>Other environment variables are initialized from the
<TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
> and
<TT
CLASS="FILENAME"
->@sysconfdir@/imapd-ssl</TT
+>@sysconfdir@/@PACKAGE@/imapd-ssl</TT
> configuration files.
These files are loaded into the environment by the system startup script
that runs <B
@@ -281,7 +281,7 @@
> in
<TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
> enables realtime concurrent folder
status updates.
When relatime folder status updates are enabled all IMAP mail clients
@@ -421,7 +421,7 @@
>
setting in the <TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
>
configuration file.
This is the default setting in new Courier-IMAP 1.6.0/Courier 0.40 installs.
@@ -445,7 +445,7 @@
><P
>This setting in <TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
>
must be enabled.
This setting uses dot-lock files to synchronize updates to folder indexes
@@ -484,7 +484,7 @@
><P
>This setting in <TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
>
actually enables concurrent realtime folder status updates using the
<TT
@@ -660,7 +660,7 @@
It may be necessary to adjust this setting in
<TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
>
for the duration of this test.</P
></TD
@@ -694,7 +694,7 @@
> library), and verify the settings in the
<TT
CLASS="FILENAME"
->@sysconfdir@/imapd</TT
+>@sysconfdir@/@PACKAGE@/imapd</TT
>.</P
></LI
><LI
diff -ruN courier-imap-4.0.6.orig/imap/imapd-ssl.dist.in courier-imap-4.0.6/imap/imapd-ssl.dist.in
--- courier-imap-4.0.6.orig/imap/imapd-ssl.dist.in 2005-07-02 12:13:57 +1100
+++ courier-imap-4.0.6/imap/imapd-ssl.dist.in 2005-11-26 22:23:34 +1000
@@ -153,7 +153,7 @@
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
#
-TLS_CERTFILE=@datadir@/imapd.pem
+TLS_CERTFILE=@localstatedir@/ssl/certs/imapd.pem
##NAME: TLS_TRUSTCERTS:0
#
@@ -194,7 +194,7 @@
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
-TLS_CACHEFILE=@localstatedir@/couriersslcache
+TLS_CACHEFILE=@localstatedir@/@PACKAGE@/couriersslcache
TLS_CACHESIZE=524288
##NAME: MAILDIRPATH:0
diff -ruN courier-imap-4.0.6.orig/imap/mkimapdcert.8.in courier-imap-4.0.6/imap/mkimapdcert.8.in
--- courier-imap-4.0.6.orig/imap/mkimapdcert.8.in 2004-02-20 12:31:12 +1000
+++ courier-imap-4.0.6/imap/mkimapdcert.8.in 2005-11-26 22:23:34 +1000
@@ -18,7 +18,7 @@
.PP
IMAP over SSL requires a valid, signed, X.509 certificate. The default
location for the certificate file is
-\fI@datadir@/imapd.pem\fR\&.
+\fI@localstatedir@/ssl/certs/imapd.pem\fR\&.
\fBmkimapdcert\fR generates a self-signed X.509 certificate,
mainly for
testing.
@@ -26,22 +26,22 @@
recognized certificate authority, in order for mail clients to accept the
certificate.
.PP
-\fI@datadir@/imapd.pem\fR must be owned by the
+\fI@localstatedir@/ssl/certs/imapd.pem\fR must be owned by the
@mailuser@ user and
have no group or world permissions.
The \fBmkimapdcert\fR command will
enforce this. To prevent an unfortunate accident,
\fBmkimapdcert\fR
-will not work if \fB@datadir@/imapd.pem\fR already exists.
+will not work if \fB@localstatedir@/ssl/certs/imapd.pem\fR already exists.
.PP
\fBmkimapdcert\fR requires
\fBOpenSSL\fR to be installed.
.SH "FILES"
.TP
-\fB@datadir@/imapd.pem\fR
+\fB@localstatedir@/ssl/certs/imapd.pem\fR
X.509 certificate.
.TP
-\fB@sysconfdir@/imapd.cnf\fR
+\fB@sysconfdir@/@PACKAGE@/imapd.cnf\fR
Parameters used by OpenSSL to
create the X.509 certificate.
.SH "SEE ALSO"
diff -ruN courier-imap-4.0.6.orig/imap/mkimapdcert.html.in courier-imap-4.0.6/imap/mkimapdcert.html.in
--- courier-imap-4.0.6.orig/imap/mkimapdcert.html.in 2004-10-21 11:58:05 +1100
+++ courier-imap-4.0.6/imap/mkimapdcert.html.in 2005-11-26 22:23:34 +1000
@@ -57,7 +57,7 @@
location for the certificate file is
<TT
CLASS="FILENAME"
->@datadir@/imapd.pem</TT
+>@localstatedir@/ssl/certs/imapd.pem</TT
>.
<B
CLASS="COMMAND"
@@ -71,7 +71,7 @@
><P
><TT
CLASS="FILENAME"
->@datadir@/imapd.pem</TT
+>@localstatedir@/ssl/certs/imapd.pem</TT
> must be owned by the
@mailuser@ user and
have no group or world permissions.
@@ -86,7 +86,7 @@
>
will not work if <B
CLASS="COMMAND"
->@datadir@/imapd.pem</B
+>@localstatedir@/ssl/certs/imapd.pem</B
> already exists.</P
><P
><B
@@ -111,13 +111,13 @@
CLASS="VARIABLELIST"
><DL
><DT
->@datadir@/imapd.pem</DT
+>@localstatedir@/ssl/certs/imapd.pem</DT
><DD
><P
>X.509 certificate.</P
></DD
><DT
->@sysconfdir@/imapd.cnf</DT
+>@sysconfdir@/@PACKAGE@/imapd.cnf</DT
><DD
><P
>Parameters used by OpenSSL to
diff -ruN courier-imap-4.0.6.orig/imap/mkimapdcert.in courier-imap-4.0.6/imap/mkimapdcert.in
--- courier-imap-4.0.6.orig/imap/mkimapdcert.in 2005-06-30 05:01:17 +1100
+++ courier-imap-4.0.6/imap/mkimapdcert.in 2005-11-26 22:26:26 +1000
@@ -13,27 +13,27 @@
prefix="@prefix@"
-if test -f @datadir@/imapd.pem
+if test -f @localstatedir@/ssl/certs/imapd.pem
then
- echo "@datadir@/imapd.pem already exists."
+ echo "@localstatedir@/ssl/certs/imapd.pem already exists."
exit 1
fi
umask 077
-cp /dev/null @datadir@/imapd.pem
-chmod 600 @datadir@/imapd.pem
-chown @mailuser@ @datadir@/imapd.pem
+cp /dev/null @localstatedir@/ssl/certs/imapd.pem
+chmod 600 @localstatedir@/ssl/certs/imapd.pem
+chown @mailuser@ @localstatedir@/ssl/certs/imapd.pem
cleanup() {- rm -f @datadir@/imapd.pem
- rm -f @datadir@/imapd.rand
+ rm -f @localstatedir@/ssl/certs/imapd.pem
+ rm -f @localstatedir@/ssl/certs/imapd.rand
exit 1
}
-cd @datadir@
-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
+cd @localstatedir@/ssl/certs
+dd if=@RANDOMV@ of=@localstatedir@/ssl/certs/imapd.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup
-@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem || cleanup
-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem || cleanup
-rm -f @datadir@/imapd.rand
+ -config @sysconfdir@/@PACKAGE@/imapd.cnf -out @localstatedir@/ssl/certs/imapd.pem -keyout @localstatedir@/ssl/certs/imapd.pem || cleanup
+@OPENSSL@ gendh -rand @localstatedir@/ssl/certs/imapd.rand 512 >>@localstatedir@/ssl/certs/imapd.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @localstatedir@/ssl/certs/imapd.pem || cleanup
+rm -f @localstatedir@/ssl/certs/imapd.rand
diff -ruN courier-imap-4.0.6.orig/imap/mkpop3dcert.8.in courier-imap-4.0.6/imap/mkpop3dcert.8.in
--- courier-imap-4.0.6.orig/imap/mkpop3dcert.8.in 2004-02-20 12:31:14 +1000
+++ courier-imap-4.0.6/imap/mkpop3dcert.8.in 2005-11-26 22:23:34 +1000
@@ -18,7 +18,7 @@
.PP
POP3 over SSL requires a valid, signed, X.509 certificate. The default
location for the certificate file is
-\fI@datadir@/pop3d.pem\fR\&.
+\fI@localstatedir@/ssl/certs/pop3d.pem\fR\&.
\fBmkpop3dcert\fR generates a self-signed X.509 certificate,
mainly for
testing.
@@ -26,22 +26,22 @@
recognized certificate authority, in order for mail clients to accept the
certificate.
.PP
-\fI@datadir@/pop3d.pem\fR must be owned by the
+\fI@localstatedir@/ssl/certs/pop3d.pem\fR must be owned by the
@mailuser@ user and
have no group or world permissions.
The \fBmkpop3dcert\fR command will
enforce this. To prevent an unfortunate accident,
\fBmkpop3dcert\fR
-will not work if \fB@datadir@/pop3d.pem\fR already exists.
+will not work if \fB@localstatedir@/ssl/certs/pop3d.pem\fR already exists.
.PP
\fBmkpop3dcert\fR requires
\fBOpenSSL\fR to be installed.
.SH "FILES"
.TP
-\fB@datadir@/pop3d.pem\fR
+\fB@localstatedir@/ssl/certs/pop3d.pem\fR
X.509 certificate.
.TP
-\fB@sysconfdir@/pop3d.cnf\fR
+\fB@sysconfdir@/@PACKAGE@/pop3d.cnf\fR
Parameters used by OpenSSL to
create the X.509 certificate.
.SH "SEE ALSO"
diff -ruN courier-imap-4.0.6.orig/imap/mkpop3dcert.html.in courier-imap-4.0.6/imap/mkpop3dcert.html.in
--- courier-imap-4.0.6.orig/imap/mkpop3dcert.html.in 2004-10-21 11:58:07 +1100
+++ courier-imap-4.0.6/imap/mkpop3dcert.html.in 2005-11-26 22:23:34 +1000
@@ -57,7 +57,7 @@
location for the certificate file is
<TT
CLASS="FILENAME"
->@datadir@/pop3d.pem</TT
+>@localstatedir@/ssl/certs/pop3d.pem</TT
>.
<B
CLASS="COMMAND"
@@ -71,7 +71,7 @@
><P
><TT
CLASS="FILENAME"
->@datadir@/pop3d.pem</TT
+>@localstatedir@/ssl/certs/pop3d.pem</TT
> must be owned by the
@mailuser@ user and
have no group or world permissions.
@@ -86,7 +86,7 @@
>
will not work if <B
CLASS="COMMAND"
->@datadir@/pop3d.pem</B
+>@localstatedir@/ssl/certs/pop3d.pem</B
> already exists.</P
><P
><B
@@ -111,13 +111,13 @@
CLASS="VARIABLELIST"
><DL
><DT
->@datadir@/pop3d.pem</DT
+>@localstatedir@/ssl/certs/pop3d.pem</DT
><DD
><P
>X.509 certificate.</P
></DD
><DT
->@sysconfdir@/pop3d.cnf</DT
+>@sysconfdir@/@PACKAGE@/pop3d.cnf</DT
><DD
><P
>Parameters used by OpenSSL to
diff -ruN courier-imap-4.0.6.orig/imap/mkpop3dcert.in courier-imap-4.0.6/imap/mkpop3dcert.in
--- courier-imap-4.0.6.orig/imap/mkpop3dcert.in 2005-06-30 05:01:17 +1100
+++ courier-imap-4.0.6/imap/mkpop3dcert.in 2005-11-26 22:27:02 +1000
@@ -13,26 +13,26 @@
prefix="@prefix@"
-if test -f @datadir@/pop3d.pem
+if test -f @localstatedir@/ssl/certs/pop3d.pem
then
- echo "@datadir@/pop3d.pem already exists."
+ echo "@localstatedir@/ssl/certs/pop3d.pem already exists."
exit 1
fi
umask 077
-cp /dev/null @datadir@/pop3d.pem
-chmod 600 @datadir@/pop3d.pem
-chown @mailuser@ @datadir@/pop3d.pem
+cp /dev/null @localstatedir@/ssl/certs/pop3d.pem
+chmod 600 @localstatedir@/ssl/certs/pop3d.pem
+chown @mailuser@ @localstatedir@/ssl/certs/pop3d.pem
cleanup() {- rm -f @datadir@/pop3d.pem
- rm -f @datadir@/pop3d.rand
+ rm -f @localstatedir@/ssl/certs/pop3d.pem
+ rm -f @localstatedir@/ssl/certs/pop3d.rand
exit 1
}
-dd if=@RANDOMV@ of=@datadir@/pop3d.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=@localstatedir@/ssl/certs/pop3d.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/pop3d.cnf -out @datadir@/pop3d.pem -keyout @datadir@/pop3d.pem || cleanup
-@OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup
-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup
-rm -f @datadir@/pop3d.rand
+ -config @sysconfdir@/@PACKAGE@/pop3d.cnf -out @localstatedir@/ssl/certs/pop3d.pem -keyout @localstatedir@/ssl/certs/pop3d.pem || cleanup
+@OPENSSL@ gendh -rand @localstatedir@/ssl/certs/pop3d.rand 512 >>@localstatedir@/ssl/certs/pop3d.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @localstatedir@/ssl/certs/pop3d.pem || cleanup
+rm -f @localstatedir@/ssl/certs/pop3d.rand
diff -ruN courier-imap-4.0.6.orig/imap/pop3d.cnf.in courier-imap-4.0.6/imap/pop3d.cnf.in
--- courier-imap-4.0.6.orig/imap/pop3d.cnf.in 2001-03-24 14:59:55 +1000
+++ courier-imap-4.0.6/imap/pop3d.cnf.in 2005-11-26 22:23:34 +1000
@@ -1,5 +1,5 @@
-RANDFILE = @datadir@/pop3d.rand
+RANDFILE = @localstatedir@/ssl/certs/pop3d.rand
[ req ]
default_bits = 1024
diff -ruN courier-imap-4.0.6.orig/imap/pop3d.dist.in courier-imap-4.0.6/imap/pop3d.dist.in
--- courier-imap-4.0.6.orig/imap/pop3d.dist.in 2005-07-05 23:43:57 +1100
+++ courier-imap-4.0.6/imap/pop3d.dist.in 2005-11-26 22:23:34 +1000
@@ -126,10 +126,10 @@
# or scripts. Rather, this is a convenient flag to be read by your system
# startup script in /etc/rc.d, like this:
#
-# . @sysconfdir@/pop3d
+# . @sysconfdir@/@PACKAGE@/pop3d
# case x$POP3DSTART in
# x[yY]*)
-# @libexecdir@/pop3d.rc start
+# @libexecdir@/@PACKAGE@/pop3d.rc start
# ;;
# esac
#
diff -ruN courier-imap-4.0.6.orig/imap/pop3d-ssl.dist.in courier-imap-4.0.6/imap/pop3d-ssl.dist.in
--- courier-imap-4.0.6.orig/imap/pop3d-ssl.dist.in 2005-07-02 12:13:57 +1100
+++ courier-imap-4.0.6/imap/pop3d-ssl.dist.in 2005-11-26 22:23:34 +1000
@@ -140,7 +140,7 @@
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
#
-TLS_CERTFILE=@datadir@/pop3d.pem
+TLS_CERTFILE=@localstatedir@/ssl/certs/pop3d.pem
##NAME: TLS_TRUSTCERTS:0
#
@@ -180,7 +180,7 @@
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
-TLS_CACHEFILE=@localstatedir@/couriersslcache
+TLS_CACHEFILE=@localstatedir@/@PACKAGE@/couriersslcache
TLS_CACHESIZE=524288
##NAME: MAILDIRPATH:0
diff -ruN courier-imap-4.0.6.orig/imapd.rc.in courier-imap-4.0.6/imapd.rc.in
--- courier-imap-4.0.6.orig/imapd.rc.in 2005-07-02 12:13:56 +1100
+++ courier-imap-4.0.6/imapd.rc.in 2005-11-26 22:36:28 +1000
@@ -8,23 +8,24 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
+sbindir=@sbindir@
libexecdir=@libexecdir@
-if test ! -f @sysconfdir@/imapd
+if test ! -f @sysconfdir@/@PACKAGE@/imapd
then
- echo "@sysconfdir@/imapd does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/imapd does not exist, forgot make install-configure?"
exit 1
fi
-if test ! -f @sysconfdir@/imapd-ssl
+if test ! -f @sysconfdir@/@PACKAGE@/imapd-ssl
then
- echo "@sysconfdir@/imapd-ssl does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/imapd-ssl does not exist, forgot make install-configure?"
exit 1
fi
TLS_CACHEFILE=""
-. @sysconfdir@/imapd-ssl
-. @sysconfdir@/imapd
+. @sysconfdir@/@PACKAGE@/imapd-ssl
+. @sysconfdir@/@PACKAGE@/imapd
case $1 in
start)
@@ -40,19 +41,19 @@
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
libexecdir=@libexecdir@ ;
- . @sysconfdir@/imapd ; \
- . @sysconfdir@/imapd-ssl ; \
+ . @sysconfdir@/@PACKAGE@/imapd ; \
+ . @sysconfdir@/@PACKAGE@/imapd-ssl ; \
IMAP_STARTTLS=$IMAPDSTARTTLS ; \
PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
@courierlogger@ -pid=$PIDFILE -start $LOGGEROPTS \
- @libexecdir@/couriertcpd -address=$ADDRESS \
+ @sbindir@/couriertcpd -address=$ADDRESS \
-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
$TCPDOPTS \
- $PORT @sbindir@/imaplogin @bindir@/imapd ${MAILDIRPATH}"+ $PORT @sbindir@/imaplogin @sbindir@/imapd ${MAILDIRPATH}";;
stop)
- @courierlogger@ -pid=$PIDFILE -stop
+ @sbindir@/couriertcpd -pid=$PIDFILE -stop
;;
esac
exit 0
diff -ruN courier-imap-4.0.6.orig/imapd-ssl.rc.in courier-imap-4.0.6/imapd-ssl.rc.in
--- courier-imap-4.0.6.orig/imapd-ssl.rc.in 2005-07-02 12:13:56 +1100
+++ courier-imap-4.0.6/imapd-ssl.rc.in 2005-11-26 22:34:56 +1000
@@ -8,23 +8,24 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
+sbindir=@sbindir@
libexecdir=@libexecdir@
-if test ! -f @sysconfdir@/imapd
+if test ! -f @sysconfdir@/@PACKAGE@/imapd
then
- echo "@sysconfdir@/imapd does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/imapd does not exist, forgot make install-configure?"
exit 1
fi
-if test ! -f @sysconfdir@/imapd-ssl
+if test ! -f @sysconfdir@/@PACKAGE@/imapd-ssl
then
- echo "@sysconfdir@/imapd-ssl does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/imapd-ssl does not exist, forgot make install-configure?"
exit 1
fi
TLS_CACHEFILE=""
-. @sysconfdir@/imapd
-. @sysconfdir@/imapd-ssl
+. @sysconfdir@/@PACKAGE@/imapd
+. @sysconfdir@/@PACKAGE@/imapd-ssl
case $1 in
start)
@@ -40,20 +41,20 @@
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
libexecdir=@libexecdir@ ;
- . @sysconfdir@/imapd ; \
- . @sysconfdir@/imapd-ssl ; \
+ . @sysconfdir@/@PACKAGE@/imapd ; \
+ . @sysconfdir@/@PACKAGE@/imapd-ssl ; \
PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
IMAP_TLS=1; \
@courierlogger@ -pid=$SSLPIDFILE -start $SSLLOGGEROPTS \
- @libexecdir@/couriertcpd -address=$SSLADDRESS \
+ @sbindir@/couriertcpd -address=$SSLADDRESS \
-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
$TCPDOPTS \
$SSLPORT $COURIERTLS -server -tcpd \
@sbindir@/imaplogin \
- @bindir@/imapd ${MAILDIRPATH}"+ @sbindir@/imapd ${MAILDIRPATH}";;
stop)
- @courierlogger@ -pid=$SSLPIDFILE -stop
+ @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
;;
esac
exit 0
diff -ruN courier-imap-4.0.6.orig/maildir/deliverquota.8.in courier-imap-4.0.6/maildir/deliverquota.8.in
--- courier-imap-4.0.6.orig/maildir/deliverquota.8.in 2004-10-21 11:57:44 +1100
+++ courier-imap-4.0.6/maildir/deliverquota.8.in 2005-11-26 22:23:34 +1000
@@ -60,7 +60,7 @@
the message was successfully delivered the maildir was at least
\fIN\fR percent full.
The warning message is copied verbatim from
-\fI@sysconfdir@/quotawarnmsg\fR with the addition of the
+\fI@sysconfdir@/@PACKAGE@/quotawarnmsg\fR with the addition of the
"Date:" and
"Message-Id:" headers.
The warning is repeated every 24 hours (at least), until the maildir drops
diff -ruN courier-imap-4.0.6.orig/maildir/deliverquota.html.in courier-imap-4.0.6/maildir/deliverquota.html.in
--- courier-imap-4.0.6.orig/maildir/deliverquota.html.in 2004-10-21 11:57:46 +1100
+++ courier-imap-4.0.6/maildir/deliverquota.html.in 2005-11-26 22:23:34 +1000
@@ -199,7 +199,7 @@
The warning message is copied verbatim from
<TT
CLASS="FILENAME"
->@sysconfdir@/quotawarnmsg</TT
+>@sysconfdir@/@PACKAGE@/quotawarnmsg</TT
> with the addition of the
"<TT
CLASS="LITERAL"
diff -ruN courier-imap-4.0.6.orig/maildir/maildirmake.1.in courier-imap-4.0.6/maildir/maildirmake.1.in
--- courier-imap-4.0.6.orig/maildir/maildirmake.1.in 2004-10-21 11:57:45 +1100
+++ courier-imap-4.0.6/maildir/maildirmake.1.in 2005-11-26 22:23:34 +1000
@@ -174,7 +174,7 @@
Normally \fB-add\fR command must be run for every maildir
which needs
to access the sharable maildir. Alternatively the file
-\fI@sysconfdir@/maildirshared\fR can be created,
+\fI@sysconfdir@/@PACKAGE@/maildirshared\fR can be created,
to specify a default set of sharable maildirs.
Each line in this file takes the following format:
.sp
diff -ruN courier-imap-4.0.6.orig/maildir/maildirmake.html.in courier-imap-4.0.6/maildir/maildirmake.html.in
--- courier-imap-4.0.6.orig/maildir/maildirmake.html.in 2004-10-21 11:57:46 +1100
+++ courier-imap-4.0.6/maildir/maildirmake.html.in 2005-11-26 22:23:34 +1000
@@ -519,7 +519,7 @@
to access the sharable maildir. Alternatively the file
<TT
CLASS="FILENAME"
->@sysconfdir@/maildirshared</TT
+>@sysconfdir@/@PACKAGE@/maildirshared</TT
> can be created,
to specify a default set of sharable maildirs.
Each line in this file takes the following format:
diff -ruN courier-imap-4.0.6.orig/maildir/sharedindexinstall.in courier-imap-4.0.6/maildir/sharedindexinstall.in
--- courier-imap-4.0.6.orig/maildir/sharedindexinstall.in 2004-01-11 12:47:33 +1000
+++ courier-imap-4.0.6/maildir/sharedindexinstall.in 2005-11-26 22:23:34 +1000
@@ -9,9 +9,9 @@
prefix="@prefix@"
sysconfdir="@sysconfdir@"
-shareddir="$sysconfdir/shared" # Where the shared index files are kept
+shareddir="$sysconfdir/@PACKAGE@/shared" # Where the shared index files are kept
-newshareddir="$sysconfdir/shared.tmp" # Updated shared index
+newshareddir="$sysconfdir/@PACKAGE@/shared.tmp" # Updated shared index
if test `ls "$newshareddir" | wc -l` = 0
then
diff -ruN courier-imap-4.0.6.orig/Makefile.am courier-imap-4.0.6/Makefile.am
--- courier-imap-4.0.6.orig/Makefile.am 2005-09-16 11:12:03 +1100
+++ courier-imap-4.0.6/Makefile.am 2005-11-26 22:23:34 +1000
@@ -141,14 +141,14 @@
for f in mkimapdcert mkpop3dcert ; \
do rm -f $(DESTDIR)$(sbindir)/$$f ; \
$(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/@PACKAGE@
install-exec-hook:
- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
- mkdir -p $(DESTDIR)$(sysconfdir)/shared
- chmod 755 $(DESTDIR)$(sysconfdir)/shared
- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
+ chmod 444 $(DESTDIR)$(sysconfdir)/@PACKAGE@/quotawarnmsg.example
+ mkdir -p $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared
+ chmod 755 $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared
+ mkdir -p $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared.tmp
+ chmod 755 $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared.tmp
install-data-local: install-man
test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
@@ -297,7 +297,7 @@
install-configure-local:
@list="$(SYSCONFFILES)"; \
for file in $$list; do \
- file="$(DESTDIR)$(sysconfdir)/$$file" ; \
+ file="$(DESTDIR)$(sysconfdir)/@PACKAGE@/$$file" ; \
case "$$file" in *.dist) \
@SYSCONFTOOL@ $$file;; esac ; done
upload-beta:
diff -ruN courier-imap-4.0.6.orig/Makefile.in courier-imap-4.0.6/Makefile.in
--- courier-imap-4.0.6.orig/Makefile.in 2005-09-24 11:46:37 +1100
+++ courier-imap-4.0.6/Makefile.in 2005-11-26 22:32:24 +1000
@@ -71,11 +71,11 @@
pop3d.rc pop3d-ssl.rc courier-imap.sysvinit courier-imap.spec \
courier-imap.lpspec INSTALL.html \
packaging/suse/courier-imap.init
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)/@PACKAGE@" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(databindir)" \
- "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \
+ "$(DESTDIR)$(libexecdir)/@PACKAGE@" "$(DESTDIR)$(sbindir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
- "$(DESTDIR)$(sysconfdir)"
+ "$(DESTDIR)$(sysconfdir)/@PACKAGE@"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -248,8 +248,8 @@
CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
databindir = $(datadir)
databin_SCRIPTS = mkimapdcert mkpop3dcert
-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
-sbinPROGRAMS = imaplogin pop3login
+binPROGRAMS = maildirmake maildiracl deliverquota maildirkw
+sbinPROGRAMS = imapd pop3d imaplogin pop3login
libexecPROGRAMS = makedatprog couriertcpd
man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
@@ -380,15 +380,15 @@
done
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
@list='$(libexec_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -436,13 +436,13 @@
done
install-databinSCRIPTS: $(databin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(databindir)" || $(mkdir_p) "$(DESTDIR)$(databindir)"
+ test -z "$(databindir)" || $(mkdir_p) "$(DESTDIR)$(databindir)/@PACKAGE@"
@list='$(databin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(databinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(databindir)/$$f'"; \
- $(databinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(databindir)/$$f"; \
+ echo " $(databinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(databindir)/@PACKAGE@/$$f'"; \
+ $(databinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(databindir)/@PACKAGE@/$$f"; \
else :; fi; \
done
@@ -455,13 +455,13 @@
done
install-libexecSCRIPTS: $(libexec_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ test -z "$(libexecdir)/@PACKAGE@" || $(mkdir_p) "$(DESTDIR)$(libexecdir)/@PACKAGE@"
@list='$(libexec_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(libexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
- $(libexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(libexecdir)/$$f"; \
+ echo " $(libexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(libexecdir)/@PACKAGE@/$$f'"; \
+ $(libexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(libexecdir)/@PACKAGE@/$$f"; \
else :; fi; \
done
@@ -593,12 +593,12 @@
done
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+ test -z "$(sysconfdir)/@PACKAGE@" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/@PACKAGE@"
@list='$(sysconf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f'"; \
+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f"; \
done
uninstall-sysconfDATA:
@@ -879,7 +879,7 @@
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(databindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)/@PACKAGE@" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(databindir)" "$(DESTDIR)$(libexecdir)/@PACKAGE@" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)/@PACKAGE@"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -1090,22 +1090,22 @@
cp -f $(srcdir)/maildir/quotawarnmsg quotawarnmsg.example
install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(databindir)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+ $(mkinstalldirs) $(DESTDIR)$(databindir)/@PACKAGE@
+ $(mkinstalldirs) $(DESTDIR)$(sbindir)
test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
- tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
+ tcpd/couriertls $(DESTDIR)$(sbindir)/couriertls
$(mkinstalldirs) $(DESTDIR)$(sbindir)
for f in mkimapdcert mkpop3dcert ; \
do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)
+ $(LN_S) $(databindir)/@PACKAGE@/$$f $(DESTDIR)$(sbindir)/$$f ; done
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/@PACKAGE@
install-exec-hook:
- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
- mkdir -p $(DESTDIR)$(sysconfdir)/shared
- chmod 755 $(DESTDIR)$(sysconfdir)/shared
- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
+ chmod 444 $(DESTDIR)$(sysconfdir)/@PACKAGE@/quotawarnmsg.example
+ mkdir -p $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared
+ chmod 755 $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared
+ mkdir -p $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared.tmp
+ chmod 755 $(DESTDIR)$(sysconfdir)/@PACKAGE@/shared.tmp
install-data-local: install-man
test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
@@ -1235,7 +1235,7 @@
install-configure-local:
@list="$(SYSCONFFILES)"; \
for file in $$list; do \
- file="$(DESTDIR)$(sysconfdir)/$$file" ; \
+ file="$(DESTDIR)$(sysconfdir)/@PACKAGE@/$$file" ; \
case "$$file" in *.dist) \
@SYSCONFTOOL@ $$file;; esac ; done
upload-beta:
diff -ruN courier-imap-4.0.6.orig/packaging/suse/courier-imap.init.in courier-imap-4.0.6/packaging/suse/courier-imap.init.in
--- courier-imap-4.0.6.orig/packaging/suse/courier-imap.init.in 2004-02-08 14:22:07 +1000
+++ courier-imap-4.0.6/packaging/suse/courier-imap.init.in 2005-11-26 22:23:34 +1000
@@ -21,8 +21,8 @@
base=${0##*/} link=${base#*[SK][0-9][0-9]}-COURIER_ETC=@sysconfdir@
-COURIER_LIBEXEC=@libexecdir@
+COURIER_ETC=@sysconfdir@/@PACKAGE@
+COURIER_LIBEXEC=@libexecdir@/@PACKAGE@
COURIER_DATA=@datadir@
COURIER_BIN=@bindir@/imapd
diff -ruN courier-imap-4.0.6.orig/pop3d.rc.in courier-imap-4.0.6/pop3d.rc.in
--- courier-imap-4.0.6.orig/pop3d.rc.in 2005-07-02 12:13:56 +1100
+++ courier-imap-4.0.6/pop3d.rc.in 2005-11-26 22:23:34 +1000
@@ -10,20 +10,20 @@
bindir=@bindir@
libexecdir=@libexecdir@
-if test ! -f @sysconfdir@/pop3d
+if test ! -f @sysconfdir@/@PACKAGE@/pop3d
then
- echo "@sysconfdir@/pop3d does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/pop3d does not exist, forgot make install-configure?"
exit 1
fi
-if test ! -f @sysconfdir@/pop3d-ssl
+if test ! -f @sysconfdir@/@PACKAGE@/pop3d-ssl
then
- echo "@sysconfdir@/pop3d-ssl does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/pop3d-ssl does not exist, forgot make install-configure?"
exit 1
fi
-. @sysconfdir@/pop3d-ssl
-. @sysconfdir@/pop3d
+. @sysconfdir@/@PACKAGE@/pop3d-ssl
+. @sysconfdir@/@PACKAGE@/pop3d
case $1 in
start)
diff -ruN courier-imap-4.0.6.orig/pop3d-ssl.rc.in courier-imap-4.0.6/pop3d-ssl.rc.in
--- courier-imap-4.0.6.orig/pop3d-ssl.rc.in 2005-07-02 12:13:56 +1100
+++ courier-imap-4.0.6/pop3d-ssl.rc.in 2005-11-26 22:37:29 +1000
@@ -8,23 +8,23 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
-libexecdir=@libexecdir@
+sbindir=@sbindir@
-if test ! -f @sysconfdir@/pop3d
+if test ! -f @sysconfdir@/@PACKAGE@/pop3d
then
- echo "@sysconfdir@/pop3d does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/pop3d does not exist, forgot make install-configure?"
exit 1
fi
-if test ! -f @sysconfdir@/pop3d-ssl
+if test ! -f @sysconfdir@/@PACKAGE@/pop3d-ssl
then
- echo "@sysconfdir@/pop3d-ssl does not exist, forgot make install-configure?"
+ echo "@sysconfdir@/@PACKAGE@/pop3d-ssl does not exist, forgot make install-configure?"
exit 1
fi
-. @sysconfdir@/pop3d
-. @sysconfdir@/pop3d-ssl
+. @sysconfdir@/@PACKAGE@/pop3d
+. @sysconfdir@/@PACKAGE@/pop3d-ssl
case $1 in
start)
@@ -33,8 +33,8 @@
exec_prefix=@exec_prefix@ ;
bindir=@bindir@ ;
libexecdir=@libexecdir@ ;
- . @sysconfdir@/pop3d ; \
- . @sysconfdir@/pop3d-ssl ; \
+ . @sysconfdir@/@PACKAGE@/pop3d ; \
+ . @sysconfdir@/@PACKAGE@/pop3d-ssl ; \
PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
POP3_TLS=1; \
POP3_STARTTLS=NO; \