diff options
| -rw-r--r-- | mail/vpopmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/vpopmail/distinfo | 6 | ||||
| -rw-r--r-- | mail/vpopmail/files/Makefile.in-noportdocs.patch | 8 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-Makefile.in | 4 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-config.h.in | 4 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-configure | 16 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-storage.h | 59 | ||||
| -rw-r--r-- | mail/vpopmail/files/patch-vdelivermail.c | 4 | ||||
| -rw-r--r-- | mail/vpopmail/files/sql-remove-deleted.patch | 4 |
9 files changed, 24 insertions, 84 deletions
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 784526761809..77f402199cb2 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vpopmail -PORTVERSION= 5.4.28 -PORTREVISION= 1 +PORTVERSION= 5.4.30 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo index ef97734bb3b3..644383398add 100644 --- a/mail/vpopmail/distinfo +++ b/mail/vpopmail/distinfo @@ -1,3 +1,3 @@ -MD5 (vpopmail-5.4.28.tar.gz) = 8b44fb9c62d4ef96b29143863b577abb -SHA256 (vpopmail-5.4.28.tar.gz) = fa32445f83fa6600f59c11bd3f34325f700378db8bbc242f2779302f3e09ea27 -SIZE (vpopmail-5.4.28.tar.gz) = 604340 +MD5 (vpopmail-5.4.30.tar.gz) = fc56d8f40159eb839689086d5610f9ed +SHA256 (vpopmail-5.4.30.tar.gz) = 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc +SIZE (vpopmail-5.4.30.tar.gz) = 609358 diff --git a/mail/vpopmail/files/Makefile.in-noportdocs.patch b/mail/vpopmail/files/Makefile.in-noportdocs.patch index bd96d04f6682..94d576f03689 100644 --- a/mail/vpopmail/files/Makefile.in-noportdocs.patch +++ b/mail/vpopmail/files/Makefile.in-noportdocs.patch @@ -2,12 +2,12 @@ Description: Do not install the documentation files. Only applied if NOPORTDOCS is defined during the port's build. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-26 +Last-Update: 2010-01-05 --- a/Makefile.in +++ b/Makefile.in -@@ -1065,7 +1065,7 @@ - @SET_MAKE@ +@@ -1049,7 +1049,7 @@ + @echo "" install-exec-am: - for d in bin doc etc include lib ; do \ @@ -15,7 +15,7 @@ Last-Update: 2009-11-26 if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \ $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \ $(DESTDIR)@vpopmaildir@/$$d ; \ -@@ -1126,14 +1126,6 @@ +@@ -1111,14 +1111,6 @@ $(DESTDIR)@vpopmaildir@/include/ ; \ done diff --git a/mail/vpopmail/files/patch-Makefile.in b/mail/vpopmail/files/patch-Makefile.in index 7ae07b46dbe5..eb31e777ea4d 100644 --- a/mail/vpopmail/files/patch-Makefile.in +++ b/mail/vpopmail/files/patch-Makefile.in @@ -3,11 +3,11 @@ Description: Install config files with -dist, do not add -fPIC. Do not unconditionally add -fPIC, this is done only for shared libs. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-26 +Last-Update: 2010-01-05 --- a/Makefile.in +++ b/Makefile.in -@@ -326,12 +326,11 @@ +@@ -320,12 +320,11 @@ noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load diff --git a/mail/vpopmail/files/patch-config.h.in b/mail/vpopmail/files/patch-config.h.in index d61b32a2283b..d076860fc026 100644 --- a/mail/vpopmail/files/patch-config.h.in +++ b/mail/vpopmail/files/patch-config.h.in @@ -1,11 +1,11 @@ Description: Add two SpamAssassin-related definitions. Forwarded: not-needed Author: Alex Dupre <ale@FreeBSD.org> -Last-Update: 2009-11-26 +Last-Update: 2010-01-05 --- a/config.h.in +++ b/config.h.in -@@ -280,6 +280,12 @@ +@@ -310,6 +310,12 @@ #undef SPAMC_PROG /* "" */ diff --git a/mail/vpopmail/files/patch-configure b/mail/vpopmail/files/patch-configure index cf722ff21bb9..86e57d26068c 100644 --- a/mail/vpopmail/files/patch-configure +++ b/mail/vpopmail/files/patch-configure @@ -10,11 +10,11 @@ Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org>, Alex Dupre <ale@FreeBSD.org>, Renato Botelho <garga@FreeBSD.org> -Last-Update: 2009-11-26 +Last-Update: 2010-01-05 --- a/configure +++ b/configure -@@ -1455,6 +1455,8 @@ +@@ -1453,6 +1453,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. @@ -23,7 +23,7 @@ Last-Update: 2009-11-26 --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. -@@ -6884,27 +6886,6 @@ +@@ -7185,27 +7187,6 @@ #---------------------------------------------------------------------- @@ -51,7 +51,7 @@ Last-Update: 2009-11-26 { $as_echo "$as_me:$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. -@@ -6991,30 +6972,11 @@ +@@ -7292,30 +7273,11 @@ # Check whether --enable-tcpserver_file was given. if test "${enable_tcpserver_file+set}" = set; then enableval=$enable_tcpserver_file; tcpserver_file="$enableval" @@ -83,7 +83,7 @@ Last-Update: 2009-11-26 { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } -@@ -7523,6 +7485,44 @@ +@@ -7824,6 +7786,44 @@ #define SPAMC_PROG "$spamc_prog" _ACEOF @@ -128,7 +128,7 @@ Last-Update: 2009-11-26 ;; esac -@@ -7785,7 +7785,7 @@ +@@ -8086,7 +8086,7 @@ { (exit 1); exit 1; }; } fi @@ -137,7 +137,7 @@ Last-Update: 2009-11-26 ;; -@@ -7852,7 +7852,7 @@ +@@ -8153,7 +8153,7 @@ #define USE_LDAP $USE_LDAP _ACEOF @@ -146,7 +146,7 @@ Last-Update: 2009-11-26 auth_inc="-I/usr/local/include" -@@ -10466,8 +10466,8 @@ +@@ -10735,8 +10735,8 @@ ;; esac diff --git a/mail/vpopmail/files/patch-storage.h b/mail/vpopmail/files/patch-storage.h deleted file mode 100644 index 3a02bd87c60f..000000000000 --- a/mail/vpopmail/files/patch-storage.h +++ /dev/null @@ -1,59 +0,0 @@ -Description: Use the FreeBSD endianness symbols. -Forwarded: no -Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-26 - ---- a/storage.h -+++ b/storage.h -@@ -27,6 +27,42 @@ - htonll() and ntohll() - */ - -+#ifdef __FreeBSD__ -+ -+#include <sys/endian.h> -+ -+#if defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) -+# if _BYTE_ORDER == _LITTLE_ENDIAN -+ -+#define VPOPMAIL_HOST_LITTLE_ENDIAN -+ -+# ifndef ntohll -+# define ntohll(_x_) __bswap64(_x_) -+# endif -+# ifndef htonll -+# define htonll(_x_) __bswap64(_x_) -+# endif -+ -+# elif _BYTE_ORDER == _BIG_ENDIAN -+ -+#define VPOPMAIL_HOST_BIG_ENDIAN -+ -+# ifndef ntohll -+# define ntohll(_x_) _x_ -+# endif -+# ifndef htonll -+# define htonll(_x_) _x_ -+# endif -+ -+# else -+#error A byte order must be selected -+# endif -+#else -+#error Could not find the _BYTE_ORDER, _LITTLE_ENDIAN, or _BIG_ENDIAN defs -+#endif -+ -+#else -+ - #include <endian.h> - #include <byteswap.h> - -@@ -56,6 +92,8 @@ - # error A byte order must be selected - #endif - -+#endif -+ - /* - Define htonll() and ntohll() if not already defined - */ diff --git a/mail/vpopmail/files/patch-vdelivermail.c b/mail/vpopmail/files/patch-vdelivermail.c index 70f5c5f39d9e..166b3cc3a464 100644 --- a/mail/vpopmail/files/patch-vdelivermail.c +++ b/mail/vpopmail/files/patch-vdelivermail.c @@ -4,7 +4,7 @@ Description: SpamAssassin support, build optimization Forwarded: not-needed Author: Alex Dupre <ale@FreeBSD.org>, Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-30 +Last-Update: 2010-01-05 --- a/vdelivermail.c +++ b/vdelivermail.c @@ -186,7 +186,7 @@ Last-Update: 2009-11-30 int child; char *(args[4]); int wstat; -@@ -1183,7 +1230,7 @@ +@@ -1186,7 +1233,7 @@ maildir_to_email(newdir), date_header()); } diff --git a/mail/vpopmail/files/sql-remove-deleted.patch b/mail/vpopmail/files/sql-remove-deleted.patch index 382133b73406..ee4fdc9d601a 100644 --- a/mail/vpopmail/files/sql-remove-deleted.patch +++ b/mail/vpopmail/files/sql-remove-deleted.patch @@ -2,11 +2,11 @@ Description: Activate the SQL_REMOVE_DELETED code. Only applied if this is requested at port build time. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-26 +Last-Update: 2010-01-05 --- a/config.h.in +++ b/config.h.in -@@ -374,3 +374,5 @@ +@@ -404,3 +404,5 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t |