View | Details | Raw Unified | Return to bug 56462
Collapse All | Expand All

(-)vpopmail/Makefile (-107 / +76 lines)
Lines 6-37 Link Here
6
#
6
#
7
7
8
PORTNAME=	vpopmail
8
PORTNAME=	vpopmail
9
PORTVERSION=	5.3.20
9
PORTVERSION=	5.3.27
10
CATEGORIES=	mail
10
CATEGORIES=	mail
11
MASTER_SITES=	http://www.inter7.com/devel/
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
13
13
MAINTAINER=	roam@FreeBSD.org
14
MAINTAINER=	roam@FreeBSD.org
14
COMMENT=	"Easy virtual domain and authentication package for use with qmail"
15
COMMENT=	Easy virtual domain and authentication package for use with qmail
15
16
16
BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
17
BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
17
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
18
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
18
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
19
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
19
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
20
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
20
21
21
.if defined(WITH_VPOPMAIL_SQWEBMAIL_CREATION)
22
PATCHFILES=	vpopmail-sqwebmail-config-${PORTVERSION}.patch
23
PATCH_SITES=	${MASTER_SITE_LOCAL} \
24
		http://people.FreeBSD.org/~roam/ports/patches/mail/vpopmail/
25
PATCH_SITE_SUBDIR=	roam
26
.endif
27
28
GNU_CONFIGURE=	YES
22
GNU_CONFIGURE=	YES
29
USE_GMAKE=	YES
23
USE_GMAKE=	YES
30
USE_REINPLACE=	YES
24
USE_REINPLACE=	YES
31
USE_PERL5_BUILD=	YES
25
USE_PERL5_BUILD=	YES
32
26
33
VCFGDIR?=	${WRKDIR}/vcfg
27
VCFGDIR?=	${WRKDIR}/vcfg
34
VCFGFILES?=	inc_deps lib_deps tcp.smtp
35
28
36
CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
29
CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
37
CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
30
CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
Lines 43-88 Link Here
43
#
36
#
44
# Define these to change from the default behaviour
37
# Define these to change from the default behaviour
45
#
38
#
46
# WITH_PASSWD   - allow authentication off /etc/passwd
39
# WITH_PASSWD		- allow authentication off /etc/passwd
47
# WITHOUT_MD5_PASSWORDS - store encrypted passwords in MD5 format
40
# WITHOUT_MD5_PASSWORDS	- disable storing encrypted passwords in MD5 format
48
# WITH_MYSQL	- allow authentitation via mysql
41
# WITHOUT_CLEAR_PASSWD	- disable storing passwords in plaintext
49
# WITH_MYSQL_LARGE_SITE - enables large site layout
42
# WITH_LEARN_PASSWORDS	- enable learning passwords during pop auth
50
# WITH_MYSQL_REPLICATION - enables MySQL database replication
43
# WITH_MYSQL		- allow authentitation via mysql
51
# WITH_MYSQL_LIMITS - enables the MySQL mailbox limit code
44
# WITH_MYSQL_REPLICATION - enable MySQL database replication
52
# WITH_SYBASE   - allow authentication via Sybase (NOT TESTED!)
45
# WITH_MYSQL_LIMITS	- enable the MySQL mailbox limit code
53
# WITH_ORACLE   - allow authentication via Oracle (NOT TESTED!)
46
# WITH_SYBASE		- allow authentication via Sybase (NOT TESTED!)
54
# WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db
47
# WITH_ORACLE		- allow authentication via Oracle (NOT TESTED!)
55
# WITH_VALIAS   - enable valias processing
48
# WITH_VALIAS		- enable valias processing
56
# WITHOUT_ROAMING - disallow roaming users
49
# WITH_ROAMING		- allow roaming users
57
# WITH_IP_ALIAS - enables IP aliasing
50
# WITH_IP_ALIAS		- enables IP aliasing
58
# WITH_DELIVER_FILTER - enables the experimental vdelivermail filter
51
# WITH_QMAIL_EXT	- enable qmail-like user-* address extesions processing
59
# WITH_QMAIL_EXT - enables qmail-like user-* address extesions processing
52
# WITHOUT_FILE_LOCKING	- disable file locking
60
# WITHOUT_FILE_LOCKING - disable file locking
53
# WITH_FILE_SYNC	- enable immediate synching (may decrease performance)
61
# WITH_FILE_SYNC - enables immediate synching (may decrease performance)
54
# WITHOUT_USERS_BIG_DIR	- disable using big directories for users
62
# WITHOUT_USERS_BIG_DIR - disables using big directories for users
55
# WITHOUT_SEEKABLE	- disable vdelivermail's attempt to make its input seekable
63
# WITHOUT_SEEKABLE - disables vdelivermail's attempt to make its input seekable
56
# WITH_DOMAIN_QUOTAS	- enable domain quotas
64
#
57
#
65
# Set these to the values you'd prefer
58
# Set these to the values you'd prefer
66
#
59
#
67
# HARDQUOTA     - size of hard quota, or 'n' for no hard quota
60
# HARDQUOTA		- size of hard quota, or 'n' for no hard quota
68
# RELAYCLEAR    - time in minutes before clearing relay hole (requires roaming)
61
# RELAYCLEAR		- time in minutes before clearing relay hole (requires
69
# DEFAULT_DOMAIN - default domain for non-vhost lookups
62
#			  roaming)
70
# WITH_SINGLE_DOMAIN - optimize for a site with many users in a single domain
63
# DEFAULT_DOMAIN	- default domain for non-vhost lookups
71
# LOGLEVEL	- n - no logging, y - log all,
64
# WITH_SINGLE_DOMAIN	- optimize for a site with many users in a single domain
72
#                 e - log errors, p - log passwords in errors
65
# LOGLEVEL		- n - no logging, y - log all,
73
# WITHOUT_AUTH_LOG - disables authentication logging
66
# 			  e - log errors, p - log passwords in errors,
74
# WITH_MYSQL_LOG - enable logging to a MySQL database
67
#			  v - verbose success and errors with passwords
75
# QMAIL_DIR     - location of qmail directory
68
# WITHOUT_AUTH_LOG	- disables authentication logging
76
# PREFIX	- installation area for vpopmail (see comment below)
69
# WITH_MYSQL_LOG	- enable logging to a MySQL database
77
# VCHKPW_GID	- the group ID of the new vchkpw group (89)
70
# QMAIL_DIR		- location of qmail directory
78
# VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
71
# PREFIX		- installation area for vpopmail (see comment below)
72
# VCHKPW_GID		- the group ID of the new vchkpw group (89)
73
# VPOPMAIL_UID		- the user ID of the new vpopmail user (89)
79
#
74
#
80
# MySQL database configuration options
75
# MySQL database configuration options
81
#
76
#
82
# WITH_MYSQL_SERVER - the hostname of the MySQL server (localhost)
77
# WITH_MYSQL_SERVER - the hostname of the MySQL server (localhost)
83
# WITH_MYSQL_USER - the username for connecting to the MySQL server (root)
78
# WITH_MYSQL_USER   - the username for connecting to the MySQL server (root)
84
# WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (secret)
79
# WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (secret)
85
# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail)
80
# WITH_MYSQL_DB     - the name of the MySQL database to use (vpopmail)
86
# The server, user and password variables may be defined separately
81
# The server, user and password variables may be defined separately
87
# for read and update access, allowing you to set up a less-priviledged
82
# for read and update access, allowing you to set up a less-priviledged
88
# MySQL connection account with read-only access, and another one which
83
# MySQL connection account with read-only access, and another one which
Lines 97-108 Link Here
97
# Please report any success or failure to the port maintainer,
92
# Please report any success or failure to the port maintainer,
98
# Peter Pentchev <roam@FreeBSD.org>
93
# Peter Pentchev <roam@FreeBSD.org>
99
#
94
#
100
# WITH_ORACLE_PROC - the name of the Oracle Pro-C precompiler, default 'proc'
95
# WITH_ORACLE_PROC    - the name of the Oracle Pro-C precompiler, default 'proc'
101
# WITH_ORACLE_SERVICE - the Oracle service name (jimmy)
96
# WITH_ORACLE_SERVICE - the Oracle service name (jimmy)
102
# WITH_ORACLE_USER - the username for connecting to the Oracle server (system)
97
# WITH_ORACLE_USER    - the username for connecting to the Oracle server (system)
103
# WITH_ORACLE_PASSWD - the password for connecting to the Oracle server (manager)
98
# WITH_ORACLE_PASSWD  - the password for connecting to the Oracle server (manager)
104
# WITH_ORACLE_DB  - the name of the Oracle database to connect to (orcl1)
99
# WITH_ORACLE_DB      - the name of the Oracle database to connect to (orcl1)
105
# WITH_ORACLE_HOME - the Oracle installation directory (/export/home/oracle)
100
# WITH_ORACLE_HOME    - the Oracle installation directory (/export/home/oracle)
106
#
101
#
107
# Sybase database configuration options
102
# Sybase database configuration options
108
#
103
#
Lines 111-126 Link Here
111
# Peter Pentchev <roam@FreeBSD.org>
106
# Peter Pentchev <roam@FreeBSD.org>
112
#
107
#
113
# WITH_SYBASE_SERVER - the Sybase server name (empty)
108
# WITH_SYBASE_SERVER - the Sybase server name (empty)
114
# WITH_SYBASE_USER - the username for connecting to the Sybase server (sa)
109
# WITH_SYBASE_USER   - the username for connecting to the Sybase server (sa)
115
# WITH_SYBASE_PASSWD - the password for connecting to the Sybase server (empty)
110
# WITH_SYBASE_PASSWD - the password for connecting to the Sybase server (empty)
116
# WITH_SYBASE_APP - the app for connecting to the Sybase server (vpopmail)
111
# WITH_SYBASE_APP    - the app for connecting to the Sybase server (vpopmail)
117
# WITH_SYBASE_DB  - the name of the Sybase database to connect to (vpopmail)
112
# WITH_SYBASE_DB     - the name of the Sybase database to connect to (vpopmail)
118
#
113
#
119
114
120
HARDQUOTA?=	10000000
115
HARDQUOTA?=	10000000
121
RELAYCLEAR?=	30
116
RELAYCLEAR?=	30
122
LOGLEVEL?=	y
117
LOGLEVEL?=	y
123
118
119
.include <bsd.port.pre.mk>
120
124
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
121
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
125
QMAIL_DIR?=	${LOCALBASE}/qmail
122
QMAIL_DIR?=	${LOCALBASE}/qmail
126
.else
123
.else
Lines 150-184 Link Here
150
CONFIGURE_ARGS+=	--enable-md5-passwords=n
147
CONFIGURE_ARGS+=	--enable-md5-passwords=n
151
.endif
148
.endif
152
149
153
.if defined(WITH_APOP)
154
BROKEN=		"The WITH_APOP option is deprecated; set WITH_CLEAR_PASSWD instead, APOP will just work"
155
.endif
156
157
.if defined(WITH_VALIAS)
150
.if defined(WITH_VALIAS)
158
CONFIGURE_ARGS+=	--enable-valias=y
151
CONFIGURE_ARGS+=	--enable-valias=y
159
.endif
152
.endif
160
153
161
.if defined(WITH_SQWEBMAIL)
154
.if defined(WITH_ROAMING)
162
CONFIGURE_ARGS+=	--enable-sqwebmail-pass=y
163
.endif
164
165
.if !defined(WITHOUT_ROAMING)
166
CONFIGURE_ARGS+=	--enable-roaming-users=y \
155
CONFIGURE_ARGS+=	--enable-roaming-users=y \
167
			--enable-relay-clear-minutes=${RELAYCLEAR}
