Update milter-manager to 1.8.7.

== [release-1-8-7] 1.8.7: 2013-06-14

A bug fix release of 1.8.6.

=== Package

  * [rpm] Keep user configuration settings on upgrade.
  * [deb][rpm] Separate milter-manager-log-analyzer from milter-manager.
    [Reported by Kazuhiro NISHIYAMA][GitHub #21]
  * Use Ruby1.9 on CentOS6 or later.
  * Drop Ubuntu Oneiric Ocelot(11.10) support.
  * Add Ubuntu Raring Ringtail(13.04) support.
  * Add Debian jessie support.

=== milter manager

==== Improvements

  * Support Ruby2.0.0.

==== Fixes

  * [debian] Support init file that contains non-ASCII characters.
    [Reported by Kazuhiro NISHIYAMA][GitHub #23]

=== milter-manager-log-analyzer

==== Fixes

  * Process mail log even if it includes invalid byte sequence.
    [Reported by Satoru Sakashita][GitHub #24]

=== Admin

  * Dropped.

=== Thanks

  * Kazuhiro NISHIYAMA
  * Satoru Sakashita

3 files changed, 7 insertions, 184 deletions

diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index c0cba7c502e..765f9db5ef2 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2013/06/20 09:12:13 obache Exp $
+# $NetBSD: Makefile,v 1.30 2013/06/29 12:10:03 obache Exp $
 #
 
-DISTNAME=	milter-manager-1.8.6
+DISTNAME=	milter-manager-1.8.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=milter-manager/}
 
diff --git a/mail/milter-manager/PLIST b/mail/milter-manager/PLIST
index e1f3644a4dc..8e6d499ccae 100644
--- a/mail/milter-manager/PLIST
+++ b/mail/milter-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/12/22 08:29:30 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/06/29 12:10:03 obache Exp $
 bin/milter-manager-log-analyzer
 bin/milter-performance-check
 bin/milter-report-statistics
@@ -215,8 +215,6 @@ share/doc/milter-manager/ja/milter-finished-emittable.xml
 share/doc/milter-manager/ja/milter-headers.xml
 share/doc/milter-manager/ja/milter-logger.xml
 share/doc/milter-manager/ja/milter-macros-requests.xml
-share/doc/milter-manager/ja/milter-manager-admin-ja.png
-share/doc/milter-manager/ja/milter-manager-admin.png
 share/doc/milter-manager/ja/milter-manager-applicable-condition.xml
 share/doc/milter-manager/ja/milter-manager-child.xml
 share/doc/milter-manager/ja/milter-manager-children.xml
@@ -291,8 +289,6 @@ 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-admin-ja.png
-share/doc/milter-manager/milter-manager-admin.png
 share/doc/milter-manager/milter-manager-log-analyzer-graphs.png
 share/doc/milter-manager/milter-manager-log-analyzer.html
 share/doc/milter-manager/milter-manager.devhelp2
@@ -342,179 +338,6 @@ share/examples/milter-manager/defaults/redhat.conf
 share/examples/milter-manager/milter-manager.conf
 share/examples/milter-manager/models/example.rb
 share/examples/rc.d/milter-manager
-share/milter-manager/admin/.autotest
-share/milter-manager/admin/README
-share/milter-manager/admin/Rakefile
-share/milter-manager/admin/TODO
-share/milter-manager/admin/app/controllers/application_controller.rb
-share/milter-manager/admin/app/controllers/config/applicable_conditions_controller.rb
-share/milter-manager/admin/app/controllers/config/connections_controller.rb
-share/milter-manager/admin/app/controllers/config/milters_controller.rb
-share/milter-manager/admin/app/controllers/config_controller.rb
-share/milter-manager/admin/app/controllers/control_controller.rb
-share/milter-manager/admin/app/controllers/sessions_controller.rb
-share/milter-manager/admin/app/controllers/users_controller.rb
-share/milter-manager/admin/app/controllers/welcome_controller.rb
-share/milter-manager/admin/app/helpers/application_helper.rb
-share/milter-manager/admin/app/helpers/config/applicable_conditions_helper.rb
-share/milter-manager/admin/app/helpers/config/connections_helper.rb
-share/milter-manager/admin/app/helpers/config/milters_helper.rb
-share/milter-manager/admin/app/helpers/config_helper.rb
-share/milter-manager/admin/app/helpers/control_helper.rb
-share/milter-manager/admin/app/helpers/sessions_helper.rb
-share/milter-manager/admin/app/helpers/users_helper.rb
-share/milter-manager/admin/app/helpers/welcome_helper.rb
-share/milter-manager/admin/app/models/config/applicable_condition.rb
-share/milter-manager/admin/app/models/config/connection.rb
-share/milter-manager/admin/app/models/config/milter.rb
-share/milter-manager/admin/app/models/config/restriction.rb
-share/milter-manager/admin/app/models/configuration.rb
-share/milter-manager/admin/app/models/user.rb
-share/milter-manager/admin/app/views/config/applicable_conditions/index.html.erb
-share/milter-manager/admin/app/views/config/applicable_conditions/show.html.erb
-share/milter-manager/admin/app/views/config/connections/edit.html.erb
-share/milter-manager/admin/app/views/config/connections/show.html.erb
-share/milter-manager/admin/app/views/config/index.html.erb
-share/milter-manager/admin/app/views/config/milters/edit.html.erb
-share/milter-manager/admin/app/views/config/milters/index.html.erb
-share/milter-manager/admin/app/views/config/milters/new.html.erb
-share/milter-manager/admin/app/views/config/milters/show.html.erb
-share/milter-manager/admin/app/views/control/index.html.erb
-share/milter-manager/admin/app/views/layouts/_footer.html.erb
-share/milter-manager/admin/app/views/layouts/_header.html.erb
-share/milter-manager/admin/app/views/layouts/application.html.erb
-share/milter-manager/admin/app/views/rescues/404.html.erb
-share/milter-manager/admin/app/views/rescues/500.html.erb
-share/milter-manager/admin/app/views/sessions/new.html.erb
-share/milter-manager/admin/app/views/users/new.html.erb
-share/milter-manager/admin/app/views/welcome/index.html.erb
-share/milter-manager/admin/config/boot.rb
-share/milter-manager/admin/config/database.yml
-share/milter-manager/admin/config/environment.rb
-share/milter-manager/admin/config/environments/development.rb
-share/milter-manager/admin/config/environments/production.rb
-share/milter-manager/admin/config/environments/test.rb
-share/milter-manager/admin/config/initializers/inflections.rb
-share/milter-manager/admin/config/initializers/mime_types.rb
-share/milter-manager/admin/config/initializers/new_rails_defaults.rb
-share/milter-manager/admin/config/initializers/site_keys.rb
-share/milter-manager/admin/config/locales/en.yml
-share/milter-manager/admin/config/locales/ja.yml
-share/milter-manager/admin/config/locales/rails/ja.yml
-share/milter-manager/admin/config/routes.rb
-share/milter-manager/admin/db/.gitignore
-share/milter-manager/admin/db/migrate/20081125042659_create_milters.rb
-share/milter-manager/admin/db/migrate/20081126000659_create_connections.rb
-share/milter-manager/admin/db/migrate/20081126001355_add_default_config_connection.rb
-share/milter-manager/admin/db/migrate/20081202083637_add_connection_spec_to_milters.rb
-share/milter-manager/admin/db/migrate/20081203131215_create_configurations.rb
-share/milter-manager/admin/db/migrate/20081209042157_create_applicable_conditions.rb
-share/milter-manager/admin/db/migrate/20081209074801_create_restrictions.rb
-share/milter-manager/admin/db/migrate/20081209082702_remove_target_from_milters.rb
-share/milter-manager/admin/db/migrate/20081212075410_add_enabled_to_milters.rb
-share/milter-manager/admin/db/migrate/20081212080532_add_description_to_milters.rb
-share/milter-manager/admin/db/migrate/20081214112549_decompose_spec.rb
-share/milter-manager/admin/db/migrate/20081216125103_add_timeout_to_milters.rb
-share/milter-manager/admin/db/migrate/20081216130836_add_user_name_to_milters.rb
-share/milter-manager/admin/db/migrate/20090107013320_add_command_options_to_milters.rb
-share/milter-manager/admin/db/migrate/20090116065917_create_users.rb
-share/milter-manager/admin/db/migrate/20090512123747_add_fallback_status_to_milters.rb
-share/milter-manager/admin/db/migrate/20090826132057_add_evaluation_mode_to_milters.rb
-share/milter-manager/admin/doc/README_FOR_APP
-share/milter-manager/admin/lib/authenticated_system.rb
-share/milter-manager/admin/lib/authenticated_test_helper.rb
-share/milter-manager/admin/lib/milter/manager.rb
-share/milter-manager/admin/lib/milter/manager/connection_spec.rb
-share/milter-manager/admin/lib/milter/manager/controller_client.rb
-share/milter-manager/admin/lib/tasks/testing.rake
-share/milter-manager/admin/public/404.html
-share/milter-manager/admin/public/422.html
-share/milter-manager/admin/public/500.html
-share/milter-manager/admin/public/dispatch.cgi
-share/milter-manager/admin/public/dispatch.fcgi
-share/milter-manager/admin/public/dispatch.rb
-share/milter-manager/admin/public/favicon.ico
-share/milter-manager/admin/public/images/logo.png
-share/milter-manager/admin/public/images/logo.svg
-share/milter-manager/admin/public/images/menu-background.png
-share/milter-manager/admin/public/images/menu-background.svg
-share/milter-manager/admin/public/images/rails.png
-share/milter-manager/admin/public/javascripts/application.js
-share/milter-manager/admin/public/javascripts/controls.js
-share/milter-manager/admin/public/javascripts/dragdrop.js
-share/milter-manager/admin/public/javascripts/effects.js
-share/milter-manager/admin/public/javascripts/prototype.js
-share/milter-manager/admin/public/robots.txt
-share/milter-manager/admin/public/stylesheets/base.css
-share/milter-manager/admin/public/stylesheets/config.css
-share/milter-manager/admin/script/about
-share/milter-manager/admin/script/console
-share/milter-manager/admin/script/dbconsole
-share/milter-manager/admin/script/destroy
-share/milter-manager/admin/script/generate
-share/milter-manager/admin/script/performance/benchmarker
-share/milter-manager/admin/script/performance/profiler
-share/milter-manager/admin/script/performance/request
-share/milter-manager/admin/script/plugin
-share/milter-manager/admin/script/process/inspector
-share/milter-manager/admin/script/process/reaper
-share/milter-manager/admin/script/process/spawner
-share/milter-manager/admin/script/runner
-share/milter-manager/admin/script/server
-share/milter-manager/admin/test/fixtures/applicable_conditions.yml
-share/milter-manager/admin/test/fixtures/configurations.yml
-share/milter-manager/admin/test/fixtures/connections.yml
-share/milter-manager/admin/test/fixtures/milters.yml
-share/milter-manager/admin/test/fixtures/restrictions.yml
-share/milter-manager/admin/test/fixtures/users.yml
-share/milter-manager/admin/test/functional/config/applicable_conditions_controller_test.rb
-share/milter-manager/admin/test/functional/config/connections_controller_test.rb
-share/milter-manager/admin/test/functional/config/milters_controller_test.rb
-share/milter-manager/admin/test/functional/config_controller_test.rb
-share/milter-manager/admin/test/functional/control_controller_test.rb
-share/milter-manager/admin/test/functional/sessions_controller_test.rb
-share/milter-manager/admin/test/functional/users_controller_test.rb
-share/milter-manager/admin/test/functional/welcome_controller_test.rb
-share/milter-manager/admin/test/integration/connection_actions_test.rb
-share/milter-manager/admin/test/integration/milter_actions_test.rb
-share/milter-manager/admin/test/performance/browsing_test.rb
-share/milter-manager/admin/test/run-test.sh
-share/milter-manager/admin/test/test_helper.rb
-share/milter-manager/admin/test/unit/config/applicable_condition_test.rb
-share/milter-manager/admin/test/unit/config/connection_test.rb
-share/milter-manager/admin/test/unit/config/milter_test.rb
-share/milter-manager/admin/test/unit/config/restriction_test.rb
-share/milter-manager/admin/test/unit/configuration_test.rb
-share/milter-manager/admin/test/unit/connection_spec_test.rb
-share/milter-manager/admin/test/unit/controller_client_test.rb
-share/milter-manager/admin/test/unit/user_test.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/.gitignore
-share/milter-manager/admin/vendor/plugins/restful-auth/CHANGELOG
-share/milter-manager/admin/vendor/plugins/restful-auth/README.textile
-share/milter-manager/admin/vendor/plugins/restful-auth/Rakefile
-share/milter-manager/admin/vendor/plugins/restful-auth/TODO
-share/milter-manager/admin/vendor/plugins/restful-auth/init.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/install.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/authentication.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/authentication/by_cookie_token.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/authentication/by_password.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/authorization.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/authorization/aasm_roles.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/authorization/stateful_roles.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/tasks/auth.rake
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/trustification.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/lib/trustification/email_validation.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/AccessControl.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/Authentication.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/Authorization.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/RailsPlugins.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/SecurityFramework.graffle
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/SecurityFramework.png
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/SecurityPatterns.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/Tradeoffs.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/notes/Trustification.txt
-share/milter-manager/admin/vendor/plugins/restful-auth/rails/init.rb
-share/milter-manager/admin/vendor/plugins/restful-auth/restful-authentication.gemspec
 share/milter-manager/license/agpl.txt
 share/milter-manager/license/fdl.txt
 share/milter-manager/license/gpl.txt
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 3981edffaa6..64454eb88ff 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2013/03/14 12:30:41 obache Exp $
+$NetBSD: distinfo,v 1.17 2013/06/29 12:10:03 obache Exp $
 
-SHA1 (milter-manager-1.8.6.tar.gz) = 87f40b52420d61b280f623120ba93df8ba9e31bf
-RMD160 (milter-manager-1.8.6.tar.gz) = 6198ae1b18d558d44bb481bada7384da9dc10fef
-Size (milter-manager-1.8.6.tar.gz) = 7361160 bytes
+SHA1 (milter-manager-1.8.7.tar.gz) = 28ea170e3ee5cfbd4f46a61c917b78378971ae4a
+RMD160 (milter-manager-1.8.7.tar.gz) = 524980c16a108846464e4d85847e0a7280dcbfc0
+Size (milter-manager-1.8.7.tar.gz) = 6647495 bytes