CVS commit: pkgsrc/mail/distribute

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Aug 15 11:30:32 UTC 2016

Modified Files:
        pkgsrc/mail/distribute: Makefile distinfo
        pkgsrc/mail/distribute/patches: patch-ac

Log Message:
PR/18422: pkgsrc/mail/distribute: write_index() is called too early.
Only call write_index() after calculating bodysum, otherwise it uses
the initial value of 0.

While I have not tested this patch myself, the need for it is clear.

Patching in pkgsrc as this package does not have an upstream.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/distribute/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/distribute/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/distribute/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/distribute/Makefile
diff -u pkgsrc/mail/distribute/Makefile:1.30 pkgsrc/mail/distribute/Makefile:1.31
--- pkgsrc/mail/distribute/Makefile:1.30        Sat Jul  9 06:38:28 2016
+++ pkgsrc/mail/distribute/Makefile     Mon Aug 15 11:30:31 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2016/07/09 06:38:28 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2016/08/15 11:30:31 maya Exp $
 
 DISTNAME=      distribute-2.1-pl19
 PKGNAME=       distribute-2.1.26
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
 # AWOL

Index: pkgsrc/mail/distribute/distinfo
diff -u pkgsrc/mail/distribute/distinfo:1.7 pkgsrc/mail/distribute/distinfo:1.8
--- pkgsrc/mail/distribute/distinfo:1.7 Tue Nov  3 23:27:03 2015
+++ pkgsrc/mail/distribute/distinfo     Mon Aug 15 11:30:31 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:27:03 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/08/15 11:30:31 maya Exp $
 
 SHA1 (distribute/distribute-2.1-pl19.tar.gz) = f33f63d42d0233eceec759dc0378a914087c0344
 RMD160 (distribute/distribute-2.1-pl19.tar.gz) = 5ffb23682176a86291eb5374ea98c9c5d002947d
@@ -34,5 +34,5 @@ SHA512 (distribute/patch.26e.gz) = c0c1d
 Size (distribute/patch.26e.gz) = 12560 bytes
 SHA1 (patch-aa) = 6c23421d76b166acffc782271f37e405b45617ed
 SHA1 (patch-ab) = 4c07a6ae9bb1e9dacd33db96624d2c2fefbb9240
-SHA1 (patch-ac) = 75a3956d6e7b53473eb0a3ad62b4ce261ccc8bf6
+SHA1 (patch-ac) = 91b8eccec33c2de27a36b5174f473aface388965
 SHA1 (patch-tmpl2c.pl) = 5cdf21381f98df64b37609173e35448427edf231

Index: pkgsrc/mail/distribute/patches/patch-ac
diff -u pkgsrc/mail/distribute/patches/patch-ac:1.4 pkgsrc/mail/distribute/patches/patch-ac:1.5
--- pkgsrc/mail/distribute/patches/patch-ac:1.4 Sun Jan  8 15:44:06 2006
+++ pkgsrc/mail/distribute/patches/patch-ac     Mon Aug 15 11:30:31 2016
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2006/01/08 15:44:06 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2016/08/15 11:30:31 maya Exp $
 
---- distribute.c.orig  2006-01-08 15:39:24.000000000 +0000
+--- distribute.c.orig  2016-08-15 10:57:27.530046718 +0000
 +++ distribute.c
 @@ -49,7 +49,8 @@
  #define       index   strchr
@@ -12,3 +12,35 @@ $NetBSD: patch-ac,v 1.4 2006/01/08 15:44
  # include <paths.h>           /* for sendmail path */
  #endif
  
+@@ -1541,15 +1542,6 @@ send_message()
+      */
+     putc('\n', pipe);
+     
+-    /* If message have not reject, then write index here.  (since we
+-     * have subject information here! -- We assume here that sendmail
+-     * will not fork shell(in this case, archive) before closing pipe. 
+-     * so archive will run AFTER we correctly wrote index.
+-     */
+-    if (reject == 0) {
+-      write_index();          /* write out index if succeed */
+-    }
+-    
+     /* Dump the message thru the pipe.  We push out the header(leader),
+      * then the message body, then the footer.
+      */
+@@ -1570,6 +1562,15 @@ send_message()
+       }
+     }
+     
++    /* If message have not reject, then write index here.  (since we
++     * have subject information here! -- We assume here that sendmail
++     * will not fork shell(in this case, archive) before closing pipe. 
++     * so archive will run AFTER we correctly wrote index.
++     */
++    if (reject == 0) {
++      write_index();          /* write out index if succeed */
++    }
++    
+ 
+     /* clean-up
+      */