156
			--enable-relay-clear-minutes=${RELAYCLEAR}
168
.endif
157
.endif
169
158
170
.if !defined(WITH_CLEAR_PASSWD)
159
.if defined(WITHOUT_CLEAR_PASSWD)
171
CONFIGURE_ARGS+=	--enable-clear-passwd=n
160
CONFIGURE_ARGS+=	--enable-clear-passwd=n
172
.endif
161
.endif
173
162
163
.if defined(WITH_LEARN_PASSWORDS)
164
CONFIGURE_ARGS+=	--enable-learn-passwords=y
165
.endif
166
174
.if defined(WITH_MYSQL)
167
.if defined(WITH_MYSQL)
175
LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
168
USE_MYSQL=		yes
176
CONFIGURE_ARGS+=	--enable-mysql=y \
169
CONFIGURE_ARGS+=	--enable-mysql=y \
177
			--enable-sqlincdir=${LOCALBASE}/include/mysql \
170
			--enable-incdir=${LOCALBASE}/include/mysql \
178
			--enable-sqllibdir=${LOCALBASE}/lib/mysql
171
			--enable-libdir=${LOCALBASE}/lib/mysql
179
.if defined(WITH_MYSQL_LARGE_SITE)
180
CONFIGURE_ARGS+=	--enable-large-site=y
181
.endif
182
.if defined(WITH_MYSQL_REPLICATION)
172
.if defined(WITH_MYSQL_REPLICATION)
183
CONFIGURE_ARGS+=	--enable-mysql-replication=y
173
CONFIGURE_ARGS+=	--enable-mysql-replication=y
184
.endif
174
.endif
Lines 189-206 Link Here
189
CONFIGURE_ARGS+=	--enable-mysql-limits=y
179
CONFIGURE_ARGS+=	--enable-mysql-limits=y
190
.endif
180
.endif
191
181
192
.if defined(WITH_MYSQL_SERVER)
182
WITH_MYSQL_SERVER?=	localhost
193
WITH_MYSQL_READ_SERVER?=	${WITH_MYSQL_SERVER}
183
WITH_MYSQL_READ_SERVER?=	${WITH_MYSQL_SERVER}
194
WITH_MYSQL_UPDATE_SERVER?=	${WITH_MYSQL_SERVER}
184
WITH_MYSQL_UPDATE_SERVER?=	${WITH_MYSQL_SERVER}
195
.endif
185
WITH_MYSQL_USER?=	vpopmail
196
.if defined(WITH_MYSQL_USER)
186
WITH_MYSQL_READ_USER?=		${WITH_MYSQL_USER}
197
WITH_MYSQL_READ_USER?=	${WITH_MYSQL_USER}
198
WITH_MYSQL_UPDATE_USER?=	${WITH_MYSQL_USER}
187
WITH_MYSQL_UPDATE_USER?=	${WITH_MYSQL_USER}
199
.endif
188
WITH_MYSQL_PASSWD?=	secret
200
.if defined(WITH_MYSQL_PASSWD)
201
WITH_MYSQL_READ_PASSWD?=	${WITH_MYSQL_PASSWD}
189
WITH_MYSQL_READ_PASSWD?=	${WITH_MYSQL_PASSWD}
202
WITH_MYSQL_UPDATE_PASSWD?=	${WITH_MYSQL_PASSWD}
190
WITH_MYSQL_UPDATE_PASSWD?=	${WITH_MYSQL_PASSWD}
203
.endif
191
WITH_MYSQL_DB?=		vpopmail
204
.endif
192
.endif
205
193
206
.if defined(WITH_SYBASE)
194
.if defined(WITH_SYBASE)
Lines 212-221 Link Here
212
CONFIGURE_ARGS+=	--enable-oracle=y
200
CONFIGURE_ARGS+=	--enable-oracle=y
213
.endif
201
.endif
214
202
215
.if defined(DEFAULT_DOMAIN)
216
CONFIGURE_ARGS+=	--enable-default-domain=${DEFAULT_DOMAIN}
217
.endif
218
219
.if defined(WITH_SINGLE_DOMAIN)
203
.if defined(WITH_SINGLE_DOMAIN)
220
CONFIGURE_ARGS+=	--enable-many-domains=n
204
CONFIGURE_ARGS+=	--enable-many-domains=n
221
.endif
205
.endif
Lines 224-233 Link Here
224
CONFIGURE_ARGS+=	--enable-ip-alias-domains=y
208
CONFIGURE_ARGS+=	--enable-ip-alias-domains=y
225
.endif
209
.endif
226
210
227
.if defined(WITH_DELIVER_FILTER)
228
CONFIGURE_ARGS+=	--enable-deliver-filter=y
229
.endif
230
231
.if defined(WITH_QMAIL_EXT)
211
.if defined(WITH_QMAIL_EXT)
232
CONFIGURE_ARGS+=	--enable-qmail-ext=y
212
CONFIGURE_ARGS+=	--enable-qmail-ext=y
233
.endif
213
.endif
Lines 252-257 Link Here
252
CONFIGURE_ARGS+=	--enable-make-seekable=n
232
CONFIGURE_ARGS+=	--enable-make-seekable=n
253
.endif
233
.endif
254
234
235
.if defined(WITH_DOMAIN_QUOTAS)
236
CONFIGURE_ARGS+=	 --enable-domainquotas=y
237
.endif
238
255
# autoconf and automake can remove our patches to the configure scripts.
239
# autoconf and automake can remove our patches to the configure scripts.
256
240
257
post-patch:
241
post-patch:
Lines 265-293 Link Here
265
249
266
pre-configure:
250
pre-configure:
267
	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}
