From 15030ddcbbc78e05359f01b1ac34d0f62210d6d9 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 13 Apr 2008 05:25:09 +0000
Subject: Update mail/ruby-tmail to 1.2.3.  Changes from version 1.2.2 include:

* Handle a potential DOS vulnerability on any host using TMail to
  handle incomming email; a crafted email with carefully positioned
  whitespace can cause the TMail library to go into an endless loop
  causing denial of service attack on email services.
---
 mail/ruby-tmail/Makefile         |  8 ++++++--
 mail/ruby-tmail/PLIST            |  7 +++++--
 mail/ruby-tmail/distinfo         |  9 ++++-----
 mail/ruby-tmail/patches/patch-ab | 12 ------------
 4 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 mail/ruby-tmail/patches/patch-ab

(limited to 'mail/ruby-tmail')

diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index 58cc5961ac0..17c8575c29b 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2008/04/04 15:19:46 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/13 05:25:09 jlam Exp $
 
-DISTNAME=	tmail-1.2.2
+DISTNAME=	tmail-1.2.3
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	mail
 
@@ -10,5 +10,9 @@ COMMENT=	Mail manipulating library for Ruby including MIME multipart support
 
 GEM_BUILD=	gemspec
 
+# Add a directory that would be created if the setup.rb script was run.
+post-extract:
+	cd ${WRKSRC} && mkdir doc
+
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ruby-tmail/PLIST b/mail/ruby-tmail/PLIST
index 17ecfa5340e..2a0fcfaff47 100644
--- a/mail/ruby-tmail/PLIST
+++ b/mail/ruby-tmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/04/04 15:19:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/13 05:25:09 jlam Exp $
 ${GEM_HOME}/cache/tmail-${PKGVERSION}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/CHANGES
@@ -43,10 +43,11 @@ ${GEM_LIBDIR}/lib/tmail/utils.rb
 ${GEM_LIBDIR}/lib/tmail/version.rb
 ${GEM_LIBDIR}/lib/tmailscanner.${RUBY_DLEXT}
 ${GEM_LIBDIR}/log/BugTrackingLog.txt
-${GEM_LIBDIR}/log/Changelog-0.txt
 ${GEM_LIBDIR}/log/Changelog.txt
+${GEM_LIBDIR}/log/Fixme.txt
 ${GEM_LIBDIR}/log/Testlog.txt
 ${GEM_LIBDIR}/log/Todo.txt
+${GEM_LIBDIR}/log/fixme.rdoc
 ${GEM_LIBDIR}/meta/MANIFEST
 ${GEM_LIBDIR}/meta/VERSION
 ${GEM_LIBDIR}/meta/project.yaml
@@ -121,6 +122,7 @@ ${GEM_LIBDIR}/test/fixtures/mailbox
 ${GEM_LIBDIR}/test/fixtures/mailbox_without_any_from_or_sender
 ${GEM_LIBDIR}/test/fixtures/mailbox_without_from
 ${GEM_LIBDIR}/test/fixtures/mailbox_without_return_path
+${GEM_LIBDIR}/test/fixtures/raw_attack_email_with_zero_length_whitespace
 ${GEM_LIBDIR}/test/fixtures/raw_base64_decoded_string
 ${GEM_LIBDIR}/test/fixtures/raw_base64_email
 ${GEM_LIBDIR}/test/fixtures/raw_base64_encoded_string
@@ -143,6 +145,7 @@ ${GEM_LIBDIR}/test/fixtures/raw_email_reply
 ${GEM_LIBDIR}/test/fixtures/raw_email_simple
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_bad_date
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_illegal_boundary
+${GEM_LIBDIR}/test/fixtures/raw_email_with_mimepart_without_content_type
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_multipart_mixed_quoted_boundary
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_nested_attachment
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_partially_quoted_subject
diff --git a/mail/ruby-tmail/distinfo b/mail/ruby-tmail/distinfo
index e3052eaaf09..31bfa2310ab 100644
--- a/mail/ruby-tmail/distinfo
+++ b/mail/ruby-tmail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/04/04 15:19:46 jlam Exp $
+$NetBSD: distinfo,v 1.8 2008/04/13 05:25:09 jlam Exp $
 
-SHA1 (tmail-1.2.2.gem) = d20da7f8457f5d88deaa0ecac3401d4ac42749b0
-RMD160 (tmail-1.2.2.gem) = c240b6687a582c487e665f38168e134dd09f0af3
-Size (tmail-1.2.2.gem) = 413184 bytes
-SHA1 (patch-ab) = a29faedac9e8dcd452cfd6cfbe992962530918a7
+SHA1 (tmail-1.2.3.gem) = 5d9b5555061f0f36db00a0f977b5ef4a8ce374cc
+RMD160 (tmail-1.2.3.gem) = 903c981dba968861e18cc9ead445da7b18d3ebde
+Size (tmail-1.2.3.gem) = 413696 bytes
diff --git a/mail/ruby-tmail/patches/patch-ab b/mail/ruby-tmail/patches/patch-ab
deleted file mode 100644
index c952cde5333..00000000000
--- a/mail/ruby-tmail/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/04/04 15:19:46 jlam Exp $
-
---- ../tmail-1.2.2.gemspec.orig	2008-03-13 11:32:01.000000000 -0400
-+++ ../tmail-1.2.2.gemspec
-@@ -28,7 +28,6 @@ extra_rdoc_files: 
- - LICENSE
- files: 
- - Rakefile
--- doc
- - test
- - test/temp_test_one.rb
- - test/kcode.rb
-- 
cgit v1.2.3