From 733a66a97ea53d68e940da1bb7f29af459430ad5 Mon Sep 17 00:00:00 2001 From: roam Date: Mon, 13 Sep 2010 09:57:47 +0000 Subject: Update to vpopmail-5.4.32 and declare a GPL-2+ license. --- mail/vpopmail/Makefile | 5 ++- mail/vpopmail/distinfo | 6 +-- mail/vpopmail/files/Makefile.in-noportdocs.patch | 6 +-- mail/vpopmail/files/patch-Makefile.in | 4 +- mail/vpopmail/files/patch-client.c | 49 ------------------------ mail/vpopmail/files/patch-config.h.in | 4 +- mail/vpopmail/files/patch-configure | 36 ++++++++--------- mail/vpopmail/files/sql-remove-deleted.patch | 4 +- 8 files changed, 32 insertions(+), 82 deletions(-) delete mode 100644 mail/vpopmail/files/patch-client.c (limited to 'mail/vpopmail') diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 535458d5af62..8002617e7b75 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vpopmail -PORTVERSION= 5.4.30 -PORTREVISION= 4 +PORTVERSION= 5.4.32 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} @@ -19,6 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp RUN_DEPENDS= ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp PATCH_STRIP= -p1 +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual USE_QMAIL= yes diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo index 644383398add..5cfc74842cb4 100644 --- a/mail/vpopmail/distinfo +++ b/mail/vpopmail/distinfo @@ -1,3 +1,3 @@ -MD5 (vpopmail-5.4.30.tar.gz) = fc56d8f40159eb839689086d5610f9ed -SHA256 (vpopmail-5.4.30.tar.gz) = 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc -SIZE (vpopmail-5.4.30.tar.gz) = 609358 +MD5 (vpopmail-5.4.32.tar.gz) = 0c8e0075c2c5c73eca85d28834fc7a98 +SHA256 (vpopmail-5.4.32.tar.gz) = 5701424b239e6f1415933af17273faf80b631f84e01b8ad3877e38b60bb8a23b +SIZE (vpopmail-5.4.32.tar.gz) = 612501 diff --git a/mail/vpopmail/files/Makefile.in-noportdocs.patch b/mail/vpopmail/files/Makefile.in-noportdocs.patch index 94d576f03689..daf404e465cb 100644 --- a/mail/vpopmail/files/Makefile.in-noportdocs.patch +++ b/mail/vpopmail/files/Makefile.in-noportdocs.patch @@ -2,11 +2,11 @@ Description: Do not install the documentation files. Only applied if NOPORTDOCS is defined during the port's build. Forwarded: not-needed Author: Peter Pentchev -Last-Update: 2010-01-05 +Last-Update: 2010-09-13 --- a/Makefile.in +++ b/Makefile.in -@@ -1049,7 +1049,7 @@ +@@ -1158,7 +1158,7 @@ @echo "" install-exec-am: @@ -15,7 +15,7 @@ Last-Update: 2010-01-05 if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \ $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \ $(DESTDIR)@vpopmaildir@/$$d ; \ -@@ -1111,14 +1111,6 @@ +@@ -1220,14 +1220,6 @@ $(DESTDIR)@vpopmaildir@/include/ ; \ done diff --git a/mail/vpopmail/files/patch-Makefile.in b/mail/vpopmail/files/patch-Makefile.in index 3bd393015d2b..bbabb8bcafdc 100644 --- a/mail/vpopmail/files/patch-Makefile.in +++ b/mail/vpopmail/files/patch-Makefile.in @@ -4,11 +4,11 @@ Description: Install config files with -dist, do not add -fPIC. Actually look for and install the vusagec.conf sample file! Forwarded: not-needed Author: Peter Pentchev -Last-Update: 2010-02-09 +Last-Update: 2010-09-13 --- a/Makefile.in +++ b/Makefile.in -@@ -320,12 +320,12 @@ +@@ -357,12 +357,12 @@ 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-client.c b/mail/vpopmail/files/patch-client.c deleted file mode 100644 index 3b3ecd27a5ea..000000000000 --- a/mail/vpopmail/files/patch-client.c +++ /dev/null @@ -1,49 +0,0 @@ -Description: Fix a segfault when vpopmaild is not used. -Origin: upstream; http://vpopmail.svn.sourceforge.net/viewvc/vpopmail/tags/v5_4_31/client.c?r1=979&r2=984&view=patch -Last-Update: 2010-01-14 - ---- a/client.c -+++ b/client.c -@@ -65,13 +65,15 @@ - fd_set wfds; - client_handle_t *handle = NULL; - -+ timeout = CLIENT_SERVER_TIMEOUT; -+ memset(socket_file, 0, sizeof(socket_file)); -+ - /* - Load configuration file - */ - - config = config_begin("vusagec.conf"); -- if (config == NULL) -- fprintf(stderr, "client_connect: warning: config_begin failed\n"); -+ if (config) { - - /* - Disabled? -@@ -89,7 +91,6 @@ - Get timeout - */ - -- timeout = CLIENT_SERVER_TIMEOUT; - str = config_fetch_by_name(config, "Server", "Timeout"); - if (str) { - fl = atoi(str); -@@ -103,8 +104,6 @@ - Determine connection type - */ - -- memset(socket_file, 0, sizeof(socket_file)); -- - str = config_fetch_by_name(config, "Server", "Remote"); - if (str) { - ret = ippp_parse(str, &addr); -@@ -131,6 +130,7 @@ - } - - config_kill(config); -+ } - - /* - Allocate a socket diff --git a/mail/vpopmail/files/patch-config.h.in b/mail/vpopmail/files/patch-config.h.in index d076860fc026..47f98f4b0702 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 -Last-Update: 2010-01-05 +Last-Update: 2010-09-13 --- a/config.h.in +++ b/config.h.in -@@ -310,6 +310,12 @@ +@@ -313,6 +313,12 @@ #undef SPAMC_PROG /* "" */ diff --git a/mail/vpopmail/files/patch-configure b/mail/vpopmail/files/patch-configure index 86e57d26068c..5a9e2e404812 100644 --- a/mail/vpopmail/files/patch-configure +++ b/mail/vpopmail/files/patch-configure @@ -10,11 +10,11 @@ Forwarded: not-needed Author: Peter Pentchev , Alex Dupre , Renato Botelho -Last-Update: 2010-01-05 +Last-Update: 2010-09-13 --- a/configure +++ b/configure -@@ -1453,6 +1453,8 @@ +@@ -1403,6 +1403,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: 2010-01-05 --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. -@@ -7185,27 +7187,6 @@ +@@ -5785,27 +5787,6 @@ #---------------------------------------------------------------------- @@ -31,14 +31,14 @@ Last-Update: 2010-01-05 -then - if test ! -d $vpopmaildir - then -- { $as_echo "$as_me:$LINENO: WARNING: creating $vpopmaildir " >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: creating $vpopmaildir " >&5 -$as_echo "$as_me: WARNING: creating $vpopmaildir " >&2;} - mkdir -p $vpopmaildir - chown $vpopmailuid $vpopmaildir - chgrp $vpopmailgid $vpopmaildir - chmod 755 $vpopmaildir - fi -- { $as_echo "$as_me:$LINENO: WARNING: making a vpopmail etc directory " >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: making a vpopmail etc directory " >&5 -$as_echo "$as_me: WARNING: making a vpopmail etc directory " >&2;} - mkdir $vpopmaildir/etc - chown $vpopmailuid "$vpopmaildir"/etc @@ -48,21 +48,21 @@ Last-Update: 2010-01-05 - -#---------------------------------------------------------------------- - - { $as_echo "$as_me:$LINENO: checking whether roaming-users has been enabled" >&5 + { $as_echo "$as_me:${as_lineno-$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. -@@ -7292,30 +7273,11 @@ +@@ -5888,28 +5869,11 @@ # Check whether --enable-tcpserver_file was given. - if test "${enable_tcpserver_file+set}" = set; then + if test "${enable_tcpserver_file+set}" = set; then : enableval=$enable_tcpserver_file; tcpserver_file="$enableval" + echo "127.:allow,RELAYCLIENT=\"\"" > ${VCFGDIR}/tcp.smtp else - if test "$tcpserver_file" = "" - then -- { $as_echo "$as_me:$LINENO: WARNING: Unable to find your tcpserver relay file." >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to find your tcpserver relay file." >&5 -$as_echo "$as_me: WARNING: Unable to find your tcpserver relay file." >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&5 -$as_echo "$as_me: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&2;} - - echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp @@ -75,15 +75,13 @@ Last-Update: 2010-01-05 - - if test ! -f "$tcpserver_file" - then -- { { $as_echo "$as_me:$LINENO: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&5 --$as_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; }; } +- as_fn_error "Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" "$LINENO" 5 - fi - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -@@ -7824,6 +7786,44 @@ +@@ -6414,6 +6378,44 @@ #define SPAMC_PROG "$spamc_prog" _ACEOF @@ -128,8 +126,8 @@ Last-Update: 2010-01-05 ;; esac -@@ -8086,7 +8086,7 @@ - { (exit 1); exit 1; }; } +@@ -6664,7 +6666,7 @@ + as_fn_error "Unable to find your MySQL lib dir, specify --enable-libdir." "$LINENO" 5 fi - auth_libs="-Xlinker -R -Xlinker $libdir -L$libdir $extralibflags -lmysqlclient -lz -lm" @@ -137,7 +135,7 @@ Last-Update: 2010-01-05 ;; -@@ -8153,7 +8153,7 @@ +@@ -6727,7 +6729,7 @@ #define USE_LDAP $USE_LDAP _ACEOF @@ -146,7 +144,7 @@ Last-Update: 2010-01-05 auth_inc="-I/usr/local/include" -@@ -10735,8 +10735,8 @@ +@@ -9029,8 +9031,8 @@ ;; esac diff --git a/mail/vpopmail/files/sql-remove-deleted.patch b/mail/vpopmail/files/sql-remove-deleted.patch index ee4fdc9d601a..66b844459249 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 -Last-Update: 2010-01-05 +Last-Update: 2010-09-13 --- a/config.h.in +++ b/config.h.in -@@ -404,3 +404,5 @@ +@@ -407,3 +407,5 @@ /* Define to `int' if doesn't define. */ #undef uid_t -- cgit