251
	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}
268
.if defined(WITH_MYSQL)
269
.if defined(WITH_MYSQL_UPDATE_SERVER)
270
	${REINPLACE_CMD} -E -e "s/(#define MYSQL_UPDATE_SERVER.*)localhost(.*)/\1${WITH_MYSQL_UPDATE_SERVER}\2/" ${WRKSRC}/vmysql.h
271
.endif
272
.if defined(WITH_MYSQL_READ_SERVER)
273
	${REINPLACE_CMD} -E -e "s/(#define MYSQL_READ_SERVER.*)localhost(.*)/\1${WITH_MYSQL_READ_SERVER}\2/" ${WRKSRC}/vmysql.h
274
.endif
275
.if defined(WITH_MYSQL_UPDATE_USER)
276
	${REINPLACE_CMD} -E "s/(#define MYSQL_UPDATE_USER.*)root(.*)/\1${WITH_MYSQL_UPDATE_USER}\2/" ${WRKSRC}/vmysql.h
277
.endif
278
.if defined(WITH_MYSQL_READ_USER)
279
	${REINPLACE_CMD} -E -e "s/(#define MYSQL_READ_USER.*)root(.*)/\1${WITH_MYSQL_READ_USER}\2/" ${WRKSRC}/vmysql.h
280
.endif
281
.if defined(WITH_MYSQL_UPDATE_PASSWD)
282
	${REINPLACE_CMD} -E -e "s/(#define MYSQL_UPDATE_PASSWD.*)secret(.*)/\1${WITH_MYSQL_UPDATE_PASSWD}\2/" ${WRKSRC}/vmysql.h
