svn commit: r316429 - in head/mail/qmailadmin: . files

[Bryan Drewery]

Author: bdrewery
Date: Wed Apr 24 13:07:34 2013
New Revision: 316429
URL: http://svnweb.freebsd.org/changeset/ports/316429

Log:
  - Fix ezmlm support by using subcommands of ezmlm-list
    on the main database dir instead of subdirs [1]. This
    is reported upstream at:
    http://sourceforge.net/tracker/?func=detail&aid=3094082&group_id=6691&atid=306691
  - Ignore the devel 1.2.16 version, it is not buildable
  - Mirror distfile
  - Convert tab to space in pkg-descr
  
  PR:		ports/177389 [1]
  Submitted by:	Tsunehiko Suzuki <tss-fbspr at e-ontap.com> [1]

Added:
  head/mail/qmailadmin/files/
  head/mail/qmailadmin/files/patch-mailinglist.c   (contents, props changed)
Modified:
  head/mail/qmailadmin/Makefile
  head/mail/qmailadmin/pkg-descr

Modified: head/mail/qmailadmin/Makefile
==============================================================================
--- head/mail/qmailadmin/Makefile	Wed Apr 24 13:07:06 2013	(r316428)
+++ head/mail/qmailadmin/Makefile	Wed Apr 24 13:07:34 2013	(r316429)
@@ -3,10 +3,11 @@
 
 PORTNAME=	qmailadmin
 PORTVERSION=	1.2.15
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	mail www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \
+		http://mirror.shatow.net/freebsd/${PORTNAME}/
 
 MAINTAINER=	bdrewery at FreeBSD.org
 COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
@@ -30,6 +31,8 @@ PATCH_SITES+=	http://qmail.jms1.net/vpop
 PATCHFILES+=	qmailadmin-1.2.12-onchange.3.patch:onchange
 PATCH_DIST_STRIP+=	-p1
 
+PORTSCOUT=	ignore:1.2.16
+
 OPTIONS_DEFINE=	IPAUTH USER_INDEX MODIFY_QUOTA DOMAIN_AUTOFILL \
 		IDX IDX_SQL HELP SPAM_DETECTION SPAM_NEEDS_EMAIL \
 		CATCHALL TRIVIAL_PASSWORD NOCACHE

Added: head/mail/qmailadmin/files/patch-mailinglist.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/qmailadmin/files/patch-mailinglist.c	Wed Apr 24 13:07:34 2013	(r316429)
@@ -0,0 +1,33 @@
+--- mailinglist.c~	2009-03-09 10:35:01.000000000 +0900
++++ mailinglist.c	2013-03-25 23:48:29.000000000 +0900
+@@ -681,13 +681,15 @@
+     dup2(handles[1],fileno(stdout));
+     sprintf(TmpBuf1, "%s/ezmlm-list", EZMLMDIR);
+     if(mod == 1) {
+-        sprintf(TmpBuf2, "%s/%s/mod", RealDir, ActionUser);
++        sprintf(TmpBuf2, "%s/%s", RealDir, ActionUser);
++        execl(TmpBuf1, "ezmlm-list", TmpBuf2, "mod", NULL);
+     } else if(mod == 2) {
+-        sprintf(TmpBuf2, "%s/%s/digest", RealDir, ActionUser);
++        sprintf(TmpBuf2, "%s/%s", RealDir, ActionUser);
++        execl(TmpBuf1, "ezmlm-list", TmpBuf2, "digest", NULL);
+     } else {
+         sprintf(TmpBuf2, "%s/%s/", RealDir, ActionUser);
++        execl(TmpBuf1, "ezmlm-list", TmpBuf2, NULL);
+     }
+-    execl(TmpBuf1, "ezmlm-list", TmpBuf2, NULL);
+     exit(127);
+   } else {
+     close(handles[1]);
+@@ -799,9 +801,9 @@
+   pid=fork();
+   if (pid==0) {
+     snprintf(subpath, sizeof(subpath), "%s/ezmlm-sub", EZMLMDIR);
+-    snprintf(listpath, sizeof(listpath), "%s/%s/%s",
+-      RealDir, ActionUser, dir);
+-    execl(subpath, "ezmlm-sub", listpath, email, NULL);
++    snprintf(listpath, sizeof(listpath), "%s/%s",
++      RealDir, ActionUser);
++    execl(subpath, "ezmlm-sub", listpath, dir, email, NULL);
+     exit(127);
+   } else wait(&pid);

Modified: head/mail/qmailadmin/pkg-descr
==============================================================================
--- head/mail/qmailadmin/pkg-descr	Wed Apr 24 13:07:06 2013	(r316428)
+++ head/mail/qmailadmin/pkg-descr	Wed Apr 24 13:07:34 2013	(r316429)
@@ -1,3 +1,3 @@
 QmailAdmin is a cgi program for administering Qmail with vchkpw.
 
-WWW:	http://www.inter7.com/qmailadmin/
+WWW: http://www.inter7.com/qmailadmin/