--- courier-imap-4.4.1/Makefile.am.p0 2008-07-15 09:26:58 +1100 +++ courier-imap-4.4.1/Makefile.am 2008-09-07 17:16:46 +1100 @@ -137,14 +137,14 @@ install-exec-local: 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 ; \ @@ -296,7 +296,7 @@ install-configure: 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: --- courier-imap-4.4.1/Makefile.in.p0 2008-07-17 12:11:34 +1100 +++ courier-imap-4.4.1/Makefile.in 2008-09-07 17:16:46 +1100 @@ -64,11 +64,11 @@ CONFIG_CLEAN_FILES = dbobj.h dbobj.confi 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) @@ -247,8 +247,8 @@ sbin_SCRIPTS = sharedindexinstall shared 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 bin_PROGRAMS = @binPROGRAMS_exec@ sbin_PROGRAMS = @sbinPROGRAMS_exec@ @@ -382,15 +382,15 @@ clean-binPROGRAMS: done install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + test -z "$(libexecdir)" || $(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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -438,13 +438,13 @@ clean-sbinPROGRAMS: 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 @@ -457,13 +457,13 @@ uninstall-databinSCRIPTS: 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 @@ -594,12 +594,12 @@ uninstall-man8: 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: @@ -896,7 +896,7 @@ check: check-recursive 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 @@ -1116,22 +1116,22 @@ quotawarnmsg.example: maildir/quotawarnm 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 ; \ @@ -1264,7 +1264,7 @@ install-configure: 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: --- courier-imap-4.4.1/courier-imap.sysvinit.in.p0 2007-07-30 11:32:07 +1100 +++ courier-imap-4.4.1/courier-imap.sysvinit.in 2008-09-07 17:16:46 +1100 @@ -17,7 +17,7 @@ datarootdir=@datarootdir@ case "$1" in start) cd / - . @sysconfdir@/imapd + . @sysconfdir@/@PACKAGE@/imapd touch /var/lock/subsys/courier-imap echo -n "Starting Courier-IMAP server:" @@ -25,12 +25,12 @@ start) 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 @@ -43,7 +43,7 @@ start) 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 ;; @@ -52,22 +52,22 @@ start) 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 @@ -82,7 +82,7 @@ start) 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 ;; @@ -92,24 +92,24 @@ start) ;; 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 --- courier-imap-4.4.1/imap/courierpop3d.8.in.p0 2007-04-23 02:33:35 +1100 +++ courier-imap-4.4.1/imap/courierpop3d.8.in 2008-09-07 17:16:46 +1100 @@ -17,7 +17,7 @@ courierpop3d \- Courier POP3 server .SH "SYNOPSIS" .HP 22 -\fB@sbindir@/couriertcpd\fR {\-nodnslookup} {\-stderr=syslog} {110} {@libexecdir@/courier/courierpop3login} [\fImodules\fR...] {@libexecdir@/courier/courierpop3d} {./Maildir} +\fB@sbindir@/couriertcpd\fR {\-nodnslookup} {\-stderr=syslog} {110} {@libexecdir@/@PACKAGE@/courierpop3login} [\fImodules\fR...] {@libexecdir@/@PACKAGE@/courierpop3d} {./Maildir} .SH "DESCRIPTION" .PP This is a simple POP3 server for Maildirs. --- courier-imap-4.4.1/imap/courierpop3d.html.in.p0 2007-04-23 02:33:36 +1100 +++ courier-imap-4.4.1/imap/courierpop3d.html.in 2008-09-07 17:16:46 +1100 @@ -4,7 +4,7 @@ Copyright 1998 - 2007 Double Precision, Inc. See COPYING for distribution information. --->

Name

courierpop3d — Courier POP3 server

Synopsis

@sbindir@/couriertcpd {-nodnslookup} {-stderr=syslog} {110} {@libexecdir@/courier/courierpop3login} [modules...] {@libexecdir@/courier/courierpop3d} {./Maildir}

DESCRIPTION

+-->

Name

courierpop3d — Courier POP3 server

Synopsis