283
.endif
284
.if defined(WITH_MYSQL_READ_PASSWD)
285
	${REINPLACE_CMD} -E -e "s/(#define MYSQL_READ_PASSWD.*)secret(.*)/\1${WITH_MYSQL_READ_PASSWD}\2/" ${WRKSRC}/vmysql.h
286
.endif
287
.if defined(WITH_MYSQL_DB)
288
	${REINPLACE_CMD} -E -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\1${WITH_MYSQL_DB}\2/" ${WRKSRC}/vmysql.h
289
.endif
290
.endif
291
.if defined(WITH_ORACLE)
252
.if defined(WITH_ORACLE)
292
.if defined(WITH_ORACLE_SERVICE)
253
.if defined(WITH_ORACLE_SERVICE)
293
	${REINPLACE_CMD} -E -e "s/(#define ORACLE_SERVICE.*)jimmy(.*)/\1${WITH_ORACLE_SERVICE}\2/" ${WRKSRC}/voracle.h
254
	${REINPLACE_CMD} -E -e "s/(#define ORACLE_SERVICE.*)jimmy(.*)/\1${WITH_ORACLE_SERVICE}\2/" ${WRKSRC}/voracle.h
Lines 335-340 Link Here
335
			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
296
			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
336
		fi; \
297
		fi; \
