Date: Thu, 1 Aug 2013 18:02:05 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324116 - in head: . mail mail/bulk_mailer mail/bulk_mailer/files Message-ID: <201308011802.r71I25Eo087949@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Aug 1 18:02:04 2013 New Revision: 324116 URL: http://svnweb.freebsd.org/changeset/ports/324116 Log: (Readdition of mail/bulk_mailer which was removed on 306404) Readd bulk_mailer 1.13, speeds delivery to mailing lists by sorting & batching addresses. Added: head/mail/bulk_mailer/ - copied from r306404, head/mail/bulk_mailer/ - copied unchanged from r306404, head/mail/bulk_mailer/files/patch-aa - copied unchanged from r306404, head/mail/bulk_mailer/files/patch-ab Directory Properties: head/mail/bulk_mailer/files/patch-Makefile.in (props changed) head/mail/bulk_mailer/files/patch-bulk_mailer.c (props changed) Deleted: head/mail/bulk_mailer/files/patch-aa head/mail/bulk_mailer/files/patch-ab Modified: head/MOVED head/mail/Makefile head/mail/bulk_mailer/Makefile (contents, props changed) head/mail/bulk_mailer/pkg-plist (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Thu Aug 1 17:54:38 2013 (r324115) +++ head/MOVED Thu Aug 1 18:02:04 2013 (r324116) @@ -3778,7 +3778,6 @@ misc/flyway||2012-10-25|Has expired: No mail/zabit||2012-10-25|Has expired: No more public distfiles mail/wbl||2012-10-25|Has expired: No more public distfiles mail/smtpd||2012-10-25|Has expired: No more public distfiles -mail/bulk_mailer||2012-10-25|Has expired: No more public distfiles lang/ironpython||2012-10-25|Has expired: No more public distfiles lang/cu-prolog||2012-10-25|Has expired: No more public distfiles japanese/stardict-dict-ja||2012-10-25|Has expired: No more public distfiles Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Thu Aug 1 17:54:38 2013 (r324115) +++ head/mail/Makefile Thu Aug 1 18:02:04 2013 (r324116) @@ -40,6 +40,7 @@ SUBDIR += bogofilter-tc SUBDIR += bsfilter SUBDIR += bsmtp + SUBDIR += bulk_mailer SUBDIR += c-sig SUBDIR += c-sig-emacs21 SUBDIR += cclient Modified: head/mail/bulk_mailer/Makefile ============================================================================== --- head/mail/bulk_mailer/Makefile Thu Oct 25 22:25:56 2012 (r306404) +++ head/mail/bulk_mailer/Makefile Thu Aug 1 18:02:04 2013 (r324116) @@ -1,21 +1,16 @@ -# New ports collection makefile for: bulk_mailer -# Date created: 20 March 1997 -# Whom: dlowe -# +# Created by: dlowe # $FreeBSD$ -# PORTNAME= bulk_mailer PORTVERSION= 1.13 CATEGORIES= mail -MASTER_SITES= ftp://cs.utk.edu/pub/moore/bulk_mailer/ +MASTER_SITES= ftp://ftp.cs.utk.edu/pub/moore/bulk_mailer/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= mat/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mat@FreeBSD.org COMMENT= Speeds delivery to mailing lists by sorting & batching addresses -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2012-10-20 - GNU_CONFIGURE= YES CONFIGURE_ARGS= --cache-file=/dev/null @@ -23,10 +18,12 @@ ALL_TARGET= bulk_mailer MAN1= bulk_mailer.1 +.include <bsd.port.options.mk> + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/bulk_mailer.README ${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/bulk_mailer.ps ${DOCSDIR} Copied: head/mail/bulk_mailer/files/patch-Makefile.in (from r306404, head/mail/bulk_mailer/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/bulk_mailer/files/patch-Makefile.in Thu Aug 1 18:02:04 2013 (r324116, copy of r306404, head/mail/bulk_mailer/files/patch-aa) @@ -0,0 +1,12 @@ +--- Makefile.in.orig Tue Sep 1 12:37:34 1998 ++++ Makefile.in Fri Feb 12 17:36:11 1999 +@@ -1,7 +1,7 @@ +-DEFINES = @DEFS@ ++DEFINES = @DEFS@ -DDEFAULT_DOMAIN=1 -DPIPECOMMAND='"/usr/sbin/sendmail -bs %s"' + LIBS = @LIBS@ + +-CFLAGS = $(DEFINES) ++CFLAGS += -Wall $(DEFINES) + + FILES = bulk_mailer.README INSTALL bulk_mailer.c patchlevel.h Makefile + Copied: head/mail/bulk_mailer/files/patch-bulk_mailer.c (from r306404, head/mail/bulk_mailer/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/bulk_mailer/files/patch-bulk_mailer.c Thu Aug 1 18:02:04 2013 (r324116, copy of r306404, head/mail/bulk_mailer/files/patch-ab) @@ -0,0 +1,161 @@ +--- bulk_mailer.c.orig Wed May 24 23:34:33 2000 ++++ bulk_mailer.c Thu Sep 12 17:32:58 2002 +@@ -95,11 +95,16 @@ + #include <sysexits.h> + #include <errno.h> + #include <time.h> ++#include <unistd.h> ++#include <stdlib.h> + #ifdef HAVE_STRING_H + #include <string.h> + #endif + #include "patchlevel.h" + ++#define COMMAND_BUF_SIZE (32*1024) ++#define DATEBUF_SIZE (100) ++ + #ifndef PIPECOMMAND + #define PIPECOMMAND "/usr/lib/sendmail -bs %s" + #endif +@@ -122,9 +127,11 @@ + char *strchr(); + char *strrchr(); + #endif ++#ifndef __FreeBSD__ + char *malloc (); + char *realloc (); + char *mktemp (); ++#endif + + /* + * (default) max different domains per envelope. +@@ -296,6 +303,7 @@ + * memory, appending a NUL to the copy. + */ + ++/* + static char * + strndup (str, len) + char *str; +@@ -307,6 +315,7 @@ + result[len] = '\0'; + return result; + } ++*/ + + /* + * sort by case-folded reversed domain +@@ -337,15 +346,15 @@ + { + char *at; + char *ptr; +- char *domain; ++/* char *domain; */ + char tempbuf[1024]; +- char c; ++/* char c; */ + + /* + * make sure there's room in the buffer. + */ + if (num_addrs >= num_addr_slots) { +- struct address *new; ++/* struct address *new; */ + + num_addr_slots += 1000; + if (address_list == NULL) +@@ -571,12 +580,12 @@ + open_envelope () + { + FILE *fp; +- char command_buf[32*1024]; ++ char command_buf[COMMAND_BUF_SIZE]; + + if (debug_flag) + fp = stderr; + else { +- sprintf (command_buf, PIPECOMMAND, sendmail_flags); ++ snprintf (command_buf, COMMAND_BUF_SIZE, PIPECOMMAND, sendmail_flags); + + if ((fp = popen (command_buf, "w")) == NULL) { + fprintf (stderr, "can't open pipe to sendmail: %s\n", +@@ -927,7 +936,7 @@ + { + struct tm gmt; + struct tm *lt; +- static char datebuf[100]; ++ static char datebuf[DATEBUF_SIZE]; + int gmtoff; + char sign; + static char *months[] = { +@@ -960,7 +969,7 @@ + sign = '-'; + gmtoff = -gmtoff; + } +- sprintf (datebuf, "%s, %d %s %04d %02d:%02d:%02d %c%02d%02d", ++ snprintf (datebuf, DATEBUF_SIZE, "%s, %d %s %04d %02d:%02d:%02d %c%02d%02d", + wdays[lt->tm_wday], lt->tm_mday, months[lt->tm_mon], lt->tm_year + 1900, + lt->tm_hour, lt->tm_min, lt->tm_sec, + sign, +@@ -985,7 +994,7 @@ + copy_message (out, in) + FILE *out, *in; + { +- int c; ++/* int c; */ + char linebuf[32*1024]; + int has_valid_approved_hdr = 0; + int has_resent_to_hdr = 0; +@@ -1218,14 +1227,14 @@ + */ + lines = 0; + while (fgets (linebuf, sizeof (linebuf), in) != NULL) { +- if (lines < 5 && ++ if (lines < 5 && ( + /* + * these often occur in English-text unsubscribe requests + */ + contains (linebuf, "delete me") || + contains (linebuf, "remove me") || + contains (linebuf, "subscribe") || +- contains (linebuf, "unsubscribe")) ++ contains (linebuf, "unsubscribe"))) + saw_command = 1; + ++lines; + fputs (linebuf, out); +@@ -1326,13 +1335,14 @@ + int argc; + char *argv[]; + { +- int i; ++/* int i; */ + FILE *fp; + FILE *tmp; + static char template[] = "/tmp/blkXXXXXX"; + char *tempname; +- int c; +- char buf[1024]; ++/* int c; */ ++/* char buf[1024]; */ ++ int fd; + + while (argc > 1 && (*argv[1] == '-' || *argv[1] == '+')) { + if (strcmp (argv[1], "-comment") == 0 && argc > 2) { +@@ -1513,8 +1523,9 @@ + exit (EX_OSFILE); + } + +- tempname = mktemp (template); +- tmp = fopen (template, "w"); ++ fd = mkstemp (template); ++ tempname = template; ++ tmp = fdopen (fd, "w+"); + switch (copy_message (tmp, stdin)) { + + case HAS_EMBEDDED_COMMAND: +@@ -1592,4 +1603,5 @@ + + exit (EX_OK); + } ++ exit (EX_OK); + } Modified: head/mail/bulk_mailer/pkg-plist ============================================================================== --- head/mail/bulk_mailer/pkg-plist Thu Oct 25 22:25:56 2012 (r306404) +++ head/mail/bulk_mailer/pkg-plist Thu Aug 1 18:02:04 2013 (r324116) @@ -1,4 +1,4 @@ bin/bulk_mailer -%%PORTDOCS%%share/doc/bulk_mailer/README -%%PORTDOCS%%share/doc/bulk_mailer/bulk_mailer.ps -%%PORTDOCS%%@dirrm share/doc/bulk_mailer +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/bulk_mailer.ps +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308011802.r71I25Eo087949>