@sbindir@/couriertcpd {-nodnslookup} {-stderr=syslog} {110} {@libexecdir@/@PACKAGE@/courierpop3login} [modules...] {@libexecdir@/@PACKAGE@/courierpop3d} {./Maildir}

DESCRIPTION

This is a simple POP3 server for Maildirs.

Note

The couriertcpd, courierpop3login, and courierpop3d modules may be installed elsewhere than --- courier-imap-4.4.1/imap/imapd-ssl.dist.in.p0 2008-07-13 07:18:12 +1100 +++ courier-imap-4.4.1/imap/imapd-ssl.dist.in 2008-09-07 17:16:46 +1100 @@ -260,7 +260,7 @@ TLS_CERTS=X509 # # This is an experimental feature. -TLS_CERTFILE=@mydatadir@/imapd.pem +TLS_CERTFILE=@localstatedir@/ssl/certs/imapd.pem ##NAME: TLS_TRUSTCERTS:0 # @@ -322,7 +322,7 @@ TLS_VERIFYPEER=NONE # 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 --- courier-imap-4.4.1/imap/imapd.8.in.p0 2007-11-11 06:46:15 +1000 +++ courier-imap-4.4.1/imap/imapd.8.in 2008-09-07 17:16:46 +1100 @@ -17,7 +17,7 @@ imapd - Courier-IMAP server .SH "SYNOPSIS" .HP 25 -\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\./Maildir} +\fB@libexecdir@/@PACKAGE@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\./Maildir} .HP 19 \fB@prefix@/bin/imapd\fR {\./Maildir} .SH "DESCRIPTION" @@ -98,9 +98,9 @@ Maildir folders, each one containing the .RE .PP Other environment variables are initialized from the -\fI@sysconfdir@/imapd\fR +\fI@sysconfdir@/@PACKAGE@/imapd\fR and -\fI@sysconfdir@/imapd\-ssl\fR +\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" @@ -110,7 +110,7 @@ IMAP_ENHANCEDIDLE to 1 in -\fI@sysconfdir@/imapd\fR +\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 immediately notified of any changes to the folder\'s contents\. .PP The Courier\-IMAP server always allows more than one mail client to have the same folder opened\. However, when two or more clients have the same folder opened, the mail clients may not necessarily know when another client added or removed messages from the folder\. The base IMAP protocol specification requires IMAP mail clients to explicitly check for any changes to the folder\'s contents\. No provisions exists to notify the mail client immediately when the folder\'s contents are modified by another mail client\. @@ -177,7 +177,7 @@ IDLE must be listed in the \fBIMAP_CAPABILITY\fR setting in the -\fI@sysconfdir@/imapd\fR +\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 the IDLE capability\. When upgrading from the previous version the @@ -188,7 +188,7 @@ capability must be manually added\. \fBIMAP_USELOCKS\fR .RS 4 This setting in -\fI@sysconfdir@/imapd\fR +\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\. .sp This setting is safe to use with NFS, as it does not use actual file locking calls, and does not require the services of the problematic NFS lock daemon\. @@ -206,7 +206,7 @@ support in most IMAP mail clients is not \fBIMAP_ENHANCEDIDLE\fR .RS 4 This setting in -\fI@sysconfdir@/imapd\fR +\fI@sysconfdir@/@PACKAGE@/imapd\fR actually enables concurrent realtime folder status updates using the IDLE extension\. Note that it is possible to enable the @@ -277,7 +277,7 @@ S:+ entering ENHANCED idle mode .br Note 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 .sp @@ -293,7 +293,7 @@ to verify that the executable is linked with the \fIlibfam\fR library), and verify the settings in the -\fI@sysconfdir@/imapd\fR\. +\fI@sysconfdir@/@PACKAGE@/imapd\fR\. .RE .sp .RS 4 --- courier-imap-4.4.1/imap/imapd.dist.in.p0 2008-06-22 03:01:23 +1100 +++ courier-imap-4.4.1/imap/imapd.dist.in 2008-09-07 17:16:46 +1100 @@ -274,7 +274,7 @@ IMAP_USELOCKS=1 # 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 # @@ -400,11 +400,11 @@ HEADERFROM=X-IMAP-Sender # 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 # --- courier-imap-4.4.1/imap/imapd.html.in.p0 2007-11-11 06:46:15 +1000 +++ courier-imap-4.4.1/imap/imapd.html.in 2008-09-07 17:16:46 +1100 @@ -4,7 +4,7 @@ Copyright 1998 - 2007 Double Precision, Inc. See COPYING for distribution information. --->

