kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/mail/courier-mta/patches/patch-aa
adam 2e85bc7502 Changes 0.68.1: 
* rfc2045mkboundary.c was broken in 0.68

Changes 0.68:
* rfc2045/rfc2045mkboundary.c (rfc2045_mk_boundary): truncate
the hostname portion of the boundary to 30 chars.
* courier/doc/courier.sgml: Remove descriptions of some configuration
files that were moved to the courier-authlib package a while ago.
They don't belong here any more.
* courier/submit.C: Use the authenticated address, instead of the
return address, for domain-based virtual configuration.
* courier/libs/cfilename.c (config_has_vhost): Checks whether
vhost.[ip] exists.
* courier/module.esmtp/courieresmtpd.c (main): Only set a message's
virtual host if vhost.[ip] exists.
* courier/module.esmtp/esmtpclient.c (get_sourceaddr): Make sure the
input buffer is null-terminated.
* courier/submit.C (getrcpts): If there's no vhost setting from the
sender's IP address (this includes local mail!) if vhost.domain exists,
use [domain] as the virtual host.
* Remove config_search(), which simply called config_localfilename().
Change all current callers to call config_localfilename().
* courier/libs/cfilename.c (config_set_local_vhost): saves a string
that gets appended as a suffix, by config_localfilename(), and if that
filename exists, that's returned as the filename, otherwise it's the
original string without the suffix. config_get_local_vhost() returns
the suffix string.
to config_set_local_vhost().
* courier/libs/comsubmitclient.c (submit_fork): If
config_get_local_vhost(), add a -vhost parameter to submit().
* courier/submit.C (cppmain): -vhost sets config_set_local_vhost().
* courier/submit2.C (closectl): New COMCTLFILE_VHOST parameter in the
config file, taken from the vhost setting.
* courier/libs/comctlfile.c (ctlfile_setvhost): If COMCTLFILE_VHOST is
set, call ctlfile_setvhost(), return an indication if the vhost has
changed. Absence of a COMCTLFILE_VHOST treated as a discrete "(null)"
setting.
* courier/module.esmtp/esmtpclient.c (esmtpchild): If ctlfile_setvhost()
then disconnect the current socket, if one is open.
* courier/module.esmtp/esmtpclient.c (get_sourceaddr): The IP address
specified in ipout or ip6out overrides SOURCE_ADDRESS and
SOURCE_ADDRESS_IPV6 environment variable.
* courier/module.local/localmail.c (main): Call ctlfile_setvhost().
* courier/module.uucp/uucp.c (uux): Call ctlfile_setvhost().
* courier/module.dsn/dsn.c (main): Call ctlfile_setvhost().
* liblock/mail.c (dotlock_exists): Quell a compiler warning.
* courier/courierd.dist.in SOURCE_ADDRESS: Add a note that this setting
is deprecated.
2012-06-09 11:45:38 +00:00

138 lines
5.5 KiB
Text
Raw Blame History

$NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $
--- courier/Makefile.in.orig 2011-04-04 13:07:49.000000000 +0000
+++ courier/Makefile.in
@@ -46,16 +46,16 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
- aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
+ aliascreate$(EXEEXT) submit$(EXEEXT) \
@EXTRAPKGLIB@ $(am__empty)
-webmail_PROGRAMS = webmail$(EXEEXT) webmlm$(EXEEXT)
+webmail_PROGRAMS = webmlm$(EXEEXT)
EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
- webmlmd$(EXEEXT) courier-config$(EXEEXT) @couriertls@ \
+ webmlmd$(EXEEXT) courier-config$(EXEEXT) \
@EXTRABIN@ $(am__empty)
-sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
- showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
+sbin_PROGRAMS = courier$(EXEEXT) courier-showconfig$(EXEEXT) \
+ courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
@EXTRASBIN@ $(am__empty)
cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
subdir = .
@@ -473,29 +473,26 @@ DISTCLEANFILES = uidgid
BUILT_SOURCES = prefix.h exec_prefix.h sysconfdir.h localstatedir.h \
libexecdir.h bindir.h sbindir.h datadir.h filtersocketdir.h \
uidgid.h configargs.h sort.h webmlmdhandlerslist.H
-extrapkglib = makedatprog courierpop3login pcpd
+extrapkglib =
webmaildir = $(libexecdir)/courier/webmail
webmail_SOURCES =
sqwebmaild_SOURCES =
# Don't forget to change perms.sh.in, if webmailimagedir moves.
webmailimagedir = $(datadir)/sqwebmail/images
-extrabin = maildrop lockmail reformail reformime mailbot mimegpg \
- imapd makemime deliverquota maildirmake maildiracl maildirkw
+extrabin =
bin_SCRIPTS = webmlmd.rc
-extrasbin = couriertcpd$(EXEEXT)
-sbinscripts = sharedindexsplit sharedindexinstall webmaild
+extrasbin =
+sbinscripts =
sbin_SCRIPTS = @SBINSCRIPTS@
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 webmlmrc.dist
+ webmlmrc.dist
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 = \
@@ -551,7 +548,7 @@ mlmdata_DATA = \
webmlmsublist.tmpl.html \
webmlm.tmpl.html
-extracmdlib = courierpop3d imaplogin
+extracmdlib =
cmdlibdir = @libexecdir@/courier
# Subdirectories
@@ -1890,6 +1887,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
+courier-showconfig$(EXEEXT): showconfig$(EXEEXT)
+ cp -f showconfig$(EXEEXT) courier-showconfig$(EXEEXT)
+
+courier-showmodules$(EXEEXT): showmodules$(EXEEXT)
+ cp -f showmodules$(EXEEXT) courier-showmodules$(EXEEXT)
+
sort.h:
echo '#define SORT "$(SORT)"' >sort.h
@@ -2045,39 +2048,21 @@ dist-hook:
install-exec-hook:
for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
- $(sysconfdir)/filters \
$(localstatedir) $(localstatedir)/tmp\
$(webmaildir)\
$(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-data-hook:
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/smtpaccess
- -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliasdir
echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildrop
+ echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildropfilter
test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
@@ -2089,10 +2074,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
Reference in a new issue View git blame Copy permalink