From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 17 07:30:15 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6F9537B401 for ; Thu, 17 Jul 2003 07:30:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B6FE43F93 for ; Thu, 17 Jul 2003 07:30:14 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h6HEUEUp036751 for ; Thu, 17 Jul 2003 07:30:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h6HEUEe5036750; Thu, 17 Jul 2003 07:30:14 -0700 (PDT) Resent-Date: Thu, 17 Jul 2003 07:30:14 -0700 (PDT) Resent-Message-Id: <200307171430.h6HEUEe5036750@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A593437B401; Thu, 17 Jul 2003 07:28:15 -0700 (PDT) Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id E508A43F85; Thu, 17 Jul 2003 07:28:13 -0700 (PDT) (envelope-from alex@vaio.alexdupre.com) Received: from vaio.alexdupre.com (host181-49.pool8288.interbusiness.it [82.88.49.181]) by relay.gufi.org (Postfix) with ESMTP id 6794020F48; Thu, 17 Jul 2003 16:28:12 +0200 (CEST) Received: from vaio.alexdupre.com (localhost [127.0.0.1]) by vaio.alexdupre.com (8.12.9/8.12.9) with ESMTP id h6HESBdS037812; Thu, 17 Jul 2003 16:28:11 +0200 (CEST) (envelope-from alex@vaio.alexdupre.com) Received: (from alex@localhost) by vaio.alexdupre.com (8.12.9/8.12.9/Submit) id h6HESAZ3037811; Thu, 17 Jul 2003 16:28:10 +0200 (CEST) Message-Id: <200307171428.h6HESAZ3037811@vaio.alexdupre.com> Date: Thu, 17 Jul 2003 16:28:10 +0200 (CEST) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: roam@FreeBSD.org Subject: ports/54585: [Update] Port: mail/vpopmail X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2003 14:30:16 -0000 >Number: 54585 >Category: ports >Synopsis: [Update] Port: mail/vpopmail >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jul 17 07:30:13 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.8-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD 4.8-ALEXDUPRE i386 >Description: Remove COMMENT quotes. Align knobs' comments. Remove APOP, SQWEBMAIL and DELIVER_FILTER obsolate knobs. Add WITH_LEARN_PASSWORDS knob. Add MySQL4 support. Fix sqlincdir and sqllibdir. Change WITHOUT_ROAMING into WITH_ROAMING (vpopmail doesn't enable it by default) Change WITH_CLEAR_PASSWD into WITHOUT_CLEAR_PASSWD (vpopmail enables it by default) >How-To-Repeat: >Fix: --- vpopmail.diff begins here --- diff -ruN vpopmail.orig/Makefile vpopmail/Makefile --- vpopmail.orig/Makefile Thu Jul 17 15:28:43 2003 +++ vpopmail/Makefile Thu Jul 17 16:01:10 2003 @@ -7,11 +7,12 @@ PORTNAME= vpopmail PORTVERSION= 5.3.20 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.inter7.com/devel/ MAINTAINER= roam@FreeBSD.org -COMMENT= "Easy virtual domain and authentication package for use with qmail" +COMMENT= Easy virtual domain and authentication package for use with qmail BUILD_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp @@ -43,46 +44,47 @@ # # Define these to change from the default behaviour # -# WITH_PASSWD - allow authentication off /etc/passwd -# WITHOUT_MD5_PASSWORDS - store encrypted passwords in MD5 format -# WITH_MYSQL - allow authentitation via mysql -# WITH_MYSQL_LARGE_SITE - enables large site layout -# WITH_MYSQL_REPLICATION - enables MySQL database replication -# WITH_MYSQL_LIMITS - enables the MySQL mailbox limit code -# WITH_SYBASE - allow authentication via Sybase (NOT TESTED!) -# WITH_ORACLE - allow authentication via Oracle (NOT TESTED!) -# WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db -# WITH_VALIAS - enable valias processing -# WITHOUT_ROAMING - disallow roaming users -# WITH_IP_ALIAS - enables IP aliasing -# WITH_DELIVER_FILTER - enables the experimental vdelivermail filter -# WITH_QMAIL_EXT - enables qmail-like user-* address extesions processing -# WITHOUT_FILE_LOCKING - disable file locking -# WITH_FILE_SYNC - enables immediate synching (may decrease performance) -# WITHOUT_USERS_BIG_DIR - disables using big directories for users -# WITHOUT_SEEKABLE - disables vdelivermail's attempt to make its input seekable +# WITH_PASSWD - allow authentication off /etc/passwd +# WITHOUT_MD5_PASSWORDS - disable storing encrypted passwords in MD5 format +# WITHOUT_CLEAR_PASSWD - disable storing passwords in plaintext +# WITH_LEARN_PASSWORDS - enable learning passwords during pop auth +# WITH_MYSQL - allow authentitation via mysql +# WITH_MYSQL_REPLICATION - enable MySQL database replication +# WITH_MYSQL_LIMITS - enable the MySQL mailbox limit code +# WITH_SYBASE - allow authentication via Sybase (NOT TESTED!) +# WITH_ORACLE - allow authentication via Oracle (NOT TESTED!) +# WITH_VALIAS - enable valias processing +# WITH_ROAMING - allow roaming users +# WITH_IP_ALIAS - enables IP aliasing +# WITH_QMAIL_EXT - enable qmail-like user-* address extesions processing +# WITHOUT_FILE_LOCKING - disable file locking +# WITH_FILE_SYNC - enable immediate synching (may decrease performance) +# WITHOUT_USERS_BIG_DIR - disable using big directories for users +# WITHOUT_SEEKABLE - disable vdelivermail's attempt to make its input seekable # # Set these to the values you'd prefer # -# HARDQUOTA - size of hard quota, or 'n' for no hard quota -# RELAYCLEAR - time in minutes before clearing relay hole (requires roaming) -# DEFAULT_DOMAIN - default domain for non-vhost lookups -# WITH_SINGLE_DOMAIN - optimize for a site with many users in a single domain -# LOGLEVEL - n - no logging, y - log all, -# e - log errors, p - log passwords in errors -# WITHOUT_AUTH_LOG - disables authentication logging -# WITH_MYSQL_LOG - enable logging to a MySQL database -# QMAIL_DIR - location of qmail directory -# PREFIX - installation area for vpopmail (see comment below) -# VCHKPW_GID - the group ID of the new vchkpw group (89) -# VPOPMAIL_UID - the user ID of the new vpopmail user (89) +# HARDQUOTA - size of hard quota, or 'n' for no hard quota +# RELAYCLEAR - time in minutes before clearing relay hole (requires +# roaming) +# DEFAULT_DOMAIN - default domain for non-vhost lookups +# WITH_SINGLE_DOMAIN - optimize for a site with many users in a single domain +# LOGLEVEL - n - no logging, y - log all, +# e - log errors, p - log passwords in errors, +# v - verbose success and errors with passwords +# WITHOUT_AUTH_LOG - disables authentication logging +# WITH_MYSQL_LOG - enable logging to a MySQL database +# QMAIL_DIR - location of qmail directory +# PREFIX - installation area for vpopmail (see comment below) +# VCHKPW_GID - the group ID of the new vchkpw group (89) +# VPOPMAIL_UID - the user ID of the new vpopmail user (89) # # MySQL database configuration options # # WITH_MYSQL_SERVER - the hostname of the MySQL server (localhost) -# WITH_MYSQL_USER - the username for connecting to the MySQL server (root) +# WITH_MYSQL_USER - the username for connecting to the MySQL server (root) # WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (secret) -# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail) +# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail) # The server, user and password variables may be defined separately # for read and update access, allowing you to set up a less-priviledged # MySQL connection account with read-only access, and another one which @@ -97,12 +99,12 @@ # Please report any success or failure to the port maintainer, # Peter Pentchev # -# WITH_ORACLE_PROC - the name of the Oracle Pro-C precompiler, default 'proc' +# WITH_ORACLE_PROC - the name of the Oracle Pro-C precompiler, default 'proc' # WITH_ORACLE_SERVICE - the Oracle service name (jimmy) -# WITH_ORACLE_USER - the username for connecting to the Oracle server (system) -# WITH_ORACLE_PASSWD - the password for connecting to the Oracle server (manager) -# WITH_ORACLE_DB - the name of the Oracle database to connect to (orcl1) -# WITH_ORACLE_HOME - the Oracle installation directory (/export/home/oracle) +# WITH_ORACLE_USER - the username for connecting to the Oracle server (system) +# WITH_ORACLE_PASSWD - the password for connecting to the Oracle server (manager) +# WITH_ORACLE_DB - the name of the Oracle database to connect to (orcl1) +# WITH_ORACLE_HOME - the Oracle installation directory (/export/home/oracle) # # Sybase database configuration options # @@ -111,16 +113,18 @@ # Peter Pentchev # # WITH_SYBASE_SERVER - the Sybase server name (empty) -# WITH_SYBASE_USER - the username for connecting to the Sybase server (sa) +# WITH_SYBASE_USER - the username for connecting to the Sybase server (sa) # WITH_SYBASE_PASSWD - the password for connecting to the Sybase server (empty) -# WITH_SYBASE_APP - the app for connecting to the Sybase server (vpopmail) -# WITH_SYBASE_DB - the name of the Sybase database to connect to (vpopmail) +# WITH_SYBASE_APP - the app for connecting to the Sybase server (vpopmail) +# WITH_SYBASE_DB - the name of the Sybase database to connect to (vpopmail) # HARDQUOTA?= 10000000 RELAYCLEAR?= 30 LOGLEVEL?= y +.include + .if exists(${LOCALBASE}/qmail/bin/qmail-send) QMAIL_DIR?= ${LOCALBASE}/qmail .else @@ -150,35 +154,36 @@ CONFIGURE_ARGS+= --enable-md5-passwords=n .endif -.if defined(WITH_APOP) -BROKEN= "The WITH_APOP option is deprecated; set WITH_CLEAR_PASSWD instead, APOP will just work" -.endif - .if defined(WITH_VALIAS) CONFIGURE_ARGS+= --enable-valias=y .endif -.if defined(WITH_SQWEBMAIL) -CONFIGURE_ARGS+= --enable-sqwebmail-pass=y -.endif - -.if !defined(WITHOUT_ROAMING) +.if defined(WITH_ROAMING) CONFIGURE_ARGS+= --enable-roaming-users=y \ --enable-relay-clear-minutes=${RELAYCLEAR} .endif -.if !defined(WITH_CLEAR_PASSWD) +.if defined(WITHOUT_CLEAR_PASSWD) CONFIGURE_ARGS+= --enable-clear-passwd=n .endif +.if defined(WITH_LEARN_PASSWORDS) +CONFIGURE_ARGS+= --enable-learn-passwords=y +.endif + .if defined(WITH_MYSQL) -LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ARGS+= --enable-mysql=y \ - --enable-sqlincdir=${LOCALBASE}/include/mysql \ - --enable-sqllibdir=${LOCALBASE}/lib/mysql -.if defined(WITH_MYSQL_LARGE_SITE) -CONFIGURE_ARGS+= --enable-large-site=y +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) +LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +.else +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client +.else +LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client +.endif .endif +CONFIGURE_ARGS+= --enable-mysql=y \ + --enable-incdir=${LOCALBASE}/include/mysql \ + --enable-libdir=${LOCALBASE}/lib/mysql .if defined(WITH_MYSQL_REPLICATION) CONFIGURE_ARGS+= --enable-mysql-replication=y .endif @@ -224,10 +229,6 @@ CONFIGURE_ARGS+= --enable-ip-alias-domains=y .endif -.if defined(WITH_DELIVER_FILTER) -CONFIGURE_ARGS+= --enable-deliver-filter=y -.endif - .if defined(WITH_QMAIL_EXT) CONFIGURE_ARGS+= --enable-qmail-ext=y .endif @@ -337,4 +338,4 @@ fi ${INSTALL_DATA} ${VCFGDIR}/inc_deps ${VCFGDIR}/lib_deps ${PREFIX}/vpopmail/etc/ -.include +.include --- vpopmail.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: