-
Notifications
You must be signed in to change notification settings - Fork 1
/
vpopmail-build-no-qmail-5.4.33.patch
324 lines (303 loc) · 8.27 KB
/
vpopmail-build-no-qmail-5.4.33.patch
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
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
--- vpopmail-5.4.33/configure.in 2011-02-28 10:00:45.000000000 -0700
+++ vpopmail-no-qmail-5.4.33/configure.in 2013-10-19 21:31:23.842031224 -0700
@@ -257,21 +257,21 @@
qmaildir=""
for f in /var/qmail
do
- if test -d $f
- then
+# if test -d $f
+# then
qmaildir=$f
- fi
+# fi
done
AC_ARG_ENABLE(qmaildir,
[ --enable-qmaildir=DIR Directory where qmail control and user directories are installed [/var/qmail].],
qmaildir="$enableval",
[
- if test "$qmaildir" = ""
- then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Unable to find your qmaildir directory, specify --enable-qmaildir.])
- fi
+ if test "$qmaildir" = ""
+ then
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([Unable to find your qmaildir directory, specify --enable-qmaildir.])
+ fi
]
)
@@ -284,11 +284,11 @@
qmailnewu=""
for f in "$qmaildir"/bin/qmail-newu /usr/sbin/qmail-newu
do
- if test -f $f
- then
+# if test -f $f
+# then
qmailnewu=$f
break
- fi
+# fi
done
AC_ARG_ENABLE(qmail-newu,
@@ -303,11 +303,11 @@
]
)
-if test ! -f "$qmailnewu"
-then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Unable to find your qmail-newu file, specify --enable-qmail-newu=/full/path/to/qmail-newu])
-fi
+#if test ! -f "$qmailnewu"
+#then
+# AC_MSG_RESULT(no)
+# AC_MSG_ERROR([Unable to find your qmail-newu file, specify --enable-qmail-newu=/full/path/to/qmail-newu])
+#fi
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(QMAILNEWU,"$qmailnewu","")
@@ -318,11 +318,11 @@
qmailinject=""
for f in "$qmaildir"/bin/qmail-inject /usr/sbin/qmail-inject /usr/bin/qmail-inject
do
- if test -f $f
- then
+# if test -f $f
+# then
qmailinject=$f
break
- fi
+# fi
done
AC_ARG_ENABLE(qmail-inject,
@@ -337,11 +337,11 @@
]
)
-if test ! -f "$qmailinject"
-then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Unable to find your qmail-inject file, specify --enable-qmail-inject=/full/path/to/qmail-inject])
-fi
+#if test ! -f "$qmailinject"
+#then
+# AC_MSG_RESULT(no)
+# AC_MSG_ERROR([Unable to find your qmail-inject file, specify --enable-qmail-inject=/full/path/to/qmail-inject])
+#fi
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(QMAILINJECT,"$qmailinject","")
@@ -352,11 +352,11 @@
qmailnewmrh=""
for f in "$qmaildir"/bin/qmail-newmrh /usr/sbin/qmail-newmrh
do
- if test -f $f
- then
+# if test -f $f
+# then
qmailnewmrh=$f
break
- fi
+# fi
done
AC_ARG_ENABLE(qmail-newmrh,
@@ -371,11 +371,11 @@
]
)
-if test ! -f "$qmailnewmrh"
-then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Unable to find your qmail-newmrh file, specify --enable-qmail-qmail-newmrh=/full/path/to/qmail-newmrh])
-fi
+#if test ! -f "$qmailnewmrh"
+#then
+# AC_MSG_RESULT(no)
+# AC_MSG_ERROR([Unable to find your qmail-newmrh file, specify --enable-qmail-qmail-newmrh=/full/path/to/qmail-newmrh])
+#fi
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(QMAILNEWMRH,"$qmailnewmrh","")
@@ -418,106 +418,106 @@
AC_MSG_RESULT(yes)
-AC_MSG_CHECKING(whether password file entry for the vpopmail user exists)
-AC_TRY_RUN( [
- #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);
- }
- ],
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)
-)
-
-if test ! -f vpopmail.uid
-then
- AC_MSG_ERROR(No vpopmail user.)
-fi
-
-if test ! -f vpopmail.gid
-then
- AC_MSG_ERROR(No vpopmail group.)
-fi
+#AC_MSG_CHECKING(whether password file entry for the vpopmail user exists)
+#AC_TRY_RUN( [
+# #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);
+# }
+# ],
+# AC_MSG_RESULT(yes),
+# AC_MSG_RESULT(no)
+# AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
+# AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)
+#)
-if test ! -f vpopmail.dir
-then
- AC_MSG_ERROR(No vpopmail home directory)
-fi
+#if test ! -f vpopmail.uid
+#then
+# AC_MSG_ERROR(No vpopmail user.)
+#fi
+
+#if test ! -f vpopmail.gid
+#then
+# AC_MSG_ERROR(No vpopmail group.)
+#fi
+
+#if test ! -f vpopmail.dir
+#then
+# AC_MSG_ERROR(No vpopmail home directory)
+#fi
-vpopmaildir=`cat vpopmail.dir`
+vpopmaildir=/home/vpopmail
AC_SUBST(vpopmaildir)
AC_DEFINE_UNQUOTED(VPOPMAILDIR,"$vpopmaildir","")
-rm -f vpopmail.dir
+#rm -f vpopmail.dir
-vpopmailuid=`cat vpopmail.uid`
+vpopmailuid=89
AC_DEFINE_UNQUOTED(VPOPMAILUID,$vpopmailuid,"")
-rm -f vpopmail.uid
+#rm -f vpopmail.uid
-vpopmailgid=`cat vpopmail.gid`
+vpopmailgid=89
AC_DEFINE_UNQUOTED(VPOPMAILGID,$vpopmailgid,"")
-rm -f vpopmail.gid
-rm -f vpopusername
+#rm -f vpopmail.gid
+#rm -f vpopusername
#----------------------------------------------------------------------
-if test ! -d $vpopmaildir/etc
-then
- if test ! -d $vpopmaildir
- then
- AC_MSG_WARN( creating $vpopmaildir )
- mkdir -p $vpopmaildir
- chown $vpopmailuid $vpopmaildir
- chgrp $vpopmailgid $vpopmaildir
- chmod 755 $vpopmaildir
- fi
- AC_MSG_WARN( making a vpopmail etc directory )
- mkdir $vpopmaildir/etc
- chown $vpopmailuid "$vpopmaildir"/etc
- chgrp $vpopmailgid "$vpopmaildir"/etc
- chmod 755 "$vpopmaildir"/etc
-fi
+#if test ! -d $vpopmaildir/etc
+#then
+# if test ! -d $vpopmaildir
+# then
+# AC_MSG_WARN( creating $vpopmaildir )
+# mkdir -p $vpopmaildir
+# chown $vpopmailuid $vpopmaildir
+# chgrp $vpopmailgid $vpopmaildir
+# chmod 755 $vpopmaildir
+# fi
+# AC_MSG_WARN( making a vpopmail etc directory )
+# mkdir $vpopmaildir/etc
+# chown $vpopmailuid "$vpopmaildir"/etc
+# chgrp $vpopmailgid "$vpopmaildir"/etc
+# chmod 755 "$vpopmaildir"/etc
+#fi
#----------------------------------------------------------------------