From 5e0a9db1122459d1ae3b6f6aa82a3fd285eb21d1 Mon Sep 17 00:00:00 2001
From: shattered <shattered>
Date: Sun, 21 Jul 2013 10:58:49 +0000
Subject: Update to 1.4.0.10. Changes:

Added iconv output support via -x<set>.

Fixed up the BASE64 decoding detection of boundaries which are sometimes missed.

Updated ripOLE to handle nameless / unknown stream blobs.

Added a header fixing routine in MIME_headers, this fix attempts
to unwrap headers which are missing a leading space on the next line
This feature can be disabled using --disable-headerfix.

Added recursion facility if the input mailpack/MIME file is a directory.
---
 mail/ripmime/Makefile         |  4 ++--
 mail/ripmime/distinfo         | 12 +++++++-----
 mail/ripmime/patches/patch-aa |  8 ++++----
 mail/ripmime/patches/patch-ab | 15 +++++++++++++++
 mail/ripmime/patches/patch-ac | 17 +++++++++++++++++
 5 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 mail/ripmime/patches/patch-ab
 create mode 100644 mail/ripmime/patches/patch-ac

(limited to 'mail/ripmime')

diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index c85124ba1b9..2cc9bcc713e 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 12:19:30 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/21 10:58:49 shattered Exp $
 #
 
-DISTNAME=	ripmime-1.4.0.2
+DISTNAME=	ripmime-1.4.0.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.pldaniels.com/ripmime/
 
diff --git a/mail/ripmime/distinfo b/mail/ripmime/distinfo
index 2f113c0d3e6..12acebc3a99 100644
--- a/mail/ripmime/distinfo
+++ b/mail/ripmime/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/02/04 02:39:54 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/07/21 10:58:49 shattered Exp $
 
-SHA1 (ripmime-1.4.0.2.tar.gz) = c1d939b7cc311e538513a7eea10cb03f36d5969b
-RMD160 (ripmime-1.4.0.2.tar.gz) = 4d0b54d661f3690dd0da43f7a235f8995411b8c2
-Size (ripmime-1.4.0.2.tar.gz) = 157535 bytes
-SHA1 (patch-aa) = 5c8ddb663a0ebf476449819bd9923a7607654535
+SHA1 (ripmime-1.4.0.10.tar.gz) = 296f657f2f664b713751178fb589d5c64dc7b6ae
+RMD160 (ripmime-1.4.0.10.tar.gz) = 312f6ca37e73a5a024dd8cf07e6b969b6d7a952d
+Size (ripmime-1.4.0.10.tar.gz) = 174610 bytes
+SHA1 (patch-aa) = 6642b5f5547ac7f0e0c63ca148a95cc77cce4f9a
+SHA1 (patch-ab) = 08d4cb2519f4f0dd062ca717185b597e4edd09f9
+SHA1 (patch-ac) = 188092463ece3302806952fec1efc06000391e36
diff --git a/mail/ripmime/patches/patch-aa b/mail/ripmime/patches/patch-aa
index 2d7b7e96000..274f72f8758 100644
--- a/mail/ripmime/patches/patch-aa
+++ b/mail/ripmime/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2010/02/04 02:39:54 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2013/07/21 10:58:49 shattered Exp $
 
---- Makefile.orig	Fri Nov 26 17:14:55 2004
+--- Makefile.orig	2008-11-07 03:33:33.000000000 +0000
 +++ Makefile
 @@ -15,7 +15,7 @@ VERSION=0.1.14
  #	use our recommended settings.
  #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS)
  #CFLAGS=-Wall -g -O2 -Wundef -Wshadow -Wsign-compare -I.
--CFLAGS=-Wall -g -O2 -I.
-+CFLAGS?=-Wall -g -O2 -I.
+-CFLAGS=-Wall -g -I. -O2 -Werror
++CFLAGS?=-Wall -g -I. -O2 -Werror
  
  # OLE decoding is still considered to be 'beta' mode - so it 
  #	disabled in the stable release of ripMIME for now
diff --git a/mail/ripmime/patches/patch-ab b/mail/ripmime/patches/patch-ab
new file mode 100644
index 00000000000..634c751e1ee
--- /dev/null
+++ b/mail/ripmime/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2013/07/21 10:58:49 shattered Exp $
+
+Avoid compiler warning.
+
+--- ripOLE/ole.c.orig	2008-10-31 16:17:32.000000000 +0000
++++ ripOLE/ole.c
+@@ -512,7 +512,7 @@ int OLE_print_sector( struct OLE_object 
+ 			int j;
+ 			for (j = current_byte -31; j <=current_byte; j++)
+ 			{
+-				if (isalnum(*(sector +j))) printf("%c",*(sector+j));
++				if (isalnum((int)*(sector +j))) printf("%c",*(sector+j));
+ 				else printf(".");
+ 			}
+ 			printf("\n");
diff --git a/mail/ripmime/patches/patch-ac b/mail/ripmime/patches/patch-ac
new file mode 100644
index 00000000000..53cf67d890f
--- /dev/null
+++ b/mail/ripmime/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2013/07/21 10:58:49 shattered Exp $
+
+Avoid compiler warning.
+
+--- ripOLE/pldstr.c.orig	2008-10-31 16:17:32.000000000 +0000
++++ ripOLE/pldstr.c
+@@ -237,8 +237,8 @@ int PLD_strncasecmp( char *s1, char *s2,
+ 
+ 	while(n > 0)
+ 	{
+-		c1 = tolower(*ds1);
+-		c2 = tolower(*ds2);
++		c1 = tolower((int)*ds1);
++		c2 = tolower((int)*ds2);
+ 
+ 		if (c1 == c2)
+ 		{
-- 
cgit v1.2.3