aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/vpopmail/Makefile31
-rw-r--r--mail/vpopmail/distinfo6
-rw-r--r--mail/vpopmail/files/patch-configure26
-rw-r--r--mail/vpopmail/pkg-plist10
4 files changed, 53 insertions, 20 deletions
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 5a46eb883be0..012efdeaddbc 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -6,13 +6,10 @@
#
PORTNAME= vpopmail
-PORTVERSION= 5.4.6
-PORTREVISION= 1
+PORTVERSION= 5.4.10
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-PATCH_SITES= http://people.FreeBSD.org/~roam/ports/patches/mail/
-PATCHFILES= vpopmail-547-snap.patch
MAINTAINER= roam@FreeBSD.org
COMMENT= Easy virtual domain and authentication package for use with qmail
@@ -36,6 +33,7 @@ CONFIGURE_ENV+= VCFGDIR="${VCFGDIR}"
CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \
--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
#
# User-configurable variables
@@ -52,6 +50,7 @@ CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \
# WITH_PGSQL - allow authentication via PostgreSQL
# WITH_SYBASE - allow authentication via Sybase (NOT TESTED!)
# WITH_ORACLE - allow authentication via Oracle (NOT TESTED!)
+# WITH_LDAP - allow authentication via LDAP
# WITH_VALIAS - enable valias processing
# WITHOUT_ROAMING - disallow roaming users
# WITH_IP_ALIAS - enables IP aliasing
@@ -129,6 +128,21 @@ RELAYCLEAR?= 30
SPAM_THRESHOLD?=15
LOGLEVEL?= y
+.if defined(WITH_LDAP)
+USE_OPENLDAP= yes
+.if defined(WITH_LDAP_SASL)
+WANT_OPENLDAP_SASL= yes
+.endif
+CONFIGURE_ARGS+= --enable-auth-module=ldap
+LDAP_FILES= ${WRKSRC}/README.ldap \
+ ${WRKSRC}/ldap/qmailUser.schema \
+ ${WRKSRC}/ldap/slapd.conf \
+ ${WRKSRC}/ldap/vpopmail.ldif
+PLIST_SUB+= LDAP=""
+.else
+PLIST_SUB+= LDAP="@comment "
+.endif
+
.if defined(WITH_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+= --enable-auth-module=mysql \
@@ -328,10 +342,11 @@ post-install:
${MKDIR} ${PREFIX}/vpopmail/etc
if [ ! -e "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
if [ -e "${VCFGDIR}/tcp.smtp" ]; then \
- ${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
+ ${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \
else \
- ${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
+ ${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \
fi; \
+ ${CP} -p ${PREFIX}/vpopmail/etc/tcp.smtp-dist ${PREFIX}/vpopmail/etc/tcp.smtp; \
fi
.if defined(DEFAULT_DOMAIN)
${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
@@ -349,5 +364,9 @@ post-install:
${ECHO_CMD} "-v -u vpopmail"
${ECHO_CMD} "***********************************************************************"
.endif
+.if defined(WITH_LDAP)
+ ${MKDIR} ${PREFIX}/vpopmail/ldap
+ ${INSTALL_DATA} ${LDAP_FILES} ${PREFIX}/vpopmail/ldap
+.endif
.include <bsd.port.post.mk>
diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo
index 93399b5e8e90..d0f50448f7f7 100644
--- a/mail/vpopmail/distinfo
+++ b/mail/vpopmail/distinfo
@@ -1,4 +1,2 @@
-MD5 (vpopmail-5.4.6.tar.gz) = 2db38c521b5fad4d76868d2582a72221
-SIZE (vpopmail-5.4.6.tar.gz) = 425910
-MD5 (vpopmail-547-snap.patch) = c9c5a82780b08e55299416df4e533238
-SIZE (vpopmail-547-snap.patch) = 18880
+MD5 (vpopmail-5.4.10.tar.gz) = 6709827f515f632424c2223c964698a1
+SIZE (vpopmail-5.4.10.tar.gz) = 432341
diff --git a/mail/vpopmail/files/patch-configure b/mail/vpopmail/files/patch-configure
index 4807bc29f55f..633f6f7fb945 100644
--- a/mail/vpopmail/files/patch-configure
+++ b/mail/vpopmail/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.old Wed Aug 25 09:34:22 2004
-+++ configure Wed Aug 25 09:41:18 2004
+--- configure.orig Sun Mar 20 16:38:35 2005
++++ configure Wed May 11 15:26:14 2005
@@ -838,6 +838,8 @@
--enable-qmail-newu=PATH Full path to qmail-newu program.
--enable-qmail-inject=PATH Full path to qmail-inject program.
@@ -9,7 +9,7 @@
--enable-vpopuser=USER User name allocated to vpopmail vpopmail.
--enable-vpopgroup=GROUP Group name allocated to vpopmail vchkpw.
--enable-roaming-users Enable POP-before-SMTP functionality.
-@@ -4694,7 +4696,7 @@
+@@ -4693,7 +4695,7 @@
#----------------------------------------------------------------------
@@ -18,7 +18,7 @@
then
{ echo "$as_me:$LINENO: WARNING: === vpopmail must be configured as root. ===" >&5
echo "$as_me: WARNING: === vpopmail must be configured as root. ===" >&2;}
-@@ -4824,6 +4826,46 @@
+@@ -4823,6 +4825,46 @@
;;
esac
@@ -65,7 +65,7 @@
#----------------------------------------------------------------------
echo "$as_me:$LINENO: checking whether we can locate the qmail directory" >&5
-@@ -5202,27 +5244,6 @@
+@@ -5201,27 +5243,6 @@
#----------------------------------------------------------------------
@@ -93,7 +93,7 @@
echo "$as_me:$LINENO: checking whether roaming-users has been enabled" >&5
echo $ECHO_N "checking whether roaming-users has been enabled... $ECHO_C" >&6
# Check whether --enable-roaming-users or --disable-roaming-users was given.
-@@ -5310,28 +5331,8 @@
+@@ -5309,29 +5330,9 @@
if test "${enable_tcpserver_file+set}" = set; then
enableval="$enable_tcpserver_file"
tcpserver_file="$enableval"
@@ -113,13 +113,23 @@
-
+ echo "127.:allow,RELAYCLIENT=\"\"" > ${VCFGDIR}/tcp.smtp
fi;
--
+
- if test ! -f "$tcpserver_file"
- then
- { { echo "$as_me:$LINENO: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&5
-echo "$as_me: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
+-
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
+
+@@ -5979,7 +5980,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"
+
diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist
index 2f113a2e8d2d..04b83fdcc359 100644
--- a/mail/vpopmail/pkg-plist
+++ b/mail/vpopmail/pkg-plist
@@ -19,7 +19,6 @@ vpopmail/bin/vmoddomlimits
vpopmail/bin/vmoduser
vpopmail/bin/vpasswd
vpopmail/bin/vpopbull
-vpopmail/bin/vqmaillocal
vpopmail/bin/vsetuserquota
vpopmail/bin/vuserinfo
vpopmail/doc/doc_html/vpopmail.html
@@ -41,7 +40,9 @@ vpopmail/doc/man_html/vsetuserquota.html
@unexec if [ -f %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi
vpopmail/etc/inc_deps
vpopmail/etc/lib_deps
-@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
+@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi
+vpopmail/etc/tcp.smtp-dist
+@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi
@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
vpopmail/etc/vlimits.default-dist
@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
@@ -51,6 +52,11 @@ vpopmail/include/vlimits.h
vpopmail/include/vpopmail.h
vpopmail/include/vpopmail_config.h
vpopmail/lib/libvpopmail.a
+%%LDAP%%vpopmail/ldap/README.ldap
+%%LDAP%%vpopmail/ldap/qmailUser.schema
+%%LDAP%%vpopmail/ldap/slapd.conf
+%%LDAP%%vpopmail/ldap/vpopmail.ldif
+%%LDAP%%@dirrm vpopmail/ldap
@dirrm vpopmail/lib
@dirrm vpopmail/include
@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
generated by cgit (git 2.34.1) at 2024-11-23 02:36:47 +0800