Name

imapd — Courier-IMAP server

Synopsis

@libexecdir@/couriertcpd {couriertcpd options} {@prefix@/sbin/imaplogin} [modules...] {@prefix@/bin/imapd} {./Maildir}

@prefix@/bin/imapd {./Maildir}

DESCRIPTION

+-->

Name

imapd — Courier-IMAP server

Synopsis

@libexecdir@/@PACKAGE@/couriertcpd {couriertcpd options} {@prefix@/sbin/imaplogin} [modules...] {@prefix@/bin/imapd} {./Maildir}

@prefix@/bin/imapd {./Maildir}

DESCRIPTION

imapd is the Courier-IMAP server that provides IMAP access to Maildir mailboxes. @@ -55,13 +55,13 @@ Maildir.

Other environment variables are initialized from the -@sysconfdir@/imapd and -@sysconfdir@/imapd-ssl configuration files. +@sysconfdir@/@PACKAGE@/imapd and +@sysconfdir@/@PACKAGE@/imapd-ssl configuration files. These files are loaded into the environment by the system startup script that runs couriertcpd.

Realtime concurrent folder status updates

Setting the IMAP_ENHANCEDIDLE to 1 in -@sysconfdir@/imapd enables realtime concurrent folder +@sysconfdir@/@PACKAGE@/imapd 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 @@ -125,14 +125,14 @@ is used by the current versions of both IDLE must be listed in the IMAP_CAPABILITY -setting in the @sysconfdir@/imapd +setting in the @sysconfdir@/@PACKAGE@/imapd 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 the IDLE capability. When upgrading from the previous version the IDLE capability must be manually added.

IMAP_USELOCKS

-This setting in @sysconfdir@/imapd +This setting in @sysconfdir@/@PACKAGE@/imapd 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.

@@ -145,7 +145,7 @@ Of course, an IMAP client that supports protocol extension is required. At press time the status and extent of IDLE support in most IMAP mail clients is not known.

IMAP_ENHANCEDIDLE

-This setting in @sysconfdir@/imapd +This setting in @sysconfdir@/@PACKAGE@/imapd actually enables concurrent realtime folder status updates using the IDLE extension. Note that it is possible to enable the IDLE extension @@ -208,7 +208,7 @@ S:+ entering ENHANCED idle mode 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 -@sysconfdir@/imapd +@sysconfdir@/@PACKAGE@/imapd for the duration of this test.

  • The last message from the server must be "entering ENHANCED idle mode". Otherwise, it means that some of the necessary prerequisites have not been @@ -218,7 +218,7 @@ or Gaminldd(1) to verify that the imapd executable is linked with the libfam library), and verify the settings in the -@sysconfdir@/imapd.

  • +@sysconfdir@/@PACKAGE@/imapd.

  • Open another terminal window, connect to the server, and modify the flags of one of the messages:

     S:* OK Courier-IMAP ready. Copyright 1998-2002 Double Precision, Inc.
--- courier-imap-4.4.1/imap/mkimapdcert.8.in.p0	2007-04-23 02:33:32 +1100
+++ courier-imap-4.4.1/imap/mkimapdcert.8.in	2008-09-07 17:16:46 +1100
@@ -21,18 +21,18 @@ mkimapdcert \- create a test SSL certifi
 .SH "DESCRIPTION"
 .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. For production use the X.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate.
 .PP
 
-\fI@datadir@/imapd.pem\fR
+\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
+\fB@localstatedir@/ssl/certs/imapd.pem\fR
 already exists.
 .PP
 
@@ -42,12 +42,12 @@ OpenSSL
 to be installed.
 .SH "FILES"
 .PP
-@datadir@/imapd.pem
+@localstatedir@/ssl/certs/imapd.pem
 .RS 4
 X.509 certificate.
 .RE
 .PP
