summaryrefslogtreecommitdiff
path: root/mail/courier-mta/patches/patch-aa
blob: 6957c39bd85b0949ebdc7881671125bcef0c93cd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
$NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $

--- courier/Makefile.in.orig	2007-11-23 22:26:43.000000000 -0500
+++ 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 = .
@@ -433,7 +433,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
 	uidgid.h configargs.h sort.h webmlmdhandlerslist.H
 RFCERRTXTIN = rfcerrheader.txt
 RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
-extrapkglib = makedatprog courierpop3login pcpd
+extrapkglib = 
 pkglibexecdir = $(libexecdir)/courier
 webmaildir = $(libexecdir)/courier/webmail
 webmail_SOURCES = 
@@ -441,22 +441,19 @@ 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 $(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist
+	$(RFCERRTXTNOIN) $(RFCERRTXTIN) 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 = \
@@ -512,7 +509,7 @@ mlmdata_DATA = \
 	webmlmsublist.tmpl.html \
 	webmlm.tmpl.html
 
-extracmdlib = courierpop3d imaplogin
+extracmdlib = 
 cmdlibdir = @libexecdir@/courier
 
 # Subdirectories
@@ -1673,6 +1670,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
 
@@ -1828,39 +1831,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; \
@@ -1872,10 +1857,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