Update to 2.3.0

OK claudio@

mail/ruby-mail/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/16 10:31:22 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2011/12/13 17:54:16 jeremy Exp $
 
 COMMENT=	easy email delivery and testing for ruby
 
-DISTNAME=	mail-2.2.10
-REVISION =	2
+DISTNAME=	mail-2.3.0
 CATEGORIES=	mail
 
 # MIT License
@@ -15,10 +14,9 @@ PERMIT_DISTFILES_FTP=	Yes
 MODULES=	lang/ruby
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS= 	devel/ruby-i18n,${MODRUBY_FLAVOR}>=0.4.1,<0.5 \
+RUN_DEPENDS= 	devel/ruby-i18n,${MODRUBY_FLAVOR}>=0.4.0 \
 		textproc/ruby-treetop,${MODRUBY_FLAVOR}>=1.4.8,<1.5 \
-		mail/ruby-mime-types,${MODRUBY_FLAVOR}>=1.16,<2.0 \
-		devel/ruby-activesupport,${MODRUBY_FLAVOR}>=2.3.6
+		mail/ruby-mime-types,${MODRUBY_FLAVOR}>=1.16,<2.0
 
 CONFIGURE_STYLE=ruby gem
 

mail/ruby-mail/distinfo

@@ -1,5 +1,5 @@
-MD5 (mail-2.2.10.gem) = eyh1GdbHcfHnnJdCvjrBTg==
-RMD160 (mail-2.2.10.gem) = Yv9ugUBAcjvk2qiWVF3Cf9jnk6Q=
-SHA1 (mail-2.2.10.gem) = Qy+A5Ye7e1d0al54gG175l6vQdU=
-SHA256 (mail-2.2.10.gem) = joBUbwiWJZ8sVGZAuxNTV81E6P8KH/SBoK3nPWMMpqI=
-SIZE (mail-2.2.10.gem) = 101376
+MD5 (mail-2.3.0.gem) = 2kVh8DYoifIOOASeihMuVA==
+RMD160 (mail-2.3.0.gem) = wbpR8xVnWDhGL85aAmSixqfcFKI=
+SHA1 (mail-2.3.0.gem) = fEbmFu5ssL8hmJMNIH8icNY/vzw=
+SHA256 (mail-2.3.0.gem) = o2Qf7BmAtENWKBFR5UvBb2dZ2tvTkw61aMDzYnlq0bI=
+SIZE (mail-2.3.0.gem) = 117760

mail/ruby-mail/patches/patch-lib_mail_core_extensions_shellwords_rb

@@ -1,63 +0,0 @@
-$OpenBSD: patch-lib_mail_core_extensions_shellwords_rb,v 1.1 2011/02/10 01:39:47 jeremy Exp $
-
-Fix for "Vulnerability in Sendmail Delivery Agent code".
-
---- lib/mail/core_extensions/shellwords.rb.orig	Wed Feb  9 09:21:19 2011
-+++ lib/mail/core_extensions/shellwords.rb	Wed Feb  9 09:21:19 2011
-@@ -0,0 +1,55 @@
-+# The following is imported from ruby 1.9.2 shellwords.rb
-+#
-+module Shellwords
-+  # Escapes a string so that it can be safely used in a Bourne shell
-+  # command line.
-+  #
-+  # Note that a resulted string should be used unquoted and is not
-+  # intended for use in double quotes nor in single quotes.
-+  #
-+  #   open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
-+  #     # ...
-+  #   }
-+  #
-+  # +String#shellescape+ is a shorthand for this function.
-+  #
-+  #   open("| grep #{pattern.shellescape} file") { |pipe|
-+  #     # ...
-+  #   }
-+  #
-+  def shellescape(str)
-+    # An empty argument will be skipped, so return empty quotes.
-+    return "''" if str.empty?
-+
-+    str = str.dup
-+
-+    # Process as a single byte sequence because not all shell
-+    # implementations are multibyte aware.
-+    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
-+
-+    # A LF cannot be escaped with a backslash because a backslash + LF
-+    # combo is regarded as line continuation and simply ignored.
-+    str.gsub!(/\n/, "'\n'")
-+
-+    return str
-+  end
-+
-+  module_function :shellescape
-+
-+  class << self
-+    alias escape shellescape
-+  end
-+
-+end
-+
-+class String
-+  # call-seq:
-+  #   str.shellescape => string
-+  #
-+  # Escapes +str+ so that it can be safely used in a Bourne shell
-+  # command line.  See +Shellwords::shellescape+ for details.
-+  #
-+  def shellescape
-+    Shellwords.escape(self)
-+  end
-+end
-\ No newline at end of file