-@sysconfdir@/imapd.cnf
+@sysconfdir@/@PACKAGE@/imapd.cnf
 .RS 4
 Parameters used by OpenSSL to create the X.509 certificate.
 .RE
--- courier-imap-4.4.1/imap/mkimapdcert.html.in.p0	2007-04-23 02:33:32 +1100
+++ courier-imap-4.4.1/imap/mkimapdcert.html.in	2008-09-07 17:16:46 +1100
@@ -7,24 +7,24 @@ information.
 -->
     
    Name
    mkimapdcert — create a test SSL certificate for IMAP over SSL
    Synopsis
    @sbindir@/mkimapdcert 
     
    DESCRIPTION
    
 IMAP over SSL requires a valid, signed, X.509 certificate.  The default
 location for the certificate file is
-@datadir@/imapd.pem.
+@localstatedir@/ssl/certs/imapd.pem.
 mkimapdcert generates a self-signed X.509 certificate,
 mainly for
 testing.
 For production use the X.509 certificate must be signed by a
 recognized certificate authority, in order for mail clients to accept the
 certificate.
    
-@datadir@/imapd.pem must be owned by the
+@localstatedir@/ssl/certs/imapd.pem must be owned by the
 @mailuser@ user and
 have no group or world permissions.
 The mkimapdcert command will
 enforce this.  To prevent an unfortunate accident,
 mkimapdcert
-will not work if @datadir@/imapd.pem already exists.
    
+will not work if @localstatedir@/ssl/certs/imapd.pem already exists.
    
 mkimapdcert requires
-OpenSSL to be installed.
     
    FILES
    @datadir@/imapd.pem
    
+OpenSSL to be installed.
     
    FILES
    @localstatedir@/ssl/certs/imapd.pem
    
 X.509 certificate.
-
    @sysconfdir@/imapd.cnf
    
+
    @sysconfdir@/@PACKAGE@/imapd.cnf
    
 Parameters used by OpenSSL to
 create the X.509 certificate.
 
     
    SEE ALSO
    
--- courier-imap-4.4.1/imap/mkimapdcert.in.p0	2007-11-05 06:50:15 +1000
+++ courier-imap-4.4.1/imap/mkimapdcert.in	2008-09-07 17:16:46 +1100
@@ -18,44 +18,45 @@ fi
 
 prefix="@prefix@"
 
-if test -f @mydatadir@/imapd.pem
+if test -f @localstatedir@/ssl/certs/imapd.pem
 then
-	echo "@mydatadir@/imapd.pem already exists."
+	echo "@localstatedir@/ssl/certs/imapd.pem already exists."
 	exit 1
 fi
 
 umask 077
 
 cleanup() {
-	rm -f @mydatadir@/imapd.pem
-	rm -f @mydatadir@/imapd.rand
-	rm -f @mydatadir@/imapd.key
-	rm -f @mydatadir@/imapd.cert
+	rm -f @localstatedir@/ssl/certs/imapd.pem
+	rm -f @localstatedir@/ssl/certs/imapd.rand
+	rm -f @localstatedir@/ssl/certs/imapd.key
+	rm -f @localstatedir@/ssl/certs/imapd.cert
 	exit 1
 }
 
-cd @mydatadir@
+cd @localstatedir@/ssl/certs
 
 if test "@ssllib@" = "openssl"
 then
-	cp /dev/null @mydatadir@/imapd.pem
-	chmod 600 @mydatadir@/imapd.pem
-	chown @mailuser@ @mydatadir@/imapd.pem
+	cp /dev/null @localstatedir@/ssl/certs/imapd.pem
+	chmod 600 @localstatedir@/ssl/certs/imapd.pem
+	chown @mailuser@ @localstatedir@/ssl/certsimapd.pem
 
-	dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null
+	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 @mydatadir@/imapd.pem -keyout @mydatadir@/imapd.pem || cleanup
-	@OPENSSL@ gendh -rand @mydatadir@/imapd.rand 512 >>@mydatadir@/imapd.pem || cleanup
-	@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/imapd.pem || cleanup
-	rm -f @mydatadir@/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
 else
