Update milter-manager to 2.0.1.

== [release-2-0-1] 2.0.1: 2014-01-24

A bug fix release of 2.0.0.

=== milter manager

==== Improvements

  * Support SIGUSR1 signal to reopen log file

==== Fixes

  * Drop functionality to report stack trace on crash.
    Because it is unsafe for all users. [GitHub #38]

=== milter-core

==== Improvements

  * Support log output by MILTER_LOG_PATH environment variable.

=== milter-client

==== Improvements

  * Support --log-path option.

=== Ruby milter

==== Improvements

  * Support --log-path option.
  * Support SIGUSR1 signal to reopen log file.

=== Package

==== Improvements

  * Drop Ubuntu Lucid (10.04) support.
  * Add Ubuntu Saucy (13.10) support.
  * deb: Support Ruby 2.0.0 detection on Debian.
  * rpm: Update Ruby1.9.3 package for CentOS6 to Ruby1.9.3-p484.
  * Remove auto-generated files from distribution archive.
    [Reported by Youhei SASAKI][milter-manager-users-ja:00225]

=== Document

==== Improvements

  * Update to the latest milter-greylist RPM.
    [Reported by ishizaka tadanori][milter-manager-users-ja:00220]
  * Improve English version reference manual.
    [GitHub #17]

=== Thanks

  * Youhei SASAKI
  * ishizaka tadanori

4 files changed, 26 insertions, 72 deletions

diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 2db420afe45..c06d217ab88 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/07/28 13:21:55 obache Exp $
+# $NetBSD: Makefile,v 1.34 2014/01/24 11:29:30 obache Exp $
 #
 
-DISTNAME=	milter-manager-2.0.0
+DISTNAME=	milter-manager-2.0.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=milter-manager/}
 
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--with-default-pid-file=${VARBASE}/run/milter-manager/milter-ma
 CONFIGURE_ARGS+=	--with-libev=${BUILDLINK_PREFIX.libev}
 CONFIGURE_ARGS+=	--with-ruby=${RUBY}
 CONFIGURE_ARGS+=	--enable-ruby-milter=${PREFIX}/${RUBY_VENDORLIB}
+CONFIGURE_ARGS+=	--with-bundled-ruby-glib2=no
 
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 
diff --git a/mail/milter-manager/PLIST b/mail/milter-manager/PLIST
index 76f51c22cd4..363e8f957bc 100644
--- a/mail/milter-manager/PLIST
+++ b/mail/milter-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/07/28 13:21:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/01/24 11:29:30 obache Exp $
 bin/milter-manager-log-analyzer
 bin/milter-performance-check
 bin/milter-report-statistics
@@ -92,6 +92,9 @@ lib/milter-manager/binding/lib/milter/client/command-line.rb
 lib/milter-manager/binding/lib/milter/client/composite-session.rb
 lib/milter-manager/binding/lib/milter/client/configuration.rb
 lib/milter-manager/binding/lib/milter/client/context-state.rb
+lib/milter-manager/binding/lib/milter/client/fallback-session.rb
+lib/milter-manager/binding/lib/milter/client/session-context.rb
+lib/milter-manager/binding/lib/milter/client/session.rb
 lib/milter-manager/binding/lib/milter/core.rb
 lib/milter-manager/binding/lib/milter/core/callback.rb
 lib/milter-manager/binding/lib/milter/core/compatible.rb
@@ -175,30 +178,9 @@ share/doc/milter-manager/install.html
 share/doc/milter-manager/introduction.html
 share/doc/milter-manager/ja/api-index-deprecated.xml
 share/doc/milter-manager/ja/api-index-full.xml
-share/doc/milter-manager/ja/available-milters.html
 share/doc/milter-manager/ja/client.xml
-share/doc/milter-manager/ja/commands.html
-share/doc/milter-manager/ja/configuration.html
 share/doc/milter-manager/ja/core.xml
-share/doc/milter-manager/ja/home.png
-share/doc/milter-manager/ja/index.html
-share/doc/milter-manager/ja/index.sgml
-share/doc/milter-manager/ja/install-options-to-centos.html
-share/doc/milter-manager/ja/install-options-to-debian.html
-share/doc/milter-manager/ja/install-options-to-freebsd.html
-share/doc/milter-manager/ja/install-options-to-ubuntu.html
-share/doc/milter-manager/ja/install-to-centos.html
-share/doc/milter-manager/ja/install-to-centos5.html
-share/doc/milter-manager/ja/install-to-debian.html
-share/doc/milter-manager/ja/install-to-freebsd.html
-share/doc/milter-manager/ja/install-to-others.html
-share/doc/milter-manager/ja/install-to-ubuntu.html
-share/doc/milter-manager/ja/install-to.html
-share/doc/milter-manager/ja/install.html
-share/doc/milter-manager/ja/introduction.html
-share/doc/milter-manager/ja/left.png
 share/doc/milter-manager/ja/libmilter-compatible.xml
-share/doc/milter-manager/ja/log-list.html
 share/doc/milter-manager/ja/manager.xml
 share/doc/milter-manager/ja/mfapi.xml
 share/doc/milter-manager/ja/mfdef.xml
@@ -233,7 +215,6 @@ share/doc/milter-manager/ja/milter-manager-launch-command-encoder.xml
 share/doc/milter-manager/ja/milter-manager-launch-protocol.xml
 share/doc/milter-manager/ja/milter-manager-leader.xml
 share/doc/milter-manager/ja/milter-manager-log-analyzer-graphs.png
-share/doc/milter-manager/ja/milter-manager-log-analyzer.html
 share/doc/milter-manager/ja/milter-manager-module-impl.xml
 share/doc/milter-manager/ja/milter-manager-module.xml
 share/doc/milter-manager/ja/milter-manager-objects.xml
@@ -241,53 +222,26 @@ share/doc/milter-manager/ja/milter-manager-process-launcher.xml
 share/doc/milter-manager/ja/milter-manager-reply-decoder.xml
 share/doc/milter-manager/ja/milter-manager-reply-encoder.xml
 share/doc/milter-manager/ja/milter-manager-reply-protocol.xml
-share/doc/milter-manager/ja/milter-manager.devhelp2
-share/doc/milter-manager/ja/milter-manager.html
 share/doc/milter-manager/ja/milter-manager.xml
 share/doc/milter-manager/ja/milter-option.xml
-share/doc/milter-manager/ja/milter-performance-check.html
 share/doc/milter-manager/ja/milter-protocol-agent.xml
 share/doc/milter-manager/ja/milter-protocol.xml
 share/doc/milter-manager/ja/milter-reader.xml
 share/doc/milter-manager/ja/milter-reply-decoder.xml
 share/doc/milter-manager/ja/milter-reply-encoder.xml
 share/doc/milter-manager/ja/milter-reply-signals.xml
-share/doc/milter-manager/ja/milter-report-statistics.html
 share/doc/milter-manager/ja/milter-server-context.xml
 share/doc/milter-manager/ja/milter-server-enum-types.xml
 share/doc/milter-manager/ja/milter-syslog-logger.xml
-share/doc/milter-manager/ja/milter-test-client.html
-share/doc/milter-manager/ja/milter-test-server.html
 share/doc/milter-manager/ja/milter-utils.xml
 share/doc/milter-manager/ja/milter-version.xml
 share/doc/milter-manager/ja/milter-writer.xml
 share/doc/milter-manager/ja/mta-and-milter-manager-and-child-milter-ja.png
 share/doc/milter-manager/ja/mta-and-milter-manager-and-child-milter.png
-share/doc/milter-manager/ja/news.html
-share/doc/milter-manager/ja/readme.html
-share/doc/milter-manager/ja/reverse-dictionary.html
-share/doc/milter-manager/ja/right.png
-share/doc/milter-manager/ja/ruby-milter-configuration.html
-share/doc/milter-manager/ja/ruby-milter-reference.html
-share/doc/milter-manager/ja/ruby-milter-tutorial.html
-share/doc/milter-manager/ja/ruby.html
 share/doc/milter-manager/ja/sendmail-and-milter-ja.png
 share/doc/milter-manager/ja/sendmail-and-milter.png
 share/doc/milter-manager/ja/sendmail-and-postfix-and-milter-ja.png
 share/doc/milter-manager/ja/sendmail-and-postfix-and-milter.png
-share/doc/milter-manager/ja/start.html
-share/doc/milter-manager/ja/style.css
-share/doc/milter-manager/ja/up.png
-share/doc/milter-manager/ja/upgrade-on-centos.html
-share/doc/milter-manager/ja/upgrade-on-debian.html
-share/doc/milter-manager/ja/upgrade-on-freebsd.html
-share/doc/milter-manager/ja/upgrade-on-ubuntu.html
-share/doc/milter-manager/ja/upgrade-options-on-centos.html
-share/doc/milter-manager/ja/upgrade-options-on-debian.html
-share/doc/milter-manager/ja/upgrade-options-on-freebsd.html
-share/doc/milter-manager/ja/upgrade-options-on-ubuntu.html
-share/doc/milter-manager/ja/upgrade.html
-share/doc/milter-manager/ja/users.html
 share/doc/milter-manager/left.png
 share/doc/milter-manager/log-list.html
 share/doc/milter-manager/milter-manager-log-analyzer-graphs.png
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 0735f9764c6..a88f1728ec3 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2013/08/19 04:47:58 taca Exp $
+$NetBSD: distinfo,v 1.21 2014/01/24 11:29:30 obache Exp $
 
-SHA1 (milter-manager-2.0.0.tar.gz) = fc8b04717313d77a41153bb43d0c46a38bf42a4d
-RMD160 (milter-manager-2.0.0.tar.gz) = e47b91682f72e4c82c01b9187df4ca0883a0cd49
-Size (milter-manager-2.0.0.tar.gz) = 6694510 bytes
-SHA1 (patch-configure) = 46de71e84df3268764e230baa6702cc5a3ae38c1
+SHA1 (milter-manager-2.0.1.tar.gz) = fee731624ab972bc1a34f65ad76a24d8e97a608f
+RMD160 (milter-manager-2.0.1.tar.gz) = 3d1446d425ef59dc95411e85515d98eede3620f6
+Size (milter-manager-2.0.1.tar.gz) = 6555523 bytes
+SHA1 (patch-configure) = ee1f31e83354c4c6b38ae1c0d4fda40f28ad92b6
diff --git a/mail/milter-manager/patches/patch-configure b/mail/milter-manager/patches/patch-configure
index a524d52d1bc..7b29b51ba0c 100644
--- a/mail/milter-manager/patches/patch-configure
+++ b/mail/milter-manager/patches/patch-configure
@@ -1,18 +1,17 @@
-$NetBSD: patch-configure,v 1.1 2013/08/19 04:47:58 taca Exp $
+$NetBSD: patch-configure,v 1.2 2014/01/24 11:29:30 obache Exp $
 
-* Not all Gem have source_index method.
+* rbconfig_vendorarchhdr dir may not be defined even if rbconfig_hdrdir exists
 
---- configure.orig	2013-06-28 02:06:00.000000000 +0000
+--- configure.orig	2014-01-23 02:36:54.000000000 +0000
 +++ configure
-@@ -13935,7 +13935,10 @@ fi
-         rescue LoadError
-           ruby_glib2_gem = nil
-         else
--          ruby_glib2_gem = Gem.source_index.find_name("glib2").first
-+          begin
-+            ruby_glib2_gem = Gem.source_index.find_name("glib2").first
-+          rescue NoMethodError
-+          end
-         end
- 	if ruby_glib2_gem.nil?
- 	  begin
+@@ -13989,6 +13989,10 @@ if test "$ruby_available" = "yes"; then
+     fi
+     if test -d "$rbconfig_vendorarchhdrdir"; then
+       RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchhdrdir"
++    else
++      if test "$rbconfig_vendorarchdir" != ""; then
++        RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchdir"
++      fi
+     fi
+     if test -d "$rbconfig_rubyarchhdrdir"; then
+       RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_rubyarchhdrdir"