mail/ruby-mail/patches/patch-lib_mail_network_delivery_methods_sendmail_rb

@@ -1,20 +0,0 @@
-$OpenBSD: patch-lib_mail_network_delivery_methods_sendmail_rb,v 1.1 2011/02/10 01:39:47 jeremy Exp $
-
-Fix for "Vulnerability in Sendmail Delivery Agent code".
-
---- lib/mail/network/delivery_methods/sendmail.rb.orig	Wed Dec 31 16:00:00 1969
-+++ lib/mail/network/delivery_methods/sendmail.rb	Wed Feb  9 09:21:19 2011
-@@ -45,11 +45,11 @@ module Mail
- 
-     def deliver!(mail)
-       envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
--      return_path = "-f \"#{envelope_from}\"" if envelope_from
-+      return_path = "-f \"#{envelope_from.to_s.shellescape}\"" if envelope_from
- 
-       arguments = [settings[:arguments], return_path].compact.join(" ")
-       
--      Sendmail.call(settings[:location], arguments, mail.destinations.join(" "), mail)
-+      Sendmail.call(settings[:location], arguments, mail.destinations.collect(&:shellescape).join(" "), mail)
-     end
-     
-     def Sendmail.call(path, arguments, destinations, mail)

mail/ruby-mail/patches/patch-lib_mail_rb

@@ -1,22 +0,0 @@
-$OpenBSD: patch-lib_mail_rb,v 1.1 2011/02/10 01:39:47 jeremy Exp $
-
-Fix for "Vulnerability in Sendmail Delivery Agent code".
-
---- lib/mail.rb.orig	Wed Dec 31 16:00:00 1969
-+++ lib/mail.rb	Wed Feb  9 09:22:07 2011
-@@ -2,6 +2,7 @@
- module Mail # :doc:
- 
-   require 'date'
-+  require 'shellwords'
- 
-   require 'active_support'
-   require 'active_support/core_ext/hash/indifferent_access'
-@@ -31,6 +32,7 @@ module Mail # :doc:
-   require 'mail/version'
- 
-   require 'mail/core_extensions/nil'
-+  require 'mail/core_extensions/shellwords' unless String.new.respond_to?(:shellescape)
-   require 'mail/core_extensions/string'
- 
-   require 'mail/patterns'

mail/ruby-mail/pkg/PLIST

@@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/02/10 01:39:47 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/12/13 17:54:16 jeremy Exp $
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.rdoc
+${GEM_LIB}/gems/${DISTNAME}/Dependencies.txt
+${GEM_LIB}/gems/${DISTNAME}/Gemfile
 ${GEM_LIB}/gems/${DISTNAME}/README.rdoc
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/TODO.rdoc
@@ -14,8 +16,13 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mail/body.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/configuration.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/nil.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/object.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/shellwords.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/smtp.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/string/
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/string.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/string/access.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/core_extensions/string/multibyte.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/elements/
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/elements.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/elements/address.rb
@@ -83,14 +90,22 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mail/fields/subject_field.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/fields/to_field.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/fields/unstructured_field.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/header.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/indifferent_hash.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/mail.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/message.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/multibyte/
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/multibyte.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/multibyte/chars.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/multibyte/exceptions.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/multibyte/unicode.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/multibyte/utils.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/delivery_methods/
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/delivery_methods/file_delivery.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/delivery_methods/sendmail.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/delivery_methods/smtp.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/delivery_methods/smtp_connection.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/delivery_methods/test_mailer.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/retriever_methods/
 ${GEM_LIB}/gems/${DISTNAME}/lib/mail/network/retriever_methods/base.rb