337
	fi
298
	fi
338
	${INSTALL_DATA} ${VCFGDIR}/inc_deps ${VCFGDIR}/lib_deps ${PREFIX}/vpopmail/etc/
299
.if defined(DEFAULT_DOMAIN)
300
	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
301
.endif
302
.if defined(WITH_MYSQL)
303
	${ECHO_CMD} "${WITH_MYSQL_READ_SERVER}|0|${WITH_MYSQL_READ_USER}|${WITH_MYSQL_READ_PASSWD}|${WITH_MYSQL_DB}" \
304
		> ${PREFIX}/vpopmail/etc/vpopmail.mysql
305
	${ECHO_CMD} "${WITH_MYSQL_UPDATE_SERVER}|0|${WITH_MYSQL_UPDATE_USER}|${WITH_MYSQL_UPDATE_PASSWD}|${WITH_MYSQL_DB}" \
306
		>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
307
.endif
339
308
340
.include <bsd.port.mk>
309
.include <bsd.port.post.mk>
(-)vpopmail/distinfo (-2 / +1 lines)
Lines 1-2 Link Here
1
MD5 (vpopmail-5.3.20.tar.gz) = 4009fd5f6f910f1c70e58e2069d5f31d
1
MD5 (vpopmail-5.3.27.tar.gz) = 3690c3b2ddc0fc412feda37170e6c56f
2
MD5 (vpopmail-sqwebmail-config-5.3.20.patch) = 3d89fd7b95d3aa1f6398ea8fccadefba
(-)vpopmail/files/patch-Makefile.in (+14 lines)
Line 0 Link Here
1
--- Makefile.in.orig	Thu Sep  4 23:45:08 2003
2
+++ Makefile.in	Thu Sep  4 23:46:17 2003
3
@@ -705,10 +705,7 @@
4
 