-	cp /dev/null @mydatadir@/imapd.key
-	chmod 600 @mydatadir@/imapd.key
-	cp /dev/null @mydatadir@/imapd.cert
-	chmod 600 @mydatadir@/imapd.cert
+	cp /dev/null @localstatedir@/ssl/certs/imapd.key
+	chmod 600 @localstatedir@/ssl/certs/imapd.key
+	cp /dev/null @localstatedir@/ssl/certs/imapd.cert
+	chmod 600 @localstatedir@/ssl/certs/imapd.cert
 
 	@CERTTOOL@ --generate-privkey --outfile imapd.key
-	@CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf
+	@CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/@PACKAGE@/imapd.cnf
 	@CERTTOOL@ --generate-dh-params >>imapd.cert
 	cat imapd.key imapd.cert >imapd.pem
 	rm -f imapd.key imapd.cert
--- courier-imap-4.4.1/imap/mkpop3dcert.8.in.p0	2007-04-23 02:33:36 +1100
+++ courier-imap-4.4.1/imap/mkpop3dcert.8.in	2008-09-07 17:16:46 +1100
@@ -21,18 +21,18 @@ mkpop3dcert \- create a test SSL certifi
 .SH "DESCRIPTION"
 .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. For production use the X.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate.
 .PP
 
-\fI@datadir@/pop3d.pem\fR
+\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
+\fB@localstatedir@/ssl/certs/pop3d.pem\fR
 already exists.
 .PP
 
@@ -42,12 +42,12 @@ OpenSSL
 to be installed.
 .SH "FILES"
 .PP
-@datadir@/pop3d.pem
+@localstatedir@/ssl/certs/pop3d.pem
 .RS 4
 X.509 certificate.
 .RE
 .PP
-@sysconfdir@/pop3d.cnf
+@sysconfdir@/@PACKAGE@/pop3d.cnf
 .RS 4
 Parameters used by OpenSSL to create the X.509 certificate.
 .RE
--- courier-imap-4.4.1/imap/mkpop3dcert.html.in.p0	2007-04-23 02:33:35 +1100
+++ courier-imap-4.4.1/imap/mkpop3dcert.html.in	2008-09-07 17:16:46 +1100
@@ -7,24 +7,24 @@ information.
 -->
     
    Name
    mkpop3dcert — create a test SSL certificate for POP3 over SSL
    Synopsis
    @sbindir@/mkpop3dcert 
     
    DESCRIPTION
    
 POP3 over SSL requires a valid, signed, X.509 certificate.  The default
 location for the certificate file is
-@datadir@/pop3d.pem.
+@localstatedir@/ssl/certs/pop3d.pem.
 mkpop3dcert generates a self-signed X.509 certificate,
 mainly for
 testing.
 For production use the X.509 certificate must be signed by a
 recognized certificate authority, in order for mail clients to accept the
 certificate.
    
-@datadir@/pop3d.pem must be owned by the
+@localstatedir@/ssl/certs/pop3d.pem must be owned by the
 @mailuser@ user and
 have no group or world permissions.
 The mkpop3dcert command will
 enforce this.  To prevent an unfortunate accident,
 mkpop3dcert
-will not work if @datadir@/pop3d.pem already exists.
    
+will not work if @localstatedir@/ssl/certs/pop3d.pem already exists.
    
 mkpop3dcert requires
-OpenSSL to be installed.
     
    FILES
    @datadir@/pop3d.pem
    
+OpenSSL to be installed.
     
    FILES
    @localstatedir@/ssl/certs/pop3d.pem
    
 X.509 certificate.
-
    @sysconfdir@/pop3d.cnf
    
+
    @sysconfdir@/@PACKAGE@/pop3d.cnf
    
 Parameters used by OpenSSL to
 create the X.509 certificate.
 
     
    SEE ALSO
    
--- courier-imap-4.4.1/imap/mkpop3dcert.in.p0	2007-11-05 06:50:15 +1000
+++ courier-imap-4.4.1/imap/mkpop3dcert.in	2008-09-07 17:16:46 +1100
@@ -18,44 +18,44 @@ fi
 
 prefix="@prefix@"
 
