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
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
|
Description: Configure for the FreeBSD ports build system.
Add the --enable-spam-threshold and --enable-spam-junkfolder options.
Do not try to create the etc/vpopmail directory and tcp.smtp in place,
this is done by the port at install time.
FreeBSD does not have libresolv.
Pass the correct compiler and linker flags to the cdb build.
FreeBSD does not need -R $libdir (a.k.a. --rpath) - the MySQL client
library is added to ldconfig's search path in its own startup script.
No need to check for uid/gid.
Forwarded: not-needed
Author: Peter Pentchev <roam@FreeBSD.org>,
Alex Dupre <ale@FreeBSD.org>,
Renato Botelho <garga@FreeBSD.org>,
Baptiste Daroussin <bapt@FreeBSD.org>
Last-Update: 2012-06-23
--- configure.orig 2010-11-08 16:02:52.000000000 +0100
+++ configure 2011-05-20 12:21:34.314930656 +0200
@@ -1403,6 +1403,8 @@
--enable-onchange-script Enable onchange script. See README.onchange for more info.
--enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
--enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
+ --enable-spam-threshold=# or n Automatically delete messages that score more than # spam hits
+ --enable-spam-junkfolder Automatically move (not deleted) spam messages into Junk folder
--enable-maildrop Enable maildrop. See README.maildrop for more info.
--enable-maildrop-prog=PATH Full path to maildrop program /usr/{local/}bin/maildrop.
--enable-domainquotas Enable non-system domain quotas. See README.quotas for more info.
@@ -5663,100 +5665,6 @@
fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define VPOPGROUP "$vpopgroup"
-_ACEOF
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether password file entry for the vpopmail user exists" >&5
-$as_echo_n "checking whether password file entry for the vpopmail user exists... " >&6; }
-if test "$cross_compiling" = yes; then :
- as_fn_error "Could not compile and run even a trivial ANSI C program - check CC." "$LINENO" 5
-
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <stdio.h>
- #include <pwd.h>
- #include <stdlib.h>
-
- int main() {
- struct passwd *pw;
- char tmpbuf[100];
- FILE *f;
-
- unlink("vpopmail.dir");
- unlink("vpopmail.uid");
- unlink("vpopmail.gid");
-
- if ( (f=fopen("vpopusername","r+"))==NULL) {
- printf("No vpopmail user found.\n");
- printf("Please add the vchkpw group and\n");
- printf("vpopmail user. Then run configure again\n");
- return(-1);
- }
-
- fgets(tmpbuf,100,f);
- fclose(f);
- tmpbuf[strlen(tmpbuf)-1] = 0;
-
- if (( pw=getpwnam(tmpbuf)) != 0 ) {
- f=fopen("vpopmail.dir","a+");
- fprintf(f,"%s\n", pw->pw_dir);
- fclose(f);
-
- f=fopen("vpopmail.uid", "a+");
- fprintf(f,"%d\n", pw->pw_uid);
- fclose(f);
-
- f=fopen("vpopmail.gid", "a+");
- fprintf(f,"%d\n", pw->pw_gid);
- fclose(f);
- } else {
- printf("No vpopmail user found.\n");
- printf("Please add the vchkpw group and\n");
- printf("vpopmail user. Then run configure again\n");
- return(-1);
- }
- return(0);
- }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error "Could not compile and run even a trivial ANSI C program - check CC." "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-if test ! -f vpopmail.uid
-then
- as_fn_error "No vpopmail user." "$LINENO" 5
-fi
-
-if test ! -f vpopmail.gid
-then
- as_fn_error "No vpopmail group." "$LINENO" 5
-fi
-
-if test ! -f vpopmail.dir
-then
- as_fn_error "No vpopmail home directory" "$LINENO" 5
-fi
-
vpopmaildir=`cat vpopmail.dir`
@@ -5785,27 +5693,6 @@
#----------------------------------------------------------------------
-if test ! -d $vpopmaildir/etc
-then
- if test ! -d $vpopmaildir
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: creating $vpopmaildir " >&5
-$as_echo "$as_me: WARNING: creating $vpopmaildir " >&2;}
- mkdir -p $vpopmaildir
- chown $vpopmailuid $vpopmaildir
- chgrp $vpopmailgid $vpopmaildir
- chmod 755 $vpopmaildir
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: making a vpopmail etc directory " >&5
-$as_echo "$as_me: WARNING: making a vpopmail etc directory " >&2;}
- mkdir $vpopmaildir/etc
- chown $vpopmailuid "$vpopmaildir"/etc
- chgrp $vpopmailgid "$vpopmaildir"/etc
- chmod 755 "$vpopmaildir"/etc
-fi
-
-#----------------------------------------------------------------------
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether roaming-users has been enabled" >&5
$as_echo_n "checking whether roaming-users has been enabled... " >&6; }
# Check whether --enable-roaming-users was given.
@@ -5888,28 +5775,11 @@
# Check whether --enable-tcpserver_file was given.
if test "${enable_tcpserver_file+set}" = set; then :
enableval=$enable_tcpserver_file; tcpserver_file="$enableval"
+ echo "127.:allow,RELAYCLIENT=\"\"" > ${VCFGDIR}/tcp.smtp
else
- if test "$tcpserver_file" = ""
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to find your tcpserver relay file." >&5
-$as_echo "$as_me: WARNING: Unable to find your tcpserver relay file." >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&5
-$as_echo "$as_me: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&2;}
-
- echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
- tcpserver_file="$vpopmaildir"/etc/tcp.smtp
- fi
-
-
fi
-
- if test ! -f "$tcpserver_file"
- then
- as_fn_error "Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" "$LINENO" 5
- fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -6414,6 +6284,44 @@
#define SPAMC_PROG "$spamc_prog"
_ACEOF
+# Check whether --enable-spam-threshold or --disable-spam-threshold was given.
+if test "${enable_spam_threshold+set}" = set; then
+ enableval="$enable_spam_threshold"
+ ENABLE_SPAM_THRESHOLD=$enableval
+else
+ ENABLE_SPAM_THRESHOLD=0
+fi
+
+case $ENABLE_SPAM_THRESHOLD in
+0*|n*|N*)
+ ;;
+*)
+ cat >> confdefs.h <<EOF
+#define SPAM_THRESHOLD $ENABLE_SPAM_THRESHOLD
+EOF
+
+ ;;
+esac
+
+# Check whether --enable-spam-junkfolder or --disable-spam-junkfolder was give
+
+if test "${enable_spam_junkfolder+set}" = set; then
+ enableval="$enable_spam_junkfolder"
+ ENABLE_SPAM_JUNKFOLDER=$enableval
+else
+ ENABLE_SPAM_JUNKFOLDER=0
+fi
+
+case $ENABLE_SPAM_JUNKFOLDER in
+0*|n*|N*)
+ ;;
+*)
+ cat >> confdefs.h <<EOF
+#define SPAM_JUNKFOLDER 1
+EOF
+
+ ;;
+esac
;;
esac
@@ -6664,7 +6572,7 @@
as_fn_error "Unable to find your MySQL lib dir, specify --enable-libdir." "$LINENO" 5
fi
- auth_libs="-Xlinker -R -Xlinker $libdir -L$libdir $extralibflags -lmysqlclient -lz -lm"
+ auth_libs="-L$libdir $extralibflags -lmysqlclient -lz -lm"
;;
@@ -6727,7 +6635,7 @@
#define USE_LDAP $USE_LDAP
_ACEOF
- auth_libs="-L/usr/local/lib -lldap -llber -lresolv"
+ auth_libs="-L/usr/local/lib -lldap -llber"
auth_inc="-I/usr/local/include"
@@ -9029,8 +8937,8 @@
;;
esac
-echo "${CC} -O2" > cdb/conf-cc
-echo "${CC} -s" > cdb/conf-ld
+echo "${CC} ${CFLAGS}" > cdb/conf-cc
+echo "${CC} ${STRIP}" > cdb/conf-ld
echo ""
echo ""
|