5
 	if test "@USE_MYSQL@" = "1"; then \
6
 	  if test ! -r $(MYSQLCONF); then \
7
-	    echo "# MySQL settings, line 1 is config for read-only," > $(MYSQLCONF); \
8
-	    echo "# line 2 is config for update.  Settings for each" >> $(MYSQLCONF); \
9
-	    echo "# line: server|port|user|password|database" >> $(MYSQLCONF); \
10
-	    echo "localhost|0|root|secret|vpopmail" >> $(MYSQLCONF); \
11
+	    touch $(MYSQLCONF); \
12
 	  fi ; \
13
 	  chown @vpopuser@  $(MYSQLCONF) ; \
14
 	  chgrp @vpopgroup@ $(MYSQLCONF) ; \
(-)vpopmail/files/patch-configure (-38 / +22 lines)
Lines 1-6 Link Here
1
--- configure.old	Thu Feb 13 17:37:40 2003
1
--- configure.orig	Thu Aug 28 21:09:47 2003
2
+++ configure	Thu Feb 13 17:38:32 2003
2
+++ configure	Fri Sep  5 00:13:14 2003
3
@@ -1285,7 +1285,7 @@
3
@@ -1317,7 +1317,7 @@
4
   ;;
4
   ;;
5
 esac
5
 esac
6
 
6
 
Lines 9-16 Link Here
9
 then
9
 then
10
     echo "configure: warning: === vpopmail must be configured as root. ===" 1>&2
10
     echo "configure: warning: === vpopmail must be configured as root. ===" 1>&2
11
     echo "configure: warning: === please switch to the root user and  ===" 1>&2
11
     echo "configure: warning: === please switch to the root user and  ===" 1>&2
12
@@ -1563,15 +1563,6 @@
12
@@ -1601,15 +1601,6 @@
13
 rm -f vpopusername 
13
 EOF
14
 
14
 
15
 
15
 
16
-if test ! -d $vpopmaildir/etc
16
-if test ! -d $vpopmaildir/etc
Lines 25-62 Link Here
25
 # Check whether --enable-roaming-users or --disable-roaming-users was given.
25
 # Check whether --enable-roaming-users or --disable-roaming-users was given.
26
 if test "${enable_roaming_users+set}" = set; then
26
 if test "${enable_roaming_users+set}" = set; then
27
   enableval="$enable_roaming_users"
27
   enableval="$enable_roaming_users"
28
@@ -1637,7 +1628,7 @@
28
@@ -1671,17 +1662,7 @@
29
   
29
 if test "${enable_tcpserver_file+set}" = set; then
30
         if test "$tcpserver_file" = ""
30
   enableval="$enable_tcpserver_file"
31
         then
31
   tcpserver_file="$enableval"
32
-else
33
-  
34
-        if test "$tcpserver_file" = ""
35
-        then
32
-	    echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
36
-	    echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
33
+	    echo "127.:allow,RELAYCLIENT=\"\"" > "$VCFGDIR"/tcp.smtp
37
-    	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
34
     	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
38
-	
35
 	
39
-            echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
36
             echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
40
-            echo "configure: warning: Creating tcp.smtp in "$vpopmaildir"/etc/tcp.smtp." 1>&2
37
@@ -2142,7 +2133,7 @@
41
-        fi
38
         fi
42
-     
39
 		auth_libs="-L$libdir $extralibflags -lmysqlclient -lz"
43
+  echo "127.:allow,RELAYCLIENT=\"\"" > /usr/ports/mail/vpopmail/work/vcfg/tcp.smtp
44
 fi
40
 
45
 
41
-		echo "-L$vpopmaildir/lib -lvpopmail -L$libdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps
46
 cat >> confdefs.h <<EOF
42
+		echo "-L$vpopmaildir/lib -lvpopmail -L$libdir -lmysqlclient -lz" > $VCFGDIR/lib_deps
43
 		
44
         ;;
45
 *)
46
@@ -2399,14 +2390,14 @@
47
 		authlib=
48
 		
49
 		auth_inc="-Icdb"
50
-		echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps
51
+		echo "-L$vpopmaildir/lib -lvpopmail" > $VCFGDIR/lib_deps
52
 		