-if test -f @mydatadir@/pop3d.pem
+if test -f @localstatedir@/ssl/certs/pop3d.pem
 then
-	echo "@mydatadir@/pop3d.pem already exists."
+	echo "@localstatedir@/ssl/certs/pop3d.pem already exists."
 	exit 1
 fi
 
 umask 077
 
 cleanup() {
-	rm -f @mydatadir@/pop3d.pem
-	rm -f @mydatadir@/pop3d.rand
-	rm -f @mydatadir@/pop3d.key
-	rm -f @mydatadir@/pop3d.cert
+	rm -f @localstatedir@/ssl/certs/pop3d.pem
+	rm -f @localstatedir@/ssl/certs/pop3d.rand
+	rm -f @localstatedir@/ssl/certs/pop3d.key
+	rm -f @localstatedir@/ssl/certs/pop3d.cert
 	exit 1
 }
 
-cd @mydatadir@
+cd @localstatedir@/ssl/certs
 
 if test "@ssllib@" = "openssl"
 then
-	cp /dev/null @mydatadir@/pop3d.pem
-	chmod 600 @mydatadir@/pop3d.pem
-	chown @mailuser@ @mydatadir@/pop3d.pem
+	cp /dev/null @localstatedir@/ssl/certs/pop3d.pem
+	chmod 600 @localstatedir@/ssl/certs/pop3d.pem
+	chown @mailuser@ @localstatedir@/ssl/certs/pop3d.pem
 
-	dd if=@RANDOMV@ of=@mydatadir@/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 @mydatadir@/pop3d.pem -keyout @mydatadir@/pop3d.pem || cleanup
-	@OPENSSL@ gendh -rand @mydatadir@/pop3d.rand 512 >>@mydatadir@/pop3d.pem || cleanup
-	@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/pop3d.pem || cleanup
-	rm -f @mydatadir@/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
 else
-	cp /dev/null @mydatadir@/pop3d.key
-	chmod 600 @mydatadir@/pop3d.key
-	cp /dev/null @mydatadir@/pop3d.cert
-	chmod 600 @mydatadir@/pop3d.cert
+	cp /dev/null @localstatedir@/ssl/certs/pop3d.key
+	chmod 600 @localstatedir@/ssl/certs/pop3d.key
+	cp /dev/null @localstatedir@/ssl/certs/pop3d.cert
+	chmod 600 @localstatedir@/ssl/certs/pop3d.cert
 
 	@CERTTOOL@ --generate-privkey --outfile pop3d.key
-	@CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf
+	@CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/@PACKAGE/pop3d.cnf
 	@CERTTOOL@ --generate-dh-params >>pop3d.cert
 	cat pop3d.key pop3d.cert >pop3d.pem
 	rm -f pop3d.key pop3d.cert
--- courier-imap-4.4.1/imap/pop3d-ssl.dist.in.p0	2008-07-13 07:18:12 +1100
+++ courier-imap-4.4.1/imap/pop3d-ssl.dist.in	2008-09-07 17:16:46 +1100
@@ -52,7 +52,7 @@ SSLPIDFILE=@piddir@/pop3d-ssl.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# courierlogger(1) options.
 #
 
 SSLLOGGEROPTS="-name=pop3d-ssl"
@@ -248,7 +248,7 @@ TLS_CERTS=X509
 #
 # This is an experimental feature.
 
-TLS_CERTFILE=@mydatadir@/pop3d.pem
+TLS_CERTFILE=@localstatedir@/ssl/certs/pop3d.pem
 
 ##NAME: TLS_TRUSTCERTS:0
 #
@@ -308,7 +308,7 @@ TLS_VERIFYPEER=NONE
 # 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
--- courier-imap-4.4.1/imap/pop3d.dist.in.p0	2005-07-05 23:43:57 +1100
+++ courier-imap-4.4.1/imap/pop3d.dist.in	2008-09-07 17:16:46 +1100
@@ -126,10 +126,10 @@ LOGGEROPTS="-name=pop3d"
 # 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
 #
--- courier-imap-4.4.1/imapd-ssl.rc.in.p0	2005-07-02 12:13:56 +1100
+++ courier-imap-4.4.1/imapd-ssl.rc.in	2008-09-07 17:19:06 +1100
@@ -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,17 +41,17 @@ start)
 		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
