Date: Thu, 7 Dec 2006 12:41:45 +0200 From: Vasil Dimov <vd@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: clive@FreeBSD.org Subject: ports/106440: Update port: mail/nullmailer to 1.03 Message-ID: <20061207104145.GA77430@qlovarnika.bg.datamax> Resent-Message-ID: <200612071050.kB7Ao19f031925@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106440 >Category: ports >Synopsis: Update port: mail/nullmailer to 1.03 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Dec 07 10:50:01 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: N/A >Environment: >Description: Update mail/nullmailer from 1.00 to 1.03, the 1.00 archive is not fetchible anymore from the master site: * Remove dead master site * Add the URL with the old versions to master sites to prevent 1.04 release rendering our port unfetchable * Remove unnecessary -lstdc++ from CXXFLAGS * Remove our implementation of SMTP authentication, since one has been implemented by the authors (remove files/patch-doc-nullmailer-send.8, files/patch-lib-list.h and files/patch-smtp_authentication) * Add a note that the SMTP authentication option has been changed >How-To-Repeat: >Fix: --- nullmailer_1.00-1.03.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/nullmailer/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 5 Mar 2005 03:46:18 -0000 1.13 +++ Makefile 7 Dec 2006 10:30:49 -0000 @@ -7,10 +7,10 @@ PORTNAME= nullmailer PORTEPOCH= 1 -PORTVERSION= 1.00 +PORTVERSION= 1.03 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ - ftp://mirrors.dataloss.nl/mirrors/bgware/nullmailer/%SUBDIR%/ + http://untroubled.org/nullmailer/archive/ MASTER_SITE_SUBDIR= ${PORTVERSION} MAINTAINER= clive@FreeBSD.org @@ -19,7 +19,7 @@ HAS_CONFIGURE= yes USE_SUBMAKE= yes -CXXFLAGS+= -lstdc++ + MAN1= nullmailer-inject.1 sendmail.1 MAN7= nullmailer.7 MAN8= nullmailer-queue.8 nullmailer-send.8 Index: distinfo =================================================================== RCS file: /home/pcvs/ports/mail/nullmailer/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 22 Jan 2006 12:50:30 -0000 1.4 +++ distinfo 7 Dec 2006 10:30:49 -0000 @@ -1,3 +1,3 @@ -MD5 (nullmailer-1.00.tar.gz) = ead32b3543ef652891edf3856ec759dd -SHA256 (nullmailer-1.00.tar.gz) = 1ebb63f010a46dce9559b1025f76e74741429071cd2d4f380a63a5ced3ce8340 -SIZE (nullmailer-1.00.tar.gz) = 170605 +MD5 (nullmailer-1.03.tar.gz) = 4e94a84f359571b0872f398f0859a22a +SHA256 (nullmailer-1.03.tar.gz) = 1471ab6c0c6038d7df4d301734e9e7f93b75147a954b52cb95e669c503fb9479 +SIZE (nullmailer-1.03.tar.gz) = 172250 Index: files/patch-doc-nullmailer-send.8 =================================================================== RCS file: files/patch-doc-nullmailer-send.8 diff -N files/patch-doc-nullmailer-send.8 --- files/patch-doc-nullmailer-send.8 5 Mar 2005 03:46:18 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ ---- doc/nullmailer-send.8~ Sat Mar 5 10:13:38 2005 -+++ doc/nullmailer-send.8 Sat Mar 5 10:16:51 2005 -@@ -57,10 +57,11 @@ - The protocol name defaults to - .IR smtp , - and may be followed by command-line arguments for that module. --For example, to connect to port 2525 on your SMTP smart host, use: -+For example, to connect to port 2525 on your SMTP smart host, -+which also requires SMTP authentication, use: - - .EX -- smarthost.dom smtp --port=2525 -+ smarthost.dom smtp --port=2525 --auth=user,pass - .EE - - Blank lines and lines starting with a pound are ignored. Index: files/patch-lib-list.h =================================================================== RCS file: files/patch-lib-list.h diff -N files/patch-lib-list.h --- files/patch-lib-list.h 5 Mar 2005 03:46:18 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- lib/list.h~ Sat Mar 5 01:16:28 2005 -+++ lib/list.h Sat Mar 5 01:13:35 2005 -@@ -18,8 +18,8 @@ - typedef list_node<T> node; - typedef list_iterator<T> iter; - typedef const_list_iterator<T> const_iter; -- friend class iter; -- friend class const_iter; -+ friend class list_iterator<T>;; -+ friend class const_list_iterator<T>;; - - list() - : head(0), tail(0), cnt(0) Index: files/patch-smtp_authentication =================================================================== RCS file: files/patch-smtp_authentication diff -N files/patch-smtp_authentication --- files/patch-smtp_authentication 5 Mar 2005 03:46:18 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,127 +0,0 @@ ---- protocols/protocol.cc~ Sat Mar 5 09:38:23 2005 -+++ protocols/protocol.cc Sat Mar 5 09:39:42 2005 -@@ -30,10 +30,12 @@ - const char* cli_help_suffix = ""; - const char* cli_args_usage = "remote-address < mail-file"; - const int cli_args_min = 1; --const int cli_args_max = 1; -+const int cli_args_max = 2; - cli_option cli_options[] = { - { 'p', "port", cli_option::integer, 0, &port, - "Set the port number on the remote host to connect to", 0 }, -+ { 'a', "auth", cli_option::string, 0, &auth, -+ "Set the user and password for authentication (user,pass)", 0 }, - {0, 0, cli_option::flag, 0, 0, 0, 0} - }; - ---- protocols/protocol.h~ Sat Mar 5 09:40:15 2005 -+++ protocols/protocol.h Sat Mar 5 09:40:46 2005 -@@ -8,6 +8,7 @@ - - // This must be provided by the protocol, but will be set by the lib. - extern int port; -+extern char* auth; - - extern void protocol_prep(fdibuf* in); - extern void protocol_send(fdibuf* in, int fd); ---- protocols/qmqp.cc~ Sat Mar 5 09:40:59 2005 -+++ protocols/qmqp.cc Sat Mar 5 09:41:21 2005 -@@ -31,6 +31,7 @@ - #include "protocol.h" - - int port = 628; -+char* auth = ""; - const char* cli_program = "qmqp"; - const char* cli_help_prefix = "Send an emal message via QMQP\n"; - ---- protocols/smtp.cc~ Sat Mar 5 09:41:31 2005 -+++ protocols/smtp.cc Sat Mar 5 09:44:58 2005 -@@ -30,6 +30,7 @@ - #include "protocol.h" - - int port = 25; -+char* auth = ""; - const char* cli_program = "smtp"; - const char* cli_help_prefix = "Send an email message via SMTP\n"; - -@@ -136,6 +137,11 @@ - { - } - -+void to64(char* infile, char* outfile); -+void to64(const mystring& infile, mystring& outfile); -+void output64chunk(int c1, int c2, int c3, int pads, char** outfile); -+void output64chunk(int c1, int c2, int c3, int pads, mystring& outfile); -+ - void protocol_send(fdibuf* in, int fd) - { - mystring hh = getenv("HELOHOST"); -@@ -143,5 +149,68 @@ - smtp conn(fd); - conn.docmd("", 200); - conn.docmd("HELO " + hh, 200); -+ -+ if ( strlen(auth) > 0 ) -+ { -+ mystring authstr = auth; -+ mystring uname = authstr.left(authstr.find_first(',')); -+ mystring pass = authstr.sub(authstr.find_first(',')+1,authstr.length()); -+ mystring plain = uname + "\1" + uname + "\1" + pass; -+ mystring encoded = "AUTH PLAIN "; -+ to64(plain,encoded); -+ conn.docmd(encoded,200); -+ } -+ - conn.send(in); - } -+ -+static char basis_64[] = -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -+ -+void to64(const mystring& infile, mystring& outfile) -+{ -+ int c1, c2, c3; -+ size_t inpos = 0; -+ while ((c1 = infile[inpos++])) { -+ c2 = infile[inpos++]; -+ if (!c2) { -+ output64chunk(c1, 0, 0, 2, outfile); -+ } else { -+ c3 = infile[inpos++]; -+ if (!c3) { -+ output64chunk(c1, c2, 0, 1, outfile); -+ } else { -+ output64chunk(c1, c2, c3, 0, outfile); -+ } -+ } -+ } -+} -+ -+void output64chunk(int c1, int c2, int c3, int pads, mystring& outfile) -+{ -+ if (c1==1) c1 = 0; -+ if (c2==1) c2 = 0; -+ if (c3==1) c3 = 0; -+ -+ char out[5]; -+ out[0] = basis_64[c1>>2]; -+ out[1] = basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)]; -+ switch (pads) -+ { -+ case 0: -+ out[2] = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)]; -+ out[3] = basis_64[c3 & 0x3F]; -+ break; -+ case 1: -+ out[2] = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)]; -+ out[3] = '='; -+ break; -+ case 2: -+ out[2] = '='; -+ out[3] = '='; -+ break; -+ }; -+ out[4] = 0; -+ outfile += out; -+} -+ Index: files/pkg-message.proto =================================================================== RCS file: /home/pcvs/ports/mail/nullmailer/files/pkg-message.proto,v retrieving revision 1.1 diff -u -r1.1 pkg-message.proto --- files/pkg-message.proto 13 Apr 2003 13:22:28 -0000 1.1 +++ files/pkg-message.proto 7 Dec 2006 10:30:49 -0000 @@ -13,4 +13,9 @@ WARNING! It will cause problem in case delivering to local recipients. Also man nullmailer-send(8) for more details +NOTE for the ones upgrading from 1.00: +The smtp authentication option has been changed from +--auth=joe,secret to --user=joe and --pass=secret, see nullmailer-send(8) +for details. + ================================================================== --- nullmailer_1.00-1.03.diff ends here --- -- Vasil Dimov gro.DSBeerF@dv % Life should not be a journey to the grave with the intention of arriving safely in a pretty and well preserved body, but rather to skid in broadside, thoroughly used up, totally worn out, and loudly proclaiming --WOW---What A RIDE!! >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061207104145.GA77430>