3d7c9445c0
* [SECURITY] Fix bug in encoding of usernames that contain '='. This
fixes the security advisories noted here:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2659
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=368834
http://secunia.com/advisories/20519/
* Implemented "Purge" option for mail filters.
* Invoke Courier filters in alphabetical order, and uses 050 exit code
to accept a message without running the remaining filters, which gets
converted to a 250 ESMTP code.
* Fix improper parsing of ident/pfix tokens in SPF.
* New command line tool "aliaslookup" to look up mail aliases.
* Added support for the koi8-u character set.
99 lines
4.2 KiB
Text
99 lines
4.2 KiB
Text
$NetBSD: patch-aa,v 1.2 2006/06/09 22:12:18 jlam Exp $
|
|
|
|
--- courier/Makefile.in.orig 2006-06-09 14:58:20.000000000 -0400
|
|
+++ courier/Makefile.in
|
|
@@ -52,17 +52,17 @@ build_triplet = @build@
|
|
host_triplet = @host@
|
|
target_triplet = @target@
|
|
pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
|
|
- aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
|
|
- @EXTRAPKGLIB@ $(am__empty)
|
|
-webmail_PROGRAMS = webmail$(EXEEXT)
|
|
+ aliascreate$(EXEEXT) submit$(EXEEXT) \
|
|
+ $(am__empty)
|
|
+webmail_PROGRAMS =
|
|
EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
|
|
bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
|
|
testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
|
|
- courier-config$(EXEEXT) @couriertls@ @EXTRABIN@
|
|
+ courier-config$(EXEEXT)
|
|
sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
|
|
showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
|
|
- @EXTRASBIN@ $(am__empty)
|
|
-cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
|
|
+ $(am__empty)
|
|
+cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT)
|
|
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
|
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
|
$(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
|
|
@@ -402,7 +402,7 @@ RFCERRTXTIN = rfcerrheader.txt
|
|
RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
|
|
extrapkglib = makedatprog courierpop3login pcpd
|
|
pkglibexecdir = $(libexecdir)/courier
|
|
-webmaildir = $(libexecdir)/courier/webmail
|
|
+webmaildir = $(pkglibexecdir)/cgi-bin
|
|
webmail_SOURCES =
|
|
sqwebmaild_SOURCES =
|
|
|
|
@@ -413,16 +413,14 @@ extrabin = maildrop lockmail reformail r
|
|
|
|
extrasbin = couriertcpd$(EXEEXT)
|
|
sbinscripts = sharedindexsplit sharedindexinstall webmaild
|
|
-sbin_SCRIPTS = @SBINSCRIPTS@
|
|
+sbin_SCRIPTS =
|
|
EXTRA_SCRIPTS =
|
|
-sysconf_DATA = pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \
|
|
+sysconf_DATA = \
|
|
courierd.dist @LDAPALIASRC@ \
|
|
- imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
|
|
- quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN)
|
|
+ $(RFCERRTXTNOIN) $(RFCERRTXTIN)
|
|
|
|
databindir = $(datadir)
|
|
-databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \
|
|
- pop3d pop3d-ssl mkimapdcert mkpop3dcert
|
|
+databin_SCRIPTS = courierctl.start makealiases makehosteddomains
|
|
|
|
mlmdatadir = $(datadir)/couriermlm
|
|
mlmdata_DATA = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \
|
|
@@ -1673,27 +1671,10 @@ install-exec-hook:
|
|
$(localstatedir)/track\
|
|
$(localstatedir)/msgs $(localstatedir)/msgq ; do \
|
|
$(mkinstalldirs) $(DESTDIR)$$d || :; done
|
|
- $(INSTALL_SCRIPT) imapd.rc $(DESTDIR)$(datadir)/imapd
|
|
- $(INSTALL_SCRIPT) imapd-ssl.rc $(DESTDIR)$(datadir)/imapd-ssl
|
|
- rm -f $(DESTDIR)$(sbindir)/imapd
|
|
- $(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd
|
|
- rm -f $(DESTDIR)$(sbindir)/imapd-ssl
|
|
- $(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl
|
|
- rm -f $(DESTDIR)$(sbindir)/mkimapdcert
|
|
- $(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert
|
|
- rm -f $(DESTDIR)$(sbindir)/mkpop3dcert
|
|
- $(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert
|
|
- rm -f $(DESTDIR)$(bindir)/makedat
|
|
- $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
|
|
- for f in makealiases makehosteddomains pop3d pop3d-ssl \
|
|
+ for f in makealiases makehosteddomains \
|
|
; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
|
|
$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
|
|
- rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
|
|
- $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
|
|
- mkdir -p $(DESTDIR)$(sysconfdir)/shared
|
|
- chmod 755 $(DESTDIR)$(sysconfdir)/shared
|
|
- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
|
|
- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
|
|
+ $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/courierwebadmin
|
|
|
|
install-data-hook:
|
|
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
|
|
@@ -1711,10 +1692,6 @@ install-data-hook:
|
|
rm -f $(DESTDIR)$(bindir)/rmail
|
|
$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
|
|
-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
|
|
- -$(mkinstalldirs) $(DESTDIR)$(webmailimagedir)
|
|
- for f in `cat ../webmail/images/filelist` ; do \
|
|
- $(INSTALL_DATA) $(srcdir)/../webmail/images/$$f \
|
|
- $(DESTDIR)$(webmailimagedir) ; done
|
|
|
|
install-permissions: perms.sh
|
|
@chmod +x perms.sh setperms.sh
|