--- courier-imap-4.4.1/imapd.rc.in.p0	2008-05-05 00:12:47 +1100
+++ courier-imap-4.4.1/imapd.rc.in	2008-09-07 17:19:19 +1100
@@ -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,16 +41,16 @@ start)
 			exec_prefix=@exec_prefix@ ;
 			bindir=@bindir@ ;
 			libexecdir=@libexecdir@ ;
-				. @sysconfdir@/imapd-ssl ; \
-				. @sysconfdir@/imapd ; \
+				. @sysconfdir@/@PACKAGE@/imapd-ssl ; \
+				. @sysconfdir@/@PACKAGE@/imapd ; \
 		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
--- courier-imap-4.4.1/maildir/deliverquota.8.in.p0	2007-04-23 02:32:19 +1100
+++ courier-imap-4.4.1/maildir/deliverquota.8.in	2008-09-07 17:16:46 +1100
@@ -67,7 +67,7 @@ The
 option places a warning message into the maildir if the maildir has a quota setting, and after 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
+\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 below
 \fIN\fR
 percent full.
--- courier-imap-4.4.1/maildir/deliverquota.html.in.p0	2007-04-23 02:32:18 +1100
+++ courier-imap-4.4.1/maildir/deliverquota.html.in	2008-09-07 17:16:46 +1100
@@ -45,7 +45,7 @@ into the maildir if the maildir has a qu
 the message was successfully delivered the maildir was at least
 N percent full.
 The warning message is copied verbatim from
-@sysconfdir@/quotawarnmsg with the addition of the
+@sysconfdir@/@PACKAGE@/quotawarnmsg with the addition of the
 "Date:" and
 "Message-Id:" headers.
 The warning is repeated every 24 hours (at least), until the maildir drops
--- courier-imap-4.4.1/maildir/maildirmake.1.in.p0	2007-04-23 02:32:19 +1100
+++ courier-imap-4.4.1/maildir/maildirmake.1.in	2008-09-07 17:16:46 +1100
@@ -156,7 +156,7 @@ option "disconnects" the sharable maildi
 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
+\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 .RS 4 .nf \fInick\fR\fIpath\fR .fi .RE
 .PP
--- courier-imap-4.4.1/maildir/maildirmake.html.in.p0	2007-04-23 02:32:19 +1100
+++ courier-imap-4.4.1/maildir/maildirmake.html.in	2008-09-07 17:16:46 +1100
@@ -108,7 +108,7 @@ the main maildir.
    -add command must be run for every maildir
 which needs
 to access the sharable maildir. Alternatively the file
-@sysconfdir@/maildirshared can be created,
+@sysconfdir@/@PACKAGE@/maildirshared can be created,
 to specify a default set of sharable maildirs.
 Each line in this file takes the following format:
 
    nick<tab>path
    
--- courier-imap-4.4.1/maildir/sharedindexinstall.in.p0	2004-01-11 12:47:33 +1000
+++ courier-imap-4.4.1/maildir/sharedindexinstall.in	2008-09-07 17:16:46 +1100
@@ -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
--- courier-imap-4.4.1/packaging/suse/courier-imap.init.in.p0	2007-07-30 11:33:14 +1100
+++ courier-imap-4.4.1/packaging/suse/courier-imap.init.in	2008-09-07 17:16:46 +1100
@@ -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_DATAROOT=@datarootdir@
 COURIER_DATA=@datadir@
 COURIER_BIN=@bindir@/imapd
--- courier-imap-4.4.1/pop3d-ssl.rc.in.p0	2005-07-02 12:13:56 +1100
+++ courier-imap-4.4.1/pop3d-ssl.rc.in	2008-09-07 17:16:46 +1100
@@ -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 @@ start)
 		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; \
--- courier-imap-4.4.1/pop3d.rc.in.p0	2008-05-05 00:12:47 +1100
+++ courier-imap-4.4.1/pop3d.rc.in	2008-09-07 17:16:46 +1100
@@ -10,20 +10,20 @@ exec_prefix=@exec_prefix@
 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)