53
         ;;
54
 *)
55
         ;;
56
 esac
57
 
58
-echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps
59
+echo "-I$vpopmaildir/include" > $VCFGDIR/inc_deps
60
 
61
 # Check whether --enable-qmail-ext or --disable-qmail-ext was given.
62
 if test "${enable_qmail_ext+set}" = set; then
(-)vpopmail/files/patch-vlimits.c (-29 lines)
Lines 1-29 Link Here
1
--- vlimits.c.old	Fri Feb 14 14:44:38 2003
2
+++ vlimits.c	Fri Feb 14 14:45:21 2003
3
@@ -46,7 +46,7 @@
4
 
5
     /* get filename */
6
     vget_assign(mydomain, dir, sizeof(dir), &uid, &gid);
7
-    strncat(dir, "/.qmailadmin-limits", sizeof(dir));
8
+    strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1);
9
 
10
     /* open file */
11
     if ((fs = fopen(dir, "r")) != NULL) {
12
@@ -209,7 +209,7 @@
13
 
14
     /* get filename */
15
     vget_assign(mydomain, dir, sizeof(dir), &uid, &gid);
16
-    strncat(dir, "/.qmailadmin-limits", sizeof(dir));
17
+    strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1);
18
 
19
     /* open file */
20
     if ((fs = fopen(dir, "w+")) != NULL) {
21
@@ -265,7 +265,7 @@
22
 
23
     /* get filename */
24
     vget_assign(mydomain, dir, sizeof(dir), &uid, &gid);
25
-    strncat(dir, "/.qmailadmin-limits", sizeof(dir));
26
+    strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1);
27
     return unlink(dir);
28
 }
29
 
(-)vpopmail/pkg-plist (-3 / +6 lines)
Lines 13-18 Link Here
13
vpopmail/bin/vipmap
13
vpopmail/bin/vipmap
14
vpopmail/bin/vkill
14
vpopmail/bin/vkill
15
vpopmail/bin/vmkpasswd
15
vpopmail/bin/vmkpasswd
16
vpopmail/bin/vmoddomlimits
16
vpopmail/bin/vmoduser
17
vpopmail/bin/vmoduser
17
vpopmail/bin/vpasswd
18
vpopmail/bin/vpasswd
18
vpopmail/bin/vpopbull
19
vpopmail/bin/vpopbull
Lines 35-55 Link Here
35
vpopmail/doc/man_html/vpasswd.html
36
vpopmail/doc/man_html/vpasswd.html
36
vpopmail/doc/man_html/vpopbull.html
37
vpopmail/doc/man_html/vpopbull.html
37
vpopmail/doc/man_html/vsetuserquota.html
38
vpopmail/doc/man_html/vsetuserquota.html
39
@unexec if [ -f %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi
38
vpopmail/etc/inc_deps
40
vpopmail/etc/inc_deps
39
vpopmail/etc/lib_deps
41
vpopmail/etc/lib_deps
40
@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
42
@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
43
@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
41
vpopmail/include/config.h
44
vpopmail/include/config.h
42
vpopmail/include/vauth.h
45
vpopmail/include/vauth.h
46
vpopmail/include/vlimits.h
43
vpopmail/include/vpopmail.h
47
vpopmail/include/vpopmail.h
44
vpopmail/include/vpopmail_config.h
48
vpopmail/include/vpopmail_config.h
45
vpopmail/lib/libvpopmail.a
49
vpopmail/lib/libvpopmail.a
46
@dirrm vpopmail/users
47
@dirrm vpopmail/lib
50
@dirrm vpopmail/lib
48
@dirrm vpopmail/include
51
@dirrm vpopmail/include
49
@dirrm vpopmail/etc
52
@dirrm vpopmail/etc
50
@dirrm vpopmail/domains
53
@unexec rmdir %D/vpopmail/domains 2>/dev/null || true
51
@dirrm vpopmail/doc/man_html
54
@dirrm vpopmail/doc/man_html
52
@dirrm vpopmail/doc/doc_html
55
@dirrm vpopmail/doc/doc_html
53
@dirrm vpopmail/doc
56
@dirrm vpopmail/doc
54
@dirrm vpopmail/bin
57
@dirrm vpopmail/bin
55
@dirrm vpopmail
58
@unexec rmdir %D/vpopmail 2>/dev/null || true

Return to bug 56462