diff -Nru milter-manager-2.0.8/aclocal.m4 milter-manager-2.0.9/aclocal.m4 --- milter-manager-2.0.8/aclocal.m4 2016-05-14 04:51:10.292874502 +0000 +++ milter-manager-2.0.9/aclocal.m4 2016-06-15 07:01:41.883291172 +0000 @@ -20,223 +20,6 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -AC_DEFUN([AC_CHECK_ENABLE_COVERAGE], -[ - AC_MSG_CHECKING([for enabling coverage]) - AC_ARG_ENABLE([coverage], - AS_HELP_STRING([--enable-coverage], - [Enable coverage]), - [cutter_enable_coverage=$enableval], - [cutter_enable_coverage=no]) - AC_MSG_RESULT($cutter_enable_coverage) - cutter_enable_coverage_report_lcov=no - if test "x$cutter_enable_coverage" != "xno"; then - ltp_version_list="1.6 1.7 1.8 1.9 1.10" - AC_PATH_TOOL(LCOV, lcov) - AC_PATH_TOOL(GENHTML, genhtml) - - if test -x "$LCOV"; then - AC_CACHE_CHECK([for ltp version], - cutter_cv_ltp_version, - [ - ltp_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` - cutter_cv_ltp_version="$ltp_version (NG)" - for ltp_check_version in $ltp_version_list; do - if test "$ltp_version" = "$ltp_check_version"; then - cutter_cv_ltp_version="$ltp_check_version (ok)" - fi - done - ]) - fi - - AC_MSG_CHECKING([for enabling coverage report by LCOV]) - case "$cutter_cv_ltp_version" in - *\(ok\)*) - cutter_enable_coverage_report_lcov=yes - ;; - *) - cutter_enable_coverage_report_lcov=no - ;; - esac - AC_MSG_RESULT($cutter_enable_coverage_report_lcov) - fi -]) - -AC_DEFUN([AC_CHECK_COVERAGE], -[ - ac_check_coverage_makefile=$1 - if test -z "$ac_check_coverage_makefile"; then - ac_check_coverage_makefile=Makefile - fi - AC_SUBST(ac_check_coverage_makefile) - - AC_CHECK_ENABLE_COVERAGE - - COVERAGE_CFLAGS= - COVERAGE_LIBS= - if test "$cutter_enable_coverage" = "yes"; then - COVERAGE_CFLAGS="--coverage" - COVERAGE_LIBS="-lgcov" - fi - AC_SUBST(COVERAGE_CFLAGS) - AC_SUBST(COVERAGE_LIBS) - AM_CONDITIONAL([ENABLE_COVERAGE], [test "$cutter_enable_coverage" = "yes"]) - AM_CONDITIONAL([ENABLE_COVERAGE_REPORT_LCOV], - [test "$cutter_enable_coverage_report_lcov" = "yes"]) - - COVERAGE_INFO_FILE="coverage.info" - AC_SUBST(COVERAGE_INFO_FILE) - - COVERAGE_REPORT_DIR="coverage" - AC_SUBST(COVERAGE_REPORT_DIR) - - if test "$GENHTML_OPTIONS" = ""; then - GENHTML_OPTIONS="" - fi - AC_SUBST(GENHTML_OPTIONS) - - if test "$cutter_enable_coverage_report_lcov" = "yes"; then - AC_CONFIG_COMMANDS([coverage-report-lcov], [ - if test -e "$ac_check_coverage_makefile" && \ - grep -q '^coverage:' $ac_check_coverage_makefile; then - : # do nothing - else - sed -e 's/^ / /g' <>$ac_check_coverage_makefile -.PHONY: coverage-clean coverage-report coverage coverage-force - -coverage-clean: - \$(LCOV) --compat-libtool --zerocounters --directory . \\ - --output-file \$(COVERAGE_INFO_FILE) - -coverage-report: - \$(LCOV) --compat-libtool --directory . \\ - --capture --output-file \$(COVERAGE_INFO_FILE) - \$(LCOV) --compat-libtool --directory . \\ - --extract \$(COVERAGE_INFO_FILE) "\`(cd '\$(top_srcdir)'; pwd)\`/*" \\ - --output-file \$(COVERAGE_INFO_FILE) - \$(GENHTML) --highlight --legend \\ - --output-directory \$(COVERAGE_REPORT_DIR) \\ - --prefix "\`(cd '\$(top_srcdir)'; pwd)\`" \\ - \$(GENHTML_OPTIONS) \$(COVERAGE_INFO_FILE) - -coverage: coverage-clean check coverage-report - -coverage-force: - \$(MAKE) \$(AM_MAKEFLAGS) coverage-clean - \$(MAKE) \$(AM_MAKEFLAGS) check || : - \$(MAKE) \$(AM_MAKEFLAGS) coverage-report -EOS - fi - ], - [ac_check_coverage_makefile="$ac_check_coverage_makefile"]) - fi -]) - -AC_DEFUN([AC_CHECK_CUTTER], -[ - AC_ARG_WITH([cutter], - AS_HELP_STRING([--with-cutter], - [Use Cutter (default: auto)]), - [cutter_with_value=$withval], - [cutter_with_value=auto]) - if test -z "$cutter_use_cutter"; then - if test "x$cutter_with_value" = "xno"; then - cutter_use_cutter=no - else - m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(CUTTER, cutter $1, - [cutter_use_cutter=yes], - [cutter_use_cutter=no]) - ], - [cutter_use_cutter=no]) - fi - fi - if test "$cutter_use_cutter" != "no"; then - _PKG_CONFIG(CUTTER, variable=cutter, cutter) - CUTTER=$pkg_cv_CUTTER - fi - ac_cv_use_cutter="$cutter_use_cutter" # for backward compatibility - AC_SUBST([CUTTER_CFLAGS]) - AC_SUBST([CUTTER_LIBS]) - AC_SUBST([CUTTER]) -]) - -AC_DEFUN([AC_CHECK_GCUTTER], -[ - AC_CHECK_CUTTER($1) - if test "$cutter_use_cutter" = "no"; then - cutter_use_gcutter=no - fi - if test "x$cutter_use_gcutter" = "x"; then - m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(GCUTTER, gcutter $1, - [cutter_use_gcutter=yes], - [cutter_use_gcutter=no]) - ], - [cutter_use_gcutter=no]) - fi - ac_cv_use_gcutter="$cutter_use_gcutter" # for backward compatibility - AC_SUBST([GCUTTER_CFLAGS]) - AC_SUBST([GCUTTER_LIBS]) -]) - -AC_DEFUN([AC_CHECK_CPPCUTTER], -[ - AC_CHECK_CUTTER($1) - if test "$cutter_use_cutter" = "no"; then - cutter_use_cppcutter=no - fi - if test "x$cutter_use_cppcutter" = "x"; then - m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(CPPCUTTER, cppcutter $1, - [cutter_use_cppcutter=yes], - [cutter_use_cppcutter=no]) - ], - [cutter_use_cppcutter=no]) - fi - ac_cv_use_cppcutter="$cutter_use_cppcutter" # for backward compatibility - AC_SUBST([CPPCUTTER_CFLAGS]) - AC_SUBST([CPPCUTTER_LIBS]) -]) - -AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF], -[ - AC_CHECK_GCUTTER($1) - if test "$cutter_use_cutter" = "no"; then - cutter_use_gdkcutter_pixbuf=no - fi - if test "x$cutter_use_gdkcutter_pixbuf" = "x"; then - m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, - [cutter_use_gdkcutter_pixbuf=yes], - [cutter_use_gdkcutter_pixbuf=no]) - ], - [cutter_use_gdkcutter_pixbuf=no]) - fi - ac_cv_use_gdkcutter_pixbuf="$cutter_use_gdkcutter_pixbuf" # for backward compatibility - AC_SUBST([GDKCUTTER_PIXBUF_CFLAGS]) - AC_SUBST([GDKCUTTER_PIXBUF_LIBS]) -]) - -AC_DEFUN([AC_CHECK_SOUPCUTTER], -[ - AC_CHECK_GCUTTER($1) - if test "$cutter_use_cutter" = "no"; then - cutter_use_soupcutter=no - fi - if test "$cutter_use_soupcutter" != "no"; then - m4_ifdef([PKG_CHECK_MODULES], [ - PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, - [cutter_use_soupcutter=yes], - [cutter_use_soupcutter=no]) - ], - [cutter_use_soupcutter=no]) - fi - ac_cv_use_soupcutter="$cutter_use_soupcutter" # for backward compatibility - AC_SUBST([SOUPCUTTER_CFLAGS]) - AC_SUBST([SOUPCUTTER_LIBS]) -]) - # Configure paths for GLIB # Owen Taylor 1997-2001 @@ -10239,8 +10022,8 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11742,3 +11525,220 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +AC_DEFUN([AC_CHECK_ENABLE_COVERAGE], +[ + AC_MSG_CHECKING([for enabling coverage]) + AC_ARG_ENABLE([coverage], + AS_HELP_STRING([--enable-coverage], + [Enable coverage]), + [cutter_enable_coverage=$enableval], + [cutter_enable_coverage=no]) + AC_MSG_RESULT($cutter_enable_coverage) + cutter_enable_coverage_report_lcov=no + if test "x$cutter_enable_coverage" != "xno"; then + ltp_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12" + AC_PATH_TOOL(LCOV, lcov) + AC_PATH_TOOL(GENHTML, genhtml) + + if test -x "$LCOV"; then + AC_CACHE_CHECK([for ltp version], + cutter_cv_ltp_version, + [ + ltp_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` + cutter_cv_ltp_version="$ltp_version (NG)" + for ltp_check_version in $ltp_version_list; do + if test "$ltp_version" = "$ltp_check_version"; then + cutter_cv_ltp_version="$ltp_check_version (ok)" + fi + done + ]) + fi + + AC_MSG_CHECKING([for enabling coverage report by LCOV]) + case "$cutter_cv_ltp_version" in + *\(ok\)*) + cutter_enable_coverage_report_lcov=yes + ;; + *) + cutter_enable_coverage_report_lcov=no + ;; + esac + AC_MSG_RESULT($cutter_enable_coverage_report_lcov) + fi +]) + +AC_DEFUN([AC_CHECK_COVERAGE], +[ + ac_check_coverage_makefile=$1 + if test -z "$ac_check_coverage_makefile"; then + ac_check_coverage_makefile=Makefile + fi + AC_SUBST(ac_check_coverage_makefile) + + AC_CHECK_ENABLE_COVERAGE + + COVERAGE_CFLAGS= + COVERAGE_LIBS= + if test "$cutter_enable_coverage" = "yes"; then + COVERAGE_CFLAGS="--coverage" + COVERAGE_LIBS="-lgcov" + fi + AC_SUBST(COVERAGE_CFLAGS) + AC_SUBST(COVERAGE_LIBS) + AM_CONDITIONAL([ENABLE_COVERAGE], [test "$cutter_enable_coverage" = "yes"]) + AM_CONDITIONAL([ENABLE_COVERAGE_REPORT_LCOV], + [test "$cutter_enable_coverage_report_lcov" = "yes"]) + + COVERAGE_INFO_FILE="coverage.info" + AC_SUBST(COVERAGE_INFO_FILE) + + COVERAGE_REPORT_DIR="coverage" + AC_SUBST(COVERAGE_REPORT_DIR) + + if test "$GENHTML_OPTIONS" = ""; then + GENHTML_OPTIONS="" + fi + AC_SUBST(GENHTML_OPTIONS) + + if test "$cutter_enable_coverage_report_lcov" = "yes"; then + AC_CONFIG_COMMANDS([coverage-report-lcov], [ + if test -e "$ac_check_coverage_makefile" && \ + grep -q '^coverage:' $ac_check_coverage_makefile; then + : # do nothing + else + sed -e 's/^ / /g' <>$ac_check_coverage_makefile +.PHONY: coverage-clean coverage-report coverage coverage-force + +coverage-clean: + \$(LCOV) --compat-libtool --zerocounters --directory . \\ + --output-file \$(COVERAGE_INFO_FILE) + +coverage-report: + \$(LCOV) --compat-libtool --directory . \\ + --capture --output-file \$(COVERAGE_INFO_FILE) + \$(LCOV) --compat-libtool --directory . \\ + --extract \$(COVERAGE_INFO_FILE) "\`(cd '\$(top_srcdir)'; pwd)\`/*" \\ + --output-file \$(COVERAGE_INFO_FILE) + \$(GENHTML) --highlight --legend \\ + --output-directory \$(COVERAGE_REPORT_DIR) \\ + --prefix "\`(cd '\$(top_srcdir)'; pwd)\`" \\ + \$(GENHTML_OPTIONS) \$(COVERAGE_INFO_FILE) + +coverage: coverage-clean check coverage-report + +coverage-force: + \$(MAKE) \$(AM_MAKEFLAGS) coverage-clean + \$(MAKE) \$(AM_MAKEFLAGS) check || : + \$(MAKE) \$(AM_MAKEFLAGS) coverage-report +EOS + fi + ], + [ac_check_coverage_makefile="$ac_check_coverage_makefile"]) + fi +]) + +AC_DEFUN([AC_CHECK_CUTTER], +[ + AC_ARG_WITH([cutter], + AS_HELP_STRING([--with-cutter], + [Use Cutter (default: auto)]), + [cutter_with_value=$withval], + [cutter_with_value=auto]) + if test -z "$cutter_use_cutter"; then + if test "x$cutter_with_value" = "xno"; then + cutter_use_cutter=no + else + m4_ifdef([PKG_CHECK_MODULES], [ + PKG_CHECK_MODULES(CUTTER, cutter $1, + [cutter_use_cutter=yes], + [cutter_use_cutter=no]) + ], + [cutter_use_cutter=no]) + fi + fi + if test "$cutter_use_cutter" != "no"; then + _PKG_CONFIG(CUTTER, variable=cutter, cutter) + CUTTER=$pkg_cv_CUTTER + fi + ac_cv_use_cutter="$cutter_use_cutter" # for backward compatibility + AC_SUBST([CUTTER_CFLAGS]) + AC_SUBST([CUTTER_LIBS]) + AC_SUBST([CUTTER]) +]) + +AC_DEFUN([AC_CHECK_GCUTTER], +[ + AC_CHECK_CUTTER($1) + if test "$cutter_use_cutter" = "no"; then + cutter_use_gcutter=no + fi + if test "x$cutter_use_gcutter" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ + PKG_CHECK_MODULES(GCUTTER, gcutter $1, + [cutter_use_gcutter=yes], + [cutter_use_gcutter=no]) + ], + [cutter_use_gcutter=no]) + fi + ac_cv_use_gcutter="$cutter_use_gcutter" # for backward compatibility + AC_SUBST([GCUTTER_CFLAGS]) + AC_SUBST([GCUTTER_LIBS]) +]) + +AC_DEFUN([AC_CHECK_CPPCUTTER], +[ + AC_CHECK_CUTTER($1) + if test "$cutter_use_cutter" = "no"; then + cutter_use_cppcutter=no + fi + if test "x$cutter_use_cppcutter" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ + PKG_CHECK_MODULES(CPPCUTTER, cppcutter $1, + [cutter_use_cppcutter=yes], + [cutter_use_cppcutter=no]) + ], + [cutter_use_cppcutter=no]) + fi + ac_cv_use_cppcutter="$cutter_use_cppcutter" # for backward compatibility + AC_SUBST([CPPCUTTER_CFLAGS]) + AC_SUBST([CPPCUTTER_LIBS]) +]) + +AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF], +[ + AC_CHECK_GCUTTER($1) + if test "$cutter_use_cutter" = "no"; then + cutter_use_gdkcutter_pixbuf=no + fi + if test "x$cutter_use_gdkcutter_pixbuf" = "x"; then + m4_ifdef([PKG_CHECK_MODULES], [ + PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, + [cutter_use_gdkcutter_pixbuf=yes], + [cutter_use_gdkcutter_pixbuf=no]) + ], + [cutter_use_gdkcutter_pixbuf=no]) + fi + ac_cv_use_gdkcutter_pixbuf="$cutter_use_gdkcutter_pixbuf" # for backward compatibility + AC_SUBST([GDKCUTTER_PIXBUF_CFLAGS]) + AC_SUBST([GDKCUTTER_PIXBUF_LIBS]) +]) + +AC_DEFUN([AC_CHECK_SOUPCUTTER], +[ + AC_CHECK_GCUTTER($1) + if test "$cutter_use_cutter" = "no"; then + cutter_use_soupcutter=no + fi + if test "$cutter_use_soupcutter" != "no"; then + m4_ifdef([PKG_CHECK_MODULES], [ + PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, + [cutter_use_soupcutter=yes], + [cutter_use_soupcutter=no]) + ], + [cutter_use_soupcutter=no]) + fi + ac_cv_use_soupcutter="$cutter_use_soupcutter" # for backward compatibility + AC_SUBST([SOUPCUTTER_CFLAGS]) + AC_SUBST([SOUPCUTTER_LIBS]) +]) + diff -Nru milter-manager-2.0.8/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.c milter-manager-2.0.9/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.c --- milter-manager-2.0.8/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.c 2016-06-06 12:58:50.101785398 +0000 +++ milter-manager-2.0.9/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.c 2016-06-15 07:14:53.441865722 +0000 @@ -6,218 +6,246 @@ -/* enumerations from "/usr/include/glib-2.0/glib/gvariant.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gtestutils.h" */ GType -g_variant_class_get_type (void) +g_test_trap_flags_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { G_VARIANT_CLASS_BOOLEAN, "G_VARIANT_CLASS_BOOLEAN", "boolean" }, - { G_VARIANT_CLASS_BYTE, "G_VARIANT_CLASS_BYTE", "byte" }, - { G_VARIANT_CLASS_INT16, "G_VARIANT_CLASS_INT16", "int16" }, - { G_VARIANT_CLASS_UINT16, "G_VARIANT_CLASS_UINT16", "uint16" }, - { G_VARIANT_CLASS_INT32, "G_VARIANT_CLASS_INT32", "int32" }, - { G_VARIANT_CLASS_UINT32, "G_VARIANT_CLASS_UINT32", "uint32" }, - { G_VARIANT_CLASS_INT64, "G_VARIANT_CLASS_INT64", "int64" }, - { G_VARIANT_CLASS_UINT64, "G_VARIANT_CLASS_UINT64", "uint64" }, - { G_VARIANT_CLASS_HANDLE, "G_VARIANT_CLASS_HANDLE", "handle" }, - { G_VARIANT_CLASS_DOUBLE, "G_VARIANT_CLASS_DOUBLE", "double" }, - { G_VARIANT_CLASS_STRING, "G_VARIANT_CLASS_STRING", "string" }, - { G_VARIANT_CLASS_OBJECT_PATH, "G_VARIANT_CLASS_OBJECT_PATH", "object-path" }, - { G_VARIANT_CLASS_SIGNATURE, "G_VARIANT_CLASS_SIGNATURE", "signature" }, - { G_VARIANT_CLASS_VARIANT, "G_VARIANT_CLASS_VARIANT", "variant" }, - { G_VARIANT_CLASS_MAYBE, "G_VARIANT_CLASS_MAYBE", "maybe" }, - { G_VARIANT_CLASS_ARRAY, "G_VARIANT_CLASS_ARRAY", "array" }, - { G_VARIANT_CLASS_TUPLE, "G_VARIANT_CLASS_TUPLE", "tuple" }, - { G_VARIANT_CLASS_DICT_ENTRY, "G_VARIANT_CLASS_DICT_ENTRY", "dict-entry" }, + static const GFlagsValue values[] = { + { G_TEST_TRAP_SILENCE_STDOUT, "G_TEST_TRAP_SILENCE_STDOUT", "silence-stdout" }, + { G_TEST_TRAP_SILENCE_STDERR, "G_TEST_TRAP_SILENCE_STDERR", "silence-stderr" }, + { G_TEST_TRAP_INHERIT_STDIN, "G_TEST_TRAP_INHERIT_STDIN", "inherit-stdin" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GVariantClass", values); + etype = g_flags_register_static ("GTestTrapFlags", values); } return etype; } GType -g_variant_parse_error_get_type (void) +g_test_subprocess_flags_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { G_VARIANT_PARSE_ERROR_FAILED, "G_VARIANT_PARSE_ERROR_FAILED", "failed" }, - { G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED, "G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED", "basic-type-expected" }, - { G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE, "G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE", "cannot-infer-type" }, - { G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED, "G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED", "definite-type-expected" }, - { G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END, "G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END", "input-not-at-end" }, - { G_VARIANT_PARSE_ERROR_INVALID_CHARACTER, "G_VARIANT_PARSE_ERROR_INVALID_CHARACTER", "invalid-character" }, - { G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING, "G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING", "invalid-format-string" }, - { G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH, "G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH", "invalid-object-path" }, - { G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE, "G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE", "invalid-signature" }, - { G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING, "G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING", "invalid-type-string" }, - { G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE, "G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE", "no-common-type" }, - { G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE, "G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE", "number-out-of-range" }, - { G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG, "G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG", "number-too-big" }, - { G_VARIANT_PARSE_ERROR_TYPE_ERROR, "G_VARIANT_PARSE_ERROR_TYPE_ERROR", "type-error" }, - { G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN, "G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN", "unexpected-token" }, - { G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD, "G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD", "unknown-keyword" }, - { G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT, "G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT", "unterminated-string-constant" }, - { G_VARIANT_PARSE_ERROR_VALUE_EXPECTED, "G_VARIANT_PARSE_ERROR_VALUE_EXPECTED", "value-expected" }, + static const GFlagsValue values[] = { + { G_TEST_SUBPROCESS_INHERIT_STDIN, "G_TEST_SUBPROCESS_INHERIT_STDIN", "in" }, + { G_TEST_SUBPROCESS_INHERIT_STDOUT, "G_TEST_SUBPROCESS_INHERIT_STDOUT", "out" }, + { G_TEST_SUBPROCESS_INHERIT_STDERR, "G_TEST_SUBPROCESS_INHERIT_STDERR", "err" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GVariantParseError", values); + etype = g_flags_register_static ("GTestSubprocessFlags", values); } return etype; } - -/* enumerations from "/usr/include/glib-2.0/glib/gthread.h" */ GType -g_thread_error_get_type (void) +g_test_log_type_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_THREAD_ERROR_AGAIN, "G_THREAD_ERROR_AGAIN", "again" }, + { G_TEST_LOG_NONE, "G_TEST_LOG_NONE", "none" }, + { G_TEST_LOG_ERROR, "G_TEST_LOG_ERROR", "error" }, + { G_TEST_LOG_START_BINARY, "G_TEST_LOG_START_BINARY", "start-binary" }, + { G_TEST_LOG_LIST_CASE, "G_TEST_LOG_LIST_CASE", "list-case" }, + { G_TEST_LOG_SKIP_CASE, "G_TEST_LOG_SKIP_CASE", "skip-case" }, + { G_TEST_LOG_START_CASE, "G_TEST_LOG_START_CASE", "start-case" }, + { G_TEST_LOG_STOP_CASE, "G_TEST_LOG_STOP_CASE", "stop-case" }, + { G_TEST_LOG_MIN_RESULT, "G_TEST_LOG_MIN_RESULT", "min-result" }, + { G_TEST_LOG_MAX_RESULT, "G_TEST_LOG_MAX_RESULT", "max-result" }, + { G_TEST_LOG_MESSAGE, "G_TEST_LOG_MESSAGE", "message" }, + { G_TEST_LOG_START_SUITE, "G_TEST_LOG_START_SUITE", "start-suite" }, + { G_TEST_LOG_STOP_SUITE, "G_TEST_LOG_STOP_SUITE", "stop-suite" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GThreadError", values); + etype = g_enum_register_static ("GTestLogType", values); } return etype; } GType -g_once_status_get_type (void) +g_test_file_type_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_ONCE_STATUS_NOTCALLED, "G_ONCE_STATUS_NOTCALLED", "notcalled" }, - { G_ONCE_STATUS_PROGRESS, "G_ONCE_STATUS_PROGRESS", "progress" }, - { G_ONCE_STATUS_READY, "G_ONCE_STATUS_READY", "ready" }, + { G_TEST_DIST, "G_TEST_DIST", "dist" }, + { G_TEST_BUILT, "G_TEST_BUILT", "built" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GOnceStatus", values); + etype = g_enum_register_static ("GTestFileType", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gkeyfile.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gconvert.h" */ GType -g_key_file_error_get_type (void) +g_convert_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_KEY_FILE_ERROR_UNKNOWN_ENCODING, "G_KEY_FILE_ERROR_UNKNOWN_ENCODING", "unknown-encoding" }, - { G_KEY_FILE_ERROR_PARSE, "G_KEY_FILE_ERROR_PARSE", "parse" }, - { G_KEY_FILE_ERROR_NOT_FOUND, "G_KEY_FILE_ERROR_NOT_FOUND", "not-found" }, - { G_KEY_FILE_ERROR_KEY_NOT_FOUND, "G_KEY_FILE_ERROR_KEY_NOT_FOUND", "key-not-found" }, - { G_KEY_FILE_ERROR_GROUP_NOT_FOUND, "G_KEY_FILE_ERROR_GROUP_NOT_FOUND", "group-not-found" }, - { G_KEY_FILE_ERROR_INVALID_VALUE, "G_KEY_FILE_ERROR_INVALID_VALUE", "invalid-value" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("GKeyFileError", values); - } - return etype; -} - -GType -g_key_file_flags_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GFlagsValue values[] = { - { G_KEY_FILE_NONE, "G_KEY_FILE_NONE", "none" }, - { G_KEY_FILE_KEEP_COMMENTS, "G_KEY_FILE_KEEP_COMMENTS", "keep-comments" }, - { G_KEY_FILE_KEEP_TRANSLATIONS, "G_KEY_FILE_KEEP_TRANSLATIONS", "keep-translations" }, + { G_CONVERT_ERROR_NO_CONVERSION, "G_CONVERT_ERROR_NO_CONVERSION", "no-conversion" }, + { G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "G_CONVERT_ERROR_ILLEGAL_SEQUENCE", "illegal-sequence" }, + { G_CONVERT_ERROR_FAILED, "G_CONVERT_ERROR_FAILED", "failed" }, + { G_CONVERT_ERROR_PARTIAL_INPUT, "G_CONVERT_ERROR_PARTIAL_INPUT", "partial-input" }, + { G_CONVERT_ERROR_BAD_URI, "G_CONVERT_ERROR_BAD_URI", "bad-uri" }, + { G_CONVERT_ERROR_NOT_ABSOLUTE_PATH, "G_CONVERT_ERROR_NOT_ABSOLUTE_PATH", "not-absolute-path" }, + { G_CONVERT_ERROR_NO_MEMORY, "G_CONVERT_ERROR_NO_MEMORY", "no-memory" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GKeyFileFlags", values); + etype = g_enum_register_static ("GConvertError", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gbookmarkfile.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gregex.h" */ GType -g_bookmark_file_error_get_type (void) +g_regex_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_BOOKMARK_FILE_ERROR_INVALID_URI, "G_BOOKMARK_FILE_ERROR_INVALID_URI", "invalid-uri" }, - { G_BOOKMARK_FILE_ERROR_INVALID_VALUE, "G_BOOKMARK_FILE_ERROR_INVALID_VALUE", "invalid-value" }, - { G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED, "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED", "app-not-registered" }, - { G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND, "G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND", "uri-not-found" }, - { G_BOOKMARK_FILE_ERROR_READ, "G_BOOKMARK_FILE_ERROR_READ", "read" }, - { G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING, "G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING", "unknown-encoding" }, - { G_BOOKMARK_FILE_ERROR_WRITE, "G_BOOKMARK_FILE_ERROR_WRITE", "write" }, - { G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND, "G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND", "file-not-found" }, + { G_REGEX_ERROR_COMPILE, "G_REGEX_ERROR_COMPILE", "compile" }, + { G_REGEX_ERROR_OPTIMIZE, "G_REGEX_ERROR_OPTIMIZE", "optimize" }, + { G_REGEX_ERROR_REPLACE, "G_REGEX_ERROR_REPLACE", "replace" }, + { G_REGEX_ERROR_MATCH, "G_REGEX_ERROR_MATCH", "match" }, + { G_REGEX_ERROR_INTERNAL, "G_REGEX_ERROR_INTERNAL", "internal" }, + { G_REGEX_ERROR_STRAY_BACKSLASH, "G_REGEX_ERROR_STRAY_BACKSLASH", "stray-backslash" }, + { G_REGEX_ERROR_MISSING_CONTROL_CHAR, "G_REGEX_ERROR_MISSING_CONTROL_CHAR", "missing-control-char" }, + { G_REGEX_ERROR_UNRECOGNIZED_ESCAPE, "G_REGEX_ERROR_UNRECOGNIZED_ESCAPE", "unrecognized-escape" }, + { G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER, "G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER", "quantifiers-out-of-order" }, + { G_REGEX_ERROR_QUANTIFIER_TOO_BIG, "G_REGEX_ERROR_QUANTIFIER_TOO_BIG", "quantifier-too-big" }, + { G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS, "G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS", "unterminated-character-class" }, + { G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS, "G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS", "invalid-escape-in-character-class" }, + { G_REGEX_ERROR_RANGE_OUT_OF_ORDER, "G_REGEX_ERROR_RANGE_OUT_OF_ORDER", "range-out-of-order" }, + { G_REGEX_ERROR_NOTHING_TO_REPEAT, "G_REGEX_ERROR_NOTHING_TO_REPEAT", "nothing-to-repeat" }, + { G_REGEX_ERROR_UNRECOGNIZED_CHARACTER, "G_REGEX_ERROR_UNRECOGNIZED_CHARACTER", "unrecognized-character" }, + { G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS, "G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS", "posix-named-class-outside-class" }, + { G_REGEX_ERROR_UNMATCHED_PARENTHESIS, "G_REGEX_ERROR_UNMATCHED_PARENTHESIS", "unmatched-parenthesis" }, + { G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE, "G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE", "inexistent-subpattern-reference" }, + { G_REGEX_ERROR_UNTERMINATED_COMMENT, "G_REGEX_ERROR_UNTERMINATED_COMMENT", "unterminated-comment" }, + { G_REGEX_ERROR_EXPRESSION_TOO_LARGE, "G_REGEX_ERROR_EXPRESSION_TOO_LARGE", "expression-too-large" }, + { G_REGEX_ERROR_MEMORY_ERROR, "G_REGEX_ERROR_MEMORY_ERROR", "memory-error" }, + { G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND, "G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND", "variable-length-lookbehind" }, + { G_REGEX_ERROR_MALFORMED_CONDITION, "G_REGEX_ERROR_MALFORMED_CONDITION", "malformed-condition" }, + { G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES, "G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES", "too-many-conditional-branches" }, + { G_REGEX_ERROR_ASSERTION_EXPECTED, "G_REGEX_ERROR_ASSERTION_EXPECTED", "assertion-expected" }, + { G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME, "G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME", "unknown-posix-class-name" }, + { G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED, "G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED", "posix-collating-elements-not-supported" }, + { G_REGEX_ERROR_HEX_CODE_TOO_LARGE, "G_REGEX_ERROR_HEX_CODE_TOO_LARGE", "hex-code-too-large" }, + { G_REGEX_ERROR_INVALID_CONDITION, "G_REGEX_ERROR_INVALID_CONDITION", "invalid-condition" }, + { G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND, "G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND", "single-byte-match-in-lookbehind" }, + { G_REGEX_ERROR_INFINITE_LOOP, "G_REGEX_ERROR_INFINITE_LOOP", "infinite-loop" }, + { G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR, "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR", "missing-subpattern-name-terminator" }, + { G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME, "G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME", "duplicate-subpattern-name" }, + { G_REGEX_ERROR_MALFORMED_PROPERTY, "G_REGEX_ERROR_MALFORMED_PROPERTY", "malformed-property" }, + { G_REGEX_ERROR_UNKNOWN_PROPERTY, "G_REGEX_ERROR_UNKNOWN_PROPERTY", "unknown-property" }, + { G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG, "G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG", "subpattern-name-too-long" }, + { G_REGEX_ERROR_TOO_MANY_SUBPATTERNS, "G_REGEX_ERROR_TOO_MANY_SUBPATTERNS", "too-many-subpatterns" }, + { G_REGEX_ERROR_INVALID_OCTAL_VALUE, "G_REGEX_ERROR_INVALID_OCTAL_VALUE", "invalid-octal-value" }, + { G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE, "G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE", "too-many-branches-in-define" }, + { G_REGEX_ERROR_DEFINE_REPETION, "G_REGEX_ERROR_DEFINE_REPETION", "define-repetion" }, + { G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS, "G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS", "inconsistent-newline-options" }, + { G_REGEX_ERROR_MISSING_BACK_REFERENCE, "G_REGEX_ERROR_MISSING_BACK_REFERENCE", "missing-back-reference" }, + { G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE, "G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE", "invalid-relative-reference" }, + { G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN, "G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN", "backtracking-control-verb-argument-forbidden" }, + { G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB, "G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB", "unknown-backtracking-control-verb" }, + { G_REGEX_ERROR_NUMBER_TOO_BIG, "G_REGEX_ERROR_NUMBER_TOO_BIG", "number-too-big" }, + { G_REGEX_ERROR_MISSING_SUBPATTERN_NAME, "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME", "missing-subpattern-name" }, + { G_REGEX_ERROR_MISSING_DIGIT, "G_REGEX_ERROR_MISSING_DIGIT", "missing-digit" }, + { G_REGEX_ERROR_INVALID_DATA_CHARACTER, "G_REGEX_ERROR_INVALID_DATA_CHARACTER", "invalid-data-character" }, + { G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME, "G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME", "extra-subpattern-name" }, + { G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED, "G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED", "backtracking-control-verb-argument-required" }, + { G_REGEX_ERROR_INVALID_CONTROL_CHAR, "G_REGEX_ERROR_INVALID_CONTROL_CHAR", "invalid-control-char" }, + { G_REGEX_ERROR_MISSING_NAME, "G_REGEX_ERROR_MISSING_NAME", "missing-name" }, + { G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS, "G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS", "not-supported-in-class" }, + { G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES, "G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES", "too-many-forward-references" }, + { G_REGEX_ERROR_NAME_TOO_LONG, "G_REGEX_ERROR_NAME_TOO_LONG", "name-too-long" }, + { G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE, "G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE", "character-value-too-large" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GBookmarkFileError", values); + etype = g_enum_register_static ("GRegexError", values); } return etype; } - -/* enumerations from "/usr/include/glib-2.0/glib/goption.h" */ GType -g_option_flags_get_type (void) +g_regex_compile_flags_get_type (void) { static GType etype = 0; if (etype == 0) { static const GFlagsValue values[] = { - { G_OPTION_FLAG_NONE, "G_OPTION_FLAG_NONE", "none" }, - { G_OPTION_FLAG_HIDDEN, "G_OPTION_FLAG_HIDDEN", "hidden" }, - { G_OPTION_FLAG_IN_MAIN, "G_OPTION_FLAG_IN_MAIN", "in-main" }, - { G_OPTION_FLAG_REVERSE, "G_OPTION_FLAG_REVERSE", "reverse" }, - { G_OPTION_FLAG_NO_ARG, "G_OPTION_FLAG_NO_ARG", "no-arg" }, - { G_OPTION_FLAG_FILENAME, "G_OPTION_FLAG_FILENAME", "filename" }, - { G_OPTION_FLAG_OPTIONAL_ARG, "G_OPTION_FLAG_OPTIONAL_ARG", "optional-arg" }, - { G_OPTION_FLAG_NOALIAS, "G_OPTION_FLAG_NOALIAS", "noalias" }, + { G_REGEX_CASELESS, "G_REGEX_CASELESS", "caseless" }, + { G_REGEX_MULTILINE, "G_REGEX_MULTILINE", "multiline" }, + { G_REGEX_DOTALL, "G_REGEX_DOTALL", "dotall" }, + { G_REGEX_EXTENDED, "G_REGEX_EXTENDED", "extended" }, + { G_REGEX_ANCHORED, "G_REGEX_ANCHORED", "anchored" }, + { G_REGEX_DOLLAR_ENDONLY, "G_REGEX_DOLLAR_ENDONLY", "dollar-endonly" }, + { G_REGEX_UNGREEDY, "G_REGEX_UNGREEDY", "ungreedy" }, + { G_REGEX_RAW, "G_REGEX_RAW", "raw" }, + { G_REGEX_NO_AUTO_CAPTURE, "G_REGEX_NO_AUTO_CAPTURE", "no-auto-capture" }, + { G_REGEX_OPTIMIZE, "G_REGEX_OPTIMIZE", "optimize" }, + { G_REGEX_FIRSTLINE, "G_REGEX_FIRSTLINE", "firstline" }, + { G_REGEX_DUPNAMES, "G_REGEX_DUPNAMES", "dupnames" }, + { G_REGEX_NEWLINE_CR, "G_REGEX_NEWLINE_CR", "newline-cr" }, + { G_REGEX_NEWLINE_LF, "G_REGEX_NEWLINE_LF", "newline-lf" }, + { G_REGEX_NEWLINE_CRLF, "G_REGEX_NEWLINE_CRLF", "newline-crlf" }, + { G_REGEX_NEWLINE_ANYCRLF, "G_REGEX_NEWLINE_ANYCRLF", "newline-anycrlf" }, + { G_REGEX_BSR_ANYCRLF, "G_REGEX_BSR_ANYCRLF", "bsr-anycrlf" }, + { G_REGEX_JAVASCRIPT_COMPAT, "G_REGEX_JAVASCRIPT_COMPAT", "javascript-compat" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GOptionFlags", values); + etype = g_flags_register_static ("GRegexCompileFlags", values); } return etype; } GType -g_option_arg_get_type (void) +g_regex_match_flags_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { G_OPTION_ARG_NONE, "G_OPTION_ARG_NONE", "none" }, - { G_OPTION_ARG_STRING, "G_OPTION_ARG_STRING", "string" }, - { G_OPTION_ARG_INT, "G_OPTION_ARG_INT", "int" }, - { G_OPTION_ARG_CALLBACK, "G_OPTION_ARG_CALLBACK", "callback" }, - { G_OPTION_ARG_FILENAME, "G_OPTION_ARG_FILENAME", "filename" }, - { G_OPTION_ARG_STRING_ARRAY, "G_OPTION_ARG_STRING_ARRAY", "string-array" }, - { G_OPTION_ARG_FILENAME_ARRAY, "G_OPTION_ARG_FILENAME_ARRAY", "filename-array" }, - { G_OPTION_ARG_DOUBLE, "G_OPTION_ARG_DOUBLE", "double" }, - { G_OPTION_ARG_INT64, "G_OPTION_ARG_INT64", "int64" }, + static const GFlagsValue values[] = { + { G_REGEX_MATCH_ANCHORED, "G_REGEX_MATCH_ANCHORED", "anchored" }, + { G_REGEX_MATCH_NOTBOL, "G_REGEX_MATCH_NOTBOL", "notbol" }, + { G_REGEX_MATCH_NOTEOL, "G_REGEX_MATCH_NOTEOL", "noteol" }, + { G_REGEX_MATCH_NOTEMPTY, "G_REGEX_MATCH_NOTEMPTY", "notempty" }, + { G_REGEX_MATCH_PARTIAL, "G_REGEX_MATCH_PARTIAL", "partial" }, + { G_REGEX_MATCH_NEWLINE_CR, "G_REGEX_MATCH_NEWLINE_CR", "newline-cr" }, + { G_REGEX_MATCH_NEWLINE_LF, "G_REGEX_MATCH_NEWLINE_LF", "newline-lf" }, + { G_REGEX_MATCH_NEWLINE_CRLF, "G_REGEX_MATCH_NEWLINE_CRLF", "newline-crlf" }, + { G_REGEX_MATCH_NEWLINE_ANY, "G_REGEX_MATCH_NEWLINE_ANY", "newline-any" }, + { G_REGEX_MATCH_NEWLINE_ANYCRLF, "G_REGEX_MATCH_NEWLINE_ANYCRLF", "newline-anycrlf" }, + { G_REGEX_MATCH_BSR_ANYCRLF, "G_REGEX_MATCH_BSR_ANYCRLF", "bsr-anycrlf" }, + { G_REGEX_MATCH_BSR_ANY, "G_REGEX_MATCH_BSR_ANY", "bsr-any" }, + { G_REGEX_MATCH_PARTIAL_SOFT, "G_REGEX_MATCH_PARTIAL_SOFT", "partial-soft" }, + { G_REGEX_MATCH_PARTIAL_HARD, "G_REGEX_MATCH_PARTIAL_HARD", "partial-hard" }, + { G_REGEX_MATCH_NOTEMPTY_ATSTART, "G_REGEX_MATCH_NOTEMPTY_ATSTART", "notempty-atstart" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GOptionArg", values); + etype = g_flags_register_static ("GRegexMatchFlags", values); } return etype; } + +/* enumerations from "/usr/include/glib-2.0/glib/ghook.h" */ GType -g_option_error_get_type (void) +g_hook_flag_mask_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { G_OPTION_ERROR_UNKNOWN_OPTION, "G_OPTION_ERROR_UNKNOWN_OPTION", "unknown-option" }, - { G_OPTION_ERROR_BAD_VALUE, "G_OPTION_ERROR_BAD_VALUE", "bad-value" }, - { G_OPTION_ERROR_FAILED, "G_OPTION_ERROR_FAILED", "failed" }, + static const GFlagsValue values[] = { + { G_HOOK_FLAG_ACTIVE, "G_HOOK_FLAG_ACTIVE", "active" }, + { G_HOOK_FLAG_IN_CALL, "G_HOOK_FLAG_IN_CALL", "in-call" }, + { G_HOOK_FLAG_MASK, "G_HOOK_FLAG_MASK", "mask" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GOptionError", values); + etype = g_flags_register_static ("GHookFlagMask", values); } return etype; } @@ -263,151 +291,259 @@ } -/* enumerations from "/usr/include/glib-2.0/glib/gchecksum.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gslice.h" */ GType -g_checksum_type_get_type (void) +g_slice_config_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_CHECKSUM_MD5, "G_CHECKSUM_MD5", "md5" }, - { G_CHECKSUM_SHA1, "G_CHECKSUM_SHA1", "sha1" }, - { G_CHECKSUM_SHA256, "G_CHECKSUM_SHA256", "sha256" }, - { G_CHECKSUM_SHA512, "G_CHECKSUM_SHA512", "sha512" }, + { G_SLICE_CONFIG_ALWAYS_MALLOC, "G_SLICE_CONFIG_ALWAYS_MALLOC", "always-malloc" }, + { G_SLICE_CONFIG_BYPASS_MAGAZINES, "G_SLICE_CONFIG_BYPASS_MAGAZINES", "bypass-magazines" }, + { G_SLICE_CONFIG_WORKING_SET_MSECS, "G_SLICE_CONFIG_WORKING_SET_MSECS", "working-set-msecs" }, + { G_SLICE_CONFIG_COLOR_INCREMENT, "G_SLICE_CONFIG_COLOR_INCREMENT", "color-increment" }, + { G_SLICE_CONFIG_CHUNK_SIZES, "G_SLICE_CONFIG_CHUNK_SIZES", "chunk-sizes" }, + { G_SLICE_CONFIG_CONTENTION_COUNTER, "G_SLICE_CONFIG_CONTENTION_COUNTER", "contention-counter" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static ("GSliceConfig", values); + } + return etype; +} + + +/* enumerations from "/usr/include/glib-2.0/glib/gtimezone.h" */ +GType +g_time_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + { G_TIME_TYPE_STANDARD, "G_TIME_TYPE_STANDARD", "standard" }, + { G_TIME_TYPE_DAYLIGHT, "G_TIME_TYPE_DAYLIGHT", "daylight" }, + { G_TIME_TYPE_UNIVERSAL, "G_TIME_TYPE_UNIVERSAL", "universal" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static ("GTimeType", values); + } + return etype; +} + + +/* enumerations from "/usr/include/glib-2.0/glib/gnode.h" */ +GType +g_traverse_flags_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GFlagsValue values[] = { + { G_TRAVERSE_LEAVES, "G_TRAVERSE_LEAVES", "leaves" }, + { G_TRAVERSE_NON_LEAVES, "G_TRAVERSE_NON_LEAVES", "non-leaves" }, + { G_TRAVERSE_ALL, "G_TRAVERSE_ALL", "all" }, + { G_TRAVERSE_MASK, "G_TRAVERSE_MASK", "mask" }, + { G_TRAVERSE_LEAFS, "G_TRAVERSE_LEAFS", "leafs" }, + { G_TRAVERSE_NON_LEAFS, "G_TRAVERSE_NON_LEAFS", "non-leafs" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GChecksumType", values); + etype = g_flags_register_static ("GTraverseFlags", values); } return etype; } - -/* enumerations from "/usr/include/glib-2.0/glib/ghook.h" */ GType -g_hook_flag_mask_get_type (void) +g_traverse_type_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GFlagsValue values[] = { - { G_HOOK_FLAG_ACTIVE, "G_HOOK_FLAG_ACTIVE", "active" }, - { G_HOOK_FLAG_IN_CALL, "G_HOOK_FLAG_IN_CALL", "in-call" }, - { G_HOOK_FLAG_MASK, "G_HOOK_FLAG_MASK", "mask" }, + static const GEnumValue values[] = { + { G_IN_ORDER, "G_IN_ORDER", "in-order" }, + { G_PRE_ORDER, "G_PRE_ORDER", "pre-order" }, + { G_POST_ORDER, "G_POST_ORDER", "post-order" }, + { G_LEVEL_ORDER, "G_LEVEL_ORDER", "level-order" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GHookFlagMask", values); + etype = g_enum_register_static ("GTraverseType", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gtestutils.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gspawn.h" */ GType -g_test_trap_flags_get_type (void) +g_spawn_error_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GFlagsValue values[] = { - { G_TEST_TRAP_SILENCE_STDOUT, "G_TEST_TRAP_SILENCE_STDOUT", "silence-stdout" }, - { G_TEST_TRAP_SILENCE_STDERR, "G_TEST_TRAP_SILENCE_STDERR", "silence-stderr" }, - { G_TEST_TRAP_INHERIT_STDIN, "G_TEST_TRAP_INHERIT_STDIN", "inherit-stdin" }, + static const GEnumValue values[] = { + { G_SPAWN_ERROR_FORK, "G_SPAWN_ERROR_FORK", "fork" }, + { G_SPAWN_ERROR_READ, "G_SPAWN_ERROR_READ", "read" }, + { G_SPAWN_ERROR_CHDIR, "G_SPAWN_ERROR_CHDIR", "chdir" }, + { G_SPAWN_ERROR_ACCES, "G_SPAWN_ERROR_ACCES", "acces" }, + { G_SPAWN_ERROR_PERM, "G_SPAWN_ERROR_PERM", "perm" }, + { G_SPAWN_ERROR_TOO_BIG, "G_SPAWN_ERROR_TOO_BIG", "too-big" }, + { G_SPAWN_ERROR_2BIG, "G_SPAWN_ERROR_2BIG", "2big" }, + { G_SPAWN_ERROR_NOEXEC, "G_SPAWN_ERROR_NOEXEC", "noexec" }, + { G_SPAWN_ERROR_NAMETOOLONG, "G_SPAWN_ERROR_NAMETOOLONG", "nametoolong" }, + { G_SPAWN_ERROR_NOENT, "G_SPAWN_ERROR_NOENT", "noent" }, + { G_SPAWN_ERROR_NOMEM, "G_SPAWN_ERROR_NOMEM", "nomem" }, + { G_SPAWN_ERROR_NOTDIR, "G_SPAWN_ERROR_NOTDIR", "notdir" }, + { G_SPAWN_ERROR_LOOP, "G_SPAWN_ERROR_LOOP", "loop" }, + { G_SPAWN_ERROR_TXTBUSY, "G_SPAWN_ERROR_TXTBUSY", "txtbusy" }, + { G_SPAWN_ERROR_IO, "G_SPAWN_ERROR_IO", "io" }, + { G_SPAWN_ERROR_NFILE, "G_SPAWN_ERROR_NFILE", "nfile" }, + { G_SPAWN_ERROR_MFILE, "G_SPAWN_ERROR_MFILE", "mfile" }, + { G_SPAWN_ERROR_INVAL, "G_SPAWN_ERROR_INVAL", "inval" }, + { G_SPAWN_ERROR_ISDIR, "G_SPAWN_ERROR_ISDIR", "isdir" }, + { G_SPAWN_ERROR_LIBBAD, "G_SPAWN_ERROR_LIBBAD", "libbad" }, + { G_SPAWN_ERROR_FAILED, "G_SPAWN_ERROR_FAILED", "failed" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GTestTrapFlags", values); + etype = g_enum_register_static ("GSpawnError", values); } return etype; } GType -g_test_subprocess_flags_get_type (void) +g_spawn_flags_get_type (void) { static GType etype = 0; if (etype == 0) { static const GFlagsValue values[] = { - { G_TEST_SUBPROCESS_INHERIT_STDIN, "G_TEST_SUBPROCESS_INHERIT_STDIN", "in" }, - { G_TEST_SUBPROCESS_INHERIT_STDOUT, "G_TEST_SUBPROCESS_INHERIT_STDOUT", "out" }, - { G_TEST_SUBPROCESS_INHERIT_STDERR, "G_TEST_SUBPROCESS_INHERIT_STDERR", "err" }, + { G_SPAWN_DEFAULT, "G_SPAWN_DEFAULT", "default" }, + { G_SPAWN_LEAVE_DESCRIPTORS_OPEN, "G_SPAWN_LEAVE_DESCRIPTORS_OPEN", "leave-descriptors-open" }, + { G_SPAWN_DO_NOT_REAP_CHILD, "G_SPAWN_DO_NOT_REAP_CHILD", "do-not-reap-child" }, + { G_SPAWN_SEARCH_PATH, "G_SPAWN_SEARCH_PATH", "search-path" }, + { G_SPAWN_STDOUT_TO_DEV_NULL, "G_SPAWN_STDOUT_TO_DEV_NULL", "stdout-to-dev-null" }, + { G_SPAWN_STDERR_TO_DEV_NULL, "G_SPAWN_STDERR_TO_DEV_NULL", "stderr-to-dev-null" }, + { G_SPAWN_CHILD_INHERITS_STDIN, "G_SPAWN_CHILD_INHERITS_STDIN", "child-inherits-stdin" }, + { G_SPAWN_FILE_AND_ARGV_ZERO, "G_SPAWN_FILE_AND_ARGV_ZERO", "file-and-argv-zero" }, + { G_SPAWN_SEARCH_PATH_FROM_ENVP, "G_SPAWN_SEARCH_PATH_FROM_ENVP", "search-path-from-envp" }, + { G_SPAWN_CLOEXEC_PIPES, "G_SPAWN_CLOEXEC_PIPES", "cloexec-pipes" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GTestSubprocessFlags", values); + etype = g_flags_register_static ("GSpawnFlags", values); } return etype; } + +/* enumerations from "/usr/include/glib-2.0/glib/gvariant.h" */ GType -g_test_log_type_get_type (void) +g_variant_class_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_TEST_LOG_NONE, "G_TEST_LOG_NONE", "none" }, - { G_TEST_LOG_ERROR, "G_TEST_LOG_ERROR", "error" }, - { G_TEST_LOG_START_BINARY, "G_TEST_LOG_START_BINARY", "start-binary" }, - { G_TEST_LOG_LIST_CASE, "G_TEST_LOG_LIST_CASE", "list-case" }, - { G_TEST_LOG_SKIP_CASE, "G_TEST_LOG_SKIP_CASE", "skip-case" }, - { G_TEST_LOG_START_CASE, "G_TEST_LOG_START_CASE", "start-case" }, - { G_TEST_LOG_STOP_CASE, "G_TEST_LOG_STOP_CASE", "stop-case" }, - { G_TEST_LOG_MIN_RESULT, "G_TEST_LOG_MIN_RESULT", "min-result" }, - { G_TEST_LOG_MAX_RESULT, "G_TEST_LOG_MAX_RESULT", "max-result" }, - { G_TEST_LOG_MESSAGE, "G_TEST_LOG_MESSAGE", "message" }, - { G_TEST_LOG_START_SUITE, "G_TEST_LOG_START_SUITE", "start-suite" }, - { G_TEST_LOG_STOP_SUITE, "G_TEST_LOG_STOP_SUITE", "stop-suite" }, + { G_VARIANT_CLASS_BOOLEAN, "G_VARIANT_CLASS_BOOLEAN", "boolean" }, + { G_VARIANT_CLASS_BYTE, "G_VARIANT_CLASS_BYTE", "byte" }, + { G_VARIANT_CLASS_INT16, "G_VARIANT_CLASS_INT16", "int16" }, + { G_VARIANT_CLASS_UINT16, "G_VARIANT_CLASS_UINT16", "uint16" }, + { G_VARIANT_CLASS_INT32, "G_VARIANT_CLASS_INT32", "int32" }, + { G_VARIANT_CLASS_UINT32, "G_VARIANT_CLASS_UINT32", "uint32" }, + { G_VARIANT_CLASS_INT64, "G_VARIANT_CLASS_INT64", "int64" }, + { G_VARIANT_CLASS_UINT64, "G_VARIANT_CLASS_UINT64", "uint64" }, + { G_VARIANT_CLASS_HANDLE, "G_VARIANT_CLASS_HANDLE", "handle" }, + { G_VARIANT_CLASS_DOUBLE, "G_VARIANT_CLASS_DOUBLE", "double" }, + { G_VARIANT_CLASS_STRING, "G_VARIANT_CLASS_STRING", "string" }, + { G_VARIANT_CLASS_OBJECT_PATH, "G_VARIANT_CLASS_OBJECT_PATH", "object-path" }, + { G_VARIANT_CLASS_SIGNATURE, "G_VARIANT_CLASS_SIGNATURE", "signature" }, + { G_VARIANT_CLASS_VARIANT, "G_VARIANT_CLASS_VARIANT", "variant" }, + { G_VARIANT_CLASS_MAYBE, "G_VARIANT_CLASS_MAYBE", "maybe" }, + { G_VARIANT_CLASS_ARRAY, "G_VARIANT_CLASS_ARRAY", "array" }, + { G_VARIANT_CLASS_TUPLE, "G_VARIANT_CLASS_TUPLE", "tuple" }, + { G_VARIANT_CLASS_DICT_ENTRY, "G_VARIANT_CLASS_DICT_ENTRY", "dict-entry" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GTestLogType", values); + etype = g_enum_register_static ("GVariantClass", values); } return etype; } GType -g_test_file_type_get_type (void) +g_variant_parse_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_TEST_DIST, "G_TEST_DIST", "dist" }, - { G_TEST_BUILT, "G_TEST_BUILT", "built" }, + { G_VARIANT_PARSE_ERROR_FAILED, "G_VARIANT_PARSE_ERROR_FAILED", "failed" }, + { G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED, "G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED", "basic-type-expected" }, + { G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE, "G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE", "cannot-infer-type" }, + { G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED, "G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED", "definite-type-expected" }, + { G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END, "G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END", "input-not-at-end" }, + { G_VARIANT_PARSE_ERROR_INVALID_CHARACTER, "G_VARIANT_PARSE_ERROR_INVALID_CHARACTER", "invalid-character" }, + { G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING, "G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING", "invalid-format-string" }, + { G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH, "G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH", "invalid-object-path" }, + { G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE, "G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE", "invalid-signature" }, + { G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING, "G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING", "invalid-type-string" }, + { G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE, "G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE", "no-common-type" }, + { G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE, "G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE", "number-out-of-range" }, + { G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG, "G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG", "number-too-big" }, + { G_VARIANT_PARSE_ERROR_TYPE_ERROR, "G_VARIANT_PARSE_ERROR_TYPE_ERROR", "type-error" }, + { G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN, "G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN", "unexpected-token" }, + { G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD, "G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD", "unknown-keyword" }, + { G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT, "G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT", "unterminated-string-constant" }, + { G_VARIANT_PARSE_ERROR_VALUE_EXPECTED, "G_VARIANT_PARSE_ERROR_VALUE_EXPECTED", "value-expected" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GTestFileType", values); + etype = g_enum_register_static ("GVariantParseError", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gtimezone.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gfileutils.h" */ GType -g_time_type_get_type (void) +g_file_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_TIME_TYPE_STANDARD, "G_TIME_TYPE_STANDARD", "standard" }, - { G_TIME_TYPE_DAYLIGHT, "G_TIME_TYPE_DAYLIGHT", "daylight" }, - { G_TIME_TYPE_UNIVERSAL, "G_TIME_TYPE_UNIVERSAL", "universal" }, + { G_FILE_ERROR_EXIST, "G_FILE_ERROR_EXIST", "exist" }, + { G_FILE_ERROR_ISDIR, "G_FILE_ERROR_ISDIR", "isdir" }, + { G_FILE_ERROR_ACCES, "G_FILE_ERROR_ACCES", "acces" }, + { G_FILE_ERROR_NAMETOOLONG, "G_FILE_ERROR_NAMETOOLONG", "nametoolong" }, + { G_FILE_ERROR_NOENT, "G_FILE_ERROR_NOENT", "noent" }, + { G_FILE_ERROR_NOTDIR, "G_FILE_ERROR_NOTDIR", "notdir" }, + { G_FILE_ERROR_NXIO, "G_FILE_ERROR_NXIO", "nxio" }, + { G_FILE_ERROR_NODEV, "G_FILE_ERROR_NODEV", "nodev" }, + { G_FILE_ERROR_ROFS, "G_FILE_ERROR_ROFS", "rofs" }, + { G_FILE_ERROR_TXTBSY, "G_FILE_ERROR_TXTBSY", "txtbsy" }, + { G_FILE_ERROR_FAULT, "G_FILE_ERROR_FAULT", "fault" }, + { G_FILE_ERROR_LOOP, "G_FILE_ERROR_LOOP", "loop" }, + { G_FILE_ERROR_NOSPC, "G_FILE_ERROR_NOSPC", "nospc" }, + { G_FILE_ERROR_NOMEM, "G_FILE_ERROR_NOMEM", "nomem" }, + { G_FILE_ERROR_MFILE, "G_FILE_ERROR_MFILE", "mfile" }, + { G_FILE_ERROR_NFILE, "G_FILE_ERROR_NFILE", "nfile" }, + { G_FILE_ERROR_BADF, "G_FILE_ERROR_BADF", "badf" }, + { G_FILE_ERROR_INVAL, "G_FILE_ERROR_INVAL", "inval" }, + { G_FILE_ERROR_PIPE, "G_FILE_ERROR_PIPE", "pipe" }, + { G_FILE_ERROR_AGAIN, "G_FILE_ERROR_AGAIN", "again" }, + { G_FILE_ERROR_INTR, "G_FILE_ERROR_INTR", "intr" }, + { G_FILE_ERROR_IO, "G_FILE_ERROR_IO", "io" }, + { G_FILE_ERROR_PERM, "G_FILE_ERROR_PERM", "perm" }, + { G_FILE_ERROR_NOSYS, "G_FILE_ERROR_NOSYS", "nosys" }, + { G_FILE_ERROR_FAILED, "G_FILE_ERROR_FAILED", "failed" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GTimeType", values); + etype = g_enum_register_static ("GFileError", values); } return etype; } - -/* enumerations from "/usr/include/glib-2.0/glib/gslice.h" */ GType -g_slice_config_get_type (void) +g_file_test_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { G_SLICE_CONFIG_ALWAYS_MALLOC, "G_SLICE_CONFIG_ALWAYS_MALLOC", "always-malloc" }, - { G_SLICE_CONFIG_BYPASS_MAGAZINES, "G_SLICE_CONFIG_BYPASS_MAGAZINES", "bypass-magazines" }, - { G_SLICE_CONFIG_WORKING_SET_MSECS, "G_SLICE_CONFIG_WORKING_SET_MSECS", "working-set-msecs" }, - { G_SLICE_CONFIG_COLOR_INCREMENT, "G_SLICE_CONFIG_COLOR_INCREMENT", "color-increment" }, - { G_SLICE_CONFIG_CHUNK_SIZES, "G_SLICE_CONFIG_CHUNK_SIZES", "chunk-sizes" }, - { G_SLICE_CONFIG_CONTENTION_COUNTER, "G_SLICE_CONFIG_CONTENTION_COUNTER", "contention-counter" }, + static const GFlagsValue values[] = { + { G_FILE_TEST_IS_REGULAR, "G_FILE_TEST_IS_REGULAR", "is-regular" }, + { G_FILE_TEST_IS_SYMLINK, "G_FILE_TEST_IS_SYMLINK", "is-symlink" }, + { G_FILE_TEST_IS_DIR, "G_FILE_TEST_IS_DIR", "is-dir" }, + { G_FILE_TEST_IS_EXECUTABLE, "G_FILE_TEST_IS_EXECUTABLE", "is-executable" }, + { G_FILE_TEST_EXISTS, "G_FILE_TEST_EXISTS", "exists" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GSliceConfig", values); + etype = g_flags_register_static ("GFileTest", values); } return etype; } @@ -536,39 +672,27 @@ } -/* enumerations from "/usr/include/glib-2.0/glib/gnode.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gstrfuncs.h" */ GType -g_traverse_flags_get_type (void) +g_ascii_type_get_type (void) { static GType etype = 0; if (etype == 0) { static const GFlagsValue values[] = { - { G_TRAVERSE_LEAVES, "G_TRAVERSE_LEAVES", "leaves" }, - { G_TRAVERSE_NON_LEAVES, "G_TRAVERSE_NON_LEAVES", "non-leaves" }, - { G_TRAVERSE_ALL, "G_TRAVERSE_ALL", "all" }, - { G_TRAVERSE_MASK, "G_TRAVERSE_MASK", "mask" }, - { G_TRAVERSE_LEAFS, "G_TRAVERSE_LEAFS", "leafs" }, - { G_TRAVERSE_NON_LEAFS, "G_TRAVERSE_NON_LEAFS", "non-leafs" }, - { 0, NULL, NULL } - }; - etype = g_flags_register_static ("GTraverseFlags", values); - } - return etype; -} - -GType -g_traverse_type_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { G_IN_ORDER, "G_IN_ORDER", "in-order" }, - { G_PRE_ORDER, "G_PRE_ORDER", "pre-order" }, - { G_POST_ORDER, "G_POST_ORDER", "post-order" }, - { G_LEVEL_ORDER, "G_LEVEL_ORDER", "level-order" }, + { G_ASCII_ALNUM, "G_ASCII_ALNUM", "alnum" }, + { G_ASCII_ALPHA, "G_ASCII_ALPHA", "alpha" }, + { G_ASCII_CNTRL, "G_ASCII_CNTRL", "cntrl" }, + { G_ASCII_DIGIT, "G_ASCII_DIGIT", "digit" }, + { G_ASCII_GRAPH, "G_ASCII_GRAPH", "graph" }, + { G_ASCII_LOWER, "G_ASCII_LOWER", "lower" }, + { G_ASCII_PRINT, "G_ASCII_PRINT", "print" }, + { G_ASCII_PUNCT, "G_ASCII_PUNCT", "punct" }, + { G_ASCII_SPACE, "G_ASCII_SPACE", "space" }, + { G_ASCII_UPPER, "G_ASCII_UPPER", "upper" }, + { G_ASCII_XDIGIT, "G_ASCII_XDIGIT", "xdigit" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GTraverseType", values); + etype = g_flags_register_static ("GAsciiType", values); } return etype; } @@ -839,41 +963,43 @@ } -/* enumerations from "/usr/include/glib-2.0/glib/gshell.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gchecksum.h" */ GType -g_shell_error_get_type (void) +g_checksum_type_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_SHELL_ERROR_BAD_QUOTING, "G_SHELL_ERROR_BAD_QUOTING", "bad-quoting" }, - { G_SHELL_ERROR_EMPTY_STRING, "G_SHELL_ERROR_EMPTY_STRING", "empty-string" }, - { G_SHELL_ERROR_FAILED, "G_SHELL_ERROR_FAILED", "failed" }, + { G_CHECKSUM_MD5, "G_CHECKSUM_MD5", "md5" }, + { G_CHECKSUM_SHA1, "G_CHECKSUM_SHA1", "sha1" }, + { G_CHECKSUM_SHA256, "G_CHECKSUM_SHA256", "sha256" }, + { G_CHECKSUM_SHA512, "G_CHECKSUM_SHA512", "sha512" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GShellError", values); + etype = g_enum_register_static ("GChecksumType", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gconvert.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gbookmarkfile.h" */ GType -g_convert_error_get_type (void) +g_bookmark_file_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_CONVERT_ERROR_NO_CONVERSION, "G_CONVERT_ERROR_NO_CONVERSION", "no-conversion" }, - { G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "G_CONVERT_ERROR_ILLEGAL_SEQUENCE", "illegal-sequence" }, - { G_CONVERT_ERROR_FAILED, "G_CONVERT_ERROR_FAILED", "failed" }, - { G_CONVERT_ERROR_PARTIAL_INPUT, "G_CONVERT_ERROR_PARTIAL_INPUT", "partial-input" }, - { G_CONVERT_ERROR_BAD_URI, "G_CONVERT_ERROR_BAD_URI", "bad-uri" }, - { G_CONVERT_ERROR_NOT_ABSOLUTE_PATH, "G_CONVERT_ERROR_NOT_ABSOLUTE_PATH", "not-absolute-path" }, - { G_CONVERT_ERROR_NO_MEMORY, "G_CONVERT_ERROR_NO_MEMORY", "no-memory" }, + { G_BOOKMARK_FILE_ERROR_INVALID_URI, "G_BOOKMARK_FILE_ERROR_INVALID_URI", "invalid-uri" }, + { G_BOOKMARK_FILE_ERROR_INVALID_VALUE, "G_BOOKMARK_FILE_ERROR_INVALID_VALUE", "invalid-value" }, + { G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED, "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED", "app-not-registered" }, + { G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND, "G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND", "uri-not-found" }, + { G_BOOKMARK_FILE_ERROR_READ, "G_BOOKMARK_FILE_ERROR_READ", "read" }, + { G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING, "G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING", "unknown-encoding" }, + { G_BOOKMARK_FILE_ERROR_WRITE, "G_BOOKMARK_FILE_ERROR_WRITE", "write" }, + { G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND, "G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND", "file-not-found" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GConvertError", values); + etype = g_enum_register_static ("GBookmarkFileError", values); } return etype; } @@ -903,275 +1029,149 @@ } -/* enumerations from "/usr/include/glib-2.0/glib/gfileutils.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gkeyfile.h" */ GType -g_file_error_get_type (void) +g_key_file_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_FILE_ERROR_EXIST, "G_FILE_ERROR_EXIST", "exist" }, - { G_FILE_ERROR_ISDIR, "G_FILE_ERROR_ISDIR", "isdir" }, - { G_FILE_ERROR_ACCES, "G_FILE_ERROR_ACCES", "acces" }, - { G_FILE_ERROR_NAMETOOLONG, "G_FILE_ERROR_NAMETOOLONG", "nametoolong" }, - { G_FILE_ERROR_NOENT, "G_FILE_ERROR_NOENT", "noent" }, - { G_FILE_ERROR_NOTDIR, "G_FILE_ERROR_NOTDIR", "notdir" }, - { G_FILE_ERROR_NXIO, "G_FILE_ERROR_NXIO", "nxio" }, - { G_FILE_ERROR_NODEV, "G_FILE_ERROR_NODEV", "nodev" }, - { G_FILE_ERROR_ROFS, "G_FILE_ERROR_ROFS", "rofs" }, - { G_FILE_ERROR_TXTBSY, "G_FILE_ERROR_TXTBSY", "txtbsy" }, - { G_FILE_ERROR_FAULT, "G_FILE_ERROR_FAULT", "fault" }, - { G_FILE_ERROR_LOOP, "G_FILE_ERROR_LOOP", "loop" }, - { G_FILE_ERROR_NOSPC, "G_FILE_ERROR_NOSPC", "nospc" }, - { G_FILE_ERROR_NOMEM, "G_FILE_ERROR_NOMEM", "nomem" }, - { G_FILE_ERROR_MFILE, "G_FILE_ERROR_MFILE", "mfile" }, - { G_FILE_ERROR_NFILE, "G_FILE_ERROR_NFILE", "nfile" }, - { G_FILE_ERROR_BADF, "G_FILE_ERROR_BADF", "badf" }, - { G_FILE_ERROR_INVAL, "G_FILE_ERROR_INVAL", "inval" }, - { G_FILE_ERROR_PIPE, "G_FILE_ERROR_PIPE", "pipe" }, - { G_FILE_ERROR_AGAIN, "G_FILE_ERROR_AGAIN", "again" }, - { G_FILE_ERROR_INTR, "G_FILE_ERROR_INTR", "intr" }, - { G_FILE_ERROR_IO, "G_FILE_ERROR_IO", "io" }, - { G_FILE_ERROR_PERM, "G_FILE_ERROR_PERM", "perm" }, - { G_FILE_ERROR_NOSYS, "G_FILE_ERROR_NOSYS", "nosys" }, - { G_FILE_ERROR_FAILED, "G_FILE_ERROR_FAILED", "failed" }, + { G_KEY_FILE_ERROR_UNKNOWN_ENCODING, "G_KEY_FILE_ERROR_UNKNOWN_ENCODING", "unknown-encoding" }, + { G_KEY_FILE_ERROR_PARSE, "G_KEY_FILE_ERROR_PARSE", "parse" }, + { G_KEY_FILE_ERROR_NOT_FOUND, "G_KEY_FILE_ERROR_NOT_FOUND", "not-found" }, + { G_KEY_FILE_ERROR_KEY_NOT_FOUND, "G_KEY_FILE_ERROR_KEY_NOT_FOUND", "key-not-found" }, + { G_KEY_FILE_ERROR_GROUP_NOT_FOUND, "G_KEY_FILE_ERROR_GROUP_NOT_FOUND", "group-not-found" }, + { G_KEY_FILE_ERROR_INVALID_VALUE, "G_KEY_FILE_ERROR_INVALID_VALUE", "invalid-value" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GFileError", values); + etype = g_enum_register_static ("GKeyFileError", values); } return etype; } GType -g_file_test_get_type (void) +g_key_file_flags_get_type (void) { static GType etype = 0; if (etype == 0) { static const GFlagsValue values[] = { - { G_FILE_TEST_IS_REGULAR, "G_FILE_TEST_IS_REGULAR", "is-regular" }, - { G_FILE_TEST_IS_SYMLINK, "G_FILE_TEST_IS_SYMLINK", "is-symlink" }, - { G_FILE_TEST_IS_DIR, "G_FILE_TEST_IS_DIR", "is-dir" }, - { G_FILE_TEST_IS_EXECUTABLE, "G_FILE_TEST_IS_EXECUTABLE", "is-executable" }, - { G_FILE_TEST_EXISTS, "G_FILE_TEST_EXISTS", "exists" }, + { G_KEY_FILE_NONE, "G_KEY_FILE_NONE", "none" }, + { G_KEY_FILE_KEEP_COMMENTS, "G_KEY_FILE_KEEP_COMMENTS", "keep-comments" }, + { G_KEY_FILE_KEEP_TRANSLATIONS, "G_KEY_FILE_KEEP_TRANSLATIONS", "keep-translations" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GFileTest", values); + etype = g_flags_register_static ("GKeyFileFlags", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gregex.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/gthread.h" */ GType -g_regex_error_get_type (void) +g_thread_error_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { G_REGEX_ERROR_COMPILE, "G_REGEX_ERROR_COMPILE", "compile" }, - { G_REGEX_ERROR_OPTIMIZE, "G_REGEX_ERROR_OPTIMIZE", "optimize" }, - { G_REGEX_ERROR_REPLACE, "G_REGEX_ERROR_REPLACE", "replace" }, - { G_REGEX_ERROR_MATCH, "G_REGEX_ERROR_MATCH", "match" }, - { G_REGEX_ERROR_INTERNAL, "G_REGEX_ERROR_INTERNAL", "internal" }, - { G_REGEX_ERROR_STRAY_BACKSLASH, "G_REGEX_ERROR_STRAY_BACKSLASH", "stray-backslash" }, - { G_REGEX_ERROR_MISSING_CONTROL_CHAR, "G_REGEX_ERROR_MISSING_CONTROL_CHAR", "missing-control-char" }, - { G_REGEX_ERROR_UNRECOGNIZED_ESCAPE, "G_REGEX_ERROR_UNRECOGNIZED_ESCAPE", "unrecognized-escape" }, - { G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER, "G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER", "quantifiers-out-of-order" }, - { G_REGEX_ERROR_QUANTIFIER_TOO_BIG, "G_REGEX_ERROR_QUANTIFIER_TOO_BIG", "quantifier-too-big" }, - { G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS, "G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS", "unterminated-character-class" }, - { G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS, "G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS", "invalid-escape-in-character-class" }, - { G_REGEX_ERROR_RANGE_OUT_OF_ORDER, "G_REGEX_ERROR_RANGE_OUT_OF_ORDER", "range-out-of-order" }, - { G_REGEX_ERROR_NOTHING_TO_REPEAT, "G_REGEX_ERROR_NOTHING_TO_REPEAT", "nothing-to-repeat" }, - { G_REGEX_ERROR_UNRECOGNIZED_CHARACTER, "G_REGEX_ERROR_UNRECOGNIZED_CHARACTER", "unrecognized-character" }, - { G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS, "G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS", "posix-named-class-outside-class" }, - { G_REGEX_ERROR_UNMATCHED_PARENTHESIS, "G_REGEX_ERROR_UNMATCHED_PARENTHESIS", "unmatched-parenthesis" }, - { G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE, "G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE", "inexistent-subpattern-reference" }, - { G_REGEX_ERROR_UNTERMINATED_COMMENT, "G_REGEX_ERROR_UNTERMINATED_COMMENT", "unterminated-comment" }, - { G_REGEX_ERROR_EXPRESSION_TOO_LARGE, "G_REGEX_ERROR_EXPRESSION_TOO_LARGE", "expression-too-large" }, - { G_REGEX_ERROR_MEMORY_ERROR, "G_REGEX_ERROR_MEMORY_ERROR", "memory-error" }, - { G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND, "G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND", "variable-length-lookbehind" }, - { G_REGEX_ERROR_MALFORMED_CONDITION, "G_REGEX_ERROR_MALFORMED_CONDITION", "malformed-condition" }, - { G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES, "G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES", "too-many-conditional-branches" }, - { G_REGEX_ERROR_ASSERTION_EXPECTED, "G_REGEX_ERROR_ASSERTION_EXPECTED", "assertion-expected" }, - { G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME, "G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME", "unknown-posix-class-name" }, - { G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED, "G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED", "posix-collating-elements-not-supported" }, - { G_REGEX_ERROR_HEX_CODE_TOO_LARGE, "G_REGEX_ERROR_HEX_CODE_TOO_LARGE", "hex-code-too-large" }, - { G_REGEX_ERROR_INVALID_CONDITION, "G_REGEX_ERROR_INVALID_CONDITION", "invalid-condition" }, - { G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND, "G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND", "single-byte-match-in-lookbehind" }, - { G_REGEX_ERROR_INFINITE_LOOP, "G_REGEX_ERROR_INFINITE_LOOP", "infinite-loop" }, - { G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR, "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR", "missing-subpattern-name-terminator" }, - { G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME, "G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME", "duplicate-subpattern-name" }, - { G_REGEX_ERROR_MALFORMED_PROPERTY, "G_REGEX_ERROR_MALFORMED_PROPERTY", "malformed-property" }, - { G_REGEX_ERROR_UNKNOWN_PROPERTY, "G_REGEX_ERROR_UNKNOWN_PROPERTY", "unknown-property" }, - { G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG, "G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG", "subpattern-name-too-long" }, - { G_REGEX_ERROR_TOO_MANY_SUBPATTERNS, "G_REGEX_ERROR_TOO_MANY_SUBPATTERNS", "too-many-subpatterns" }, - { G_REGEX_ERROR_INVALID_OCTAL_VALUE, "G_REGEX_ERROR_INVALID_OCTAL_VALUE", "invalid-octal-value" }, - { G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE, "G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE", "too-many-branches-in-define" }, - { G_REGEX_ERROR_DEFINE_REPETION, "G_REGEX_ERROR_DEFINE_REPETION", "define-repetion" }, - { G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS, "G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS", "inconsistent-newline-options" }, - { G_REGEX_ERROR_MISSING_BACK_REFERENCE, "G_REGEX_ERROR_MISSING_BACK_REFERENCE", "missing-back-reference" }, - { G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE, "G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE", "invalid-relative-reference" }, - { G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN, "G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN", "backtracking-control-verb-argument-forbidden" }, - { G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB, "G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB", "unknown-backtracking-control-verb" }, - { G_REGEX_ERROR_NUMBER_TOO_BIG, "G_REGEX_ERROR_NUMBER_TOO_BIG", "number-too-big" }, - { G_REGEX_ERROR_MISSING_SUBPATTERN_NAME, "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME", "missing-subpattern-name" }, - { G_REGEX_ERROR_MISSING_DIGIT, "G_REGEX_ERROR_MISSING_DIGIT", "missing-digit" }, - { G_REGEX_ERROR_INVALID_DATA_CHARACTER, "G_REGEX_ERROR_INVALID_DATA_CHARACTER", "invalid-data-character" }, - { G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME, "G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME", "extra-subpattern-name" }, - { G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED, "G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED", "backtracking-control-verb-argument-required" }, - { G_REGEX_ERROR_INVALID_CONTROL_CHAR, "G_REGEX_ERROR_INVALID_CONTROL_CHAR", "invalid-control-char" }, - { G_REGEX_ERROR_MISSING_NAME, "G_REGEX_ERROR_MISSING_NAME", "missing-name" }, - { G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS, "G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS", "not-supported-in-class" }, - { G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES, "G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES", "too-many-forward-references" }, - { G_REGEX_ERROR_NAME_TOO_LONG, "G_REGEX_ERROR_NAME_TOO_LONG", "name-too-long" }, - { G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE, "G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE", "character-value-too-large" }, + { G_THREAD_ERROR_AGAIN, "G_THREAD_ERROR_AGAIN", "again" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GRegexError", values); + etype = g_enum_register_static ("GThreadError", values); } return etype; } GType -g_regex_compile_flags_get_type (void) +g_once_status_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GFlagsValue values[] = { - { G_REGEX_CASELESS, "G_REGEX_CASELESS", "caseless" }, - { G_REGEX_MULTILINE, "G_REGEX_MULTILINE", "multiline" }, - { G_REGEX_DOTALL, "G_REGEX_DOTALL", "dotall" }, - { G_REGEX_EXTENDED, "G_REGEX_EXTENDED", "extended" }, - { G_REGEX_ANCHORED, "G_REGEX_ANCHORED", "anchored" }, - { G_REGEX_DOLLAR_ENDONLY, "G_REGEX_DOLLAR_ENDONLY", "dollar-endonly" }, - { G_REGEX_UNGREEDY, "G_REGEX_UNGREEDY", "ungreedy" }, - { G_REGEX_RAW, "G_REGEX_RAW", "raw" }, - { G_REGEX_NO_AUTO_CAPTURE, "G_REGEX_NO_AUTO_CAPTURE", "no-auto-capture" }, - { G_REGEX_OPTIMIZE, "G_REGEX_OPTIMIZE", "optimize" }, - { G_REGEX_FIRSTLINE, "G_REGEX_FIRSTLINE", "firstline" }, - { G_REGEX_DUPNAMES, "G_REGEX_DUPNAMES", "dupnames" }, - { G_REGEX_NEWLINE_CR, "G_REGEX_NEWLINE_CR", "newline-cr" }, - { G_REGEX_NEWLINE_LF, "G_REGEX_NEWLINE_LF", "newline-lf" }, - { G_REGEX_NEWLINE_CRLF, "G_REGEX_NEWLINE_CRLF", "newline-crlf" }, - { G_REGEX_NEWLINE_ANYCRLF, "G_REGEX_NEWLINE_ANYCRLF", "newline-anycrlf" }, - { G_REGEX_BSR_ANYCRLF, "G_REGEX_BSR_ANYCRLF", "bsr-anycrlf" }, - { G_REGEX_JAVASCRIPT_COMPAT, "G_REGEX_JAVASCRIPT_COMPAT", "javascript-compat" }, + static const GEnumValue values[] = { + { G_ONCE_STATUS_NOTCALLED, "G_ONCE_STATUS_NOTCALLED", "notcalled" }, + { G_ONCE_STATUS_PROGRESS, "G_ONCE_STATUS_PROGRESS", "progress" }, + { G_ONCE_STATUS_READY, "G_ONCE_STATUS_READY", "ready" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GRegexCompileFlags", values); + etype = g_enum_register_static ("GOnceStatus", values); } return etype; } + +/* enumerations from "/usr/include/glib-2.0/glib/gshell.h" */ GType -g_regex_match_flags_get_type (void) +g_shell_error_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GFlagsValue values[] = { - { G_REGEX_MATCH_ANCHORED, "G_REGEX_MATCH_ANCHORED", "anchored" }, - { G_REGEX_MATCH_NOTBOL, "G_REGEX_MATCH_NOTBOL", "notbol" }, - { G_REGEX_MATCH_NOTEOL, "G_REGEX_MATCH_NOTEOL", "noteol" }, - { G_REGEX_MATCH_NOTEMPTY, "G_REGEX_MATCH_NOTEMPTY", "notempty" }, - { G_REGEX_MATCH_PARTIAL, "G_REGEX_MATCH_PARTIAL", "partial" }, - { G_REGEX_MATCH_NEWLINE_CR, "G_REGEX_MATCH_NEWLINE_CR", "newline-cr" }, - { G_REGEX_MATCH_NEWLINE_LF, "G_REGEX_MATCH_NEWLINE_LF", "newline-lf" }, - { G_REGEX_MATCH_NEWLINE_CRLF, "G_REGEX_MATCH_NEWLINE_CRLF", "newline-crlf" }, - { G_REGEX_MATCH_NEWLINE_ANY, "G_REGEX_MATCH_NEWLINE_ANY", "newline-any" }, - { G_REGEX_MATCH_NEWLINE_ANYCRLF, "G_REGEX_MATCH_NEWLINE_ANYCRLF", "newline-anycrlf" }, - { G_REGEX_MATCH_BSR_ANYCRLF, "G_REGEX_MATCH_BSR_ANYCRLF", "bsr-anycrlf" }, - { G_REGEX_MATCH_BSR_ANY, "G_REGEX_MATCH_BSR_ANY", "bsr-any" }, - { G_REGEX_MATCH_PARTIAL_SOFT, "G_REGEX_MATCH_PARTIAL_SOFT", "partial-soft" }, - { G_REGEX_MATCH_PARTIAL_HARD, "G_REGEX_MATCH_PARTIAL_HARD", "partial-hard" }, - { G_REGEX_MATCH_NOTEMPTY_ATSTART, "G_REGEX_MATCH_NOTEMPTY_ATSTART", "notempty-atstart" }, + static const GEnumValue values[] = { + { G_SHELL_ERROR_BAD_QUOTING, "G_SHELL_ERROR_BAD_QUOTING", "bad-quoting" }, + { G_SHELL_ERROR_EMPTY_STRING, "G_SHELL_ERROR_EMPTY_STRING", "empty-string" }, + { G_SHELL_ERROR_FAILED, "G_SHELL_ERROR_FAILED", "failed" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GRegexMatchFlags", values); + etype = g_enum_register_static ("GShellError", values); } return etype; } -/* enumerations from "/usr/include/glib-2.0/glib/gspawn.h" */ +/* enumerations from "/usr/include/glib-2.0/glib/goption.h" */ GType -g_spawn_error_get_type (void) +g_option_flags_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { G_SPAWN_ERROR_FORK, "G_SPAWN_ERROR_FORK", "fork" }, - { G_SPAWN_ERROR_READ, "G_SPAWN_ERROR_READ", "read" }, - { G_SPAWN_ERROR_CHDIR, "G_SPAWN_ERROR_CHDIR", "chdir" }, - { G_SPAWN_ERROR_ACCES, "G_SPAWN_ERROR_ACCES", "acces" }, - { G_SPAWN_ERROR_PERM, "G_SPAWN_ERROR_PERM", "perm" }, - { G_SPAWN_ERROR_TOO_BIG, "G_SPAWN_ERROR_TOO_BIG", "too-big" }, - { G_SPAWN_ERROR_2BIG, "G_SPAWN_ERROR_2BIG", "2big" }, - { G_SPAWN_ERROR_NOEXEC, "G_SPAWN_ERROR_NOEXEC", "noexec" }, - { G_SPAWN_ERROR_NAMETOOLONG, "G_SPAWN_ERROR_NAMETOOLONG", "nametoolong" }, - { G_SPAWN_ERROR_NOENT, "G_SPAWN_ERROR_NOENT", "noent" }, - { G_SPAWN_ERROR_NOMEM, "G_SPAWN_ERROR_NOMEM", "nomem" }, - { G_SPAWN_ERROR_NOTDIR, "G_SPAWN_ERROR_NOTDIR", "notdir" }, - { G_SPAWN_ERROR_LOOP, "G_SPAWN_ERROR_LOOP", "loop" }, - { G_SPAWN_ERROR_TXTBUSY, "G_SPAWN_ERROR_TXTBUSY", "txtbusy" }, - { G_SPAWN_ERROR_IO, "G_SPAWN_ERROR_IO", "io" }, - { G_SPAWN_ERROR_NFILE, "G_SPAWN_ERROR_NFILE", "nfile" }, - { G_SPAWN_ERROR_MFILE, "G_SPAWN_ERROR_MFILE", "mfile" }, - { G_SPAWN_ERROR_INVAL, "G_SPAWN_ERROR_INVAL", "inval" }, - { G_SPAWN_ERROR_ISDIR, "G_SPAWN_ERROR_ISDIR", "isdir" }, - { G_SPAWN_ERROR_LIBBAD, "G_SPAWN_ERROR_LIBBAD", "libbad" }, - { G_SPAWN_ERROR_FAILED, "G_SPAWN_ERROR_FAILED", "failed" }, + static const GFlagsValue values[] = { + { G_OPTION_FLAG_NONE, "G_OPTION_FLAG_NONE", "none" }, + { G_OPTION_FLAG_HIDDEN, "G_OPTION_FLAG_HIDDEN", "hidden" }, + { G_OPTION_FLAG_IN_MAIN, "G_OPTION_FLAG_IN_MAIN", "in-main" }, + { G_OPTION_FLAG_REVERSE, "G_OPTION_FLAG_REVERSE", "reverse" }, + { G_OPTION_FLAG_NO_ARG, "G_OPTION_FLAG_NO_ARG", "no-arg" }, + { G_OPTION_FLAG_FILENAME, "G_OPTION_FLAG_FILENAME", "filename" }, + { G_OPTION_FLAG_OPTIONAL_ARG, "G_OPTION_FLAG_OPTIONAL_ARG", "optional-arg" }, + { G_OPTION_FLAG_NOALIAS, "G_OPTION_FLAG_NOALIAS", "noalias" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ("GSpawnError", values); + etype = g_flags_register_static ("GOptionFlags", values); } return etype; } GType -g_spawn_flags_get_type (void) +g_option_arg_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GFlagsValue values[] = { - { G_SPAWN_DEFAULT, "G_SPAWN_DEFAULT", "default" }, - { G_SPAWN_LEAVE_DESCRIPTORS_OPEN, "G_SPAWN_LEAVE_DESCRIPTORS_OPEN", "leave-descriptors-open" }, - { G_SPAWN_DO_NOT_REAP_CHILD, "G_SPAWN_DO_NOT_REAP_CHILD", "do-not-reap-child" }, - { G_SPAWN_SEARCH_PATH, "G_SPAWN_SEARCH_PATH", "search-path" }, - { G_SPAWN_STDOUT_TO_DEV_NULL, "G_SPAWN_STDOUT_TO_DEV_NULL", "stdout-to-dev-null" }, - { G_SPAWN_STDERR_TO_DEV_NULL, "G_SPAWN_STDERR_TO_DEV_NULL", "stderr-to-dev-null" }, - { G_SPAWN_CHILD_INHERITS_STDIN, "G_SPAWN_CHILD_INHERITS_STDIN", "child-inherits-stdin" }, - { G_SPAWN_FILE_AND_ARGV_ZERO, "G_SPAWN_FILE_AND_ARGV_ZERO", "file-and-argv-zero" }, - { G_SPAWN_SEARCH_PATH_FROM_ENVP, "G_SPAWN_SEARCH_PATH_FROM_ENVP", "search-path-from-envp" }, - { G_SPAWN_CLOEXEC_PIPES, "G_SPAWN_CLOEXEC_PIPES", "cloexec-pipes" }, + static const GEnumValue values[] = { + { G_OPTION_ARG_NONE, "G_OPTION_ARG_NONE", "none" }, + { G_OPTION_ARG_STRING, "G_OPTION_ARG_STRING", "string" }, + { G_OPTION_ARG_INT, "G_OPTION_ARG_INT", "int" }, + { G_OPTION_ARG_CALLBACK, "G_OPTION_ARG_CALLBACK", "callback" }, + { G_OPTION_ARG_FILENAME, "G_OPTION_ARG_FILENAME", "filename" }, + { G_OPTION_ARG_STRING_ARRAY, "G_OPTION_ARG_STRING_ARRAY", "string-array" }, + { G_OPTION_ARG_FILENAME_ARRAY, "G_OPTION_ARG_FILENAME_ARRAY", "filename-array" }, + { G_OPTION_ARG_DOUBLE, "G_OPTION_ARG_DOUBLE", "double" }, + { G_OPTION_ARG_INT64, "G_OPTION_ARG_INT64", "int64" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GSpawnFlags", values); + etype = g_enum_register_static ("GOptionArg", values); } return etype; } - -/* enumerations from "/usr/include/glib-2.0/glib/gstrfuncs.h" */ GType -g_ascii_type_get_type (void) +g_option_error_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GFlagsValue values[] = { - { G_ASCII_ALNUM, "G_ASCII_ALNUM", "alnum" }, - { G_ASCII_ALPHA, "G_ASCII_ALPHA", "alpha" }, - { G_ASCII_CNTRL, "G_ASCII_CNTRL", "cntrl" }, - { G_ASCII_DIGIT, "G_ASCII_DIGIT", "digit" }, - { G_ASCII_GRAPH, "G_ASCII_GRAPH", "graph" }, - { G_ASCII_LOWER, "G_ASCII_LOWER", "lower" }, - { G_ASCII_PRINT, "G_ASCII_PRINT", "print" }, - { G_ASCII_PUNCT, "G_ASCII_PUNCT", "punct" }, - { G_ASCII_SPACE, "G_ASCII_SPACE", "space" }, - { G_ASCII_UPPER, "G_ASCII_UPPER", "upper" }, - { G_ASCII_XDIGIT, "G_ASCII_XDIGIT", "xdigit" }, + static const GEnumValue values[] = { + { G_OPTION_ERROR_UNKNOWN_OPTION, "G_OPTION_ERROR_UNKNOWN_OPTION", "unknown-option" }, + { G_OPTION_ERROR_BAD_VALUE, "G_OPTION_ERROR_BAD_VALUE", "bad-value" }, + { G_OPTION_ERROR_FAILED, "G_OPTION_ERROR_FAILED", "failed" }, { 0, NULL, NULL } }; - etype = g_flags_register_static ("GAsciiType", values); + etype = g_enum_register_static ("GOptionError", values); } return etype; } diff -Nru milter-manager-2.0.8/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.h milter-manager-2.0.9/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.h --- milter-manager-2.0.8/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.h 2016-06-06 12:58:50.101785398 +0000 +++ milter-manager-2.0.9/binding/ruby/glib-2.2.5/ext/glib2/glib-enum-types.h 2016-06-15 07:14:53.441865722 +0000 @@ -8,35 +8,31 @@ G_BEGIN_DECLS -/* enumerations from "/usr/include/glib-2.0/glib/gvariant.h" */ -GType g_variant_class_get_type (void); -#define G_TYPE_VARIANT_CLASS (g_variant_class_get_type()) -GType g_variant_parse_error_get_type (void); -#define G_TYPE_VARIANT_PARSE_ERROR (g_variant_parse_error_get_type()) - -/* enumerations from "/usr/include/glib-2.0/glib/gthread.h" */ -GType g_thread_error_get_type (void); -#define G_TYPE_THREAD_ERROR (g_thread_error_get_type()) -GType g_once_status_get_type (void); -#define G_TYPE_ONCE_STATUS (g_once_status_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gtestutils.h" */ +GType g_test_trap_flags_get_type (void); +#define G_TYPE_TEST_TRAP_FLAGS (g_test_trap_flags_get_type()) +GType g_test_subprocess_flags_get_type (void); +#define G_TYPE_TEST_SUBPROCESS_FLAGS (g_test_subprocess_flags_get_type()) +GType g_test_log_type_get_type (void); +#define G_TYPE_TEST_LOG_TYPE (g_test_log_type_get_type()) +GType g_test_file_type_get_type (void); +#define G_TYPE_TEST_FILE_TYPE (g_test_file_type_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gkeyfile.h" */ -GType g_key_file_error_get_type (void); -#define G_TYPE_KEY_FILE_ERROR (g_key_file_error_get_type()) -GType g_key_file_flags_get_type (void); -#define G_TYPE_KEY_FILE_FLAGS (g_key_file_flags_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gconvert.h" */ +GType g_convert_error_get_type (void); +#define G_TYPE_CONVERT_ERROR (g_convert_error_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gbookmarkfile.h" */ -GType g_bookmark_file_error_get_type (void); -#define G_TYPE_BOOKMARK_FILE_ERROR (g_bookmark_file_error_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gregex.h" */ +GType g_regex_error_get_type (void); +#define G_TYPE_REGEX_ERROR (g_regex_error_get_type()) +GType g_regex_compile_flags_get_type (void); +#define G_TYPE_REGEX_COMPILE_FLAGS (g_regex_compile_flags_get_type()) +GType g_regex_match_flags_get_type (void); +#define G_TYPE_REGEX_MATCH_FLAGS (g_regex_match_flags_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/goption.h" */ -GType g_option_flags_get_type (void); -#define G_TYPE_OPTION_FLAGS (g_option_flags_get_type()) -GType g_option_arg_get_type (void); -#define G_TYPE_OPTION_ARG (g_option_arg_get_type()) -GType g_option_error_get_type (void); -#define G_TYPE_OPTION_ERROR (g_option_error_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/ghook.h" */ +GType g_hook_flag_mask_get_type (void); +#define G_TYPE_HOOK_FLAG_MASK (g_hook_flag_mask_get_type()) /* enumerations from "/usr/include/glib-2.0/glib/gutils.h" */ GType g_user_directory_get_type (void); @@ -44,31 +40,37 @@ GType g_format_size_flags_get_type (void); #define G_TYPE_FORMAT_SIZE_FLAGS (g_format_size_flags_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gchecksum.h" */ -GType g_checksum_type_get_type (void); -#define G_TYPE_CHECKSUM_TYPE (g_checksum_type_get_type()) - -/* enumerations from "/usr/include/glib-2.0/glib/ghook.h" */ -GType g_hook_flag_mask_get_type (void); -#define G_TYPE_HOOK_FLAG_MASK (g_hook_flag_mask_get_type()) - -/* enumerations from "/usr/include/glib-2.0/glib/gtestutils.h" */ -GType g_test_trap_flags_get_type (void); -#define G_TYPE_TEST_TRAP_FLAGS (g_test_trap_flags_get_type()) -GType g_test_subprocess_flags_get_type (void); -#define G_TYPE_TEST_SUBPROCESS_FLAGS (g_test_subprocess_flags_get_type()) -GType g_test_log_type_get_type (void); -#define G_TYPE_TEST_LOG_TYPE (g_test_log_type_get_type()) -GType g_test_file_type_get_type (void); -#define G_TYPE_TEST_FILE_TYPE (g_test_file_type_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gslice.h" */ +GType g_slice_config_get_type (void); +#define G_TYPE_SLICE_CONFIG (g_slice_config_get_type()) /* enumerations from "/usr/include/glib-2.0/glib/gtimezone.h" */ GType g_time_type_get_type (void); #define G_TYPE_TIME_TYPE (g_time_type_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gslice.h" */ -GType g_slice_config_get_type (void); -#define G_TYPE_SLICE_CONFIG (g_slice_config_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gnode.h" */ +GType g_traverse_flags_get_type (void); +#define G_TYPE_TRAVERSE_FLAGS (g_traverse_flags_get_type()) +GType g_traverse_type_get_type (void); +#define G_TYPE_TRAVERSE_TYPE (g_traverse_type_get_type()) + +/* enumerations from "/usr/include/glib-2.0/glib/gspawn.h" */ +GType g_spawn_error_get_type (void); +#define G_TYPE_SPAWN_ERROR (g_spawn_error_get_type()) +GType g_spawn_flags_get_type (void); +#define G_TYPE_SPAWN_FLAGS (g_spawn_flags_get_type()) + +/* enumerations from "/usr/include/glib-2.0/glib/gvariant.h" */ +GType g_variant_class_get_type (void); +#define G_TYPE_VARIANT_CLASS (g_variant_class_get_type()) +GType g_variant_parse_error_get_type (void); +#define G_TYPE_VARIANT_PARSE_ERROR (g_variant_parse_error_get_type()) + +/* enumerations from "/usr/include/glib-2.0/glib/gfileutils.h" */ +GType g_file_error_get_type (void); +#define G_TYPE_FILE_ERROR (g_file_error_get_type()) +GType g_file_test_get_type (void); +#define G_TYPE_FILE_TEST (g_file_test_get_type()) /* enumerations from "/usr/include/glib-2.0/glib/gdate.h" */ GType g_date_dm_y_get_type (void); @@ -86,11 +88,9 @@ GType g_markup_collect_type_get_type (void); #define G_TYPE_MARKUP_COLLECT_TYPE (g_markup_collect_type_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gnode.h" */ -GType g_traverse_flags_get_type (void); -#define G_TYPE_TRAVERSE_FLAGS (g_traverse_flags_get_type()) -GType g_traverse_type_get_type (void); -#define G_TYPE_TRAVERSE_TYPE (g_traverse_type_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gstrfuncs.h" */ +GType g_ascii_type_get_type (void); +#define G_TYPE_ASCII_TYPE (g_ascii_type_get_type()) /* enumerations from "/usr/include/glib-2.0/glib/gunicode.h" */ GType g_unicode_type_get_type (void); @@ -102,41 +102,41 @@ GType g_normalize_mode_get_type (void); #define G_TYPE_NORMALIZE_MODE (g_normalize_mode_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gshell.h" */ -GType g_shell_error_get_type (void); -#define G_TYPE_SHELL_ERROR (g_shell_error_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gchecksum.h" */ +GType g_checksum_type_get_type (void); +#define G_TYPE_CHECKSUM_TYPE (g_checksum_type_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gconvert.h" */ -GType g_convert_error_get_type (void); -#define G_TYPE_CONVERT_ERROR (g_convert_error_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gbookmarkfile.h" */ +GType g_bookmark_file_error_get_type (void); +#define G_TYPE_BOOKMARK_FILE_ERROR (g_bookmark_file_error_get_type()) /* enumerations from "/usr/include/glib-2.0/glib/gmessages.h" */ GType g_log_level_flags_get_type (void); #define G_TYPE_LOG_LEVEL_FLAGS (g_log_level_flags_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gfileutils.h" */ -GType g_file_error_get_type (void); -#define G_TYPE_FILE_ERROR (g_file_error_get_type()) -GType g_file_test_get_type (void); -#define G_TYPE_FILE_TEST (g_file_test_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gkeyfile.h" */ +GType g_key_file_error_get_type (void); +#define G_TYPE_KEY_FILE_ERROR (g_key_file_error_get_type()) +GType g_key_file_flags_get_type (void); +#define G_TYPE_KEY_FILE_FLAGS (g_key_file_flags_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gregex.h" */ -GType g_regex_error_get_type (void); -#define G_TYPE_REGEX_ERROR (g_regex_error_get_type()) -GType g_regex_compile_flags_get_type (void); -#define G_TYPE_REGEX_COMPILE_FLAGS (g_regex_compile_flags_get_type()) -GType g_regex_match_flags_get_type (void); -#define G_TYPE_REGEX_MATCH_FLAGS (g_regex_match_flags_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gthread.h" */ +GType g_thread_error_get_type (void); +#define G_TYPE_THREAD_ERROR (g_thread_error_get_type()) +GType g_once_status_get_type (void); +#define G_TYPE_ONCE_STATUS (g_once_status_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gspawn.h" */ -GType g_spawn_error_get_type (void); -#define G_TYPE_SPAWN_ERROR (g_spawn_error_get_type()) -GType g_spawn_flags_get_type (void); -#define G_TYPE_SPAWN_FLAGS (g_spawn_flags_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/gshell.h" */ +GType g_shell_error_get_type (void); +#define G_TYPE_SHELL_ERROR (g_shell_error_get_type()) -/* enumerations from "/usr/include/glib-2.0/glib/gstrfuncs.h" */ -GType g_ascii_type_get_type (void); -#define G_TYPE_ASCII_TYPE (g_ascii_type_get_type()) +/* enumerations from "/usr/include/glib-2.0/glib/goption.h" */ +GType g_option_flags_get_type (void); +#define G_TYPE_OPTION_FLAGS (g_option_flags_get_type()) +GType g_option_arg_get_type (void); +#define G_TYPE_OPTION_ARG (g_option_arg_get_type()) +GType g_option_error_get_type (void); +#define G_TYPE_OPTION_ERROR (g_option_error_get_type()) /* enumerations from "/usr/include/glib-2.0/gobject/gsignal.h" */ GType g_signal_flags_get_type (void); diff -Nru milter-manager-2.0.8/binding/ruby/glib-2.2.5/ext/glib2/Makefile milter-manager-2.0.9/binding/ruby/glib-2.2.5/ext/glib2/Makefile --- milter-manager-2.0.8/binding/ruby/glib-2.2.5/ext/glib2/Makefile 2016-06-06 12:58:50.145785818 +0000 +++ milter-manager-2.0.9/binding/ruby/glib-2.2.5/ext/glib2/Makefile 2016-06-15 07:14:53.453865762 +0000 @@ -11,13 +11,13 @@ #### Start of system configuration section. #### -srcdir = /home/kenhys/work/milter/milter-manager/milter-manager.clean/binding/ruby/glib-2.2.5/ext/glib2 -topdir = /home/kenhys/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0 +srcdir = /home/kenji/wc/milter-manager/binding/ruby/glib-2.2.5/ext/glib2 +topdir = /home/kenji/.rbenv/versions/2.3.1/include/ruby-2.3.0 hdrdir = $(topdir) -arch_hdrdir = /home/kenhys/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/x86_64-linux +arch_hdrdir = /home/kenji/.rbenv/versions/2.3.1/include/ruby-2.3.0/x86_64-linux PATH_SEPARATOR = : VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby -prefix = $(DESTDIR)/home/kenhys/.rvm/rubies/ruby-2.3.1 +prefix = $(DESTDIR)/home/kenji/.rbenv/versions/2.3.1 rubysitearchprefix = $(rubylibprefix)/$(sitearch) rubyarchprefix = $(rubylibprefix)/$(arch) rubylibprefix = $(libdir)/$(RUBY_BASE_NAME) @@ -83,9 +83,9 @@ CFLAGS = $(CCDLFLAGS) $(cflags) -fPIC -Wall -Waggregate-return -Wcast-align -Wextra -Wformat=2 -Winit-self -Wlarger-than-65500 -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpacked -Wp,-D_FORTIFY_SOURCE=2 -Wpointer-arith -Wswitch-default -Wswitch-enum -Wundef -Wunsafe-loop-optimizations -Wwrite-strings -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $(ARCH_FLAG) INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) -I$(sitearchdir) -I$(vendorarchdir) DEFS = -CPPFLAGS = -DHAVE_RB_DEFINE_ALLOC_FUNC -DHAVE_RB_BLOCK_PROC -DHAVE_OBJECT_ALLOCATE -DHAVE_UNISTD_H -DHAVE_G_SPAWN_CLOSE_PID -DHAVE_G_THREAD_INIT -DHAVE_G_MAIN_DEPTH -DHAVE_G_LISTENV -DHAVE_RB_CHECK_ARRAY_TYPE -DHAVE_RB_CHECK_HASH_TYPE -DHAVE_RB_EXEC_RECURSIVE -DHAVE_RB_ERRINFO -DHAVE_RB_SOURCEFILE -DHAVE_RB_SOURCELINE -DHAVE_RB_THREAD_CALL_WITHOUT_GVL -DHAVE_RUBY_NATIVE_THREAD_P -DHAVE_RB_THREAD_CALL_WITH_GVL -DHAVE_RB_STR_NEW_CSTR -DHAVE_RB_GC_REGISTER_MARK_OBJECT -DHAVE_RB_EXC_NEW_STR -DRUBY_GLIB2_COMPILATION $(DEFS) $(cppflags) +CPPFLAGS = -DHAVE_RB_DEFINE_ALLOC_FUNC -DHAVE_RB_BLOCK_PROC -DHAVE_OBJECT_ALLOCATE -DHAVE_UNISTD_H -DHAVE_G_SPAWN_CLOSE_PID -DHAVE_G_THREAD_INIT -DHAVE_G_MAIN_DEPTH -DHAVE_G_LISTENV -DHAVE_RB_CHECK_ARRAY_TYPE -DHAVE_RB_CHECK_HASH_TYPE -DHAVE_RB_EXEC_RECURSIVE -DHAVE_RB_ERRINFO -DHAVE_RB_SOURCEFILE -DHAVE_RB_SOURCELINE -DHAVE_RB_THREAD_CALL_WITHOUT_GVL -DHAVE_RUBY_NATIVE_THREAD_P -DHAVE_RB_THREAD_CALL_WITH_GVL -DHAVE_RB_STR_NEW_CSTR -DHAVE_RB_GC_REGISTER_MARK_OBJECT -DHAVE_RB_EXC_NEW_STR -DRUBY_GLIB2_COMPILATION -I/home/kenji/.rbenv/versions/2.3.1/include $(DEFS) $(cppflags) CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG) -ldflags = -L. -fstack-protector -rdynamic -Wl,-export-dynamic -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -pthread +ldflags = -L. -L/home/kenji/.rbenv/versions/2.3.1/lib -fstack-protector -rdynamic -Wl,-export-dynamic -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -pthread dldflags = ARCH_FLAG = DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) @@ -135,10 +135,10 @@ target_prefix = LOCAL_LIBS = LIBS = $(LIBRUBYARG_SHARED) -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lglib-2.0 -lpthread -lgmp -ldl -lcrypt -lm -lc -ORIG_SRCS = rbglib_utf8.c rbgobj_paramspecs.c rbgobj_signal.c rbglib_threads.c rbgutildeprecated.c rbglib_bookmarkfile.c rbgobj_object.c rbglib_unichar.c rbgobj_type.c rbgobj_enumflags.c rbgobj_value.c rbglib_source.c rbglib_io_constants.c rbgobj_strv.c rbgobj_typeinterface.c rbglib_utf16.c rbglib_pollfd.c rbglib_messages.c rbgobj_valuearray.c rbgutil.c rbgobj_closure.c rbglib_maincontext.c rbglib_spawnerror.c rbglib_convert.c rbglib_win32.c rbglib_shell.c rbgobj_param.c rbglib_iochannel.c rbglib_keyfile.c rbglib_i18n.c rbgobj_typemodule.c rbglib_utils.c rbglib_unicode.c rbglib_int64.c rbglib_shellerror.c rbglib_ucs4.c rbgobj_flags.c rbgobj_typeplugin.c glib-enum-types.c rbgobj_convert.c rbglib.c rbgobj_enums.c rbglib_iochannelerror.c rbgobject.c rbgobj_typeinstance.c rbgutil_list.c rbglib_mainloop.c rbglib_gettext.c rbglibdeprecated.c rbglib_fileutils.c rbgobj_valuetypes.c rbglib_error.c rbgobj_boxed.c rbglib_spawn.c rbgutil_callback.c rbglib_timer.c rbglib_iochannel_win32_socket.c -SRCS = $(ORIG_SRCS) rbglib_utf8.c rbgobj_paramspecs.c rbgobj_signal.c rbglib_threads.c rbgutildeprecated.c rbglib_bookmarkfile.c rbgobj_object.c rbglib_unichar.c rbgobj_type.c rbgobj_enumflags.c rbgobj_value.c rbglib_source.c rbglib_io_constants.c rbgobj_strv.c rbgobj_typeinterface.c rbglib_utf16.c rbglib_pollfd.c rbglib_messages.c rbgobj_valuearray.c rbgutil.c rbgobj_closure.c rbglib_maincontext.c rbglib_spawnerror.c rbglib_convert.c rbglib_win32.c rbglib_shell.c rbgobj_param.c rbglib_iochannel.c rbglib_keyfile.c rbglib_i18n.c rbgobj_typemodule.c rbglib_utils.c rbglib_unicode.c rbglib_int64.c rbglib_shellerror.c rbglib_ucs4.c rbgobj_flags.c rbgobj_typeplugin.c glib-enum-types.c rbgobj_convert.c rbglib.c rbgobj_enums.c rbglib_iochannelerror.c rbgobject.c rbgobj_typeinstance.c rbgutil_list.c rbglib_mainloop.c rbglib_gettext.c rbglibdeprecated.c rbglib_fileutils.c rbgobj_valuetypes.c rbglib_error.c rbgobj_boxed.c rbglib_spawn.c rbgutil_callback.c rbglib_timer.c rbglib_iochannel_win32_socket.c -OBJS = rbglib_utf8.o rbgobj_paramspecs.o rbgobj_signal.o rbglib_threads.o rbgutildeprecated.o rbglib_bookmarkfile.o rbgobj_object.o rbglib_unichar.o rbgobj_type.o rbgobj_enumflags.o rbgobj_value.o rbglib_source.o rbglib_io_constants.o rbgobj_strv.o rbgobj_typeinterface.o rbglib_utf16.o rbglib_pollfd.o rbglib_messages.o rbgobj_valuearray.o rbgutil.o rbgobj_closure.o rbglib_maincontext.o rbglib_spawnerror.o rbglib_convert.o rbglib_win32.o rbglib_shell.o rbgobj_param.o rbglib_iochannel.o rbglib_keyfile.o rbglib_i18n.o rbgobj_typemodule.o rbglib_utils.o rbglib_unicode.o rbglib_int64.o rbglib_shellerror.o rbglib_ucs4.o rbgobj_flags.o rbgobj_typeplugin.o glib-enum-types.o rbgobj_convert.o rbglib.o rbgobj_enums.o rbglib_iochannelerror.o rbgobject.o rbgobj_typeinstance.o rbgutil_list.o rbglib_mainloop.o rbglib_gettext.o rbglibdeprecated.o rbglib_fileutils.o rbgobj_valuetypes.o rbglib_error.o rbgobj_boxed.o rbglib_spawn.o rbgutil_callback.o rbglib_timer.o rbglib_iochannel_win32_socket.o -HDRS = $(srcdir)/rbglib.h $(srcdir)/rbgprivate.h $(srcdir)/rbgobject.h $(srcdir)/rbglibdeprecated.h $(srcdir)/rbglib2conversions.h $(srcdir)/glib-enum-types.h $(srcdir)/rbgutil_list.h $(srcdir)/rbgcompat.h $(srcdir)/rbgutil.h $(srcdir)/rbgutildeprecated.h +ORIG_SRCS = rbgutildeprecated.c rbglib_iochannelerror.c rbgobj_object.c rbgobj_closure.c rbgobj_paramspecs.c rbgobj_typeinstance.c rbglib_convert.c rbglib_shellerror.c rbgobj_param.c rbgutil_callback.c rbglib_error.c rbgobj_enumflags.c rbgobj_strv.c rbgobj_enums.c rbgobj_type.c rbgutil.c rbglib_unichar.c rbgobj_value.c rbgobj_boxed.c rbgobj_typeinterface.c rbglib_bookmarkfile.c rbglib_iochannel_win32_socket.c rbglib_io_constants.c rbglib_shell.c rbglib_keyfile.c rbglib_spawn.c rbglib_threads.c rbglib_fileutils.c rbglib_int64.c rbgobj_convert.c glib-enum-types.c rbglib.c rbglib_mainloop.c rbgobj_valuearray.c rbglib_spawnerror.c rbgobj_valuetypes.c rbgutil_list.c rbglib_pollfd.c rbglib_timer.c rbglib_utf16.c rbglib_i18n.c rbglib_ucs4.c rbglib_unicode.c rbgobj_typemodule.c rbgobject.c rbglib_win32.c rbglib_iochannel.c rbglib_maincontext.c rbglib_messages.c rbglib_source.c rbglib_utf8.c rbgobj_typeplugin.c rbglib_gettext.c rbgobj_flags.c rbgobj_signal.c rbglibdeprecated.c rbglib_utils.c +SRCS = $(ORIG_SRCS) rbgutildeprecated.c rbglib_iochannelerror.c rbgobj_object.c rbgobj_closure.c rbgobj_paramspecs.c rbgobj_typeinstance.c rbglib_convert.c rbglib_shellerror.c rbgobj_param.c rbgutil_callback.c rbglib_error.c rbgobj_enumflags.c rbgobj_strv.c rbgobj_enums.c rbgobj_type.c rbgutil.c rbglib_unichar.c rbgobj_value.c rbgobj_boxed.c rbgobj_typeinterface.c rbglib_bookmarkfile.c rbglib_iochannel_win32_socket.c rbglib_io_constants.c rbglib_shell.c rbglib_keyfile.c rbglib_spawn.c rbglib_threads.c rbglib_fileutils.c rbglib_int64.c rbgobj_convert.c glib-enum-types.c rbglib.c rbglib_mainloop.c rbgobj_valuearray.c rbglib_spawnerror.c rbgobj_valuetypes.c rbgutil_list.c rbglib_pollfd.c rbglib_timer.c rbglib_utf16.c rbglib_i18n.c rbglib_ucs4.c rbglib_unicode.c rbgobj_typemodule.c rbgobject.c rbglib_win32.c rbglib_iochannel.c rbglib_maincontext.c rbglib_messages.c rbglib_source.c rbglib_utf8.c rbgobj_typeplugin.c rbglib_gettext.c rbgobj_flags.c rbgobj_signal.c rbglibdeprecated.c rbglib_utils.c +OBJS = rbgutildeprecated.o rbglib_iochannelerror.o rbgobj_object.o rbgobj_closure.o rbgobj_paramspecs.o rbgobj_typeinstance.o rbglib_convert.o rbglib_shellerror.o rbgobj_param.o rbgutil_callback.o rbglib_error.o rbgobj_enumflags.o rbgobj_strv.o rbgobj_enums.o rbgobj_type.o rbgutil.o rbglib_unichar.o rbgobj_value.o rbgobj_boxed.o rbgobj_typeinterface.o rbglib_bookmarkfile.o rbglib_iochannel_win32_socket.o rbglib_io_constants.o rbglib_shell.o rbglib_keyfile.o rbglib_spawn.o rbglib_threads.o rbglib_fileutils.o rbglib_int64.o rbgobj_convert.o glib-enum-types.o rbglib.o rbglib_mainloop.o rbgobj_valuearray.o rbglib_spawnerror.o rbgobj_valuetypes.o rbgutil_list.o rbglib_pollfd.o rbglib_timer.o rbglib_utf16.o rbglib_i18n.o rbglib_ucs4.o rbglib_unicode.o rbgobj_typemodule.o rbgobject.o rbglib_win32.o rbglib_iochannel.o rbglib_maincontext.o rbglib_messages.o rbglib_source.o rbglib_utf8.o rbgobj_typeplugin.o rbglib_gettext.o rbgobj_flags.o rbgobj_signal.o rbglibdeprecated.o rbglib_utils.o +HDRS = $(srcdir)/rbgutildeprecated.h $(srcdir)/rbglibdeprecated.h $(srcdir)/rbglib.h $(srcdir)/rbgutil_list.h $(srcdir)/rbgprivate.h $(srcdir)/rbgutil.h $(srcdir)/glib-enum-types.h $(srcdir)/rbgcompat.h $(srcdir)/rbgobject.h $(srcdir)/rbglib2conversions.h TARGET = glib2 TARGET_NAME = glib2 TARGET_ENTRY = Init_$(TARGET_NAME) diff -Nru milter-manager-2.0.8/binding/ruby/glib-2.2.5/Makefile milter-manager-2.0.9/binding/ruby/glib-2.2.5/Makefile --- milter-manager-2.0.8/binding/ruby/glib-2.2.5/Makefile 2016-06-06 12:58:50.153785894 +0000 +++ milter-manager-2.0.9/binding/ruby/glib-2.2.5/Makefile 2016-06-15 07:14:53.457865775 +0000 @@ -27,7 +27,7 @@ bindingdir = $(pkglibdir)/binding binding_extdir = $(bindingdir)/ext binding_libdir = $(bindingdir)/lib -RUBY = /home/kenhys/.rvm/rubies/ruby-2.3.1/bin/ruby +RUBY = /home/kenji/.rbenv/versions/2.3.1/bin/ruby check: # $(RUBY) $(srcdir_prefix)test/run-test.rb diff -Nru milter-manager-2.0.8/binding/ruby/glib-2.2.5/Makefile.lib milter-manager-2.0.9/binding/ruby/glib-2.2.5/Makefile.lib --- milter-manager-2.0.8/binding/ruby/glib-2.2.5/Makefile.lib 2016-06-06 12:58:50.141785780 +0000 +++ milter-manager-2.0.9/binding/ruby/glib-2.2.5/Makefile.lib 2016-06-15 07:14:53.453865762 +0000 @@ -12,12 +12,12 @@ #### Start of system configuration section. #### srcdir = ../../.././binding/ruby/glib-2.2.5 -topdir = /home/kenhys/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0 +topdir = /home/kenji/.rbenv/versions/2.3.1/include/ruby-2.3.0 hdrdir = $(topdir) -arch_hdrdir = /home/kenhys/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/x86_64-linux +arch_hdrdir = /home/kenji/.rbenv/versions/2.3.1/include/ruby-2.3.0/x86_64-linux PATH_SEPARATOR = : VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby -prefix = $(DESTDIR)/home/kenhys/.rvm/rubies/ruby-2.3.1 +prefix = $(DESTDIR)/home/kenji/.rbenv/versions/2.3.1 rubysitearchprefix = $(rubylibprefix)/$(sitearch) rubyarchprefix = $(rubylibprefix)/$(arch) rubylibprefix = $(libdir)/$(RUBY_BASE_NAME) @@ -83,9 +83,9 @@ CFLAGS = $(CCDLFLAGS) $(cflags) -fPIC $(ARCH_FLAG) INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) DEFS = -CPPFLAGS = $(DEFS) $(cppflags) +CPPFLAGS = -I/home/kenji/.rbenv/versions/2.3.1/include $(DEFS) $(cppflags) CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG) -ldflags = -L. -fstack-protector -rdynamic -Wl,-export-dynamic +ldflags = -L. -L/home/kenji/.rbenv/versions/2.3.1/lib -fstack-protector -rdynamic -Wl,-export-dynamic dldflags = ARCH_FLAG = DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) @@ -188,56 +188,56 @@ pre-install-rb: Makefile $(MAKEDIRS) $(RUBYLIBDIR)/gnome2/rake pre-install-rb-default: Makefile -pre-install-rb-default: $(TIMESTAMP_DIR)/.RUBYLIBDIR.time -install-rb-default: $(RUBYLIBDIR)/glib2.rb -$(RUBYLIBDIR)/glib2.rb: $(srcdir)/lib/glib2.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/glib2.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/pkg-config.rb -$(RUBYLIBDIR)/pkg-config.rb: $(srcdir)/lib/pkg-config.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/pkg-config.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/mkmf-gnome2.rb -$(RUBYLIBDIR)/mkmf-gnome2.rb: $(srcdir)/lib/mkmf-gnome2.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/mkmf-gnome2.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/glib-mkenums.rb -$(RUBYLIBDIR)/glib-mkenums.rb: $(srcdir)/lib/glib-mkenums.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/glib-mkenums.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/gnome2-raketask.rb -$(RUBYLIBDIR)/gnome2-raketask.rb: $(srcdir)/lib/gnome2-raketask.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2-raketask.rb $(@D) pre-install-rb-default: $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time -install-rb-default: $(RUBYLIBDIR)/gnome2/rake/windows-binary-build-task.rb -$(RUBYLIBDIR)/gnome2/rake/windows-binary-build-task.rb: $(srcdir)/lib/gnome2/rake/windows-binary-build-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/windows-binary-build-task.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/gnome2/rake/windows-binary-download-task.rb -$(RUBYLIBDIR)/gnome2/rake/windows-binary-download-task.rb: $(srcdir)/lib/gnome2/rake/windows-binary-download-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/windows-binary-download-task.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/gnome2/rake/package.rb -$(RUBYLIBDIR)/gnome2/rake/package.rb: $(srcdir)/lib/gnome2/rake/package.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/package.rb $(@D) -install-rb-default: $(RUBYLIBDIR)/gnome2/rake/native-binary-build-task.rb -$(RUBYLIBDIR)/gnome2/rake/native-binary-build-task.rb: $(srcdir)/lib/gnome2/rake/native-binary-build-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time - $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/native-binary-build-task.rb $(@D) install-rb-default: $(RUBYLIBDIR)/gnome2/rake/source-download-task.rb $(RUBYLIBDIR)/gnome2/rake/source-download-task.rb: $(srcdir)/lib/gnome2/rake/source-download-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/source-download-task.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/gnome2/rake/native-binary-build-task.rb +$(RUBYLIBDIR)/gnome2/rake/native-binary-build-task.rb: $(srcdir)/lib/gnome2/rake/native-binary-build-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/native-binary-build-task.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/gnome2/rake/package.rb +$(RUBYLIBDIR)/gnome2/rake/package.rb: $(srcdir)/lib/gnome2/rake/package.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/package.rb $(@D) install-rb-default: $(RUBYLIBDIR)/gnome2/rake/external-package.rb $(RUBYLIBDIR)/gnome2/rake/external-package.rb: $(srcdir)/lib/gnome2/rake/external-package.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/external-package.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/gnome2/rake/windows-binary-download-task.rb +$(RUBYLIBDIR)/gnome2/rake/windows-binary-download-task.rb: $(srcdir)/lib/gnome2/rake/windows-binary-download-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/windows-binary-download-task.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/gnome2/rake/windows-binary-build-task.rb +$(RUBYLIBDIR)/gnome2/rake/windows-binary-build-task.rb: $(srcdir)/lib/gnome2/rake/windows-binary-build-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/windows-binary-build-task.rb $(@D) install-rb-default: $(RUBYLIBDIR)/gnome2/rake/package-task.rb $(RUBYLIBDIR)/gnome2/rake/package-task.rb: $(srcdir)/lib/gnome2/rake/package-task.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2/rake/package-task.rb $(@D) +pre-install-rb-default: $(TIMESTAMP_DIR)/.RUBYLIBDIR.time +install-rb-default: $(RUBYLIBDIR)/glib2.rb +$(RUBYLIBDIR)/glib2.rb: $(srcdir)/lib/glib2.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/glib2.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/glib-mkenums.rb +$(RUBYLIBDIR)/glib-mkenums.rb: $(srcdir)/lib/glib-mkenums.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/glib-mkenums.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/mkmf-gnome2.rb +$(RUBYLIBDIR)/mkmf-gnome2.rb: $(srcdir)/lib/mkmf-gnome2.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/mkmf-gnome2.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/gnome2-raketask.rb +$(RUBYLIBDIR)/gnome2-raketask.rb: $(srcdir)/lib/gnome2-raketask.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/gnome2-raketask.rb $(@D) +install-rb-default: $(RUBYLIBDIR)/pkg-config.rb +$(RUBYLIBDIR)/pkg-config.rb: $(srcdir)/lib/pkg-config.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.time + $(Q) $(INSTALL_DATA) $(srcdir)/lib/pkg-config.rb $(@D) pre-install-rb-default: $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.glib2.time install-rb-default: $(RUBYLIBDIR)/glib2/deprecatable.rb $(RUBYLIBDIR)/glib2/deprecatable.rb: $(srcdir)/lib/glib2/deprecatable.rb $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.glib2.time $(Q) $(INSTALL_DATA) $(srcdir)/lib/glib2/deprecatable.rb $(@D) pre-install-rb-default: $(ECHO) installing default libraries -$(TIMESTAMP_DIR)/.RUBYLIBDIR.time: - $(Q) $(MAKEDIRS) $(@D) $(RUBYLIBDIR) - $(Q) $(TOUCH) $@ $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.gnome2.-.rake.time: $(Q) $(MAKEDIRS) $(@D) $(RUBYLIBDIR)/gnome2/rake $(Q) $(TOUCH) $@ +$(TIMESTAMP_DIR)/.RUBYLIBDIR.time: + $(Q) $(MAKEDIRS) $(@D) $(RUBYLIBDIR) + $(Q) $(TOUCH) $@ $(TIMESTAMP_DIR)/.RUBYLIBDIR.-.glib2.time: $(Q) $(MAKEDIRS) $(@D) $(RUBYLIBDIR)/glib2 $(Q) $(TOUCH) $@ diff -Nru milter-manager-2.0.8/binding/ruby/lib/milter/manager.rb milter-manager-2.0.9/binding/ruby/lib/milter/manager.rb --- milter-manager-2.0.8/binding/ruby/lib/milter/manager.rb 2016-05-13 13:35:17.476432277 +0000 +++ milter-manager-2.0.9/binding/ruby/lib/milter/manager.rb 2016-06-15 06:24:22.002529051 +0000 @@ -418,14 +418,22 @@ def load_if_exist(path) load(path) + true rescue NonexistentPath => e raise unless e.path == path # ignore. log this? + false end def load_default platform = @configuration.package_platform - load_if_exist("defaults/#{platform}.conf") if platform + return if platform.nil? + + return if load_if_exist("defaults/#{platform}.conf") + + if platform.start_with?("centos") + load_if_exist("defaults/redhat.conf") + end end def define_milter(name, &block) diff -Nru milter-manager-2.0.8/binding/ruby/test-unit/doc/text/news.md milter-manager-2.0.9/binding/ruby/test-unit/doc/text/news.md --- milter-manager-2.0.8/binding/ruby/test-unit/doc/text/news.md 2016-06-06 12:58:12.465367417 +0000 +++ milter-manager-2.0.9/binding/ruby/test-unit/doc/text/news.md 2016-05-09 09:07:11.133137278 +0000 @@ -1,18 +1,5 @@ # News -## 3.1.9 - 2016-05-20 {#version-3-1-9} - -### Fixes - - * Fixed conflict with test-unit-power_assert. - [GitHub#120][Patch by Kazuki Tsujimoto] - - * Fixed a bug that path in `$LOAD_PATH` may be removed. - -### Thanks - - * Kazuki Tsujimoto - ## 3.1.8 - 2016-03-19 {#version-3-1-8} ### Improvements diff -Nru milter-manager-2.0.8/binding/ruby/test-unit/lib/test/unit/collector/load.rb milter-manager-2.0.9/binding/ruby/test-unit/lib/test/unit/collector/load.rb --- milter-manager-2.0.8/binding/ruby/test-unit/lib/test/unit/collector/load.rb 2016-06-06 12:58:12.465367417 +0000 +++ milter-manager-2.0.9/binding/ruby/test-unit/lib/test/unit/collector/load.rb 2016-05-09 09:07:11.141137290 +0000 @@ -131,8 +131,6 @@ return yield if path.nil? path = path.to_s - return yield if $LOAD_PATH.index(path) - begin $LOAD_PATH.unshift(path) yield diff -Nru milter-manager-2.0.8/binding/ruby/test-unit/lib/test/unit/version.rb milter-manager-2.0.9/binding/ruby/test-unit/lib/test/unit/version.rb --- milter-manager-2.0.8/binding/ruby/test-unit/lib/test/unit/version.rb 2016-06-06 12:58:12.465367417 +0000 +++ milter-manager-2.0.9/binding/ruby/test-unit/lib/test/unit/version.rb 2016-05-09 09:07:11.149137300 +0000 @@ -1,5 +1,5 @@ module Test module Unit - VERSION = '3.2.0' + VERSION = '3.1.9' end end diff -Nru milter-manager-2.0.8/config/config.guess milter-manager-2.0.9/config/config.guess --- milter-manager-2.0.8/config/config.guess 2016-05-13 19:37:54.372627886 +0000 +++ milter-manager-2.0.9/config/config.guess 2015-10-16 01:03:10.917881483 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2016-04-02' +timestamp='2015-08-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # # Please send patches to . @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -237,10 +237,6 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; - *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} - exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -272,42 +268,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE=alpha ;; + UNAME_MACHINE="alpha" ;; "EV4.5 (21064)") - UNAME_MACHINE=alpha ;; + UNAME_MACHINE="alpha" ;; "LCA4 (21066/21068)") - UNAME_MACHINE=alpha ;; + UNAME_MACHINE="alpha" ;; "EV5 (21164)") - UNAME_MACHINE=alphaev5 ;; + UNAME_MACHINE="alphaev5" ;; "EV5.6 (21164A)") - UNAME_MACHINE=alphaev56 ;; + UNAME_MACHINE="alphaev56" ;; "EV5.6 (21164PC)") - UNAME_MACHINE=alphapca56 ;; + UNAME_MACHINE="alphapca56" ;; "EV5.7 (21164PC)") - UNAME_MACHINE=alphapca57 ;; + UNAME_MACHINE="alphapca57" ;; "EV6 (21264)") - UNAME_MACHINE=alphaev6 ;; + UNAME_MACHINE="alphaev6" ;; "EV6.7 (21264A)") - UNAME_MACHINE=alphaev67 ;; + UNAME_MACHINE="alphaev67" ;; "EV6.8CB (21264C)") - UNAME_MACHINE=alphaev68 ;; + UNAME_MACHINE="alphaev68" ;; "EV6.8AL (21264B)") - UNAME_MACHINE=alphaev68 ;; + UNAME_MACHINE="alphaev68" ;; "EV6.8CX (21264D)") - UNAME_MACHINE=alphaev68 ;; + UNAME_MACHINE="alphaev68" ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE=alphaev69 ;; + UNAME_MACHINE="alphaev69" ;; "EV7 (21364)") - UNAME_MACHINE=alphaev7 ;; + UNAME_MACHINE="alphaev7" ;; "EV7.9 (21364A)") - UNAME_MACHINE=alphaev79 ;; + UNAME_MACHINE="alphaev79" ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -380,16 +376,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH=i386 + SUN_ARCH="i386" # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH=x86_64 + SUN_ARCH="x86_64" fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -414,7 +410,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -639,13 +635,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 - 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH=hppa2.0n ;; - 64) HP_ARCH=hppa2.0w ;; - '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac fi @@ -684,11 +680,11 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ ${HP_ARCH} = "hppa2.0w" ] then eval $set_cc_for_build @@ -701,12 +697,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH=hppa2.0w + HP_ARCH="hppa2.0w" else - HP_ARCH=hppa64 + HP_ARCH="hppa64" fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -811,14 +807,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -900,7 +896,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -923,7 +919,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -969,9 +965,6 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1127,7 +1120,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configure will decide that + # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1276,9 +1269,6 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; - SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1292,9 +1282,9 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1316,7 +1306,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = x86; then + if test "$UNAME_PROCESSOR" = "x86"; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1347,7 +1337,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "$cputype" = "386"; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1389,7 +1379,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1400,9 +1390,6 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; - amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; esac cat >&2 <. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='milter-manager' PACKAGE_TARNAME='milter-manager' -PACKAGE_VERSION='2.0.8' -PACKAGE_STRING='milter-manager 2.0.8' +PACKAGE_VERSION='2.0.9' +PACKAGE_STRING='milter-manager 2.0.9' PACKAGE_BUGREPORT='milter-manager-users-en@lists.sourceforge.net' PACKAGE_URL='' @@ -673,6 +673,10 @@ SOLARIS_PLATFORM_TRUE FREEBSD_PLATFORM_FALSE FREEBSD_PLATFORM_TRUE +REDHAT_SYSTEMD_PLATFORM_FALSE +REDHAT_SYSTEMD_PLATFORM_TRUE +REDHAT_SYSVINIT_PLATFORM_FALSE +REDHAT_SYSVINIT_PLATFORM_TRUE REDHAT_PLATFORM_FALSE REDHAT_PLATFORM_TRUE DEBIAN_PLATFORM_FALSE @@ -1554,7 +1558,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures milter-manager 2.0.8 to adapt to many kinds of systems. +\`configure' configures milter-manager 2.0.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1625,7 +1629,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of milter-manager 2.0.8:";; + short | recursive ) echo "Configuration of milter-manager 2.0.9:";; esac cat <<\_ACEOF @@ -1797,7 +1801,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -milter-manager configure 2.0.8 +milter-manager configure 2.0.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2277,7 +2281,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by milter-manager $as_me 2.0.8, which was +It was created by milter-manager $as_me 2.0.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3145,7 +3149,7 @@ # Define the identity of the package. PACKAGE='milter-manager' - VERSION='2.0.8' + VERSION='2.0.9' cat >>confdefs.h <<_ACEOF @@ -3395,8 +3399,8 @@ MILTER_MANAGER_VERSION_MAJOR=2 MILTER_MANAGER_VERSION_MINOR=0 -MILTER_MANAGER_VERSION_MICRO=8 -MILTER_MANAGER_VERSION=2.0.8 +MILTER_MANAGER_VERSION_MICRO=9 +MILTER_MANAGER_VERSION=2.0.9 @@ -14084,7 +14088,7 @@ $as_echo "$cutter_enable_coverage" >&6; } cutter_enable_coverage_report_lcov=no if test "x$cutter_enable_coverage" != "xno"; then - ltp_version_list="1.6 1.7 1.8 1.9 1.10" + ltp_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lcov", so it can be a program name with args. set dummy ${ac_tool_prefix}lcov; ac_word=$2 @@ -17220,6 +17224,24 @@ esac fi +if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "redhat"; then + distribution=$(cut -d " " -f 1 /etc/redhat-release | tr "A-Z" "a-z") + case "$distribution" in + centos) + if grep -q Linux /etc/redhat-release; then + distribution_version=$(cut -d " " -f 4 /etc/redhat-release) + else + distribution_version=$(cut -d " " -f 3 /etc/redhat-release) + fi + ;; + *) + : # do nothing + ;; + esac + distribution_version=$(echo "$distribution_version" | cut -d "." -f 1) + MILTER_MANAGER_PACKAGE_PLATFORM="${distribution}${distribution_version}" +fi + if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = ""; then MILTER_MANAGER_PACKAGE_PLATFORM="unknown" fi @@ -17234,7 +17256,9 @@ DEBIAN_PLATFORM_FALSE= fi - if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "redhat"; then + if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "redhat" \ + -o "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos6" \ + -o "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos7"; then REDHAT_PLATFORM_TRUE= REDHAT_PLATFORM_FALSE='#' else @@ -17242,6 +17266,22 @@ REDHAT_PLATFORM_FALSE= fi + if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos6"; then + REDHAT_SYSVINIT_PLATFORM_TRUE= + REDHAT_SYSVINIT_PLATFORM_FALSE='#' +else + REDHAT_SYSVINIT_PLATFORM_TRUE='#' + REDHAT_SYSVINIT_PLATFORM_FALSE= +fi + + if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos7"; then + REDHAT_SYSTEMD_PLATFORM_TRUE= + REDHAT_SYSTEMD_PLATFORM_FALSE='#' +else + REDHAT_SYSTEMD_PLATFORM_TRUE='#' + REDHAT_SYSTEMD_PLATFORM_FALSE= +fi + if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "freebsd"; then FREEBSD_PLATFORM_TRUE= FREEBSD_PLATFORM_FALSE='#' @@ -17699,6 +17739,14 @@ as_fn_error $? "conditional \"REDHAT_PLATFORM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${REDHAT_SYSVINIT_PLATFORM_TRUE}" && test -z "${REDHAT_SYSVINIT_PLATFORM_FALSE}"; then + as_fn_error $? "conditional \"REDHAT_SYSVINIT_PLATFORM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${REDHAT_SYSTEMD_PLATFORM_TRUE}" && test -z "${REDHAT_SYSTEMD_PLATFORM_FALSE}"; then + as_fn_error $? "conditional \"REDHAT_SYSTEMD_PLATFORM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${FREEBSD_PLATFORM_TRUE}" && test -z "${FREEBSD_PLATFORM_FALSE}"; then as_fn_error $? "conditional \"FREEBSD_PLATFORM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18104,7 +18152,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by milter-manager $as_me 2.0.8, which was +This file was extended by milter-manager $as_me 2.0.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18170,7 +18218,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -milter-manager config.status 2.0.8 +milter-manager config.status 2.0.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru milter-manager-2.0.8/configure.ac milter-manager-2.0.9/configure.ac --- milter-manager-2.0.8/configure.ac 2016-05-14 04:50:49.008553637 +0000 +++ milter-manager-2.0.9/configure.ac 2016-06-15 07:01:35.371270201 +0000 @@ -5,7 +5,7 @@ m4_define([milter_manager_version_major], [2]) m4_define([milter_manager_version_minor], [0]) -m4_define([milter_manager_version_micro], [8]) +m4_define([milter_manager_version_micro], [9]) m4_define([milter_manager_version], [milter_manager_version_major.milter_manager_version_minor.milter_manager_version_micro]) @@ -724,6 +724,24 @@ esac fi +if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "redhat"; then + distribution=$(cut -d " " -f 1 /etc/redhat-release | tr "A-Z" "a-z") + case "$distribution" in + centos) + if grep -q Linux /etc/redhat-release; then + distribution_version=$(cut -d " " -f 4 /etc/redhat-release) + else + distribution_version=$(cut -d " " -f 3 /etc/redhat-release) + fi + ;; + *) + : # do nothing + ;; + esac + distribution_version=$(echo "$distribution_version" | cut -d "." -f 1) + MILTER_MANAGER_PACKAGE_PLATFORM="${distribution}${distribution_version}" +fi + if test "$MILTER_MANAGER_PACKAGE_PLATFORM" = ""; then MILTER_MANAGER_PACKAGE_PLATFORM="unknown" fi @@ -732,7 +750,13 @@ AM_CONDITIONAL(DEBIAN_PLATFORM, [test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "debian"]) AM_CONDITIONAL(REDHAT_PLATFORM, - [test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "redhat"]) + [test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "redhat" \ + -o "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos6" \ + -o "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos7"]) +AM_CONDITIONAL(REDHAT_SYSVINIT_PLATFORM, + [test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos6"]) +AM_CONDITIONAL(REDHAT_SYSTEMD_PLATFORM, + [test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "centos7"]) AM_CONDITIONAL(FREEBSD_PLATFORM, [test "$MILTER_MANAGER_PACKAGE_PLATFORM" = "freebsd"]) AM_CONDITIONAL(SOLARIS_PLATFORM, diff -Nru milter-manager-2.0.8/data/init.d/redhat/Makefile.am milter-manager-2.0.9/data/init.d/redhat/Makefile.am --- milter-manager-2.0.8/data/init.d/redhat/Makefile.am 2016-05-13 13:35:17.488426501 +0000 +++ milter-manager-2.0.9/data/init.d/redhat/Makefile.am 2016-06-08 06:09:30.380913089 +0000 @@ -2,7 +2,7 @@ init_script = milter-manager -if REDHAT_PLATFORM +if REDHAT_SYSVINIT_PLATFORM initdir = $(sysconfdir)/rc.d/init.d dist_init_SCRIPTS = $(init_script) else diff -Nru milter-manager-2.0.8/data/init.d/redhat/Makefile.in milter-manager-2.0.9/data/init.d/redhat/Makefile.in --- milter-manager-2.0.8/data/init.d/redhat/Makefile.in 2016-06-06 12:58:34.073622275 +0000 +++ milter-manager-2.0.9/data/init.d/redhat/Makefile.in 2016-06-15 07:14:43.985834787 +0000 @@ -469,9 +469,9 @@ top_srcdir = @top_srcdir@ SUBDIRS = sysconfig init_script = milter-manager -@REDHAT_PLATFORM_TRUE@initdir = $(sysconfdir)/rc.d/init.d -@REDHAT_PLATFORM_TRUE@dist_init_SCRIPTS = $(init_script) -@REDHAT_PLATFORM_FALSE@EXTRA_DIST = $(init_script) +@REDHAT_SYSVINIT_PLATFORM_TRUE@initdir = $(sysconfdir)/rc.d/init.d +@REDHAT_SYSVINIT_PLATFORM_TRUE@dist_init_SCRIPTS = $(init_script) +@REDHAT_SYSVINIT_PLATFORM_FALSE@EXTRA_DIST = $(init_script) all: all-recursive .SUFFIXES: diff -Nru milter-manager-2.0.8/data/systemd/redhat/Makefile.am milter-manager-2.0.9/data/systemd/redhat/Makefile.am --- milter-manager-2.0.8/data/systemd/redhat/Makefile.am 2016-05-13 13:35:17.492424576 +0000 +++ milter-manager-2.0.9/data/systemd/redhat/Makefile.am 2016-06-08 06:09:00.660792123 +0000 @@ -1,6 +1,6 @@ service = milter-manager.service -if REDHAT_PLATFORM +if REDHAT_SYSTEMD_PLATFORM initscript_DATA = $(service) initscriptdir = $(pkgdatadir) else diff -Nru milter-manager-2.0.8/data/systemd/redhat/Makefile.in milter-manager-2.0.9/data/systemd/redhat/Makefile.in --- milter-manager-2.0.8/data/systemd/redhat/Makefile.in 2016-06-06 12:58:34.641628404 +0000 +++ milter-manager-2.0.9/data/systemd/redhat/Makefile.in 2016-06-15 07:14:44.197835480 +0000 @@ -406,9 +406,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ service = milter-manager.service -@REDHAT_PLATFORM_TRUE@initscript_DATA = $(service) -@REDHAT_PLATFORM_TRUE@initscriptdir = $(pkgdatadir) -@REDHAT_PLATFORM_FALSE@EXTRA_DIST = $(service) +@REDHAT_SYSTEMD_PLATFORM_TRUE@initscript_DATA = $(service) +@REDHAT_SYSTEMD_PLATFORM_TRUE@initscriptdir = $(pkgdatadir) +@REDHAT_SYSTEMD_PLATFORM_FALSE@EXTRA_DIST = $(service) all: all-am .SUFFIXES: diff -Nru milter-manager-2.0.8/debian/changelog milter-manager-2.0.9/debian/changelog --- milter-manager-2.0.8/debian/changelog 2016-06-06 13:12:19.000000000 +0000 +++ milter-manager-2.0.9/debian/changelog 2016-06-15 07:39:58.000000000 +0000 @@ -1,14 +1,20 @@ -milter-manager (2.0.8-2~wily1) wily; urgency=medium +milter-manager (2.0.9-2~wily1) wily; urgency=medium * Build for wily. - -- Kentaro Hayashi Mon, 06 Jun 2016 22:12:19 +0900 + -- Kenji Okimoto Wed, 15 Jun 2016 16:39:58 +0900 + +milter-manager (2.0.9-1) unstable; urgency=low + + * New upstream release. + + -- Kenji Okimoto Wed, 15 Jun 2016 00:00:00 +0900 milter-manager (2.0.8-1) unstable; urgency=low * New upstream release. - -- HAYASHI Kentaro Sun, 29 May 2016 00:00:00 +0900 + -- HAYASHI Kentaro Wed, 15 Jun 2016 00:00:00 +0900 milter-manager (2.0.7-1) unstable; urgency=low diff -Nru milter-manager-2.0.8/debian/control milter-manager-2.0.9/debian/control --- milter-manager-2.0.8/debian/control 2016-06-06 13:12:19.000000000 +0000 +++ milter-manager-2.0.9/debian/control 2016-06-15 07:39:58.000000000 +0000 @@ -5,6 +5,7 @@ Uploaders: Kenji Okimoto , Youhei SASAKI Build-Depends: debhelper (>= 9), + dh-systemd, autotools-dev, libglib2.0-dev, libev-dev, diff -Nru milter-manager-2.0.8/debian/milter-manager.postinst milter-manager-2.0.9/debian/milter-manager.postinst --- milter-manager-2.0.8/debian/milter-manager.postinst 2016-06-06 13:12:19.000000000 +0000 +++ milter-manager-2.0.9/debian/milter-manager.postinst 2016-06-15 07:39:58.000000000 +0000 @@ -11,13 +11,6 @@ fi } -fixperms() { - dpkg-statoverride --list /var/run/milter-manager >/dev/null || \ - dpkg-statoverride --update --add milter-manager milter-manager 0755 /var/run/milter-manager - dpkg-statoverride --list /var/spool/postfix/milter-manager >/dev/null || \ - dpkg-statoverride --update --add milter-manager milter-manager 0755 /var/spool/postfix/milter-manager -} - remove_unused_file() { if test -f /etc/cron.d/milter-manager; then rm -f /etc/cron.d/milter-manager @@ -27,7 +20,6 @@ case "$1" in configure) add_system_user - fixperms remove_unused_file ;; abort-upgrade|abort-deconfigure|abort-remove) diff -Nru milter-manager-2.0.8/debian/milter-manager.postrm milter-manager-2.0.9/debian/milter-manager.postrm --- milter-manager-2.0.8/debian/milter-manager.postrm 2016-06-06 13:12:19.000000000 +0000 +++ milter-manager-2.0.9/debian/milter-manager.postrm 2016-06-15 07:39:58.000000000 +0000 @@ -4,9 +4,7 @@ if [ "$1" = "purge" ]; then rm -f /var/run/milter-manager/* - dpkg-statoverride --remove /var/run/milter-manager - rm -f /var/spool/postfix/milter-manager/* - dpkg-statoverride --remove /var/spool/postfix/milter-manager + dpkg-statoverride --remove /var/run/milter-manager 2> /dev/null || : fi # Remove the file installed by 1.8.6 or earlier diff -Nru milter-manager-2.0.8/debian/milter-manager.service milter-manager-2.0.9/debian/milter-manager.service --- milter-manager-2.0.8/debian/milter-manager.service 1970-01-01 00:00:00.000000000 +0000 +++ milter-manager-2.0.9/debian/milter-manager.service 2016-06-15 07:39:58.000000000 +0000 @@ -0,0 +1,15 @@ +[Unit] +Description=milter-manager server daemon +After=syslog.target network-online.target + +[Service] +Type=forking +PIDFile=/run/milter-manager/milter-manager.pid +EnvironmentFile=-/etc/default/milter-manager +User=root +Group=root +ExecStart=/usr/sbin/milter-manager $OPTIONS --daemon --pid-file "/run/milter-manager/milter-manager.pid" +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -Nru milter-manager-2.0.8/debian/milter-manager.tmpfile milter-manager-2.0.9/debian/milter-manager.tmpfile --- milter-manager-2.0.8/debian/milter-manager.tmpfile 1970-01-01 00:00:00.000000000 +0000 +++ milter-manager-2.0.9/debian/milter-manager.tmpfile 2016-06-15 07:39:58.000000000 +0000 @@ -0,0 +1,2 @@ +# Directory for milter manager sockets and pid +d /var/run/milter-manager 0775 milter-manager mail - - diff -Nru milter-manager-2.0.8/debian/rules milter-manager-2.0.9/debian/rules --- milter-manager-2.0.8/debian/rules 2016-06-06 13:12:19.000000000 +0000 +++ milter-manager-2.0.9/debian/rules 2016-06-15 07:39:58.000000000 +0000 @@ -13,7 +13,7 @@ export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ + dh $@ --with=systemd override_dh_auto_configure: dh_auto_configure -- \ diff -Nru milter-manager-2.0.8/doc/install-to-centos6.rd milter-manager-2.0.9/doc/install-to-centos6.rd --- milter-manager-2.0.8/doc/install-to-centos6.rd 2016-05-13 13:35:17.496422650 +0000 +++ milter-manager-2.0.9/doc/install-to-centos6.rd 2016-06-08 03:03:22.773570788 +0000 @@ -25,11 +25,11 @@ On 32bit environment: - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm On 64bit environment: - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm Now, you can install milters: @@ -45,7 +45,7 @@ Register milter manager yum repository like the following: - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm Now, you can install milter manager: diff -Nru milter-manager-2.0.8/doc/install-to-centos6.rd.ja milter-manager-2.0.9/doc/install-to-centos6.rd.ja --- milter-manager-2.0.8/doc/install-to-centos6.rd.ja 2016-05-13 13:35:17.496422650 +0000 +++ milter-manager-2.0.9/doc/install-to-centos6.rd.ja 2016-06-08 03:02:29.421186973 +0000 @@ -24,11 +24,11 @@ 32bit環境の場合は以下のようにEPELを登録します。 - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm 64bit環境の場合は以下のようにEPELを登録します。 - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm リポジトリを登録したらmilterをインストールします。 @@ -44,7 +44,7 @@ まず、yumリポジトリを登録します。 - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm 登録が完了したらmilter managerをインストールできます。 diff -Nru milter-manager-2.0.8/doc/install-to-centos.rd milter-manager-2.0.9/doc/install-to-centos.rd --- milter-manager-2.0.8/doc/install-to-centos.rd 2016-05-13 13:35:17.496422650 +0000 +++ milter-manager-2.0.9/doc/install-to-centos.rd 2016-06-08 03:03:55.637799164 +0000 @@ -39,7 +39,7 @@ Register milter manager yum repository like the following: - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm Now, you install milter manager: diff -Nru milter-manager-2.0.8/doc/install-to-centos.rd.ja milter-manager-2.0.9/doc/install-to-centos.rd.ja --- milter-manager-2.0.8/doc/install-to-centos.rd.ja 2016-05-13 13:35:17.496422650 +0000 +++ milter-manager-2.0.9/doc/install-to-centos.rd.ja 2016-06-08 03:04:07.997883566 +0000 @@ -39,7 +39,7 @@ まず、yumリポジトリを登録します。 - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm 登録が完了したらmilter managerをインストールできます。 diff -Nru milter-manager-2.0.8/doc/install-to-ubuntu.rd milter-manager-2.0.9/doc/install-to-ubuntu.rd --- milter-manager-2.0.8/doc/install-to-ubuntu.rd 2016-05-16 16:54:17.127482145 +0000 +++ milter-manager-2.0.9/doc/install-to-ubuntu.rd 2016-06-15 00:27:30.870123111 +0000 @@ -10,15 +10,19 @@ == Install packages -We provide milter manager deb packages for the following distributions. -You put the following content to /etc/apt/sources.list.d/milter-manager.list. +We provide milter manager deb packages for Ubuntu on +(()). You also enable the official backports repository to detect the latest viruses by the latest ClamAV. + % sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-backports main universe" + === PPA (Personal Package Archive) -The milter-manager APT repository for Ubuntu uses PPA (Personal Package Archive) on Launchpad since milter-manager 2.0.8. You can install milter manager by APT from the PPA. +The milter manager APT repository for Ubuntu uses PPA (Personal +Package Archive) on (()). You can +install milter manager by APT from the PPA. Here are supported Ubuntu versions: @@ -33,7 +37,9 @@ % sudo add-apt-repository -y ppa:milter-manager/ppa % sudo apt-get update -Then install: +=== Install + +Install milter manager: % sudo apt-get -y install milter-manager diff -Nru milter-manager-2.0.8/doc/install-to-ubuntu.rd.ja milter-manager-2.0.9/doc/install-to-ubuntu.rd.ja --- milter-manager-2.0.8/doc/install-to-ubuntu.rd.ja 2016-05-13 13:35:17.496422650 +0000 +++ milter-manager-2.0.9/doc/install-to-ubuntu.rd.ja 2016-06-15 00:27:50.778212402 +0000 @@ -10,64 +10,34 @@ == パッケージのインストール -milter managerのサイトでは以下のUbuntu用debパッケージを提供しています。 -まず、以下の内容の/etc/apt/sources.list.d/milter-manager.listを作成し -ます。 +Ubuntu向けのmilter managerのAPTリポジトリを +(())上で提供しています。 また、最新のClamAVを使ってウィルスチェックできるようにするため、バック ポートリポジトリも有効にします。 -=== Precise Pangolinの場合 + % sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-backports main universe" -/etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable precise universe - deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable precise universe +=== PPA (Personal Package Archive) -もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 -容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 +Ubuntu向けのmilter managerのAPTリポジトリは +(())上にあります。 - deb http://jp.archive.ubuntu.com/ubuntu precise-backports main universe +サポートしているUbuntuのバージョン: -=== Trusty Tahrの場合 + * 12.04 LTS Precise Pangolin + * 14.04 LTS Trusty Tahr + * 15.10 Wily Werewolf + * 16.04 LTS Xenial Xerus -/etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable trusty universe - deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable trusty universe +(({ppa:milter-manager/ppa})) PPAを追加します: -もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 -容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - - deb http://archive.ubuntu.com/ubuntu trusty-backports main universe - -=== Vivid Vervetの場合 - -/etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable vivid universe - deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable vivid universe - -もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 -容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - - deb http://archive.ubuntu.com/ubuntu vivid-backports main universe - -=== Wily Werewolfの場合 - -/etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable wily universe - deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable wily universe - -もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 -容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - - deb http://archive.ubuntu.com/ubuntu wily-backports main universe + % sudo apt-get -y install software-properties-common + % sudo add-apt-repository -y ppa:milter-manager/ppa + % sudo apt-get update === インストール -パッケージはmilter managerリリース用の鍵でサインされています。信用 -する場合は鍵を登録します。 - - % sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1BD22CD1 - milter managerをインストールします。 % sudo apt-get update diff -Nru milter-manager-2.0.8/doc/milter-manager.jman milter-manager-2.0.9/doc/milter-manager.jman --- milter-manager-2.0.8/doc/milter-manager.jman 2016-05-14 06:44:35.545788689 +0000 +++ milter-manager-2.0.9/doc/milter-manager.jman 2015-11-30 07:46:59.579250046 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-MANAGER 1 "May 2016" "milter manager" "milter managerのマニュアル" +.TH MILTER\-MANAGER 1 "November 2015" "milter manager" "milter managerのマニュアル" .SH 名前 .PP milter\-manager \- milterを使った効果的なスパム対策・ウィルス対策 diff -Nru milter-manager-2.0.8/doc/milter-manager-log-analyzer.jman milter-manager-2.0.9/doc/milter-manager-log-analyzer.jman --- milter-manager-2.0.8/doc/milter-manager-log-analyzer.jman 2016-05-14 06:44:36.253797725 +0000 +++ milter-manager-2.0.9/doc/milter-manager-log-analyzer.jman 2015-10-16 01:08:04.670584720 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-MANAGER\-LOG\-ANALYZER 1 "May 2016" "milter manager" "milter managerのマニュアル" +.TH MILTER\-MANAGER\-LOG\-ANALYZER 1 "October 2015" "milter manager" "milter managerのマニュアル" .SH 名前 .PP milter\-manager\-log\-analyzer \- milter\-managerのログを解析するプログラム diff -Nru milter-manager-2.0.8/doc/milter-manager-log-analyzer.man milter-manager-2.0.9/doc/milter-manager-log-analyzer.man --- milter-manager-2.0.8/doc/milter-manager-log-analyzer.man 2016-05-14 06:44:35.373786494 +0000 +++ milter-manager-2.0.9/doc/milter-manager-log-analyzer.man 2015-10-16 01:07:55.618563059 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-MANAGER\-LOG\-ANALYZER 1 "May 2016" "milter manager" "milter manager's manual" +.TH MILTER\-MANAGER\-LOG\-ANALYZER 1 "October 2015" "milter manager" "milter manager's manual" .SH NAME .PP milter\-manager\-log\-analyzer \- log analyzer for milter\-manager diff -Nru milter-manager-2.0.8/doc/milter-manager.man milter-manager-2.0.9/doc/milter-manager.man --- milter-manager-2.0.8/doc/milter-manager.man 2016-05-14 06:44:34.621776896 +0000 +++ milter-manager-2.0.9/doc/milter-manager.man 2015-11-30 07:46:59.583250056 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-MANAGER 1 "May 2016" "milter manager" "milter manager's manual" +.TH MILTER\-MANAGER 1 "November 2015" "milter manager" "milter manager's manual" .SH NAME .PP milter\-manager \- an effective anti\-spam and anti\-virus solution with milters diff -Nru milter-manager-2.0.8/doc/milter-performance-check.jman milter-manager-2.0.9/doc/milter-performance-check.jman --- milter-manager-2.0.8/doc/milter-performance-check.jman 2016-05-14 06:44:35.973794152 +0000 +++ milter-manager-2.0.9/doc/milter-performance-check.jman 2015-10-16 01:08:04.582584509 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-PERFORMANCE\-CHECK 1 "May 2016" "milter manager" "milter managerのマニュアル" +.TH MILTER\-PERFORMANCE\-CHECK 1 "October 2015" "milter manager" "milter managerのマニュアル" .SH 名前 .PP milter\-performance\-check \- MTAのパフォーマンスを計るプログラム diff -Nru milter-manager-2.0.8/doc/milter-performance-check.man milter-manager-2.0.9/doc/milter-performance-check.man --- milter-manager-2.0.8/doc/milter-performance-check.man 2016-05-14 06:44:35.081782767 +0000 +++ milter-manager-2.0.9/doc/milter-performance-check.man 2015-10-16 01:07:55.626563078 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-PERFORMANCE\-CHECK 1 "May 2016" "milter manager" "milter manager's manual" +.TH MILTER\-PERFORMANCE\-CHECK 1 "October 2015" "milter manager" "milter manager's manual" .SH NAME .PP milter\-performance\-check \- MTA performance check program diff -Nru milter-manager-2.0.8/doc/milter-report-statistics.jman milter-manager-2.0.9/doc/milter-report-statistics.jman --- milter-manager-2.0.8/doc/milter-report-statistics.jman 2016-05-14 06:44:36.125796092 +0000 +++ milter-manager-2.0.9/doc/milter-report-statistics.jman 2015-10-16 01:08:04.626584615 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-STATISTICS\-REPORT 1 "May 2016" "milter manager" "milter managerのマニュアル" +.TH MILTER\-STATISTICS\-REPORT 1 "October 2015" "milter manager" "milter managerのマニュアル" .SH 名前 .PP milter\-statistics\-report \- milter(などの)プロセスの統計情報を表示するプログラム diff -Nru milter-manager-2.0.8/doc/milter-report-statistics.man milter-manager-2.0.9/doc/milter-report-statistics.man --- milter-manager-2.0.8/doc/milter-report-statistics.man 2016-05-14 06:44:35.221784554 +0000 +++ milter-manager-2.0.9/doc/milter-report-statistics.man 2015-10-16 01:07:55.618563059 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-STATISTICS\-REPORT 1 "May 2016" "milter manager" "milter manager's manual" +.TH MILTER\-STATISTICS\-REPORT 1 "October 2015" "milter manager" "milter manager's manual" .SH NAME .PP milter\-statistics\-report \- milter process statistics reporter diff -Nru milter-manager-2.0.8/doc/milter-test-client.jman milter-manager-2.0.9/doc/milter-test-client.jman --- milter-manager-2.0.8/doc/milter-test-client.jman 2016-05-14 06:44:35.817792161 +0000 +++ milter-manager-2.0.9/doc/milter-test-client.jman 2015-11-30 00:35:48.005677536 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-TEST\-CLIENT 1 "May 2016" "milter manager" "milter managerのマニュアル" +.TH MILTER\-TEST\-CLIENT 1 "November 2015" "milter manager" "milter managerのマニュアル" .SH 名前 .PP milter\-test\-client \- milter側のmilterプロトコルを実装したプログラム diff -Nru milter-manager-2.0.8/doc/milter-test-client.man milter-manager-2.0.9/doc/milter-test-client.man --- milter-manager-2.0.8/doc/milter-test-client.man 2016-05-14 06:44:34.913780623 +0000 +++ milter-manager-2.0.9/doc/milter-test-client.man 2015-11-30 00:21:36.267411309 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-TEST\-CLIENT 1 "May 2016" "milter manager" "milter manager's manual" +.TH MILTER\-TEST\-CLIENT 1 "November 2015" "milter manager" "milter manager's manual" .SH NAME .PP milter\-test\-client \- milter side milter protocol implemented program diff -Nru milter-manager-2.0.8/doc/milter-test-server.jman milter-manager-2.0.9/doc/milter-test-server.jman --- milter-manager-2.0.8/doc/milter-test-server.jman 2016-05-14 06:44:35.685790476 +0000 +++ milter-manager-2.0.9/doc/milter-test-server.jman 2015-10-16 01:08:04.486584279 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-TEST\-SERVER 1 "May 2016" "milter manager" "milter managerのマニュアル" +.TH MILTER\-TEST\-SERVER 1 "October 2015" "milter manager" "milter managerのマニュアル" .SH 名前 .PP milter\-test\-server \- MTA側のmilterプロトコルを実装したプログラム diff -Nru milter-manager-2.0.8/doc/milter-test-server.man milter-manager-2.0.9/doc/milter-test-server.man --- milter-manager-2.0.8/doc/milter-test-server.man 2016-05-14 06:44:34.769778785 +0000 +++ milter-manager-2.0.9/doc/milter-test-server.man 2015-10-16 01:07:55.626563078 +0000 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! it was generated by rd2 -.TH MILTER\-TEST\-SERVER 1 "May 2016" "milter manager" "milter manager's manual" +.TH MILTER\-TEST\-SERVER 1 "October 2015" "milter manager" "milter manager's manual" .SH NAME .PP milter\-test\-server \- MTA side milter protocol implemented program diff -Nru milter-manager-2.0.8/doc/reference/header.html milter-manager-2.0.9/doc/reference/header.html --- milter-manager-2.0.8/doc/reference/header.html 2016-05-14 04:51:47.593431659 +0000 +++ milter-manager-2.0.9/doc/reference/header.html 2016-06-15 07:07:29.916418291 +0000 @@ -13,7 +13,7 @@ - + diff -Nru milter-manager-2.0.8/doc/reference/header-ja.html milter-manager-2.0.9/doc/reference/header-ja.html --- milter-manager-2.0.8/doc/reference/header-ja.html 2016-05-14 04:51:47.593431659 +0000 +++ milter-manager-2.0.9/doc/reference/header-ja.html 2016-06-15 07:07:29.916418291 +0000 @@ -13,7 +13,7 @@ - + diff -Nru milter-manager-2.0.8/doc/reference/html/index.html milter-manager-2.0.9/doc/reference/html/index.html --- milter-manager-2.0.8/doc/reference/html/index.html 2016-06-06 13:00:04.970327375 +0000 +++ milter-manager-2.0.9/doc/reference/html/index.html 2016-06-15 07:19:57.798862480 +0000 @@ -14,7 +14,7 @@
-

for milter manager 2.0.8 +

for milter manager 2.0.9


diff -Nru milter-manager-2.0.8/doc/reference/html/install-to-centos6.html milter-manager-2.0.9/doc/reference/html/install-to-centos6.html --- milter-manager-2.0.8/doc/reference/html/install-to-centos6.html 2016-06-06 13:00:04.974327397 +0000 +++ milter-manager-2.0.9/doc/reference/html/install-to-centos6.html 2016-06-15 07:19:57.802862493 +0000 @@ -47,9 +47,9 @@

Spamass-milter, clamav-milter and milter-greylist are used as milters. Milter packages registered in EPEL are used.

Register EPEL like the following.

On 32bit environment:

-
% sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm
+
% sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm

On 64bit environment:

-
% sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm
+
% sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm

Now, you can install milters:

% sudo yum install -y spamass-milter clamav-milter milter-greylist

And you can install RRDtool for generating graphs:

@@ -59,7 +59,7 @@

Build and Install

milter manager can be installed by yum.

Register milter manager yum repository like the following:

-
% sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm
+
% sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm

Now, you can install milter manager:

% sudo yum install -y milter-manager
diff -Nru milter-manager-2.0.8/doc/reference/html/install-to-centos.html milter-manager-2.0.9/doc/reference/html/install-to-centos.html --- milter-manager-2.0.8/doc/reference/html/install-to-centos.html 2016-06-06 13:00:04.970327375 +0000 +++ milter-manager-2.0.9/doc/reference/html/install-to-centos.html 2016-06-15 07:19:57.798862480 +0000 @@ -56,7 +56,7 @@

Build and Install

milter manager can be installed by yum.

Register milter manager yum repository like the following:

-
% sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm
+
% sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm

Now, you install milter manager:

% sudo yum install -y milter-manager
diff -Nru milter-manager-2.0.8/doc/reference/html/install-to-ubuntu.html milter-manager-2.0.9/doc/reference/html/install-to-ubuntu.html --- milter-manager-2.0.8/doc/reference/html/install-to-ubuntu.html 2016-06-06 13:00:04.970327375 +0000 +++ milter-manager-2.0.9/doc/reference/html/install-to-ubuntu.html 2016-06-15 07:19:57.802862493 +0000 @@ -38,11 +38,20 @@

Install packages

-

We provide milter manager deb packages for the following distributions. You put the following content to /etc/apt/sources.list.d/milter-manager.list.

+

+ We provide milter manager deb packages for Ubuntu on + Launchpad + . +

You also enable the official backports repository to detect the latest viruses by the latest ClamAV.

+
% sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-backports main universe"
-

PPA (Personal Package Archive)

-

The milter-manager APT repository for Ubuntu uses PPA (Personal Package Archive) on Launchpad since milter-manager 2.0.8. You can install milter manager by APT from the PPA.

+

PPA (Personal Package Archive)

+

+ The milter manager APT repository for Ubuntu uses PPA (Personal Package Archive) on + Launchpad + . You can install milter manager by APT from the PPA. +

Here are supported Ubuntu versions:

  • 12.04 LTS Precise Pangolin

  • @@ -58,7 +67,11 @@
    % sudo apt-get -y install software-properties-common
     % sudo add-apt-repository -y ppa:milter-manager/ppa
     % sudo apt-get update
    -

    Then install:

    +
+
+
+

Install

+

Install milter manager:

% sudo apt-get -y install milter-manager

We use Postfix as MTA:

% sudo apt-get -V -y install postfix
diff -Nru milter-manager-2.0.8/doc/reference/html/news.html milter-manager-2.0.9/doc/reference/html/news.html --- milter-manager-2.0.8/doc/reference/html/news.html 2016-06-06 13:00:04.970327375 +0000 +++ milter-manager-2.0.9/doc/reference/html/news.html 2016-06-15 07:19:57.802862493 +0000 @@ -29,13 +29,117 @@
+

2.0.9: 2016-06-15

+

A bug fix release of 2.0.8

+
+

milter manager

+
+
+

Fixes

+
  • Detect milters properly on CentOS6, CentOS7

+
+
+
+

2.0.8: 2016-06-15

+

A bug fix release of 2.0.7

+

You need to update /etc/apt/sources.list.d/milter-manager.list before you update packages if you have already installed milter-manager.

+

For example, on Debian (jessie) /etc/apt/sources.list.d/milter-manager.list:

+
deb http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main
+deb-src http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main
+

Ubuntu: Add ppa:milter-manager/ppa

+
% sudo apt-get -y install software-properties-common
+% sudo add-apt-repository -y ppa:milter-manager/ppa
+% sudo apt-get update
+

CentOS: Update milter-manager-release to 1.3.0

+
% sudo yum install -y \
+http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm
+
+

Package

+
+

Fixes

+
    +
  • Suppress warnings (false detection) by lintian [Patched by Youhei SASAKI]

  • +
  • Keep files that is needed when rebuild document under debian directory while building deb package. We need this for clean build. [Patched by Youhei SASAKI]

  • +
  • Update apt-line for Debian to correspond specification change of SourceForge.net

  • +
  • Create APT repository for Debian stretch properly

  • +
  • Update mitler-manager-release for CentOS to correspond specification change of SourceForge.net. You cannot update milter-manager via yum command If you use milter-manager-release before 1.3.0.

  • +
+
+
+

Improvements

+
    +
  • Drop Debian wheezy support

  • +
  • Add Ubuntu Xenial (16.04 LTS) support

  • +
  • Drop Ubuntu Wily (15.10) support

  • +
  • Drop Ubuntu Vivid (15.04) support

  • +
  • Add systemd support for deb packages (Except Ubuntu Precise(12.04))

  • +
  • Update Ruby to 2.2.5 on CentOS6

  • +
  • systemd support is stable on CentOS7

  • +
  • Arrange build script for CentOS [Patched by Hiroshi Ohkubo][GitHub #92]

  • +
+
+
+
+
+

milter manager

+
+

Fixes

+
    +
  • Fix milter-manager-log-analyzer errors with RRDtool 1.5 [Reporde by Dave Dodd][milter-manager-users-en]

  • +
  • Use "_" instead of "-" to avoid bug of RRDtool 1.5 [Reporde by Dave Dodd][milter-manager-users-en]

  • +
  • Fix a bug that configure option --with-bundled-ruby-glib2 does not work properly on BSD.

  • +
+
+
+
+
+

libmilter-compatible

+
+

Fixes

+
  • Set timeout properly using smfi_settimeout()

+
+
+
+
+

Ruby milter

+
+

Fixes

+
  • Fix error when --fallback-status=temporary-failure [Patched by Nobuhiko MIYAHARA][GitHub #87]

+
+
+
+
+

Document

+
+

Improvements

+
    +
  • Add link to Russian translation [Translated by Alisa Bagrii]

  • +
  • Update document for recent clamav-milter on Debian/Ubuntu [Reported by Kazuhiro NISHIYAMA][GitHub #90]

  • +
  • Create socket directory when install on Debian/Ubuntu [Reported by Kazuhiro NISHIYAMA][GitHub #91]

  • +
+
+
+
+
+

Thanks

+
    +
  • Youhei SASAKI

  • +
  • Nobuhiko MIYAHARA

  • +
  • Alisa Bagrii

  • +
  • Kazuhiro NISHIYAMA

  • +
  • Dave Dodd

  • +
  • Hiroshi Ohkubo

  • +
+
+
+

2.0.7: 2015-11-30

A bug fix release of 2.0.6

-

Package

+

Package

-

Fixes

+

Fixes

  • Fix milter-manager(1) and html documents

@@ -43,13 +147,13 @@

2.0.6: 2015-11-30

A bug fix release of 2.0.5.

-

Package

+

Package

-

Fixes

+

Fixes

  • Add missing dependency for deb Package [Reported by Christian Use][milter-manager-users-en]

-

Improvements

+

Improvements

  • Add Debian stretch support

  • Add Ubuntu Vivid (15.04) support

  • @@ -64,9 +168,9 @@

-

milter manager

+

milter manager

-

Improvements

+

Improvements

  • Update bundled libev to 4.19

  • Update bundled ruby-glib2 to 2.2.5

  • @@ -75,9 +179,9 @@

-

milter core

+

milter core

-

Improvements

+

Improvements

  • --log-level and --log-item can accepts multiple values separated by pipe "|" such as "info|default" [Reported by TOMITA Masahiro]

  • Don't colorize log by default when output is file [Reported by TOMITA Masahiro][GitHub #58]

  • @@ -86,9 +190,9 @@

-

Ruby milter

+

Ruby milter

-

Improvements

+

Improvements

  • Add Milter::ServerContext#negotiate

  • Add Milter::ServerContext#data

  • @@ -103,15 +207,15 @@

-

Document

+

Document

-

Fixes

+

Fixes

  • Fix typos [Patched by Youhei SASAKI][GitHub #82]


-

Thanks

+

Thanks

  • TOMITA Masahiro

  • Christian Use

  • @@ -125,9 +229,9 @@

    2.0.5: 2014-12-09

    A bug fix release of 2.0.4. Add experimental APIs can hold data between the mail transaction.

    -

    Package

    +

    Package

    -

    Improvements

    +

    Improvements

    • Drop CentOS5 support

    • Add CentOS7 support

    • @@ -141,46 +245,46 @@

    -

    milter manager

    +

    milter manager

    -

    Fixes

    +

    Fixes

    • Ensure to set UTF-8 encoding to file content [Reported by Panagiotis Skarvelis][SF.net #6]


    -

    milter-client

    +

    milter-client

    -

    Improvements

    +

    Improvements

    • Add APIs can hold data between the mail transaction. (experimental)


    -

    Ruby milter

    +

    Ruby milter

    -

    Improvements

    +

    Improvements

    • Drop Ruby1.8 support

    • Add APIs can hold data between the mail transaction. (experimental)

    -

    Fixes

    +

    Fixes

    • Setup signal handler when invoke milter in single process mode [GitHub #53]


    -

    Document

    +

    Document

    -

    Fixes

    +

    Fixes

    • Execute sa-update before invoke sa-spamd on FreeBSD [Reported by moto kawasaki][milter-manager-users-ja:00250]


    -

    Thanks

    +

    Thanks

    • Youhei SASAKI

    • Kazuhiro NISHIYAMA

    • @@ -194,17 +298,17 @@

      2.0.4: 2014-06-20

      A bug fix release of 2.0.3

      -

      Ruby milter

      +

      Ruby milter

      -

      Improvements

      +

      Improvements

      • Add Milter::Client::Test::MilterRunner

      • Add Milter::Client::EnvelopeAddress

      -

      Fixes

      +

      Fixes

      • Fix the bug that milter written in Ruby cannot finish properly on multiple CPU environment

    @@ -212,9 +316,9 @@

    2.0.3: 2014-05-20

    A bug fix release of 2.0.2

    -

    Package

    +

    Package

    -

    Improvements

    +

    Improvements

    • Drop Ubuntu Quantal (12.10) support

    • Drop Ubuntu Raring (13.04) support

    • @@ -226,21 +330,21 @@

    -

    milter manager

    +

    milter manager

    -

    Improvements

    +

    Improvements

    • Update bundled libev to 4.15

    -

    Fixes

    +

    Fixes

    • Fix a bug that data_stopper cannot stop apply children [GitHub #39]


    -

    Ruby milter

    +

    Ruby milter

    -

    Improvements

    +

    Improvements

    • Update bundled glib2 to 2.2.0

    • Milter::Logger methods can accept a block

    • @@ -249,15 +353,15 @@

    -

    Document

    +

    Document

    -

    Fixes

    +

    Fixes

    • Fix typos in FreeBSD installation [Patched by Dave Dodd]


    -

    Thanks

    +

    Thanks

    • Dave Dodd

    @@ -265,15 +369,15 @@

    2.0.2: 2014-01-27

    A bug fix release of 2.0.1

    -

    Package

    +

    Package

    -

    Fixes

    +

    Fixes

    • Add Ubuntu Lucid (10.04) support again [Reported by Mitsuru Ogino][milter-manager-users-ja:00229]


    -

    Thanks

    +

    Thanks

    • Mitsuru Ogino

    @@ -281,37 +385,37 @@

    2.0.1: 2014-01-24

    A bug fix release of 2.0.0.

    -

    milter manager

    +

    milter manager

    -

    Improvements

    +

    Improvements

    • Support SIGUSR1 signal to reopen log file

    -

    Fixes

    +

    Fixes

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


    -

    milter-core

    +

    milter-core

    -

    Improvements

    +

    Improvements

    • Support log output by MILTER_LOG_PATH environment variable.


    -

    milter-client

    +

    milter-client

    -

    Improvements

    +

    Improvements

    • Support --log-path option.


    -

    Ruby milter

    +

    Ruby milter

    -

    Improvements

    +

    Improvements

    • Support --log-path option.

    • Support SIGUSR1 signal to reopen log file.

    • @@ -320,9 +424,9 @@

    -

    Package

    +

    Package

    -

    Improvements

    +

    Improvements

    • Drop Ubuntu Lucid (10.04) support.

    • Add Ubuntu Saucy (13.10) support.

    • @@ -334,9 +438,9 @@

    -

    Document

    +

    Document

    -

    Improvements

    +

    Improvements

    • Update to the latest milter-greylist RPM. [Reported by ishizaka tadanori][milter-manager-users-ja:00220]

    • Improve English version reference manual. [GitHub #17]

    • @@ -345,7 +449,7 @@

    -

    Thanks

    +

    Thanks

    • Youhei SASAKI

    • ishizaka tadanori

    • @@ -365,18 +469,18 @@

      milter manager 2.0.0 is more stable than 1.8.0, because users have been increased and reported issues. We have been able to fix problems, because users have reported a lot of problems. Of course, milter manager is very stable, and Ruby/milter (functionality which you can write milter in Ruby) is also stable enough. We have reflected our knowledge that we have developed milter written in Ruby to Ruby/milter.

      We can say that milter manager 2.0.0 is better than 1.8.0 with confidence. Let's try milter manager if you haven't used milter manager yet.

      -

      milter-test-server

      +

      milter-test-server

      -

      Improvements

      +

      Improvements

      • Support multiline header. [GitHub #33]


      -

      Ruby milter

      +

      Ruby milter

      -

      Fixes

      +

      Fixes

      • Fix a bug that reject/temporary failure on envelope recipient calls reset.

    @@ -384,18 +488,18 @@

    1.8.9: 2013-06-28

    A bug fix release of 1.8.8.

    -

    Package

    +

    Package

    -

    Improvements

    +

    Improvements

    • [rpm] Update Ruby1.9.3 package for CentOS6 to Ruby1.9.3-p448 released on 2013-06-27


    -

    milter manager

    +

    milter manager

    -

    Fixes

    +

    Fixes

    • [binding][ruby] Fixed a bug that milter-manager couldn't detect socket path if greylist.conf includes socket path with permission.

    @@ -403,9 +507,9 @@

    1.8.8: 2013-06-25

    A bug fix release of 1.8.7.

    -

    Package

    +

    Package

    -

    Fixes

    +

    Fixes

    • [rpm] milter-manager-log-analyzer should include cron configuration. [Reported by Satoru Sakashita][milter-manager-users-ja:00200]

    • [deb] Remove old configuration file installed by milter-manager. [Reported by Youhei SASAKI][milter-manager-users-ja:00202]

    • @@ -414,12 +518,12 @@

    -

    Known Issues

    +

    Known Issues

    • [test] Failed some test cases using rrdtool on some environments. [Reported by Hirohisa Yamaguchi][GitHub #29]


    -

    Thanks

    +

    Thanks

    • Satoru Sakashita

    • Youhei SASAKI

    • @@ -431,7 +535,7 @@

      1.8.7: 2013-06-14

      A bug fix release of 1.8.6.

      -

      Package

      +

      Package

      • [rpm] Keep user configuration settings on upgrade.

      • [deb][rpm] Separate milter-manager-log-analyzer from milter-manager. [Reported by Kazuhiro NISHIYAMA][GitHub #21]

      • @@ -443,32 +547,32 @@

      -

      milter manager

      +

      milter manager

      -

      Improvements

      +

      Improvements

      • Support Ruby2.0.0.

      -

      Fixes

      +

      Fixes

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


      -

      milter-manager-log-analyzer

      +

      milter-manager-log-analyzer

      -

      Fixes

      +

      Fixes

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


      -

      Admin

      +

      Admin

      • Dropped.


      -

      Thanks

      +

      Thanks

      • Kazuhiro NISHIYAMA

      • Satoru Sakashita

      • @@ -479,37 +583,37 @@

        1.8.6: 2013-03-07

        A bug fix release of 1.8.5.

        -

        milter-core

        +

        milter-core

        -

        Improvements

        +

        Improvements

        • [core][event-loop] Add an API to customize event loop on your own.

        -

        Fixes

        +

        Fixes

        • [core][event-loop] Fix to work broken libev backend with Ruby 1.9.


        -

        milter manager

        +

        milter manager

        -

        Improvements

        +

        Improvements

        • Add max-pending-finished-sessions as configuration option. If the number of current pending finished sessions is larger than 'max-pending-finished-sessions', the current pending finished sessions are freed immediately.


        -

        milter-client

        +

        milter-client

        -

        Improvements

        +

        Improvements

        • Add --max-pending-finished-sessions command line option.


        -

        Ruby milter

        +

        Ruby milter

        -

        Improvements

        +

        Improvements

        • Add an API to customize event loop on your own from Ruby.

        • Support manager.max_pending_finished_sessions.

        • @@ -519,17 +623,17 @@

        -

        Document

        +

        Document

        -

        Improvements

        +

        Improvements

        • Add documentation about manager.max_pending_finished_sessions

        • Add API to reset transaction.

        -

        Fixes

        +

        Fixes

        • Fix the default value of manager.maitenance_interval which is not correct.

        @@ -537,7 +641,7 @@

        1.8.5: 2012-12-03

        A bug fix release of 1.8.4.

        -

        Package

        +

        Package

        • Drop Ubuntu Natty Narwhal support.

        • Fix broken documents.

        • @@ -545,12 +649,12 @@

        -

        Ruby milter

        +

        Ruby milter

        • Fix a typo in test for Ruby1.8. [Pull requested by umq]


        -

        Thanks

        +

        Thanks

        • umq

        @@ -558,7 +662,7 @@

        1.8.4: 2012-11-21

        A bug fix release of 1.8.3.

        -

        Package

        +

        Package

        • Added Ubuntu Quantal Quetzal support.

        • Provided packages built by using Ruby1.9 on following distributions: Debian wheezy, Debian sid, Ubuntu Precise Pangolin, Ubuntu Quantal Quetzal

        • @@ -571,13 +675,13 @@

        -

        milter manager

        +

        milter manager

        -

        Improvements

        +

        Improvements

        • configure: Specify Ruby/GLib2 version to --with-bundled-ruby-glib2 option

        -

        Fixes

        +

        Fixes

        • manager: Suppressed compiler type warnings. [GitHub #12] [Reported by Hirohisa Yamaguchi]

        • debian cron: used mail.log instead of mail.info [milter-manager-users-ja:00171] [Reported by Kazuhiro NISHIYAMA]

        • @@ -586,38 +690,38 @@

        -

        milter-core

        +

        milter-core

        -

        Improvements

        +

        Improvements

        • Supported MILTER_DEBUG=fatal-criticals.

        • binding ruby: milter callback arguments are ASCII_8BIT. [GitHub #3]

        -

        Fixes

        +

        Fixes

        • Fixed an issue which a following warning is shown when running at high loads. "g_io_channel_write_chars: assertion `channel->is_writeable' failed"


        -

        Admin

        +

        Admin

        -

        Improvements

        +

        Improvements

        • Upgraded to Rails2.3.14


        -

        Document

        +

        Document

        -

        Fixes

        +

        Fixes

        • Fixed about install sequence on CentOS. [GitHub #13] [Reported by Kunkichi]


        -

        Thanks

        +

        Thanks

        • Hirohisa Yamaguchi

        • Kazuhiro NISHIYAMA

        • @@ -630,7 +734,7 @@

          1.8.3: 2012-05-22

          A bug fix release of 1.8.2.

          -

          Package

          +

          Package

          • [ubuntu] Added Ubuntu Precise Pangolin support.

          • [solaris] Use pkgutil instead of pkg-get. [GitHub #6] [Reported by h0lzi]

          • @@ -638,13 +742,13 @@

          -

          milter manager

          +

          milter manager

          -

          Improvements

          +

          Improvements

          • binding ruby: update bundled ruby-glib2 to 1.1.3

          -

          Fixes

          +

          Fixes

          • [manager] support manager.event_loop_backend = "libev" on CentOS. [Reported by SHIONO Kenji]

          • [manager][children] use gulong instead of guint. g_signal_connect() returns gulong.

          • @@ -653,17 +757,17 @@

          -

          milter-core

          +

          milter-core

          -

          Fixes

          +

          Fixes

          • [libev] check whether the next id is used or not.


          -

          Document

          +

          Document

          -

          Fixes

          +

          Fixes

          • doc install debian ubuntu: add missing postfix group related configuration milter-manager user should belong to postfix group to access a socket of other milter. [milter-manager-users-ja:00163] [Suggested by Satoru Sakashita]

          • doc debian: adjust to the latest squeeze environment [Suggested by Satoru Sakashita]

          • @@ -672,7 +776,7 @@

          -

          Thanks

          +

          Thanks

          • Satoru Sakashita

          • SHIONO Kenji

          • @@ -684,10 +788,10 @@

            1.8.2: 2011-11-29

            A bug fix release of 1.8.1.

            -

            milter-core

            +

            milter-core

            -

            Fixes

            +

            Fixes

            • [event-loop][glib] fix memory leaks since 1.6.6.

            • [core] fix memory leak when delete header.

            • @@ -699,7 +803,7 @@

              A bug fix release of 1.8.0.

              Now, manager.event_loop_backend and manager.n_workers aren't experimental!

              -

              Package

              +

              Package

              • [ubuntu] Added Ubuntu Oneiric Ocelot support.

              • [centos] Added CentOS 6 support.

              • @@ -708,13 +812,13 @@

              -

              milter manager

              +

              milter manager

              -

              Improvements

              +

              Improvements

              • [applicable-condition][sendmail] clear DNS cache for each 100 IP addresses.

              -

              Fixes

              +

              Fixes

              • detach IO for launcher on daemon mode. use milter_client_is_run_as_daemon() to get whether daemonize or not. [Reported by OBATA Akio]

              • add a workaround for Ruby cleanup. If environment variable MILTER_MANAGER_RUBY_STOP_TIMER_THREAD_BEFORE_CLEANUP=yes, skip timer thread before cleanup.

              • @@ -725,48 +829,48 @@

              -

              milter-core

              +

              milter-core

              -

              Fixes

              +

              Fixes

              • fix missing null FD close by inverted condition. [Reported by OBATA Akio]


              -

              milter-client

              +

              milter-client

              -

              Improvements

              +

              Improvements

              • use higher priority for accepting connection.

              -

              Fixes

              +

              Fixes

              • fix a bug that workers don't shutdown on master shutdown. It's GLib evnet loop backend specific problem.


              -

              milter-server

              +

              milter-server

              -

              Improvements

              +

              Improvements

              • add more information to error message.

              • [server] unify unknown name logging.

              -

              Fixes

              +

              Fixes

              • fix a bug that all milters can't find on 2nd RCPT in the same session.


              -

              Ruby milter

              +

              Ruby milter

              -

              Improvements

              +

              Improvements

              • add Milter::Client::Configuration::MilterConfiguration#name.

              -

              Fixes

              +

              Fixes

              • fix event_loop_created hook can't get event loop.

              • do not raise error if process raw shift_jis mail file. Ruby 1.9.

              • @@ -777,9 +881,9 @@

              -

              milter-test-server

              +

              milter-test-server

              -

              Fixes

              +

              Fixes

              • fix quoted charset detection. [Reported by nobu]

              • fix multiline header parsing.

              • @@ -789,9 +893,9 @@

              -

              Document

              +

              Document

              -

              Improvements

              +

              Improvements

              • add log list to HTML.

              • fix typos. [Pull requested by Norio Suzuki]

              • @@ -800,15 +904,15 @@

              -

              Admin

              +

              Admin

              -

              Improvements

              +

              Improvements

              • use locale "en" if Accept-Language is not "ja". [Reported by Larry G. Wapnitsky]


              -

              Thanks

              +

              Thanks

              • Mitsuru Ogino

              • OBATA Akio

              • @@ -824,17 +928,17 @@

                1.8.0: 2011-06-10

                The first release of stable 1.8.x series.

                -

                All

                +

                All

                -

                Improvements

                +

                Improvements

                • Removed unused variables.


                -

                Package

                +

                Package

                -

                Improvements

                +

                Improvements

                • [debian] Removed Debian GNU/Linux lenny support.

                • [debian] Added Debian GNU/Linux wheezy support.

                • @@ -846,15 +950,15 @@
                -

                Fixes

                +

                Fixes

                • [debian] Added missing milter.rb. [Reported by Mitsuru Ogino]


                -

                milter manager

                +

                milter manager

                -

                Improvements

                +

                Improvements

                • [trust applicable condition] Normalized domain name.

                • @@ -877,7 +981,7 @@

                -

                Fixes

                +

                Fixes

                • Fixed a bug that child milter process launcher isn't exited. [Reported by OBATA Akio]

                • Fixed a bug that child milters that return reject, temporary failure or discard aren't used in the same session.

                • @@ -886,46 +990,46 @@

                -

                milter-core

                +

                milter-core

                -

                Improvements

                +

                Improvements

                • Added trace log level that is more verbose than debug log level.

                • Supported +/- log level prefix to add/remove log level from the current log levels in MILTER_LOG_LEVEL environment environment.

                -

                Fixes

                +

                Fixes

                • Fixed a read block bug when readable data is available.


                -

                Ruby milter

                +

                Ruby milter

                -

                Improvements

                +

                Improvements

                • [configuration] Used 'accept' as default value for fallback status.


                -

                milter-performance-check

                +

                milter-performance-check

                -

                Improvements

                +

                Improvements

                • Supported CentOS 5.


                -

                Document

                +

                Document

                -

                Fixes

                +

                Fixes

                • Used Milter::VERSION instead of Milter::TOOLKIT_VERSION for confirming Ruby milter's version. [Reported by Mitsuru Ogino]


                -

                Thanks

                +

                Thanks

                • Mitsuru Ogino

                • OBATA Akio

                • @@ -937,25 +1041,25 @@

                  1.6.9: 2011-04-26

                  A bug fix release of 1.6.8.

                  -

                  All

                  +

                  All

                  -

                  Improvements

                  +

                  Improvements

                  • autogen.sh supports bash. [Reported by Kenji Shiono]


                  -

                  Document

                  +

                  Document

                  -

                  Improvements

                  +

                  Improvements

                  • Followed Ruby milter's change. [Reported by akira yamada]


                  -

                  milter manager

                  +

                  milter manager

                  -

                  Improvements

                  +

                  Improvements

                  • Added @@ -966,23 +1070,23 @@

                  -

                  Fixes

                  +

                  Fixes

                  • Fixed a bug that define_connection_checker raises an exception. [Reported by Kenji Shiono]


                  -

                  milter-client

                  +

                  milter-client

                  -

                  Improvements

                  +

                  Improvements

                  • Supported error report when UNIX domain socket mode change is failed.


                  -

                  milter-performance-check

                  +

                  milter-performance-check

                  -

                  Improvements

                  +

                  Improvements

                  • Added --starttls option.

                  • Added --auth-user option.

                  • @@ -992,13 +1096,13 @@
                  -

                  Fixes

                  +

                  Fixes

                  • Fixed a bug that --smtp-port is ignored.


                  -

                  Thanks

                  +

                  Thanks

                  • Kenji Shiono

                  • akira yamada

                  • @@ -1009,29 +1113,29 @@

                    1.6.8: 2011-04-15

                    A bug fix release of 1.6.7.

                    -

                    All

                    +

                    All

                    -

                    Improvements

                    +

                    Improvements

                    • Don't create needless directories on install. [Reported by OBATA Akio]


                    -

                    Document

                    +

                    Document

                    -

                    Improvements

                    +

                    Improvements

                    • Changed target CentOS version to 5.6.

                    -

                    Fixes

                    +

                    Fixes

                    • Fixed wrong internal links.


                    -

                    milter-manager

                    +

                    milter-manager

                    -

                    Improvements

                    +

                    Improvements


                    -

                    Ruby milter

                    +

                    Ruby milter

                    -

                    Improvements

                    +

                    Improvements

                    • Added @@ -1057,27 +1161,27 @@


                    -

                    milter-core

                    +

                    milter-core

                    -

                    Improvements

                    +

                    Improvements

                    • Followed the Sendmail behavior rather than Postfix behavior on adding a header.


                    -

                    milter-server

                    +

                    milter-server

                    -

                    Improvements

                    +

                    Improvements

                    • Don't require Ruby's header files until they are needed.

                    -

                    Fixes

                    +

                    Fixes

                    • Fixed a bug that milter-test-server can't be detected.


                    -

                    Thanks

                    +

                    Thanks

                    • OBATA Akio

                    @@ -1085,21 +1189,21 @@

                    1.6.7: 2011-04-08

                    A bug fix release of 1.6.6.

                    -

                    All

                    +

                    All

                    -

                    Improvements

                    +

                    Improvements

                    • Don't create needless directories on install. [Reported by OBATA Akio]

                    -

                    Fixes

                    +

                    Fixes

                    • Fixed a bug that Ruby/GLib2 in system can't be found. [Reported by OBATA Akio]


                    -

                    Package

                    +

                    Package

                    -

                    Fixes

                    +

                    Fixes

                    • [RPM] Fixed dependencies.

                    • [Debian] Fixed dependencies.

                    • @@ -1110,17 +1214,17 @@

                    -

                    milter-manager

                    +

                    milter-manager

                    -

                    Fixes

                    +

                    Fixes

                    • [S25R] Fixed a bug that milter is always run.


                    -

                    milter-core

                    +

                    milter-core

                    -

                    Improvements

                    +

                    Improvements

                    • Added "+LEVEL1|LEVEL2|..." syntax to add log levels.

                    • Added "-LEVEL1|LEVEL2|..." syntax to remove log levels.

                    • @@ -1129,9 +1233,9 @@

                    -

                    milter-client

                    +

                    milter-client

                    -

                    Improvements

                    +

                    Improvements

                    • Added --log-level option.

                    • Added --quiet option.

                    • @@ -1140,7 +1244,7 @@

                    -

                    Thanks

                    +

                    Thanks

                    • OBATA Akio

                    @@ -1148,9 +1252,9 @@

                    1.6.6: 2011-04-07

                    This release improves Ruby support and Solaris support.

                    -

                    All

                    +

                    All

                    -

                    Improvements

                    +

                    Improvements

                    • Added --with-bundled-ruby-glib2 configure option for using bundled Ruby/GLib2 anytime.

                    • Supported Solaris.

                    • @@ -1159,17 +1263,17 @@

                    -

                    Document

                    +

                    Document

                    -

                    Fixes

                    +

                    Fixes

                    • [Debian] add missing GROUP=postfix in configuration. [Reported by Jordao]


                    -

                    Package

                    +

                    Package

                    -

                    Improvements

                    +

                    Improvements

                    • Supported Solaris.

                    • Fedora 13 -> 14.

                    • @@ -1178,9 +1282,9 @@

                    -

                    milter-core

                    +

                    milter-core

                    -

                    Improvements

                    +

                    Improvements

                    • Set 'warning' log level by default.

                    • Set 'statistics' log level by default.

                    • @@ -1189,15 +1293,15 @@
                    -

                    Fixes

                    +

                    Fixes

                    • Fixed a memory leak on read error.


                    -

                    milter-manager

                    +

                    milter-manager

                    -

                    Improvements

                    +

                    Improvements

                    • Supported database connection.

                    • Disabled S25R applicable condition for IPv6 connection by default. It's customizable by s25r.check_only_ipv4=.

                    • @@ -1207,15 +1311,15 @@
                    -

                    Fixes

                    +

                    Fixes

                    • Fixed a crash bug on reloading. [Reported by Kenji Shiono]


                    -

                    libmilter-compatible

                    +

                    libmilter-compatible

                    -

                    Improvements

                    +

                    Improvements

                    • Supported event loop backend customize by environment variable:

                        @@ -1227,9 +1331,9 @@

                      -

                      milter-test-client

                      +

                      milter-test-client

                      -

                      Improvements

                      +

                      Improvements

                      • Added --pid-file option.

                      • Supported shutdown by SIGTERM.

                      • @@ -1238,9 +1342,9 @@

                      -

                      milter-test-server

                      +

                      milter-test-server

                      -

                      Improvements

                      +

                      Improvements

                      • Added --envelope-from option.

                      • Deprecated --from option.

                      • @@ -1259,9 +1363,9 @@

                      -

                      milter-report-statistics

                      +

                      milter-report-statistics

                      -

                      Improvements

                      +

                      Improvements

                      • Supported Solaris.

                      • Added --pid option.

                      • @@ -1271,9 +1375,9 @@

                      -

                      Ruby milter

                      +

                      Ruby milter

                      -

                      Improvements

                      +

                      Improvements

                      • Added --maintenance-interval option.

                      • Added --run-gc-on-maintain option.

                      • @@ -1297,13 +1401,13 @@
                      -

                      Fixes

                      +

                      Fixes

                      • Fixed a crash bug.


                      -

                      Thanks

                      +

                      Thanks

                      • Jordao

                      • Kenji Shiono

                      • @@ -1314,9 +1418,9 @@

                        1.6.5: 2011-01-26

                        A bug fix release of 1.6.4.

                        -

                        milter manager

                        +

                        milter manager

                        -

                        Fixes

                        +

                        Fixes

                        • Fixed a bug that "Sendmail Compatible" applicable condition doesn't set applicable if_addr and id_name macro value. [Patch by Kenji Shiono]

                        • Fixed a crash bug that may be caused SMTP client disconnection is detected. [Reported by Kenji Shiono]

                        • @@ -1325,23 +1429,23 @@

                        -

                        milter-manager-log-analyzer

                        +

                        milter-manager-log-analyzer

                        -

                        Improvements

                        +

                        Improvements

                        • Supported parsing Authentication-Results added by ENMA.


                        -

                        Ruby milter

                        +

                        Ruby milter

                        -

                        Improvements

                        +

                        Improvements

                        • Supported effective user and group change.


                        -

                        Thanks

                        +

                        Thanks

                        • Kenji Shiono

                        @@ -1349,10 +1453,10 @@

                        1.6.4: 2011-01-21

                        A bug fix release of 1.6.3.

                        -

                        milter-client

                        +

                        milter-client

                        -

                        Fixes

                        +

                        Fixes

                        • Used event loop usage as before when event loop backend is GLib.

                        @@ -1360,9 +1464,9 @@

                        1.6.3: 2011-01-20

                        A performance improvement release. This release includes a few performance improvement features but they are marked 'experimental'. They will be 'stable' feature in 1.8.0.

                        -

                        milter manager

                        +

                        milter manager

                        -

                        Improvements

                        +

                        Improvements

                        • Upgraded bundled Ruby/GLib2 to 0.90.5 from 0.19.4.

                        • Supported Ruby 1.9.2.

                        • @@ -1395,7 +1499,7 @@
                        -

                        Fixes

                        +

                        Fixes

                        • Fixed a bug that @@ -1408,17 +1512,17 @@


                        -

                        Document

                        +

                        Document

                        -

                        Improvements

                        +

                        Improvements

                        • Described about Postfix's {client_addr}. [Reported by Kenji Shiono]


                        -

                        milter-client

                        +

                        milter-client

                        -

                        Improvements

                        +

                        Improvements

                        • Supported multi process. (experimental)

                        • @@ -1432,21 +1536,21 @@

                        -

                        milter-server

                        +

                        milter-server

                        -

                        Improvements

                        +

                        Improvements

                        • Added more condition checks on evnets.

                        -

                        Fixes

                        +

                        Fixes

                        • Fixed a bug that timeout detection doesn't work. [Reported by Kenji Shiono]


                        -

                        Ruby milter

                        +

                        Ruby milter

                        -

                        Improvements

                        +

                        Improvements

                        • Added ruby-milter.pc.

                        • Added --packet-buffer-size option that specifies send packet buffer size. (experimental)

                        • @@ -1457,9 +1561,9 @@

                        -

                        milter-test-client

                        +

                        milter-test-client

                        -

                        Improvements

                        +

                        Improvements

                        • Added @@ -1481,9 +1585,9 @@


                        -

                        milter-performance-check

                        +

                        milter-performance-check

                        -

                        Improvements

                        +

                        Improvements

                        • Added @@ -1510,9 +1614,9 @@


                        -

                        milter-report-statistics

                        +

                        milter-report-statistics

                        -

                        Improvements

                        +

                        Improvements


                        -

                        Packet

                        +

                        Packet

                        • Updated package repository RPM for CentOS: 1.0.0-0 -> 1.0.0-1.


                        -

                        Thanks

                        +

                        Thanks

                        • Kenji Shiono

                        @@ -1535,45 +1639,45 @@

                        1.6.2: 2010-11-23

                        A bug fix release of 1.6.1.

                        -

                        milter manager

                        +

                        milter manager

                        -

                        Improvements

                        +

                        Improvements

                        • Made PID file directory prepareing process in init script on Debian robust. [Reported by Kenji Shiono]

                        • Used gint64 for time_t. [Suggested by OBATA Akio]

                        -

                        Fixes

                        +

                        Fixes

                        • Fixed missing temporary file close. [Reported by Kenji Shiono]


                        -

                        milter manager admin

                        +

                        milter manager admin

                        -

                        Improvements

                        +

                        Improvements

                        • Documented required sqlite3-ruby version on CentOS. [Reported by Kenji Shiono]


                        -

                        Ruby milter

                        +

                        Ruby milter

                        -

                        Improvements

                        +

                        Improvements

                        • Made milter-tarpit.rb, a sample milter, asynchronous. [Reported by Kenji Shiono]

                        • Provided all milter API.

                        -

                        Fixes

                        +

                        Fixes

                        • Fixed a typo in command line option. [Reported by Kenji Shiono]


                        -

                        Thanks

                        +

                        Thanks

                        • Kenji Shiono

                        • OBATA Akio

                        • @@ -1584,15 +1688,15 @@

                          1.6.1: 2010-08-21

                          A bug fix release of 1.6.0.

                          -

                          milter manager

                          +

                          milter manager

                          -

                          Fixes

                          +

                          Fixes

                          • Fixed a bug that no statistics information isn't logged to syslog. [Reported by akira yamada]


                          -

                          Thanks

                          +

                          Thanks

                          • akira yamada

                        @@ -1600,10 +1704,10 @@

                        1.6.0: 2010-08-11

                        The first release of stable 1.6.x series.

                        -

                        milter manager

                        +

                        milter manager

                        -

                        Improvements

                        +

                        Improvements

                        • Added parsers for Postfix cidr_table(5) and regexp_table(5): PostfixCIDRTable, PostfixRegexpTable

                        @@ -1611,9 +1715,9 @@

                        1.5.3: 2010-08-03

                        The last release of 1.5.x series. (plan)

                        -

                        Document

                        +

                        Document

                        -

                        Improvements

                        +

                        Improvements


                        -

                        milter manager

                        +

                        milter manager

                        -

                        Improvements

                        +

                        Improvements

                        • Ensured to reply for negotiation on negotiation failure.

                        • Reduced the default timeout for reporting timeout error to MTA. The previous default timeout is the same as MTA default. With the value, we can't have a time to report timeout error to MTA.

                        • @@ -1643,17 +1747,17 @@

                        -

                        milter manager admin

                        +

                        milter manager admin

                        -

                        Improvements

                        +

                        Improvements

                        • Supported Rails 2.3.8.


                        -

                        milter-test-server

                        +

                        milter-test-server

                        -

                        Improvements

                        +

                        Improvements

                        • Added @@ -1670,17 +1774,17 @@


                        -

                        milter-core

                        +

                        milter-core

                        -

                        Improvements

                        +

                        Improvements

                        • Chanaged default log level to output error and critical message.


                        -

                        Ruby milter

                        +

                        Ruby milter

                        -

                        Improvements

                        +

                        Improvements

                        • Added --user, --gorup, --unix-socket-group, --unix-socket-mode, --syslog, --library-version options.

                        • Added milter-test-client implemented by Ruby as a sample.

                        • @@ -1690,7 +1794,7 @@

                        -

                        Thanks

                        +

                        Thanks

                        • SATOH Fumiyasu

                        @@ -1699,9 +1803,9 @@

                        A bug fix release of 1.5.1.

                        We recommend development version users who use a milter that uses NO_REPLY_* or milter-greylist 4.3.x upgrade to this version.

                        -

                        Document

                        +

                        Document

                        -

                        Improvements

                        +

                        Improvements

                        • Created @@ -1714,9 +1818,9 @@


                        -

                        milter manager

                        +

                        milter manager

                        -

                        Improvements

                        +

                        Improvements


                        -

                        milter-manager-log-analyzer

                        +

                        milter-manager-log-analyzer

                        -

                        Improvements

                        +

                        Improvements

                        • Supported milter-greylist 4.3.x.


                        -

                        milter-toolkit

                        +

                        milter-toolkit

                        -

                        Improvements

                        +

                        Improvements

                        • Used inet_pton()/inet_pton() instead of inet_aton()/inet_ntoa(). [Suggested by SATOH Fumiyasu]


                        -

                        Thanks

                        +

                        Thanks

                        • SATOH Fumiyasu

                        • ROSSO

                        • @@ -1756,24 +1860,24 @@

                          A bug fix release of 1.5.0.

                          It includes a memory leak fix derived from Ruby/GLib2 because bundled Ruby/GLib2 is updated. If bundled Ruby/GLib2 is used, upgrade is recommended.

                          -

                          Document

                          +

                          Document

                          -

                          Improvements

                          +

                          Improvements

                          • Added install document for development release on Ubuntu Karmic Koara.

                          • Added a description that installs Rack explicitly. [Reported by Tsuchiya]

                          -

                          Fixes

                          +

                          Fixes

                          • FreeBSD: Fixed package name [Reported by Tsuchiya]


                          -

                          libmilter-core

                          +

                          libmilter-core

                          -

                          Improvements

                          +

                          Improvements

                          • Supported syslog level change by MILTER_LOG_SYSLOG_LEVEL environment variable.

                          • Added memory profiler.

                          • @@ -1782,9 +1886,9 @@

                          -

                          milter manager

                          +

                          milter manager

                          -

                          Improvements

                          +

                          Improvements

                          • Supported Solaris. [Reported and patched by SATOH Fumiyasu]

                          • Bundled Ruby/GLib2 0.19.4.

                          • @@ -1793,9 +1897,9 @@

                          -

                          milter-test-client

                          +

                          milter-test-client

                          -

                          Improvements

                          +

                          Improvements


                          -

                          Thanks

                          +

                          Thanks

                          • Tsuchiya

                          • SATOH Fumiyasu

                          • @@ -1816,9 +1920,9 @@

                            1.5.0: 2010-03-29

                            A development release.

                            -

                            Document

                            +

                            Document

                            -

                            Improvements

                            +

                            Improvements

                            • For Debian GNU/Linux・Ubuntu:

                              @@ -1838,7 +1942,7 @@
                            -

                            Bug fixes

                            +

                            Bug fixes

                            • For FreeBSD:

                              • Fixed pw command options.

                              @@ -1847,9 +1951,9 @@

                            -

                            milter manager

                            +

                            milter manager

                            -

                            Improvements

                            +

                            Improvements

                            • init script for Debian GNU/Linux:

                              @@ -1933,20 +2037,20 @@
                            -

                            Bug fixes

                            +

                            Bug fixes

                            • FreeBSD: Fixed OpenDKIM detection when any profiles aren't used in /etc/rc.conf. [Reported by Tsuchiya]

                            • Fixed a bug that applicable condition is ignored by Ruby's GC.

                            -

                            Experimental

                            +

                            Experimental

                            • Introduced policy framework to specify condition and milter all together.


                            -

                            milter-toolkit

                            +

                            milter-toolkit

                            • Supported milter development by Ruby bindings: @@ -1958,7 +2062,7 @@


                            -

                            milter-manager-log-analyzer

                            +

                            milter-manager-log-analyzer

                            • Speed up (almost 2 times faster)

                            • Supported visualization about number connections that is disconnection from SMTP clients.

                            • @@ -1966,7 +2070,7 @@

                            -

                            milter-performance-check

                            +

                            milter-performance-check

                            • New options

                              • @@ -1977,7 +2081,7 @@


                              -

                              milter-test-client

                              +

                              milter-test-client

                              • New options:

                                  @@ -2002,15 +2106,15 @@

                                -

                                Package

                                +

                                Package

                                -

                                CentOS

                                +

                                CentOS

                                • Split to some packages.


                                -

                                Test

                                +

                                Test

                                • Supported Cutter @@ -2019,7 +2123,7 @@


                                -

                                Thanks

                                +

                                Thanks

                                • ZnZ

                                • Tsuchiya

                                • @@ -2031,7 +2135,7 @@

                                  1.4.2: 2010-03-29

                                  A bug fix release for 1.4.1.

                                  -

                                  Document

                                  +

                                  Document

                                  • Upgraded target FreeBSD version: 7.2-RELEASE -> 8.0-RELEASE

                                  • Changed to use CPPFLAGS instead of CFLAGS for configure on FreeBSD.

                                  • @@ -2040,10 +2144,10 @@

                                  -

                                  milter manager

                                  +

                                  milter manager

                                  -

                                  Bug fixes

                                  +

                                  Bug fixes

                                  • Fixed a bug that socket group isn't effected when both effective user and socket group are specified.

                                  • Fixed a bug that auto milter detection is failed on no OpenDKIM installed FreeBSD environment.

                                  • @@ -2054,7 +2158,7 @@

                                    1.4.1: 2009-10-29

                                    A bug fix release for 1.4.0.

                                    -

                                    Document

                                    +

                                    Document

                                    • Upgraded target CentOS version: 5.3 -> 5.4.

                                    • Fixed types. [Yuto Hayamizu]

                                    • @@ -2063,9 +2167,9 @@

                                    -

                                    milter manager

                                    +

                                    milter manager

                                    -

                                    Improvements

                                    +

                                    Improvements

                                    • Bundled Ruby/GLib2 for CentOS.

                                    • @@ -2081,7 +2185,7 @@
                                    -

                                    Bug fixes

                                    +

                                    Bug fixes

                                    • Fixed a bug that init script overwrites default configuration value on CentOS. [Reported by gorimaru]

                                    • Fixed a bug that needless commands are sent to finished child milter on evaluation mode.

                                    • @@ -2090,7 +2194,7 @@

                                    -

                                    Thanks

                                    +

                                    Thanks

                                    • Yuto Hayamizu

                                    • gorimaru

                                    • @@ -2102,19 +2206,19 @@

                                      1.4.0: 2009-10-13

                                      A stable release.

                                      -

                                      Document

                                      +

                                      Document

                                      • Added install documents for Debian.


                                      -

                                      milter-manager

                                      +

                                      milter-manager

                                      -

                                      Improvements

                                      +

                                      Improvements

                                      • Supported OpenDKIM detection on Debian/Ubuntu/FreeBSD.

                                      -

                                      Bug fixes

                                      +

                                      Bug fixes

                                      • Fixed a bug that adding header statistics isn't logged on evaluation mode.

                                    @@ -2122,9 +2226,9 @@

                                    1.3.1: 2009-09-16

                                    A development release. Evaluation mode was added.

                                    -

                                    milter-manager

                                    +

                                    milter-manager

                                    -

                                    Improvements

                                    +

                                    Improvements

                                    • Added @@ -2153,27 +2257,27 @@


                                    -

                                    milter-toolkit

                                    +

                                    milter-toolkit

                                    • Added more the Ruby bindings [Yuto Hayamizu]


                                    -

                                    milter manager admin

                                    +

                                    milter manager admin

                                    • Supported Rails 2.3.4


                                    -

                                    milter-test-client

                                    +

                                    milter-test-client

                                    • Added --syslog options that logs to syslog.


                                    -

                                    milter-manager-log-analyzer

                                    +

                                    milter-manager-log-analyzer

                                    • Supported milter-greylist's SPF result.


                                    -

                                    Thanks

                                    +

                                    Thanks

                                    • Yuto Hayamizu

                                    • Syunsuke Komma

                                    • @@ -2184,13 +2288,13 @@

                                      1.3.0: 2009-08-12

                                      A development release.

                                      -

                                      milter-manager

                                      +

                                      milter-manager

                                      -

                                      Improvements

                                      +

                                      Improvements

                                      • Improved a process for multi messages in a SMTP session.

                                      -

                                      Bug fixes

                                      +

                                      Bug fixes

                                      • Fixed a bug that quarantine is ignored. [Reported by Tsuchiya]

                                      • Fixed a bug that discard is ignored. [Reported by Tsuchiya]

                                      • @@ -2200,7 +2304,7 @@

                                      -

                                      milter-test-server

                                      +

                                      milter-test-server

                                      • Suppressed needless abort.

                                      • Changed to send 'continue' on 'quarantine'.

                                      • @@ -2208,12 +2312,12 @@

                                      -

                                      milter-manager-log-analyzer

                                      +

                                      milter-manager-log-analyzer

                                      • Supported virus detection result of clamav-milter.


                                      -

                                      Thanks

                                      +

                                      Thanks

                                      • Tsuchiya

                                      • Павел Гришин

                                      • @@ -2224,13 +2328,13 @@

                                        1.2.0: 2009-07-17

                                        A stable release.

                                        -

                                        milter-manager

                                        +

                                        milter-manager

                                        -

                                        Improvements

                                        +

                                        Improvements

                                        • Supported DATA stopper independently of MTA's milter protocol.

                                        -

                                        Bug fixes

                                        +

                                        Bug fixes

                                        • Fixed a timeout problem when all milters are stopped on message processing. [Reported by sgyk]

                                        • Fixed a problem that milter-manager doesn't work with Postfix 2.3.3. [Reported by Fumihisa Tonaka]

                                        • @@ -2239,7 +2343,7 @@

                                        -

                                        Thanks

                                        +

                                        Thanks

                                        • sgyk

                                        • Fumihisa Tonaka

                                        • @@ -2250,9 +2354,9 @@

                                          1.1.1: 2009-07-03

                                          A release to be the next stable release 1.2.0.

                                          -

                                          milter-manager

                                          +

                                          milter-manager

                                          -

                                          Improvements

                                          +

                                          Improvements

                                          • Reduced needless abort calls.

                                          • Reduced statistics logs.

                                          • @@ -2280,7 +2384,7 @@
                                          -

                                          Bug fixes

                                          +

                                          Bug fixes

                                          • Fixed a race condition on multiple milters running.

                                          • Fixed a problem that error status isn't replied to MTA. [Reported by Fumihisa Tonaka]

                                          • @@ -2290,12 +2394,12 @@

                                          -

                                          milter-test-server

                                          +

                                          milter-test-server

                                          • Changed to report a message is rejected or temporary failed if all recipients are rejected or temporary failed.


                                          -

                                          milter-manager-log-analyzer

                                          +

                                          milter-manager-log-analyzer

                                          • Supported application result graphs for each milter.

                                          • Supported statistics graphs for each method.

                                          • @@ -2303,7 +2407,7 @@

                                          -

                                          Thanks

                                          +

                                          Thanks

                                          • Fumihisa Tonaka

                                          • sgyk

                                          • @@ -2311,10 +2415,10 @@
                                          -

                                          1.1.0: 2009-06-02

                                          +

                                          1.1.0: 2009-06-02

                                          A development release leading up to the next stable release 1.2.0.

                                          -

                                          milter-manager

                                          +

                                          milter-manager

                                          • Reduced needless logs.

                                          • Supported ENMA auto detection on FreeBSD.

                                          • @@ -2343,12 +2447,12 @@

                                          -

                                          milter manager admin

                                          +

                                          milter manager admin

                                          • Supported Ruby on Rails 2.3.2.


                                          -

                                          milter-test-server

                                          +

                                          milter-test-server

                                          • Supported reply-code.

                                          • @@ -2363,33 +2467,33 @@

                                          -

                                          milter-manager-log-analyzer

                                          +

                                          milter-manager-log-analyzer

                                          • Reduced memory usage.


                                          -

                                          Documentation

                                          +

                                          Documentation

                                          • Fixed a link: [Павел Гришин]

                                          -

                                          1.0.1: 2009-05-14

                                          +

                                          1.0.1: 2009-05-14

                                          A bug fix release of 1.0.0.

                                          -

                                          milter-manager

                                          +

                                          milter-manager

                                          • Fixed a bug that milter-manager isn't restarted on updating RPM package.


                                          -

                                          milter manager admin

                                          +

                                          milter manager admin

                                          • Specified used gem version [Reported by nhisa]

                                          -

                                          1.0.0: 2009-04-16

                                          +

                                          1.0.0: 2009-04-16

                                          The first stable release.

                                          -

                                          Documentation

                                          +

                                          Documentation

                                          • Added man pages for commands.

                                          • Added --external option to clamav-milter's configuration.

                                          • @@ -2398,20 +2502,20 @@

                                          -

                                          milter-manager

                                          +

                                          milter-manager

                                          • Added ENMA detection on CentOS.


                                          -

                                          milter-performance-check

                                          +

                                          milter-performance-check

                                          • Worked --n-mails option with --period/--interval option.

                                          -

                                          0.9.0: 2009-03-10

                                          +

                                          0.9.0: 2009-03-10

                                          Speed and stability are improved.

                                          -

                                          milter-manager

                                          +

                                          milter-manager

                                          • Added a feature to change group of UNIX domain socket.

                                          • @@ -2436,7 +2540,7 @@

                                          -

                                          New applicable conditions

                                          +

                                          New applicable conditions

                                          • @@ -2456,7 +2560,7 @@


                                          -

                                          milter-performance-check

                                          +

                                          milter-performance-check

                                          • Added a feature to send a file as a mail.

                                          • Added a feature to send each file under specified directories as a mail.

                                          • @@ -2468,12 +2572,12 @@

                                          -

                                          milter-manager-log-analyzer

                                          +

                                          milter-manager-log-analyzer

                                          • [incompatible]: Added an item "abort" to processed mail graph.

                                          -

                                          0.8.0: 2009-02-06

                                          +

                                          0.8.0: 2009-02-06

                                          • New features

                                            @@ -2509,7 +2613,7 @@
                                          -

                                          0.7.0: 2009-01-16

                                          +

                                          0.7.0: 2009-01-16

                                          • Initial release on SF.net.

                                          diff -Nru milter-manager-2.0.8/doc/reference/install-to-centos6.xml milter-manager-2.0.9/doc/reference/install-to-centos6.xml --- milter-manager-2.0.8/doc/reference/install-to-centos6.xml 2016-05-14 06:44:49.293964116 +0000 +++ milter-manager-2.0.9/doc/reference/install-to-centos6.xml 2016-06-08 05:30:08.239247285 +0000 @@ -31,9 +31,9 @@ Spamass-milter, clamav-milter and milter-greylist are used as milters. Milter packages registered in EPEL are used. Register EPEL like the following. On 32bit environment: - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm On 64bit environment: - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm Now, you can install milters: % sudo yum install -y spamass-milter clamav-milter milter-greylist And you can install RRDtool for generating graphs: @@ -44,7 +44,7 @@ Build and Install milter manager can be installed by yum. Register milter manager yum repository like the following: - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm Now, you can install milter manager: % sudo yum install -y milter-manager diff -Nru milter-manager-2.0.8/doc/reference/install-to-centos6.xml.ja milter-manager-2.0.9/doc/reference/install-to-centos6.xml.ja --- milter-manager-2.0.8/doc/reference/install-to-centos6.xml.ja 2016-05-14 06:44:49.121961922 +0000 +++ milter-manager-2.0.9/doc/reference/install-to-centos6.xml.ja 2016-06-08 05:30:08.171246997 +0000 @@ -30,9 +30,9 @@ MTAは標準でインストールされているPostfixを利用することとします。 milterはspamass-milter、clamav-milter、milter-greylistを使用 することとします。各milterはEPELにあるものを利用します。 32bit環境の場合は以下のようにEPELを登録します。 - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm 64bit環境の場合は以下のようにEPELを登録します。 - % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm + % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm リポジトリを登録したらmilterをインストールします。 % sudo yum install -y spamass-milter clamav-milter milter-greylist また、グラフ作成用にRRDtoolもインストールします。 @@ -43,7 +43,7 @@ milter managerパッケージのインストール milter managerはyumでインストールできます。 まず、yumリポジトリを登録します。 - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm 登録が完了したらmilter managerをインストールできます。 % sudo yum install -y milter-manager diff -Nru milter-manager-2.0.8/doc/reference/install-to-centos.xml milter-manager-2.0.9/doc/reference/install-to-centos.xml --- milter-manager-2.0.8/doc/reference/install-to-centos.xml 2016-05-14 06:44:50.485979322 +0000 +++ milter-manager-2.0.9/doc/reference/install-to-centos.xml 2016-06-08 05:30:08.295247522 +0000 @@ -41,7 +41,7 @@ Build and Install milter manager can be installed by yum. Register milter manager yum repository like the following: - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm Now, you install milter manager: % sudo yum install -y milter-manager diff -Nru milter-manager-2.0.8/doc/reference/install-to-centos.xml.ja milter-manager-2.0.9/doc/reference/install-to-centos.xml.ja --- milter-manager-2.0.8/doc/reference/install-to-centos.xml.ja 2016-05-14 06:44:50.309977077 +0000 +++ milter-manager-2.0.9/doc/reference/install-to-centos.xml.ja 2016-06-08 05:30:08.227247234 +0000 @@ -40,7 +40,7 @@ milter managerパッケージのインストール milter managerはyumでインストールできます。 まず、yumリポジトリを登録します。 - % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm 登録が完了したらmilter managerをインストールできます。 % sudo yum install -y milter-manager diff -Nru milter-manager-2.0.8/doc/reference/install-to-ubuntu.xml milter-manager-2.0.9/doc/reference/install-to-ubuntu.xml --- milter-manager-2.0.8/doc/reference/install-to-ubuntu.xml 2016-06-06 12:59:11.733975586 +0000 +++ milter-manager-2.0.9/doc/reference/install-to-ubuntu.xml 2016-06-15 00:30:23.198894511 +0000 @@ -22,11 +22,20 @@ Install packages - We provide milter manager deb packages for the following distributions. You put the following content to /etc/apt/sources.list.d/milter-manager.list. + + We provide milter manager deb packages for Ubuntu on + Launchpad + . + You also enable the official backports repository to detect the latest viruses by the latest ClamAV. + % sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-backports main universe" PPA (Personal Package Archive) - The milter-manager APT repository for Ubuntu uses PPA (Personal Package Archive) on Launchpad since milter-manager 2.0.8. You can install milter manager by APT from the PPA. + + The milter manager APT repository for Ubuntu uses PPA (Personal Package Archive) on + Launchpad + . You can install milter manager by APT from the PPA. + Here are supported Ubuntu versions: @@ -50,7 +59,11 @@ % sudo apt-get -y install software-properties-common % sudo add-apt-repository -y ppa:milter-manager/ppa % sudo apt-get update - Then install: + + + + Install + Install milter manager: % sudo apt-get -y install milter-manager We use Postfix as MTA: % sudo apt-get -V -y install postfix diff -Nru milter-manager-2.0.8/doc/reference/install-to-ubuntu.xml.ja milter-manager-2.0.9/doc/reference/install-to-ubuntu.xml.ja --- milter-manager-2.0.8/doc/reference/install-to-ubuntu.xml.ja 2016-05-14 06:44:46.757931762 +0000 +++ milter-manager-2.0.9/doc/reference/install-to-ubuntu.xml.ja 2016-06-15 00:30:23.126894188 +0000 @@ -22,48 +22,46 @@ パッケージのインストール - milter managerのサイトでは以下のUbuntu用debパッケージを提供しています。 まず、以下の内容の/etc/apt/sources.list.d/milter-manager.listを作成し ます。 + + Ubuntu向けのmilter managerのAPTリポジトリを + Launchpad + 上で提供しています。 + また、最新のClamAVを使ってウィルスチェックできるようにするため、バック ポートリポジトリも有効にします。 + % sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-backports main universe" - Precise Pangolinの場合 - /etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable precise universe -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable precise universe - もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - deb http://jp.archive.ubuntu.com/ubuntu precise-backports main universe - - - - Trusty Tahrの場合 - /etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable trusty universe -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable trusty universe - もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - deb http://archive.ubuntu.com/ubuntu trusty-backports main universe - - - - Vivid Vervetの場合 - /etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable vivid universe -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable vivid universe - もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - deb http://archive.ubuntu.com/ubuntu vivid-backports main universe - - - - Wily Werewolfの場合 - /etc/apt/sources.list.d/milter-manager.list: - deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable wily universe -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable wily universe - もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。 - deb http://archive.ubuntu.com/ubuntu wily-backports main universe + PPA (Personal Package Archive) + + Ubuntu向けのmilter managerのAPTリポジトリは + Launchpad + 上にあります。 + + サポートしているUbuntuのバージョン: + + + 12.04 LTS Precise Pangolin + + + 14.04 LTS Trusty Tahr + + + 15.10 Wily Werewolf + + + 16.04 LTS Xenial Xerus + + + + ppa:milter-manager/ppa + PPAを追加します: + + % sudo apt-get -y install software-properties-common +% sudo add-apt-repository -y ppa:milter-manager/ppa +% sudo apt-get update インストール - パッケージはmilter managerリリース用の鍵でサインされています。信用 する場合は鍵を登録します。 - % sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1BD22CD1 milter managerをインストールします。 % sudo apt-get update % sudo apt-get -V -y install milter-manager diff -Nru milter-manager-2.0.8/doc/reference/ja/html/core.xml milter-manager-2.0.9/doc/reference/ja/html/core.xml --- milter-manager-2.0.8/doc/reference/ja/html/core.xml 2016-06-06 13:00:04.906327033 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/core.xml 2016-06-15 07:19:57.774862400 +0000 @@ -71,7 +71,7 @@ milter_quit void milter_quit (void); -Call this function after the milter-core library use. +Call this function after the milter-server library use. diff -Nru milter-manager-2.0.8/doc/reference/ja/html/index.html milter-manager-2.0.9/doc/reference/ja/html/index.html --- milter-manager-2.0.8/doc/reference/ja/html/index.html 2016-06-06 13:00:04.902327011 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/index.html 2016-06-15 07:19:57.770862387 +0000 @@ -14,7 +14,7 @@
                                          -

                                          milter manager2.0.8 +

                                          milter manager2.0.9 用


                                          diff -Nru milter-manager-2.0.8/doc/reference/ja/html/install-to-centos6.html milter-manager-2.0.9/doc/reference/ja/html/install-to-centos6.html --- milter-manager-2.0.8/doc/reference/ja/html/install-to-centos6.html 2016-06-06 13:00:04.902327011 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/install-to-centos6.html 2016-06-15 07:19:57.774862400 +0000 @@ -46,9 +46,9 @@

                                          MTAは標準でインストールされているPostfixを利用することとします。

                                          milterはspamass-milter、clamav-milter、milter-greylistを使用 することとします。各milterはEPELにあるものを利用します。

                                          32bit環境の場合は以下のようにEPELを登録します。

                                          -
                                          % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm
                                          +
                                          % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/i386/epel-release-6-8.noarch.rpm

                                          64bit環境の場合は以下のようにEPELを登録します。

                                          -
                                          % sudo rpm -Uhv http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm
                                          +
                                          % sudo yum install -y http://ftp.jaist.ac.jp/pub/Linux/Fedora/epel/6/x86_64/epel-release-6-8.noarch.rpm

                                          リポジトリを登録したらmilterをインストールします。

                                          % sudo yum install -y spamass-milter clamav-milter milter-greylist

                                          また、グラフ作成用にRRDtoolもインストールします。

                                          @@ -58,7 +58,7 @@

                                          milter managerパッケージのインストール

                                          milter managerはyumでインストールできます。

                                          まず、yumリポジトリを登録します。

                                          -
                                          % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm
                                          +
                                          % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm

                                          登録が完了したらmilter managerをインストールできます。

                                          % sudo yum install -y milter-manager
                                          diff -Nru milter-manager-2.0.8/doc/reference/ja/html/install-to-centos.html milter-manager-2.0.9/doc/reference/ja/html/install-to-centos.html --- milter-manager-2.0.8/doc/reference/ja/html/install-to-centos.html 2016-06-06 13:00:04.902327011 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/install-to-centos.html 2016-06-15 07:19:57.774862400 +0000 @@ -55,7 +55,7 @@

                                          milter managerパッケージのインストール

                                          milter managerはyumでインストールできます。

                                          まず、yumリポジトリを登録します。

                                          -
                                          % sudo rpm -Uvh http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm
                                          +
                                          % sudo yum install -y http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm

                                          登録が完了したらmilter managerをインストールできます。

                                          % sudo yum install -y milter-manager
                                          diff -Nru milter-manager-2.0.8/doc/reference/ja/html/install-to-ubuntu.html milter-manager-2.0.9/doc/reference/ja/html/install-to-ubuntu.html --- milter-manager-2.0.8/doc/reference/ja/html/install-to-ubuntu.html 2016-06-06 13:00:04.902327011 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/install-to-ubuntu.html 2016-06-15 07:19:57.774862400 +0000 @@ -38,48 +38,38 @@

                                          パッケージのインストール

                                          -

                                          milter managerのサイトでは以下のUbuntu用debパッケージを提供しています。 まず、以下の内容の/etc/apt/sources.list.d/milter-manager.listを作成し ます。

                                          +

                                          + Ubuntu向けのmilter managerのAPTリポジトリを + Launchpad + 上で提供しています。 +

                                          また、最新のClamAVを使ってウィルスチェックできるようにするため、バック ポートリポジトリも有効にします。

                                          +
                                          % sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-backports main universe"
                                          -

                                          Precise Pangolinの場合

                                          -

                                          /etc/apt/sources.list.d/milter-manager.list:

                                          -
                                          deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable precise universe
                                          -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable precise universe
                                          -

                                          もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。

                                          -
                                          deb http://jp.archive.ubuntu.com/ubuntu precise-backports main universe
                                          +

                                          PPA (Personal Package Archive)

                                          +

                                          + Ubuntu向けのmilter managerのAPTリポジトリは + Launchpad + 上にあります。 +

                                          +

                                          サポートしているUbuntuのバージョン:

                                          +
                                            +
                                          • 12.04 LTS Precise Pangolin

                                          • +
                                          • 14.04 LTS Trusty Tahr

                                          • +
                                          • 15.10 Wily Werewolf

                                          • +
                                          • 16.04 LTS Xenial Xerus

                                          • +
                                          +

                                          + ppa:milter-manager/ppa + PPAを追加します: +

                                          +
                                          % sudo apt-get -y install software-properties-common
                                          +% sudo add-apt-repository -y ppa:milter-manager/ppa
                                          +% sudo apt-get update

                                          -

                                          Trusty Tahrの場合

                                          -

                                          /etc/apt/sources.list.d/milter-manager.list:

                                          -
                                          deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable trusty universe
                                          -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable trusty universe
                                          -

                                          もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。

                                          -
                                          deb http://archive.ubuntu.com/ubuntu trusty-backports main universe
                                          -
                                          -
                                          -
                                          -

                                          Vivid Vervetの場合

                                          -

                                          /etc/apt/sources.list.d/milter-manager.list:

                                          -
                                          deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable vivid universe
                                          -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable vivid universe
                                          -

                                          もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。

                                          -
                                          deb http://archive.ubuntu.com/ubuntu vivid-backports main universe
                                          -
                                          -
                                          -
                                          -

                                          Wily Werewolfの場合

                                          -

                                          /etc/apt/sources.list.d/milter-manager.list:

                                          -
                                          deb http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable wily universe
                                          -deb-src http://downloads.sourceforge.net/project/milter-manager/ubuntu/stable wily universe
                                          -

                                          もし、まだバックポートリポジトリを有効にしていない場合は以下のような内 容の/etc/apt/sources.list.d/backports.listを作成して有効にします。

                                          -
                                          deb http://archive.ubuntu.com/ubuntu wily-backports main universe
                                          -
                                          -
                                          -
                                          -

                                          インストール

                                          -

                                          パッケージはmilter managerリリース用の鍵でサインされています。信用 する場合は鍵を登録します。

                                          -
                                          % sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1BD22CD1
                                          +

                                          インストール

                                          milter managerをインストールします。

                                          % sudo apt-get update
                                           % sudo apt-get -V -y install milter-manager
                                          diff -Nru milter-manager-2.0.8/doc/reference/ja/html/milter-version.xml milter-manager-2.0.9/doc/reference/ja/html/milter-version.xml --- milter-manager-2.0.8/doc/reference/ja/html/milter-version.xml 2016-06-06 13:00:04.910327054 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/milter-version.xml 2016-06-15 07:19:57.774862400 +0000 @@ -66,7 +66,7 @@ MILTER_TOOLKIT_VERSION MILTER_TOOLKIT_VERSION -#define MILTER_TOOLKIT_VERSION G_STRINGIFY(2.0.8) +#define MILTER_TOOLKIT_VERSION G_STRINGIFY(2.0.9) @@ -82,7 +82,7 @@ MILTER_TOOLKIT_VERSION_MICRO MILTER_TOOLKIT_VERSION_MICRO -#define MILTER_TOOLKIT_VERSION_MICRO 8 +#define MILTER_TOOLKIT_VERSION_MICRO 9 diff -Nru milter-manager-2.0.8/doc/reference/ja/html/news.html milter-manager-2.0.9/doc/reference/ja/html/news.html --- milter-manager-2.0.8/doc/reference/ja/html/news.html 2016-06-06 13:00:04.906327033 +0000 +++ milter-manager-2.0.9/doc/reference/ja/html/news.html 2016-06-15 07:19:57.774862400 +0000 @@ -29,67 +29,89 @@
                                          -

                                          2.0.8: 2016-05-XX

                                          +

                                          2.0.9: 2016-06-15

                                          +

                                          2.0.8 のバグフィックスリリースです。

                                          +
                                          +

                                          milter manager

                                          +
                                          +
                                          +

                                          修正

                                          +
                                          • CentOS6, CentOS7 上で milter の自動検出を正しく動作するようにした

                                          +
                                          +
                                          +
                                          +

                                          2.0.8: 2016-06-15

                                          2.0.7 のバグフィックスリリースです。

                                          すでにmilter-managerをインストールしている場合、パッケージを更新する前 に次の作業が必要です。

                                          Debianの場合: /etc/apt/sources.list.d/milter-manager.listを更新する(以 下はjessieの例です)

                                          deb http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main
                                           deb-src http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main
                                          +

                                          Ubuntuの場合: ppa:milter-manager/ppa を追加する

                                          +
                                          % sudo apt-get -y install software-properties-common
                                          +% sudo add-apt-repository -y ppa:milter-manager/ppa
                                          +% sudo apt-get update

                                          CentOSの場合: milter-manager-releaseパッケージを1.3.0に更新する

                                          -
                                          % sudo rpm -Uvh \
                                          +
                                          % sudo yum install -y \
                                           http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm
                                          -

                                          Package

                                          +

                                          Package

                                          -

                                          修正

                                          +

                                          修正

                                          • debパッケージのlintianによるチェックで誤検出により警告がでていたの を修正しました。[佐々木洋平さんがパッチを提供]

                                          • debパッケージのビルド中に、ドキュメントを生成しなおすのに必要なファ イルをdebian/ディレクトリ以下に保持するようにしました。これはdebパッ ケージをクリーンビルドするのに必要です。[佐々木洋平さんがパッチを 提供]

                                          • Debian向けのapt-lineを更新しました。SourceForge.netの仕様変更に対 応しています。/etc/apt/sources.list.d/milter-manager.listの更新が 必要です。

                                          • +
                                          • Debian stretch 向けのAPTリポジトリを正しく生成するようにしました

                                          • CentOS向けのmilter-manager-releaseパッケージを更新しました。 SourceForge.netの仕様変更に対応しています。1.3.0より古いバージョ ンではyum updateでmilter-managerを更新できません。

                                          -

                                          改善

                                          +

                                          改善

                                            -
                                          • CentOS5のサポートをやめました

                                          • -
                                          • CentOS7のサポートを追加しました

                                          • +
                                          • Debian wheezy のサポートをやめました

                                          • +
                                          • Ubuntu Xenial (16.04 LTS) のサポートを追加しました

                                          • +
                                          • Ubuntu Wily (15.10) のサポートを追加しました

                                          • +
                                          • Ubuntu Vivid (15.04) のサポートを追加しました

                                          • +
                                          • debパッケージでsystemdをサポートしました (Ubuntu Precise(12.04) 以外)

                                          • +
                                          • CentOS6で使うRubyを2.2.5にしました

                                          • +
                                          • CentOS7でのsystemdサポートは安定しています

                                          • +
                                          • CentOSのビルドスクリプトを整理しました [Patched by Hiroshi Ohkubo][GitHub #92]


                                          -

                                          milter manager

                                          +

                                          milter manager

                                          -

                                          修正

                                          +

                                          修正

                                          • milter-manager-log-analyzerで未定義の値は0として扱うようにしました。 RRDtool 1.5でエラーになっていた不具合を修正しています。[Dave Doddさんが 報告][milter-manager-users-en]

                                          • -
                                          • configureのオプション--with-bundled-ruby-glib2がBSDで正しく動作し ない不具合を修正しました。

                                          • milter-manager-log-analyzerでデータソース名に"-"ではなく、"_"を使 うようにしました。これはRRDtool 1.5の不具合を回避するためです。 [Dave Doddさんが報告][milter-manager-users-en]

                                          • +
                                          • configureのオプション--with-bundled-ruby-glib2がBSDで正しく動作し ない不具合を修正しました。


                                          -

                                          libmilter-compatible

                                          +

                                          libmilter-compatible

                                          -

                                          修正

                                          +

                                          修正

                                          • smfi_settimout()でタイムアウト値を正しく設定できない不具合を修正し ました。


                                          -

                                          Ruby milter

                                          +

                                          Ruby milter

                                          -

                                          修正

                                          +

                                          修正

                                          • --fallback-statusオプションの値が'temporary-failure'のときにエラー が発生する問題を修正しました。[Nobuhiko MIYAHARAさんがパッチ提 供][GitHub #87]


                                          -

                                          Document

                                          +

                                          Document

                                          -

                                          改善

                                          +

                                          改善

                                          • リファレンスのIntroductionにロシア語に翻訳されたドキュメントへのリ ンクを追加しました。[Alisa Bagriiさんが翻訳]

                                          • Debian/Ubuntuで最近のclamav-milterでは設定変更が不要になっているの でそれにあわせてドキュメントを更新しました。[西山和弘さんが報 告][GitHub #90]

                                          • @@ -99,12 +121,14 @@

                                          -

                                          感謝

                                          +

                                          感謝

                                          • 佐々木洋平さん

                                          • Nobuhiko MIYAHARAさん

                                          • Alisa Bagriiさん

                                          • 西山和弘さん

                                          • +
                                          • Dave Doddさん

                                          • +
                                          • Hiroshi Ohkuboさん

                                          @@ -112,10 +136,10 @@

                                          2.0.7: 2015-11-30

                                          2.0.6 のバグフィックスリリースです。

                                          -

                                          Package

                                          +

                                          Package

                                          -

                                          修正

                                          +

                                          修正

                                          • milter-manager(1)やhtmlのドキュメントの問題を修正しました

                                          @@ -123,13 +147,13 @@

                                          2.0.6: 2015-11-30

                                          2.0.5 のバグフィックスリリースです。

                                          -

                                          Package

                                          +

                                          Package

                                          -

                                          修正

                                          +

                                          修正

                                          • debパッケージの依存関係を修正しました [Christian Useさんが報告][milter-manager-users-en]

                                          -

                                          改善

                                          +

                                          改善

                                          • Debian stretch のサポートを追加しました

                                          • Ubuntu Vivid (15.04) のサポートを追加しました

                                          • @@ -144,9 +168,9 @@

                                          -

                                          milter manager

                                          +

                                          milter manager

                                          -

                                          改善

                                          +

                                          改善

                                          • バンドルしている libev のバージョンを 4.19 にしました

                                          • バンドルしている ruby-glib2 のバージョンを 2.2.5 にしました

                                          • @@ -155,9 +179,9 @@

                                          -

                                          milter core

                                          +

                                          milter core

                                          -

                                          改善

                                          +

                                          改善

                                          • --log-level オプションと--log-itemオプションでパイプで区切って複数の値を指定できるようにしました [とみたまさひろさんが報告]

                                          • ログの出力先がファイルの場合、デフォルトでは色を付けないようにしました [とみたまさひろさんが報告][GitHub #58]

                                          • @@ -166,9 +190,9 @@

                                          -

                                          Ruby milter

                                          +

                                          Ruby milter

                                          -

                                          改善

                                          +

                                          改善

                                          • Milter::ServerContext#negotiate を追加しました

                                          • Milter::ServerContext#data を追加しました

                                          • @@ -183,15 +207,15 @@

                                          -

                                          Document

                                          +

                                          Document

                                          -

                                          修正

                                          +

                                          修正

                                          • タイポの修正 [佐々木洋平さんがパッチを提供][GitHub #82]


                                          -

                                          感謝

                                          +

                                          感謝

                                          • とみたまさひろさん

                                          • Christian Useさん

                                          • @@ -205,9 +229,9 @@

                                            2.0.5: 2014-12-09

                                            2.0.4 のバグフィックスリリースですが、実験的な機能としてメールトランザ クション(STMPコマンドのMAILからDATAの終わりまで)の間、データを保持でき る実験的なAPIを追加しました。

                                            -

                                            Package

                                            +

                                            Package

                                            -

                                            改善

                                            +

                                            改善

                                            • CentOS5 のサポートをやめました

                                            • CentOS7 のサポートを追加しました

                                            • @@ -222,46 +246,46 @@

                                            -

                                            milter manager

                                            +

                                            milter manager

                                            -

                                            修正

                                            +

                                            修正

                                            • milter manager から読み込むファイルを常にUTF-8と見做すようにした [Panagiotis Skarvelis さんが報告][SF.net #6]


                                            -

                                            milter-client

                                            +

                                            milter-client

                                            -

                                            改善

                                            +

                                            改善

                                            • メールトランザクションの間、データを保持できるAPIを追加しました(実験的)


                                            -

                                            Ruby milter

                                            +

                                            Ruby milter

                                            -

                                            改善

                                            +

                                            改善

                                            • Ruby1.8のサポートをやめました

                                            • メールトランザクションの間、データを保持できるAPIを追加しました(実験的)

                                            -

                                            修正

                                            +

                                            修正

                                            • シングルプロセスで起動したとき、シグナルハンドラがセットアップでき ていなかった問題を修正 [GitHub #53]


                                            -

                                            Document

                                            +

                                            Document

                                            -

                                            修正

                                            +

                                            修正

                                            • FreeBSD で sa-spamd を起動する前に sa-update を実行するようにしました [川崎さんが報告][milter-manager-users-ja:00250]


                                            -

                                            感謝

                                            +

                                            感謝

                                            • 佐々木さん

                                            • 西山さん

                                            • @@ -275,17 +299,17 @@

                                              2.0.4: 2014-06-20

                                              2.0.3 のバグフィックスリリースです。

                                              -

                                              Ruby milter

                                              +

                                              Ruby milter

                                              -

                                              改善

                                              +

                                              改善

                                              • Milter::Client::Test::MilterRunner を追加しました

                                              • Milter::Client::EnvelopeAddress を追加しました

                                              -

                                              修正

                                              +

                                              修正

                                              • 複数のCPUを使用している環境でRubyで書かれたmilterが正常終了できない問題を修正しました

                                            @@ -293,9 +317,9 @@

                                            2.0.3: 2014-05-20

                                            2.0.2 のバグフィックスリリースです。

                                            -

                                            Package

                                            +

                                            Package

                                            -

                                            改善

                                            +

                                            改善

                                            • Ubuntu Quantal (12.10) のサポートをやめました

                                            • Ubuntu Raring (13.04) のサポートをやめました

                                            • @@ -307,21 +331,21 @@

                                            -

                                            milter manager

                                            +

                                            milter manager

                                            -

                                            改善

                                            +

                                            改善

                                            • バンドルしている libev のバージョンを 4.15 にしました

                                            -

                                            修正

                                            +

                                            修正

                                            • data_stopper が子 milter の適用を止められないバグを修正しました [GitHub #39]


                                            -

                                            Ruby milter

                                            +

                                            Ruby milter

                                            -

                                            改善

                                            +

                                            改善

                                            • バンドルしている glib2 のバージョンを 2.2.0 にしました

                                            • Milter::Logger のメソッドがブロックを受け付けるようにしました

                                            • @@ -330,15 +354,15 @@

                                            -

                                            Document

                                            +

                                            Document

                                            -

                                            修正

                                            +

                                            修正

                                            • FreeBSD へのインストールに関するタイポを修正しました [Dave Dodd さんがパッチを提供]


                                            -

                                            感謝

                                            +

                                            感謝

                                            • Dave Dodd さん

                                            @@ -346,15 +370,15 @@

                                            2.0.2: 2014-01-27

                                            2.0.1 のバグフィックスリリースです。

                                            -

                                            パッケージ

                                            +

                                            パッケージ

                                            -

                                            修正

                                            +

                                            修正

                                            • Ubuntu Lucid (10.04) サポートを復活 [荻野 充さんが報告][milter-manager-users-ja:00229]


                                            -

                                            感謝

                                            +

                                            感謝

                                            • 荻野 充さん

                                            @@ -362,37 +386,37 @@

                                            2.0.1: 2014-01-24

                                            2.0.0 のバグフィックスリリースです。

                                            -

                                            milter manager

                                            +

                                            milter manager

                                            -

                                            改善

                                            +

                                            改善

                                            • SIGUSR1 シグナルを受け取るとログファイルを開き直すようにしました。

                                            -

                                            修正

                                            +

                                            修正

                                            • 全てのユーザーにとって安全ではないため、クラッシュしたときに スタックトレースを表示する機能を廃止しました。 [GitHub #38]


                                            -

                                            milter-core

                                            +

                                            milter-core

                                            -

                                            改善

                                            +

                                            改善

                                            • 環境変数 MILTER_LOG_PATH でログファイルのパスを変更できるようにしました。


                                            -

                                            milter-client

                                            +

                                            milter-client

                                            -

                                            改善

                                            +

                                            改善

                                            • --log-path オプションを追加しました。


                                            -

                                            Ruby milter

                                            +

                                            Ruby milter

                                            -

                                            改善

                                            +

                                            改善

                                            • --log-path オプションを追加しました。

                                            • SIGUSR1 シグナルを受け取るとログファイルを開き直すようにしました。

                                            • @@ -401,9 +425,9 @@

                                            -

                                            パッケージ

                                            +

                                            パッケージ

                                            -

                                            改善

                                            +

                                            改善

                                            • Ubuntu Lucid (10.04) のサポートをやめました。

                                            • Ubuntu Saucy (13.10) のサポートを追加しました。

                                            • @@ -415,9 +439,9 @@

                                            -

                                            ドキュメント

                                            +

                                            ドキュメント

                                            -

                                            改善

                                            +

                                            改善

                                            • 最新の milter-greylist の RPM パッケージを使うようにしました。 [Reported by ishizaka tadanoriさん][milter-manager-users-ja:00220]

                                            • 英語版のドキュメントを改善しました。 [GitHub #17]

                                            • @@ -426,7 +450,7 @@

                                            -

                                            感謝

                                            +

                                            感謝

                                            • 佐々木洋平さん

                                            • ishizaka tadanoriさん

                                            • @@ -442,18 +466,18 @@

                                              より安定したことをアピールすると書いた通り、1.8.0の頃よりさらに安定しま した。これは、動作実績が増え、ユーザーのみなさんから問題を報告してもらっ たおかげです。問題を教えてもらえたのでさまざまな問題を修正できました。 milter manager本体はもちろんですが、Rubyでmilterを書くための機能である Ruby/milterはかなり安定しました。Rubyでmilterを実装する機会が増え、さま ざまなノウハウが溜まりました。これらのノウハウがRuby/milterに反映されて います。

                                              2.0.0は1.8.0よりも確実によくなっていると自信を持って言えます。これまで milter managerを使ったことがなかったみなさんもぜひ試してみてください!

                                              -

                                              milter-test-server

                                              +

                                              milter-test-server

                                              -

                                              改善

                                              +

                                              改善

                                              • 複数行のヘッダをサポート。 [GitHub #33]


                                              -

                                              Ruby milter

                                              +

                                              Ruby milter

                                              -

                                              修正

                                              +

                                              修正

                                              • envelope recipient で reject や temporary failure したときにも reset を呼んでいた問題を修正。

                                            @@ -461,18 +485,18 @@

                                            1.8.9: 2013-06-28

                                            1.8.8 のバグフィックスリリースです。

                                            -

                                            パッケージ

                                            +

                                            パッケージ

                                            -

                                            改善

                                            +

                                            改善

                                            • [rpm] CentOS6 向けに提供している Ruby1.9.3 は 2013-06-27 にリリース された Ruby1.9.3-p448 に更新。


                                            -

                                            milter manager

                                            +

                                            milter manager

                                            -

                                            修正

                                            +

                                            修正

                                            • [binding][ruby] milter-greylist の自動検出で greylist.conf の ソケットのパスにパーミッションが書かれているとソケットのパスを検出 できなかった問題を修正。

                                            @@ -480,9 +504,9 @@

                                            1.8.8: 2013-06-25

                                            1.8.7 のバグフィックスリリースです。

                                            -

                                            パッケージ

                                            +

                                            パッケージ

                                            -

                                            修正

                                            +

                                            修正

                                            • [rpm] cron の設定ファイルが milter-manager-log-analyzer ではなく milter-manager に含まれていた問題を修正。 [坂下聡さんが報告][milter-manager-users-ja:00200]

                                            • [deb] 古い設定ファイルが削除されていなかった問題を修正。 [佐々木洋平さんが報告][milter-manager-users-ja:00202]

                                            • @@ -491,12 +515,12 @@

                                            -

                                            既知の問題

                                            +

                                            既知の問題

                                            • [test] いくつかの環境で rrdtool を使用しているテストが失敗する問題。 [山口さんが報告][GitHub #29]


                                            -

                                            感謝

                                            +

                                            感謝

                                            • 坂下聡さん

                                            • 佐々木洋平さん

                                            • @@ -508,7 +532,7 @@

                                              1.8.7: 2013-06-14

                                              1.8.6 のバグフィックスリリースです。

                                              -

                                              パッケージ

                                              +

                                              パッケージ

                                              • [rpm] 更新時にユーザーの設定を上書きしないように修正。

                                              • [deb][rpm] milter-manager-log-analyzer を milter-manager から分離。 [西山和弘さんが報告][GitHub #21]

                                              • @@ -520,32 +544,32 @@

                                              -

                                              milter manager

                                              +

                                              milter manager

                                              -

                                              改善

                                              +

                                              改善

                                              • Ruby2.0.0 をサポート。

                                              -

                                              修正

                                              +

                                              修正

                                              • [debian] non-ASCII な文字列を含む設定ファイルをサポート。 [西山和弘さんが報告][GitHub #23]


                                              -

                                              milter-manager-log-analyzer

                                              +

                                              milter-manager-log-analyzer

                                              -

                                              修正

                                              +

                                              修正

                                              • ログに不正なバイト列を含む場合でも処理できるようにした。 [坂下聡さんが報告][GitHub #24]


                                              -

                                              Admin

                                              +

                                              Admin

                                              • 削除。


                                              -

                                              感謝

                                              +

                                              感謝

                                              • 西山和弘さん

                                              • 坂下聡さん

                                              • @@ -556,37 +580,37 @@

                                                1.8.6: 2013-03-07

                                                1.8.5 のバグフィックスリリースです。

                                                -

                                                milter-core

                                                +

                                                milter-core

                                                -

                                                改良

                                                +

                                                改良

                                                • [core][event-loop] イベントループを独自にカスタマイズするための APIを提供。

                                                -

                                                修正

                                                +

                                                修正

                                                • [core][event-loop] Ruby 1.9でlibevバックエンドが動作しない不具合を 修正。


                                                -

                                                milter manager

                                                +

                                                milter manager

                                                -

                                                改良

                                                +

                                                改良

                                                • 設定項目としてmax-pending-finished-sessionsを追加。 終了したmilterのセッションのうち、リソースの開放待ちになっているも のが一定数を超えたら強制的に開放できるようにします。


                                                -

                                                milter-client

                                                +

                                                milter-client

                                                -

                                                改良

                                                +

                                                改良

                                                • --max-pending-finished-sessionsオプションを追加。


                                                -

                                                Ruby milter

                                                +

                                                Ruby milter

                                                -

                                                改良

                                                +

                                                改良

                                                • Rubyからイベントループを独自にカスタマイズするためのAPIをサポート。

                                                • manager.max_pending_finished_sessions設定項目をサポート。

                                                • @@ -596,17 +620,17 @@

                                                -

                                                Document

                                                +

                                                Document

                                                -

                                                改良

                                                +

                                                改良

                                                • manager.max_pending_finished_sessionsのドキュメントを追加。

                                                • トランザクションをリセットするAPIのドキュメントを追加

                                                -

                                                修正

                                                +

                                                修正

                                                • manager.maitenance_intervalの既定値を正確な値に修正した

                                                @@ -614,7 +638,7 @@

                                                1.8.5: 2012-12-03

                                                1.8.4 のバグフィックスリリースです。

                                                -

                                                Package

                                                +

                                                Package

                                                • Ubuntu Natty Narwhal サポートを削除。

                                                • ドキュメントが壊れていた問題を修正。

                                                • @@ -622,12 +646,12 @@

                                                -

                                                Ruby milter

                                                +

                                                Ruby milter

                                                • Ruby1.8向けのテストのタイポの修正。 [umq さんが Pull request]


                                                -

                                                感謝

                                                +

                                                感謝

                                                • umq さん

                                                @@ -635,7 +659,7 @@

                                                1.8.4: 2012-11-21

                                                1.8.3 のバグフィックスリリースです。

                                                -

                                                Package

                                                +

                                                Package

                                                • Ubuntu Quantal Quetzal サポートを追加。

                                                • 以下のディストリビューションで Ruby1.9 を使用してビルドしたパッケージを提供。 Debian wheezy, Debian sid, Ubuntu Precise Pangolin, Ubuntu Quantal Quetzal

                                                • @@ -648,13 +672,13 @@

                                                -

                                                milter manager

                                                +

                                                milter manager

                                                -

                                                改良

                                                +

                                                改良

                                                • configure: バンドルしている Ruby/GLib2 のバージョンを --with-bundled-ruby-glib2 オプションで指定できるようにした。

                                                -

                                                修正

                                                +

                                                修正

                                                • manager: コンパイラによる型の警告を抑制。 [GitHub #12] [山口さんが報告]

                                                • debian cron: mail.info ではなく mail.log を使うようにした。 [milter-manager-users-ja:00171] [西山さん]

                                                • @@ -663,38 +687,38 @@

                                                -

                                                milter-core

                                                +

                                                milter-core

                                                -

                                                改良

                                                +

                                                改良

                                                • MILTER_DEBUG=fatal-criticals のサポートを追加しました。

                                                • binding ruby: milter のコールバック引数を ASCII_8BIT にした。 [GitHub #3]

                                                -

                                                修正

                                                +

                                                修正

                                                • 高負荷で実行時に以下の警告が出力される問題を修正。 "g_io_channel_write_chars: assertion `channel->is_writeable' failed"


                                                -

                                                Admin

                                                +

                                                Admin

                                                -

                                                改良

                                                +

                                                改良

                                                • Rails2.3.14 に更新


                                                -

                                                Document

                                                +

                                                Document

                                                -

                                                修正

                                                +

                                                修正

                                                • CentOS 上のインストール手順ついて修正。 [GitHub #13] [Kunkichi さんが報告]


                                                -

                                                感謝

                                                +

                                                感謝

                                                • 山口さん

                                                • 西山さん

                                                • @@ -707,7 +731,7 @@

                                                  1.8.3: 2012-05-22

                                                  1.8.2 のバグフィックスリリースです。

                                                  -

                                                  Package

                                                  +

                                                  Package

                                                  • [ubuntu] Ubuntu Precise Pangolin サポートを追加。

                                                  • [solaris] pkg-get のかわりに pkgutil を使用するようにした。 [GitHub #6] [h0lzi さんが報告]

                                                  • @@ -715,13 +739,13 @@

                                                  -

                                                  milter manager

                                                  +

                                                  milter manager

                                                  -

                                                  改良

                                                  +

                                                  改良

                                                  • binding ruby: 同梱している ruby-glib2 を 1.1.3 に更新。

                                                  -

                                                  修正

                                                  +

                                                  修正

                                                  • [manager] CentOS で manager.event_loop_backend = "libev" をサポート。 [塩野さんが報告]

                                                  • [manager][children] g_signal_connect() が gulong を返すので guint ではなく gulong を使用するようにした。

                                                  • @@ -730,17 +754,17 @@

                                                  -

                                                  milter-core

                                                  +

                                                  milter-core

                                                  -

                                                  修正

                                                  +

                                                  修正

                                                  • [libev] 次のIDが使用済みかどうかチェックするようにした。


                                                  -

                                                  Document

                                                  +

                                                  Document

                                                  -

                                                  修正

                                                  +

                                                  修正

                                                  • doc install debian ubuntu: postfix グループに関する設定を追加。 milter-manager ユーザは他の milter のソケットにアクセスするために postfix グループに所属している必要がある。 [milter-manager-users-ja:00163] [坂下さんが提案]

                                                  • doc debian: 最新の squeeze 環境に追従。 [坂下さんが提案]

                                                  • @@ -749,7 +773,7 @@

                                                  -

                                                  感謝

                                                  +

                                                  感謝

                                                  • 坂下さん

                                                  • 塩野さん

                                                  • @@ -761,10 +785,10 @@

                                                    1.8.2: 2011-11-29

                                                    1.8.1 のバグフィックスリリースです。

                                                    -

                                                    milter-core

                                                    +

                                                    milter-core

                                                    -

                                                    Fixes

                                                    +

                                                    Fixes

                                                    • [event-loop][glib] 1.6.6 以降でのメモリリークを修正。

                                                    • [core] ヘッダを削除したときのメモリリークを修正。

                                                    • @@ -776,7 +800,7 @@

                                                      1.8.0 のバグフィックスリリースです。

                                                      manager.event_loop_backend と manager.n_workers は実用できるほどに安定 しました!!

                                                      -

                                                      パッケージ

                                                      +

                                                      パッケージ

                                                      • [ubuntu] Ubuntu Oneiric Ocelotサポートを追加。

                                                      • [centos] CentOS 6サポートを追加。

                                                      • @@ -785,13 +809,13 @@

                                                      -

                                                      milter manager

                                                      +

                                                      milter manager

                                                      -

                                                      改良

                                                      +

                                                      改良

                                                      • sendmail 互換のための applicable-condition で100 IP アドレス処理す るごとに DNS のキャッシュをクリアするようにした。

                                                      -

                                                      修正

                                                      +

                                                      修正

                                                      • デーモンモードで起動するかどうか判定するために milter_client_is_run_as_daemon() を使うようにした。 [おばたさんが報告]

                                                      • MILTER_MANAGER_RUBY_STOP_TIMER_THREAD_BEFORE_CLEANUP=yes がセットさ れていたら Ruby の終了処理でクリーンアップの前にタイマースレッドの 処理をスキップするようにした。

                                                      • @@ -802,48 +826,48 @@

                                                      -

                                                      milter-core

                                                      +

                                                      milter-core

                                                      -

                                                      修正

                                                      +

                                                      修正

                                                      • 空の FD を閉じるときの条件を修正。 [おばたさんが報告]


                                                      -

                                                      milter-client

                                                      +

                                                      milter-client

                                                      -

                                                      改良

                                                      +

                                                      改良

                                                      • 新規接続の受付を優先的に処理するようにした。

                                                      -

                                                      修正

                                                      +

                                                      修正

                                                      • イベントループバックエンドに GLib を使用しているとき、マスタープロ セスが終了してもワーカプロセスが終了しない問題を修正。


                                                      -

                                                      milter-server

                                                      +

                                                      milter-server

                                                      -

                                                      改良

                                                      +

                                                      改良

                                                      • エラーメッセージに出力する情報を増やした。

                                                      • 名前が設定されていないオブジェクトをログ出力するときの表記を "(unknown)"に統一した。

                                                      -

                                                      修正

                                                      +

                                                      修正

                                                      • 同一セッションで二番目以降の RCPT を受け付けない問題を修正。


                                                      -

                                                      Ruby milter

                                                      +

                                                      Ruby milter

                                                      -

                                                      改良

                                                      +

                                                      改良

                                                      • Milter::Client::Configuration::MilterConfiguration#name を追加。

                                                      -

                                                      修正

                                                      +

                                                      修正

                                                      • event_loop_created フックでイベントループを取得できなかった問題を修 正。

                                                      • 本文が 8bit の Shift_JIS であるメールを与えた場合に例外が発生する問 題を修正。

                                                      • @@ -854,9 +878,9 @@

                                                      -

                                                      milter-test-server

                                                      +

                                                      milter-test-server

                                                      -

                                                      修正

                                                      +

                                                      修正

                                                      • クオートされた charset の検出方法を修正。[中田さんが報告]

                                                      • 複数行ヘッダのパースを修正。

                                                      • @@ -866,9 +890,9 @@

                                                      -

                                                      ドキュメント

                                                      +

                                                      ドキュメント

                                                      -

                                                      改良

                                                      +

                                                      改良

                                                      • 出力するログの説明を追加。

                                                      • タイポを修正。[鈴木さんが Pull request]

                                                      • @@ -877,15 +901,15 @@

                                                      -

                                                      milter manager admin

                                                      +

                                                      milter manager admin

                                                      -

                                                      改良

                                                      +

                                                      改良

                                                      • Accept-Language が "ja" 以外のときは "en" をロケールとして使用する ようにした。[Larry G. Wapnitsky さんが報告]


                                                      -

                                                      感謝

                                                      +

                                                      感謝

                                                      • 荻野充さん

                                                      • おばたさん

                                                      • @@ -901,17 +925,17 @@

                                                        1.8.0: 2011-06-10

                                                        安定版1.8.x系最初のリリースです。

                                                        -

                                                        全体

                                                        +

                                                        全体

                                                        -

                                                        改良

                                                        +

                                                        改良

                                                        • 使用していない変数を削除。


                                                        -

                                                        パッケージ

                                                        +

                                                        パッケージ

                                                        -

                                                        改良

                                                        +

                                                        改良

                                                        • [debian] Debian GNU/Linux lennyサポートを削除。

                                                        • [debian] Debian GNU/Linux wheezyサポートを追加。

                                                        • @@ -923,15 +947,15 @@
                                                        -

                                                        修正

                                                        +

                                                        修正

                                                        • [debian] milter.rbが含まれていない問題を修正。 [荻野充さんが報告]


                                                        -

                                                        milter manager

                                                        +

                                                        milter manager

                                                        -

                                                        改良

                                                        +

                                                        改良

                                                        • [trust適用条件] ドメイン名を正規化するようにした。

                                                        • @@ -951,7 +975,7 @@

                                                        -

                                                        修正

                                                        +

                                                        修正

                                                        • 子milter起動用プロセスが終了しない問題を修正。 [おばたさんが報告]

                                                        • 同一セッションで複数のメッセージを送った場合、子milterが 最初のメッセージでreject/temporary failure/discardを返す と、2通目以降のメッセージが子milterに渡らない問題を修正。

                                                        • @@ -960,46 +984,46 @@

                                                        -

                                                        milter-core

                                                        +

                                                        milter-core

                                                        -

                                                        改良

                                                        +

                                                        改良

                                                        • debugレベルよりも多くのログを出力するtraceレベルを追加。

                                                        • MILTER_LOG_LEVEL環境変数でのログレベルの指定時に+/-でロ グレベルを追加・削除できるようにした。

                                                        -

                                                        修正

                                                        +

                                                        修正

                                                        • 読み込めるデータが残っているのにブロックしてしまう問題を 修正。


                                                        -

                                                        Ruby milter

                                                        +

                                                        Ruby milter

                                                        -

                                                        改良

                                                        +

                                                        改良

                                                        • [設定ファイル] エラー時に返すステータスのデフォルト値を acceptにした。


                                                        -

                                                        milter-performance-check

                                                        +

                                                        milter-performance-check

                                                        -

                                                        改良

                                                        +

                                                        改良

                                                        • CentOS 5対応。


                                                        -

                                                        ドキュメント

                                                        +

                                                        ドキュメント

                                                        -

                                                        修正

                                                        +

                                                        修正

                                                        • Ruby milterのバージョン確認にはMilter::TOOLKIT_VERSIONで はなくMilter::VERSIONを使うようにした。 [荻野充さんが報告]


                                                        -

                                                        感謝

                                                        +

                                                        感謝

                                                        • 荻野充さん

                                                        • おばたさん

                                                        • @@ -1011,25 +1035,25 @@

                                                          1.6.9: 2011-04-26

                                                          1.6.8のバグフィックスリリースです。

                                                          -

                                                          全体

                                                          +

                                                          全体

                                                          -

                                                          改良

                                                          +

                                                          改良

                                                          • bashでもautogen.shを動くようにした。 [Kenji Shionoさんが報告]


                                                          -

                                                          ドキュメント

                                                          +

                                                          ドキュメント

                                                          -

                                                          改良

                                                          +

                                                          改良

                                                          • Ruby milterの仕様変更に追従。 [akira yamadaさんが報告]


                                                          -

                                                          milter manager

                                                          +

                                                          milter manager

                                                          -

                                                          改良

                                                          +

                                                          改良

                                                          -

                                                          修正

                                                          +

                                                          修正

                                                          • define_connection_checkerが例外を発生する問題を修正。 [Kenji Shionoさんが報告]


                                                          -

                                                          milter-client

                                                          +

                                                          milter-client

                                                          -

                                                          改良

                                                          +

                                                          改良

                                                          • UNIXドメインソケットのモードの変更に失敗したときにエラー を通知するようにした。


                                                          -

                                                          milter-performance-check

                                                          +

                                                          milter-performance-check

                                                          -

                                                          改良

                                                          +

                                                          改良

                                                          • --starttlsオプションの追加。

                                                          • --auth-userオプションの追加。

                                                          • @@ -1065,13 +1089,13 @@
                                                          -

                                                          修正

                                                          +

                                                          修正

                                                          • --smtp-portが無視される問題を修正。


                                                          -

                                                          感謝

                                                          +

                                                          感謝

                                                          • Kenji Shionoさん

                                                          • akira yamadaさん

                                                          • @@ -1082,29 +1106,29 @@

                                                            1.6.8: 2011-04-15

                                                            1.6.7のバグフィックスリリースです。

                                                            -

                                                            全体

                                                            +

                                                            全体

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • インストール時に必要のないディレクトリを作成しないように した。 [OBATA Akioさんが報告]


                                                            -

                                                            ドキュメント

                                                            +

                                                            ドキュメント

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • CentOS 5.6向けの記述にした。

                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • 内部リンクを修正した。


                                                            -

                                                            milter-manager

                                                            +

                                                            milter-manager

                                                            -

                                                            改良

                                                            +

                                                            改良


                                                            -

                                                            Ruby milter

                                                            +

                                                            Ruby milter

                                                            -

                                                            改良

                                                            +

                                                            改良


                                                            -

                                                            milter-core

                                                            +

                                                            milter-core

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • ヘッダー追加時の挙動をPostfixではなくSendmailと同様の挙 動になるようにした。


                                                            -

                                                            milter-server

                                                            +

                                                            milter-server

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • 必要になるまでRubyのヘッダーファイルを要求しないようにし た。

                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • milter-test-serverの検出に失敗する問題を修正


                                                            -

                                                            感謝

                                                            +

                                                            感謝

                                                            • OBATA Akioさん

                                                            @@ -1156,21 +1180,21 @@

                                                            1.6.7: 2011-04-08

                                                            1.6.6のバグフィックスリリースです。

                                                            -

                                                            全体

                                                            +

                                                            全体

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • インストール時に必要のないディレクトリを作成しないように した。 [OBATA Akioさんが報告]

                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • システムにインストールされているRuby/GLib2を検出できない 問題を修正。 [OBATA Akioさんが報告]


                                                            -

                                                            パッケージ

                                                            +

                                                            パッケージ

                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • [RPM] 依存関係を修正。

                                                            • [Debian] 依存関係を修正。

                                                            • @@ -1181,17 +1205,17 @@

                                                            -

                                                            milter-manager

                                                            +

                                                            milter-manager

                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • [S25R] 常にmilterを実行してしまう問題を修正。


                                                            -

                                                            milter-core

                                                            +

                                                            milter-core

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • ログレベルを追加する"+LEVEL1|LEVEL2|..."構文を追加。

                                                            • ログレベルを削除する"-LEVEL1|LEVEL2|..."構文を追加。

                                                            • @@ -1200,9 +1224,9 @@

                                                            -

                                                            milter-client

                                                            +

                                                            milter-client

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • --log-levelオプションの追加。

                                                            • --quietオプションの追加。

                                                            • @@ -1211,7 +1235,7 @@

                                                            -

                                                            感謝

                                                            +

                                                            感謝

                                                            • OBATA Akioさん

                                                            @@ -1219,9 +1243,9 @@

                                                            1.6.6: 2011-04-07

                                                            RubyサポートとSolarisサポートを強化したリリースです。

                                                            -

                                                            全体

                                                            +

                                                            全体

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • 必ずバンドルしているRuby/GLib2を使う --with-bundled-ruby-glib2 configureオプションを追加。

                                                            • Solaris対応。

                                                            • @@ -1230,17 +1254,17 @@

                                                            -

                                                            ドキュメント

                                                            +

                                                            ドキュメント

                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • [Debian] 設定からGROUP=postfixが抜けていたことを修正。 [Jordaoさんが報告]


                                                            -

                                                            パッケージ

                                                            +

                                                            パッケージ

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • Solaris対応。

                                                            • Fedoraのバージョンを13から14へアップ

                                                            • @@ -1249,9 +1273,9 @@

                                                            -

                                                            milter-core

                                                            +

                                                            milter-core

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • デフォルトでwarningレベルもログ出力するようにした。

                                                            • デフォルトでstatisticsレベルもログ出力するようにした。

                                                            • @@ -1260,15 +1284,15 @@
                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • 読み込みエラー時のメモリリークを修正。


                                                            -

                                                            milter-manager

                                                            +

                                                            milter-manager

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • データベース接続対応。

                                                            • 接続元がIPv6を利用している場合はデフォルトではS25Rを無効 にするようにした。s25r.check_only_ipv4=でカスタマイズ可 能。

                                                            • @@ -1278,15 +1302,15 @@
                                                            -

                                                            修正

                                                            +

                                                            修正

                                                            • 設定ファイルを再読みするとクラッシュする問題を修正。 [Kenji Shionoさんが報告]


                                                            -

                                                            libmilter-compatible

                                                            +

                                                            libmilter-compatible

                                                            -

                                                            改良

                                                            +

                                                            改良

                                                            • 環境変数でのイベントループバックエンドのカスタマイズに対 応。

                                                                @@ -1298,9 +1322,9 @@

                                                              -

                                                              milter-test-client

                                                              +

                                                              milter-test-client

                                                              -

                                                              改良

                                                              +

                                                              改良

                                                              • --pid-fileオプションの追加。

                                                              • SIGTERMによる終了に対応。

                                                              • @@ -1309,9 +1333,9 @@

                                                              -

                                                              milter-test-server

                                                              +

                                                              milter-test-server

                                                              -

                                                              改良

                                                              +

                                                              改良

                                                              • --envelope-fromオプションの追加。

                                                              • --fromオプションを非推奨にした。

                                                              • @@ -1330,9 +1354,9 @@

                                                              -

                                                              milter-report-statistics

                                                              +

                                                              milter-report-statistics

                                                              -

                                                              改良

                                                              +

                                                              改良

                                                              • Solaris対応。

                                                              • --pidオプションの追加。

                                                              • @@ -1342,9 +1366,9 @@

                                                              -

                                                              Ruby milter

                                                              +

                                                              Ruby milter

                                                              -

                                                              改良

                                                              +

                                                              改良

                                                              • --maintenance-intervalオプションの追加。

                                                              • --run-gc-on-maintainオプションの追加。

                                                              • @@ -1368,13 +1392,13 @@
                                                              -

                                                              修正

                                                              +

                                                              修正

                                                              • 終了時にクラッシュする問題を修正。


                                                              -

                                                              感謝

                                                              +

                                                              感謝

                                                              • Jordaoさん

                                                              • Kenji Shionoさん

                                                              • @@ -1385,9 +1409,9 @@

                                                                1.6.5: 2011-01-26

                                                                1.6.4のバグフィックスリリースです。

                                                                -

                                                                milter manager

                                                                +

                                                                milter manager

                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • 「Sendmail Compatible」適用条件でif_addrとid_nameに Sendmailの場合と同じ値を設定していなかった問題を修正。 [Kenji Shionoさんがパッチ作成]

                                                                • SMTPクライアントの切断を検出した時にクラッシュする問題を 修正。 [Kenji Shionoさんが報告]

                                                                • @@ -1396,23 +1420,23 @@

                                                                -

                                                                milter-manager-log-analyzer

                                                                +

                                                                milter-manager-log-analyzer

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • ENMAの追加するAuthentication-Resultsの解析に対応。


                                                                -

                                                                Ruby milter

                                                                +

                                                                Ruby milter

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • 実行ユーザー・グループの変更に対応。


                                                                -

                                                                感謝

                                                                +

                                                                感謝

                                                                • Kenji Shionoさん

                                                                @@ -1420,10 +1444,10 @@

                                                                1.6.4: 2011-01-21

                                                                1.6.3のバグフィックスリリースです。

                                                                -

                                                                milter-client

                                                                +

                                                                milter-client

                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • イベントループバックエンドとしてGLibを利用する場合のイベ ントループの利用方法を従来のものに変更。

                                                                @@ -1431,9 +1455,9 @@

                                                                1.6.3: 2011-01-20

                                                                パフォーマンス改善を目指したリリースです。パフォーマンス改善 のための実験的な機能が入っています。これらの機能は1.8.0で正 式な機能となる予定です。

                                                                -

                                                                milter manager

                                                                +

                                                                milter manager

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • バンドルしているRuby/GLib2を0.19.4から0.90.5へアップグレード。

                                                                • Ruby 1.9.2対応。

                                                                • @@ -1466,7 +1490,7 @@
                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • Postfix 2.3で @@ -1479,17 +1503,17 @@


                                                                -

                                                                ドキュメント

                                                                +

                                                                ドキュメント

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • Postfixの{client_addr}について追記。 [Kenji Shionoさんが報告]


                                                                -

                                                                milter-client

                                                                +

                                                                milter-client

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • マルチプロセス対応。(実験的)

                                                                • @@ -1503,21 +1527,21 @@

                                                                -

                                                                milter-server

                                                                +

                                                                milter-server

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • イベント発生時の状態チェックを強化。

                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • タイムアウト検出が誤動作する問題を修正。 [Kenji Shionoさんが報告]


                                                                -

                                                                Ruby milter

                                                                +

                                                                Ruby milter

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • マルチプロセス対応。(実験的)

                                                                • ruby-milter.pcの導入。

                                                                • @@ -1529,9 +1553,9 @@

                                                                -

                                                                milter-test-client

                                                                +

                                                                milter-test-client

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • ワーカープロセス数を指定する @@ -1553,9 +1577,9 @@


                                                                -

                                                                milter-performance-check

                                                                +

                                                                milter-performance-check

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • 本文サイズを大きくする @@ -1582,9 +1606,9 @@


                                                                -

                                                                milter-report-statistics

                                                                +

                                                                milter-report-statistics

                                                                -

                                                                改良

                                                                +

                                                                改良


                                                                -

                                                                パッケージ

                                                                +

                                                                パッケージ

                                                                • CentOS用パッケージリポジトリRPMを更新: 1.0.0-0 -> 1.0.0-1.


                                                                -

                                                                感謝

                                                                +

                                                                感謝

                                                                • Kenji Shionoさん

                                                                @@ -1607,45 +1631,45 @@

                                                                1.6.2: 2010-11-23

                                                                1.6.1のバグフィックスリリースです。

                                                                -

                                                                milter manager

                                                                +

                                                                milter manager

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • Debianの起動スクリプトでのPIDファイル保存用ディレクトリ の準備処理を堅牢化。 [Kenji Shionoさんが報告]

                                                                • time_tが必要なところではgint64を使用。 [OBATA Akioさんが提案]

                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • 一時ファイルをclose忘れを修正。 [Kenji Shionoさんが報告]


                                                                -

                                                                milter manager admin

                                                                +

                                                                milter manager admin

                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • CentOSで使用するsqlite3-rubyのバージョンを指定。(ドキュメント) [Kenji Shionoさんが報告]


                                                                -

                                                                Ruby milter

                                                                +

                                                                Ruby milter

                                                                -

                                                                改良

                                                                +

                                                                改良

                                                                • milter-tarpit.rb(サンプルmilter)を非同期化。 [Kenji Shionoさんが報告]

                                                                • milter作成APIをすべて提供。

                                                                -

                                                                修正

                                                                +

                                                                修正

                                                                • コマンドラインオプションのtypoを修正。 [Kenji Shionoさんが報告]


                                                                -

                                                                感謝

                                                                +

                                                                感謝

                                                                • Kenji Shionoさん

                                                                • OBATA Akioさん

                                                                • @@ -1656,15 +1680,15 @@

                                                                  1.6.1: 2010-08-21

                                                                  1.6.0のバグフィックスリリースです。

                                                                  -

                                                                  milter manager

                                                                  +

                                                                  milter manager

                                                                  -

                                                                  修正

                                                                  +

                                                                  修正

                                                                  • syslogに統計情報用のログが出力されない問題の修正。 [やまだあきらさんが報告]


                                                                  -

                                                                  感謝

                                                                  +

                                                                  感謝

                                                                  • やまだあきらさん

                                                                @@ -1672,10 +1696,10 @@

                                                                1.6.0: 2010-08-11

                                                                安定版1.6.x系最初のリリースです。

                                                                -

                                                                milter manager

                                                                +

                                                                milter manager

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • Postfixのcidr_table(5)とregexp_table(5)のパーサを追加: PostfixCIDRTable, PostfixRegexpTable

                                                                @@ -1683,9 +1707,9 @@

                                                                1.5.3: 2010-08-03

                                                                1.5.x最後のリリースです。(予定)

                                                                -

                                                                ドキュメント

                                                                +

                                                                ドキュメント

                                                                -

                                                                改善

                                                                +

                                                                改善


                                                                -

                                                                milter manager

                                                                +

                                                                milter manager

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • ネゴシエーションに失敗した場合にも結果を返すようにした。

                                                                • デフォルトのタイムアウト時間を短くした。これまではMTAと 同じ時間になっていたが、それではタイムアウト時にMTAに結 果を返せないため。

                                                                • @@ -1720,17 +1744,17 @@

                                                                -

                                                                milter manager admin

                                                                +

                                                                milter manager admin

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • Rails 2.3.8対応


                                                                -

                                                                milter-test-server

                                                                +

                                                                milter-test-server

                                                                -

                                                                改善

                                                                +

                                                                改善


                                                                -

                                                                milter-core

                                                                +

                                                                milter-core

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • デフォルトでエラーと致命的なログを出力するように変更。


                                                                -

                                                                Ruby milter

                                                                +

                                                                Ruby milter

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • --user, --gorup, --unix-socket-group, --unix-socket-mode, --syslog, --library-version オプショ ンを追加。

                                                                • サンプルとしてmilter-test-clientのRuby実装を追加。

                                                                • @@ -1765,7 +1789,7 @@

                                                                -

                                                                感謝

                                                                +

                                                                感謝

                                                                • さとうふみやすさん

                                                                @@ -1774,9 +1798,9 @@

                                                                1.5.1のバグフィックスリリースです。

                                                                NO_REPLY_*を利用するmilterやmilter-greylist 4.3.xと一緒に使っ ている開発版ユーザはアップデートすることをおすすめします。

                                                                -

                                                                ドキュメント

                                                                +

                                                                ドキュメント

                                                                -

                                                                改善

                                                                +

                                                                改善


                                                                -

                                                                milter manager

                                                                +

                                                                milter manager

                                                                -

                                                                改善

                                                                +

                                                                改善


                                                                -

                                                                milter-manager-log-analyzer

                                                                +

                                                                milter-manager-log-analyzer

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • milter-greylist 4.3.xに対応


                                                                -

                                                                milter-toolkit

                                                                +

                                                                milter-toolkit

                                                                -

                                                                改善

                                                                +

                                                                改善

                                                                • inet_aton()/inet_ntoa()の代わりにinet_pton()/inet_pton() を使用。[さとうふみやすさんが提案]

                                                                • NO_REPLY_*のサポート。 [ROSSOさんが報告]

                                                                • @@ -1821,7 +1845,7 @@

                                                                -

                                                                感謝

                                                                +

                                                                感謝

                                                                • さとうふみやすさん

                                                                • ROSSOさん

                                                                • @@ -1833,24 +1857,24 @@

                                                                  1.5.0のバグフィックスリリースです。

                                                                  同梱しているRuby/GLib2を更新したので、Ruby/GLib2内で起こって いたメモリリークが修正されています。同梱しているRuby/GLib2を 使っている場合はアップデートを推奨します。

                                                                  -

                                                                  ドキュメント

                                                                  +

                                                                  ドキュメント

                                                                  -

                                                                  改善

                                                                  +

                                                                  改善

                                                                  • Ubuntu Karmic Koara用の開発版インストールドキュメントを 追加

                                                                  • 明示的にRackをインストールする記述を追加 [土谷さんが報告]

                                                                  -

                                                                  修正

                                                                  +

                                                                  修正

                                                                  • FreeBSD: パッケージ名の修正 [土谷さんが報告]


                                                                  -

                                                                  libmilter-core

                                                                  +

                                                                  libmilter-core

                                                                  -

                                                                  改善

                                                                  +

                                                                  改善

                                                                  • MILTER_LOG_SYSLOG_LEVEL環境変数でsyslogに出力するログの 種類を変更可能にした

                                                                  • メモリプロファイラを追加

                                                                  • @@ -1859,9 +1883,9 @@

                                                                  -

                                                                  milter manager

                                                                  +

                                                                  milter manager

                                                                  -

                                                                  改善

                                                                  +

                                                                  改善

                                                                  • Solaris対応 [さとうふみやすさんが報告・パッチ提供]

                                                                  • Ruby/GLib2 0.19.4を同梱

                                                                  • @@ -1870,9 +1894,9 @@

                                                                  -

                                                                  milter-test-client

                                                                  +

                                                                  milter-test-client

                                                                  -

                                                                  改善

                                                                  +

                                                                  改善


                                                                  -

                                                                  感謝

                                                                  +

                                                                  感謝

                                                                  • 土谷さん

                                                                  • さとうふみやすさん

                                                                  • @@ -1892,9 +1916,9 @@

                                                                    1.5.0: 2010-03-29

                                                                    開発版リリースです。

                                                                    -

                                                                    ドキュメント

                                                                    +

                                                                    ドキュメント

                                                                    -

                                                                    改善

                                                                    +

                                                                    改善

                                                                    • Debian GNU/Linux・Ubuntu用ドキュメント

                                                                      @@ -1914,7 +1938,7 @@
                                                                    -

                                                                    修正

                                                                    +

                                                                    修正

                                                                    • FreeBSD用ドキュメント

                                                                      • pwコマンドのオプションを修正

                                                                      @@ -1923,9 +1947,9 @@

                                                                    -

                                                                    milter manager

                                                                    +

                                                                    milter manager

                                                                    -

                                                                    改善

                                                                    +

                                                                    改善

                                                                    • Debian GNU/Linux用のinitスクリプト

                                                                      @@ -2008,20 +2032,20 @@
                                                                    -

                                                                    バグ修正

                                                                    +

                                                                    バグ修正

                                                                    • FreeBSD: /etc/rc.confでプロファイルを指定していなかった 場合にOpenDKIMの検出に失敗する問題の修正 [土谷さんが報告]

                                                                    • RubyのGCにより適用条件が実行されないことがある問題の修正

                                                                    -

                                                                    実験的

                                                                    +

                                                                    実験的

                                                                    • 条件とmilterを一度に指定できるポリシーフレームワークを追加


                                                                    -

                                                                    milter-toolkit

                                                                    +

                                                                    milter-toolkit

                                                                    • Rubyバインディングによるmilter作成をサポート: @@ -2033,7 +2057,7 @@


                                                                    -

                                                                    milter-manager-log-analyzer

                                                                    +

                                                                    milter-manager-log-analyzer

                                                                    • 高速化(約2倍)

                                                                    • SMTPクライアントの途中切断数のグラフ化をサポート

                                                                    • @@ -2041,7 +2065,7 @@

                                                                    -

                                                                    milter-performance-check

                                                                    +

                                                                    milter-performance-check

                                                                    • オプション追加

                                                                      • @@ -2052,7 +2076,7 @@


                                                                      -

                                                                      milter-test-client

                                                                      +

                                                                      milter-test-client

                                                                      • オプション追加

                                                                          @@ -2077,15 +2101,15 @@

                                                                        -

                                                                        パッケージ

                                                                        +

                                                                        パッケージ

                                                                        -

                                                                        CentOS

                                                                        +

                                                                        CentOS

                                                                        • パッケージを分割


                                                                        -

                                                                        テスト

                                                                        +

                                                                        テスト

                                                                        • Cutter 1.1.0対応 @@ -2093,7 +2117,7 @@


                                                                        -

                                                                        感謝

                                                                        +

                                                                        感謝

                                                                        • 西山さん

                                                                        • 土谷さん

                                                                        • @@ -2105,7 +2129,7 @@

                                                                          1.4.2: 2010-03-29

                                                                          1.4.1のバグフィックスリリースです。

                                                                          -

                                                                          ドキュメント

                                                                          +

                                                                          ドキュメント

                                                                          • FreeBSDのビルド時にCFLAGSではなくCPPFLAGSを使うように変更

                                                                          • FreeBSDの対象バージョンを7.2-RELEASEから8.0-RELEASEに変更

                                                                          • @@ -2114,10 +2138,10 @@

                                                                          -

                                                                          milter manager

                                                                          +

                                                                          milter manager

                                                                          -

                                                                          バグ修正

                                                                          +

                                                                          バグ修正

                                                                          • 実効ユーザとソケットのグループを指定したときにソケットの グループが反映されない問題の修正

                                                                          • FreeBSD: OpenDKIMがインストールされていないときにmilter 自動検出が失敗する問題の修正

                                                                          • @@ -2128,7 +2152,7 @@

                                                                            1.4.1: 2009-10-29

                                                                            1.4.0のバグフィックスリリースです。

                                                                            -

                                                                            ドキュメント

                                                                            +

                                                                            ドキュメント

                                                                            • CentOSの対象バージョンを5.3から5.4に変更

                                                                            • typoを修正 [はやみずさん]

                                                                            • @@ -2137,9 +2161,9 @@

                                                                            -

                                                                            milter manager

                                                                            +

                                                                            milter manager

                                                                            -

                                                                            改善

                                                                            +

                                                                            改善

                                                                            • システムにRuby/GLib2がインストールされていない環境のため に、Ruby/GLib2をバンドル。CentOSでは別途Ruby/GLib2のRPM をインストールする必要がなくなった。

                                                                            • @@ -2155,7 +2179,7 @@
                                                                            -

                                                                            バグ修正

                                                                            +

                                                                            バグ修正

                                                                            • CentOS用initスクリプトのデフォルト値が設定ファイルの設定 を上書きしてしまう問題を修正 [ゴリ丸さんによる報告]

                                                                            • 評価モード時に、処理が終了した子milterに余計なコマンドを 送ってしまう問題を修正

                                                                            • @@ -2164,7 +2188,7 @@

                                                                            -

                                                                            感謝

                                                                            +

                                                                            感謝

                                                                            • はやみずさん

                                                                            • ゴリ丸さん

                                                                            • @@ -2176,19 +2200,19 @@

                                                                              1.4.0: 2009-10-13

                                                                              安定版リリースです。

                                                                              -

                                                                              ドキュメント

                                                                              +

                                                                              ドキュメント

                                                                              • Debian用インストールドキュメントを追加


                                                                              -

                                                                              milter-manager

                                                                              +

                                                                              milter-manager

                                                                              -

                                                                              改善

                                                                              +

                                                                              改善

                                                                              • Debian/Ubuntu/FreeBSD環境でのOpenDKIM検出に対応

                                                                              -

                                                                              バグ修正

                                                                              +

                                                                              バグ修正

                                                                              • 評価モード時にヘッダ追加の統計ログが出力されない問題を修 正

                                                                            @@ -2196,9 +2220,9 @@

                                                                            1.3.1: 2009-09-16

                                                                            開発版リリースです。評価モードが追加されました。

                                                                            -

                                                                            milter-manager

                                                                            +

                                                                            milter-manager

                                                                            -

                                                                            改善

                                                                            +

                                                                            改善

                                                                            • 子milterの結果を利用しない @@ -2227,27 +2251,27 @@


                                                                            -

                                                                            milter-toolkit

                                                                            +

                                                                            milter-toolkit

                                                                            • Rubyバインディングの追加 [はやみずさん]


                                                                            -

                                                                            milter manager admin

                                                                            +

                                                                            milter manager admin

                                                                            • Rails 2.3.4対応


                                                                            -

                                                                            milter-test-client

                                                                            +

                                                                            milter-test-client

                                                                            • syslogにログを出力する--syslogオプションの追加


                                                                            -

                                                                            milter-manager-log-analyzer

                                                                            +

                                                                            milter-manager-log-analyzer

                                                                            • milter-greylistのSPF結果に対応


                                                                            -

                                                                            感謝

                                                                            +

                                                                            感謝

                                                                            • はやみずさん

                                                                            • 今間さん

                                                                            • @@ -2258,13 +2282,13 @@

                                                                              1.3.0: 2009-08-12

                                                                              開発版リリースです。

                                                                              -

                                                                              milter-manager

                                                                              +

                                                                              milter-manager

                                                                              -

                                                                              改善

                                                                              +

                                                                              改善

                                                                              • 1セッションで複数のメールを送信する場合の処理を改善

                                                                              -

                                                                              バグ修正

                                                                              +

                                                                              バグ修正

                                                                              • quarantineが無視される問題を修正 [土谷さんによる報告]

                                                                              • discardが無視される問題の修正 [土谷さんによる報告]

                                                                              • @@ -2274,7 +2298,7 @@

                                                                              -

                                                                              milter-test-server

                                                                              +

                                                                              milter-test-server

                                                                              • 不必要なabortを削除

                                                                              • quarantine時にはcontinueを送るように変更

                                                                              • @@ -2282,12 +2306,12 @@

                                                                              -

                                                                              milter-manager-log-analyzer

                                                                              +

                                                                              milter-manager-log-analyzer

                                                                              • clamav-milterのウィルス検出結果に対応


                                                                              -

                                                                              感謝

                                                                              +

                                                                              感謝

                                                                              • 土谷さん

                                                                              • Павел Гришинさん

                                                                              • @@ -2298,13 +2322,13 @@

                                                                                1.2.0: 2009-07-17

                                                                                安定版リリースです。

                                                                                -

                                                                                milter-manager

                                                                                +

                                                                                milter-manager

                                                                                -

                                                                                改善

                                                                                +

                                                                                改善

                                                                                • MTAのmilterプロトコルのバージョンに関係なくDATA時の停止 判定処理をサポート

                                                                                -

                                                                                バグ修正

                                                                                +

                                                                                バグ修正

                                                                                • メッセージ処理時にすべてのmilterを停止すると処理がタイム アウト待ちになってしまう問題の修正 [sgykさんによる報告]

                                                                                • Postfix 2.3.3で動作しない問題の修正 [となかさんによる報告]

                                                                                • @@ -2313,7 +2337,7 @@

                                                                                -

                                                                                感謝

                                                                                +

                                                                                感謝

                                                                                • sgykさん

                                                                                • となかさん

                                                                                • @@ -2324,9 +2348,9 @@

                                                                                  1.1.1: 2009-07-03

                                                                                  次期安定版1.2.0になる予定のリリースです。

                                                                                  -

                                                                                  milter-manager

                                                                                  +

                                                                                  milter-manager

                                                                                  -

                                                                                  改善

                                                                                  +

                                                                                  改善

                                                                                  • 不必要なabortコールバック呼び出しを削減

                                                                                  • 統計ログの削減

                                                                                  • @@ -2354,7 +2378,7 @@
                                                                                  -

                                                                                  バグ修正

                                                                                  +

                                                                                  バグ修正

                                                                                  • 複数milter実行時の競合条件を修正

                                                                                  • milterがメッセージ本文処理中にエラーステータスを返したと き、MTAにレスポンスを返さない問題の修正 [となかさんによる報告]

                                                                                  • @@ -2364,12 +2388,12 @@

                                                                                  -

                                                                                  milter-test-server

                                                                                  +

                                                                                  milter-test-server

                                                                                  • すべての宛先が拒否または一時障害ステータスを返されたと きは、セッション全体のステータスとして拒否または一時障害 と報告するように変更


                                                                                  -

                                                                                  milter-manager-log-analyzer

                                                                                  +

                                                                                  milter-manager-log-analyzer

                                                                                  • milter毎の適用結果グラフの生成

                                                                                  • 迷惑メール対策手法の統計グラフの生成

                                                                                  • @@ -2377,7 +2401,7 @@

                                                                                  -

                                                                                  感謝

                                                                                  +

                                                                                  感謝

                                                                                  • となかさん

                                                                                  • sgykさん

                                                                                  • @@ -2385,10 +2409,10 @@
                                                                                  -

                                                                                  1.1.0: 2009-06-02

                                                                                  +

                                                                                  1.1.0: 2009-06-02

                                                                                  次期安定版1.2.0に向けた開発版です。

                                                                                  -

                                                                                  milter-manager

                                                                                  +

                                                                                  milter-manager

                                                                                  • 不要なログの削減

                                                                                  • FreeBSD上でのENMAの自動検出をサポート

                                                                                  • @@ -2417,12 +2441,12 @@

                                                                                  -

                                                                                  milter manager admin

                                                                                  +

                                                                                  milter manager admin

                                                                                  • Ruby on Rails 2.3.2対応


                                                                                  -

                                                                                  milter-test-server

                                                                                  +

                                                                                  milter-test-server

                                                                                  • reply-codeのサポート

                                                                                  • @@ -2437,33 +2461,33 @@

                                                                                  -

                                                                                  milter-manager-log-analyzer

                                                                                  +

                                                                                  milter-manager-log-analyzer

                                                                                  • メモリ使用量の削減


                                                                                  -

                                                                                  ドキュメント

                                                                                  +

                                                                                  ドキュメント

                                                                                  • リンク先修正: [Павел Гришинさん]

                                                                                  -

                                                                                  1.0.1: 2009-05-14

                                                                                  +

                                                                                  1.0.1: 2009-05-14

                                                                                  1.0.0のバグフィックス版です。

                                                                                  -

                                                                                  milter-manager

                                                                                  +

                                                                                  milter-manager

                                                                                  • RPMパッケージアップデート時にmilter-managerが再起動され ない問題を修正


                                                                                  -

                                                                                  milter manager admin

                                                                                  +

                                                                                  milter manager admin

                                                                                  • gemの使用バージョンを明示 [nhisaさんによる報告]

                                                                                  -

                                                                                  1.0.0: 2009-04-16

                                                                                  +

                                                                                  1.0.0: 2009-04-16

                                                                                  最初の安定版リリースです。

                                                                                  -

                                                                                  ドキュメント

                                                                                  +

                                                                                  ドキュメント

                                                                                  • コマンドのmanページを追加

                                                                                  • clamav-milterの設定に--externalオプションの追加

                                                                                  • @@ -2472,20 +2496,20 @@

                                                                                  -

                                                                                  milter-manager

                                                                                  +

                                                                                  milter-manager

                                                                                  • CentOS環境でのENMA検出機能の追加


                                                                                  -

                                                                                  milter-performance-check

                                                                                  +

                                                                                  milter-performance-check

                                                                                  • --n-mailsオプションと、--period/--intervalオプションを使 えるように改良

                                                                                  -

                                                                                  0.9.0: 2009-03-10

                                                                                  +

                                                                                  0.9.0: 2009-03-10

                                                                                  速度と安定性が向上しました。

                                                                                  -

                                                                                  milter-manager

                                                                                  +

                                                                                  milter-manager

                                                                                  • UNIXドメインソケットのグループを指定する機能の追加

                                                                                  • @@ -2510,7 +2534,7 @@

                                                                                  -

                                                                                  新適用規則

                                                                                  +

                                                                                  新適用規則

                                                                                  • @@ -2530,7 +2554,7 @@


                                                                                  -

                                                                                  milter-performance-check

                                                                                  +

                                                                                  milter-performance-check

                                                                                  • ファイルを1通のメールとして送信する機能の追加

                                                                                  • 指定したディレクトリ以下にあるファイルをそれぞれ1通のメー ルとして送信する機能の追加

                                                                                  • @@ -2542,12 +2566,12 @@

                                                                                  -

                                                                                  milter-manager-log-analyzer

                                                                                  +

                                                                                  milter-manager-log-analyzer

                                                                                  • [非互換]: 処理メールグラフに「abort」時の項目を追加

                                                                                  -

                                                                                  0.8.0: 2009-02-06

                                                                                  +

                                                                                  0.8.0: 2009-02-06

                                                                                  • 新機能

                                                                                    @@ -2583,7 +2607,7 @@
                                                                                  -

                                                                                  0.7.0: 2009-01-16

                                                                                  +

                                                                                  0.7.0: 2009-01-16

                                                                                  • SF.netでの最初のリリース。

                                                                                  diff -Nru milter-manager-2.0.8/doc/reference/news.xml milter-manager-2.0.9/doc/reference/news.xml --- milter-manager-2.0.8/doc/reference/news.xml 2016-05-16 16:38:49.615929434 +0000 +++ milter-manager-2.0.9/doc/reference/news.xml 2016-06-15 07:15:18.733948476 +0000 @@ -11,6 +11,183 @@ NEWS The history of milter manager + + 2.0.9: 2016-06-15 + A bug fix release of 2.0.8 + + milter manager + + + + Fixes + + + Detect milters properly on CentOS6, CentOS7 + + + + + + + + 2.0.8: 2016-06-15 + A bug fix release of 2.0.7 + You need to update /etc/apt/sources.list.d/milter-manager.list before you update packages if you have already installed milter-manager. + For example, on Debian (jessie) /etc/apt/sources.list.d/milter-manager.list: + deb http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main +deb-src http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main + Ubuntu: Add ppa:milter-manager/ppa + % sudo apt-get -y install software-properties-common +% sudo add-apt-repository -y ppa:milter-manager/ppa +% sudo apt-get update + CentOS: Update milter-manager-release to 1.3.0 + % sudo yum install -y \ +http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + + Package + + Fixes + + + Suppress warnings (false detection) by lintian [Patched by Youhei SASAKI] + + + Keep files that is needed when rebuild document under debian directory while building deb package. We need this for clean build. [Patched by Youhei SASAKI] + + + Update apt-line for Debian to correspond specification change of SourceForge.net + + + Create APT repository for Debian stretch properly + + + Update mitler-manager-release for CentOS to correspond specification change of SourceForge.net. You cannot update milter-manager via yum command If you use milter-manager-release before 1.3.0. + + + + + + Improvements + + + Drop Debian wheezy support + + + Add Ubuntu Xenial (16.04 LTS) support + + + Drop Ubuntu Wily (15.10) support + + + Drop Ubuntu Vivid (15.04) support + + + Add systemd support for deb packages (Except Ubuntu Precise(12.04)) + + + Update Ruby to 2.2.5 on CentOS6 + + + systemd support is stable on CentOS7 + + + Arrange build script for CentOS [Patched by Hiroshi Ohkubo][GitHub #92] + + + + + + + + milter manager + + Fixes + + + Fix milter-manager-log-analyzer errors with RRDtool 1.5 [Reporde by Dave Dodd][milter-manager-users-en] + + + Use "_" instead of "-" to avoid bug of RRDtool 1.5 [Reporde by Dave Dodd][milter-manager-users-en] + + + Fix a bug that configure option --with-bundled-ruby-glib2 does not work properly on BSD. + + + + + + + + libmilter-compatible + + Fixes + + + Set timeout properly using smfi_settimeout() + + + + + + + + Ruby milter + + Fixes + + + Fix error when --fallback-status=temporary-failure [Patched by Nobuhiko MIYAHARA][GitHub #87] + + + + + + + + Document + + Improvements + + + Add link to Russian translation [Translated by Alisa Bagrii] + + + Update document for recent clamav-milter on Debian/Ubuntu [Reported by Kazuhiro NISHIYAMA][GitHub #90] + + + Create socket directory when install on Debian/Ubuntu [Reported by Kazuhiro NISHIYAMA][GitHub #91] + + + + + + + + Thanks + + + Youhei SASAKI + + + Nobuhiko MIYAHARA + + + Alisa Bagrii + + + Kazuhiro NISHIYAMA + + + Dave Dodd + + + Hiroshi Ohkubo + + + + + + 2.0.7: 2015-11-30 A bug fix release of 2.0.6 diff -Nru milter-manager-2.0.8/doc/reference/news.xml.ja milter-manager-2.0.9/doc/reference/news.xml.ja --- milter-manager-2.0.8/doc/reference/news.xml.ja 2016-05-16 16:38:49.291925680 +0000 +++ milter-manager-2.0.9/doc/reference/news.xml.ja 2016-06-15 07:15:18.609948071 +0000 @@ -11,15 +11,37 @@ お知らせ milter managerの歴史 + + 2.0.9: 2016-06-15 + 2.0.8 のバグフィックスリリースです。 + + milter manager + + + + 修正 + + + CentOS6, CentOS7 上で milter の自動検出を正しく動作するようにした + + + + + + - 2.0.8: 2016-05-XX + 2.0.8: 2016-06-15 2.0.7 のバグフィックスリリースです。 すでにmilter-managerをインストールしている場合、パッケージを更新する前 に次の作業が必要です。 Debianの場合: /etc/apt/sources.list.d/milter-manager.listを更新する(以 下はjessieの例です) deb http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main deb-src http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main + Ubuntuの場合: ppa:milter-manager/ppa を追加する + % sudo apt-get -y install software-properties-common +% sudo add-apt-repository -y ppa:milter-manager/ppa +% sudo apt-get update CentOSの場合: milter-manager-releaseパッケージを1.3.0に更新する - % sudo rpm -Uvh \ + % sudo yum install -y \ http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm Package @@ -36,6 +58,9 @@ Debian向けのapt-lineを更新しました。SourceForge.netの仕様変更に対 応しています。/etc/apt/sources.list.d/milter-manager.listの更新が 必要です。 + Debian stretch 向けのAPTリポジトリを正しく生成するようにしました + + CentOS向けのmilter-manager-releaseパッケージを更新しました。 SourceForge.netの仕様変更に対応しています。1.3.0より古いバージョ ンではyum updateでmilter-managerを更新できません。 @@ -45,10 +70,28 @@ 改善 - CentOS5のサポートをやめました + Debian wheezy のサポートをやめました + + + Ubuntu Xenial (16.04 LTS) のサポートを追加しました - CentOS7のサポートを追加しました + Ubuntu Wily (15.10) のサポートを追加しました + + + Ubuntu Vivid (15.04) のサポートを追加しました + + + debパッケージでsystemdをサポートしました (Ubuntu Precise(12.04) 以外) + + + CentOS6で使うRubyを2.2.5にしました + + + CentOS7でのsystemdサポートは安定しています + + + CentOSのビルドスクリプトを整理しました [Patched by Hiroshi Ohkubo][GitHub #92] @@ -64,10 +107,10 @@ milter-manager-log-analyzerで未定義の値は0として扱うようにしました。 RRDtool 1.5でエラーになっていた不具合を修正しています。[Dave Doddさんが 報告][milter-manager-users-en] - configureのオプション--with-bundled-ruby-glib2がBSDで正しく動作し ない不具合を修正しました。 + milter-manager-log-analyzerでデータソース名に"-"ではなく、"_"を使 うようにしました。これはRRDtool 1.5の不具合を回避するためです。 [Dave Doddさんが報告][milter-manager-users-en] - milter-manager-log-analyzerでデータソース名に"-"ではなく、"_"を使 うようにしました。これはRRDtool 1.5の不具合を回避するためです。 [Dave Doddさんが報告][milter-manager-users-en] + configureのオプション--with-bundled-ruby-glib2がBSDで正しく動作し ない不具合を修正しました。 @@ -134,6 +177,12 @@ 西山和弘さん + + Dave Doddさん + + + Hiroshi Ohkuboさん + diff -Nru milter-manager-2.0.8/doc/reference/version.xml milter-manager-2.0.9/doc/reference/version.xml --- milter-manager-2.0.8/doc/reference/version.xml 2016-06-06 12:58:55.385834852 +0000 +++ milter-manager-2.0.9/doc/reference/version.xml 2016-06-15 07:14:55.053870997 +0000 @@ -1 +1 @@ -2.0.8 +2.0.9 diff -Nru milter-manager-2.0.8/doc/reference/xml/core.xml milter-manager-2.0.9/doc/reference/xml/core.xml --- milter-manager-2.0.8/doc/reference/xml/core.xml 2016-06-06 13:00:04.882326904 +0000 +++ milter-manager-2.0.9/doc/reference/xml/core.xml 2016-06-15 07:19:57.766862374 +0000 @@ -71,7 +71,7 @@ milter_quit void milter_quit (void); -Call this function after the milter-core library use. +Call this function after the milter-server library use. diff -Nru milter-manager-2.0.8/doc/reference/xml/milter-version.xml milter-manager-2.0.9/doc/reference/xml/milter-version.xml --- milter-manager-2.0.8/doc/reference/xml/milter-version.xml 2016-06-06 13:00:04.886326925 +0000 +++ milter-manager-2.0.9/doc/reference/xml/milter-version.xml 2016-06-15 07:19:57.766862374 +0000 @@ -66,7 +66,7 @@ MILTER_TOOLKIT_VERSION MILTER_TOOLKIT_VERSION -#define MILTER_TOOLKIT_VERSION G_STRINGIFY(2.0.8) +#define MILTER_TOOLKIT_VERSION G_STRINGIFY(2.0.9) @@ -82,7 +82,7 @@ MILTER_TOOLKIT_VERSION_MICRO MILTER_TOOLKIT_VERSION_MICRO -#define MILTER_TOOLKIT_VERSION_MICRO 8 +#define MILTER_TOOLKIT_VERSION_MICRO 9 diff -Nru milter-manager-2.0.8/html/index.html milter-manager-2.0.9/html/index.html --- milter-manager-2.0.8/html/index.html 2016-05-14 04:51:47.589431600 +0000 +++ milter-manager-2.0.9/html/index.html 2016-06-15 07:08:09.452546940 +0000 @@ -26,7 +26,7 @@ - +
                                                                                @@ -34,11 +34,11 @@

                                                                                The latest release

                                                                                - 2.0.8 is the latest stable release. It had been released at 2016-05-29. + 2.0.9 is the latest stable release. It had been released at 2016-06-15.

                                                                                @@ -52,10 +52,7 @@ Ubuntu

                                                                              • - CentOS 5 -
                                                                              • -
                                                                              • - CentOS 6 + CentOS
                                                                              • FreeBSD diff -Nru milter-manager-2.0.8/html/index.html.ja milter-manager-2.0.9/html/index.html.ja --- milter-manager-2.0.8/html/index.html.ja 2016-05-14 04:51:47.589431600 +0000 +++ milter-manager-2.0.9/html/index.html.ja 2016-06-15 07:08:26.484602386 +0000 @@ -26,7 +26,7 @@
                                                                              • - +
                                                                              @@ -35,11 +35,11 @@

                                                                              最新リリース

                                                                              - 2016-05-29にリリースされた2.0.8が最新安定版リリースです。 + 2016-06-15にリリースされた2.0.9が最新安定版リリースです。

                                                                              環境毎のインストール方法です。

                                                                              @@ -51,10 +51,7 @@ Ubuntu
                                                                            • - CentOS 5 -
                                                                            • -
                                                                            • - CentOS 6 + CentOS
                                                                            • FreeBSD Binary files /tmp/tmphpCFPV/FKeBxyOsMQ/milter-manager-2.0.8/html/mini-heading-mark.png and /tmp/tmphpCFPV/2QiIzurqbC/milter-manager-2.0.9/html/mini-heading-mark.png differ Binary files /tmp/tmphpCFPV/FKeBxyOsMQ/milter-manager-2.0.8/html/mini-upgrade.png and /tmp/tmphpCFPV/2QiIzurqbC/milter-manager-2.0.9/html/mini-upgrade.png differ diff -Nru milter-manager-2.0.8/milter/core/milter-version.h milter-manager-2.0.9/milter/core/milter-version.h --- milter-manager-2.0.8/milter/core/milter-version.h 2016-06-06 12:58:53.505817487 +0000 +++ milter-manager-2.0.9/milter/core/milter-version.h 2016-06-15 07:14:54.377868785 +0000 @@ -24,10 +24,10 @@ G_BEGIN_DECLS -#define MILTER_TOOLKIT_VERSION G_STRINGIFY(2.0.8) +#define MILTER_TOOLKIT_VERSION G_STRINGIFY(2.0.9) #define MILTER_TOOLKIT_VERSION_MAJOR 2 #define MILTER_TOOLKIT_VERSION_MINOR 0 -#define MILTER_TOOLKIT_VERSION_MICRO 8 +#define MILTER_TOOLKIT_VERSION_MICRO 9 #define MILTER_TOOLKIT_CHECK_VERSION(major, minor, micro) \ (MILTER_TOOLKIT_MAJOR_VERSION > (major) || \ diff -Nru milter-manager-2.0.8/NEWS milter-manager-2.0.9/NEWS --- milter-manager-2.0.8/NEWS 2016-05-13 13:35:17.456441905 +0000 +++ milter-manager-2.0.9/NEWS 2016-06-15 07:06:34.452237987 +0000 @@ -2,6 +2,111 @@ = NEWS --- The history of milter manager +== [release-2-0-9] 2.0.9: 2016-06-15 + +A bug fix release of 2.0.8 + +=== milter manager + +==== Fixes + + * Detect milters properly on CentOS6, CentOS7 + +== [release-2-0-8] 2.0.8: 2016-06-15 + +A bug fix release of 2.0.7 + +You need to update /etc/apt/sources.list.d/milter-manager.list before +you update packages if you have already installed milter-manager. + +For example, on Debian (jessie) /etc/apt/sources.list.d/milter-manager.list: + deb http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main + deb-src http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main + +Ubuntu: Add ppa:milter-manager/ppa + + % sudo apt-get -y install software-properties-common + % sudo add-apt-repository -y ppa:milter-manager/ppa + % sudo apt-get update + +CentOS: Update milter-manager-release to 1.3.0 + + % sudo yum install -y \ + http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm + +=== Package + +==== Fixes + + * Suppress warnings (false detection) by lintian + [Patched by Youhei SASAKI] + * Keep files that is needed when rebuild document under debian + directory while building deb package. We need this for clean + build. [Patched by Youhei SASAKI] + * Update apt-line for Debian to correspond specification change of + SourceForge.net + * Create APT repository for Debian stretch properly + * Update mitler-manager-release for CentOS to correspond + specification change of SourceForge.net. You cannot update + milter-manager via yum command If you use milter-manager-release + before 1.3.0. + +==== Improvements + + * Drop Debian wheezy support + * Add Ubuntu Xenial (16.04 LTS) support + * Drop Ubuntu Wily (15.10) support + * Drop Ubuntu Vivid (15.04) support + * Add systemd support for deb packages (Except Ubuntu Precise(12.04)) + * Update Ruby to 2.2.5 on CentOS6 + * systemd support is stable on CentOS7 + * Arrange build script for CentOS + [Patched by Hiroshi Ohkubo][GitHub #92] + +=== milter manager + +==== Fixes + + * Fix milter-manager-log-analyzer errors with RRDtool 1.5 + [Reporde by Dave Dodd][milter-manager-users-en] + * Use "_" instead of "-" to avoid bug of RRDtool 1.5 + [Reporde by Dave Dodd][milter-manager-users-en] + * Fix a bug that configure option --with-bundled-ruby-glib2 does not + work properly on BSD. + +=== libmilter-compatible + +==== Fixes + + * Set timeout properly using smfi_settimeout() + +=== Ruby milter + +==== Fixes + + * Fix error when --fallback-status=temporary-failure + [Patched by Nobuhiko MIYAHARA][GitHub #87] + +=== Document + +==== Improvements + + * Add link to Russian translation + [Translated by Alisa Bagrii] + * Update document for recent clamav-milter on Debian/Ubuntu + [Reported by Kazuhiro NISHIYAMA][GitHub #90] + * Create socket directory when install on Debian/Ubuntu + [Reported by Kazuhiro NISHIYAMA][GitHub #91] + +=== Thanks + + * Youhei SASAKI + * Nobuhiko MIYAHARA + * Alisa Bagrii + * Kazuhiro NISHIYAMA + * Dave Dodd + * Hiroshi Ohkubo + == [release-2-0-7] 2.0.7: 2015-11-30 A bug fix release of 2.0.6 diff -Nru milter-manager-2.0.8/NEWS.ja milter-manager-2.0.9/NEWS.ja --- milter-manager-2.0.8/NEWS.ja 2016-05-16 15:16:06.611390303 +0000 +++ milter-manager-2.0.9/NEWS.ja 2016-06-15 07:05:09.463962139 +0000 @@ -2,7 +2,17 @@ = お知らせ --- milter managerの歴史 -== [release-2-0-8] 2.0.8: 2016-05-XX +== [release-2-0-9] 2.0.9: 2016-06-15 + +2.0.8 のバグフィックスリリースです。 + +=== milter manager + +==== 修正 + + * CentOS6, CentOS7 上で milter の自動検出を正しく動作するようにした + +== [release-2-0-8] 2.0.8: 2016-06-15 2.0.7 のバグフィックスリリースです。 @@ -15,9 +25,15 @@ deb http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main deb-src http://downloads.sourceforge.net/project/milter-manager/debian/stable jessie main +Ubuntuの場合: ppa:milter-manager/ppa を追加する + + % sudo apt-get -y install software-properties-common + % sudo add-apt-repository -y ppa:milter-manager/ppa + % sudo apt-get update + CentOSの場合: milter-manager-releaseパッケージを1.3.0に更新する - % sudo rpm -Uvh \ + % sudo yum install -y \ http://sourceforge.net/projects/milter-manager/files/centos/milter-manager-release-1.3.0-1.noarch.rpm === Package @@ -33,14 +49,22 @@ * Debian向けのapt-lineを更新しました。SourceForge.netの仕様変更に対 応しています。/etc/apt/sources.list.d/milter-manager.listの更新が 必要です。 + * Debian stretch 向けのAPTリポジトリを正しく生成するようにしました * CentOS向けのmilter-manager-releaseパッケージを更新しました。 SourceForge.netの仕様変更に対応しています。1.3.0より古いバージョ ンではyum updateでmilter-managerを更新できません。 ==== 改善 - * CentOS5のサポートをやめました - * CentOS7のサポートを追加しました + * Debian wheezy のサポートをやめました + * Ubuntu Xenial (16.04 LTS) のサポートを追加しました + * Ubuntu Wily (15.10) のサポートを追加しました + * Ubuntu Vivid (15.04) のサポートを追加しました + * debパッケージでsystemdをサポートしました (Ubuntu Precise(12.04) 以外) + * CentOS6で使うRubyを2.2.5にしました + * CentOS7でのsystemdサポートは安定しています + * CentOSのビルドスクリプトを整理しました + [Patched by Hiroshi Ohkubo][GitHub #92] === milter manager @@ -49,11 +73,11 @@ * milter-manager-log-analyzerで未定義の値は0として扱うようにしました。 RRDtool 1.5でエラーになっていた不具合を修正しています。[Dave Doddさんが 報告][milter-manager-users-en] - * configureのオプション--with-bundled-ruby-glib2がBSDで正しく動作し - ない不具合を修正しました。 * milter-manager-log-analyzerでデータソース名に"-"ではなく、"_"を使 うようにしました。これはRRDtool 1.5の不具合を回避するためです。 [Dave Doddさんが報告][milter-manager-users-en] + * configureのオプション--with-bundled-ruby-glib2がBSDで正しく動作し + ない不具合を修正しました。 === libmilter-compatible @@ -88,6 +112,8 @@ * Nobuhiko MIYAHARAさん * Alisa Bagriiさん * 西山和弘さん + * Dave Doddさん + * Hiroshi Ohkuboさん == [release-2-0-7] 2.0.7: 2015-11-30 diff -Nru milter-manager-2.0.8/package/rpm/centos/milter-manager.spec.in milter-manager-2.0.9/package/rpm/centos/milter-manager.spec.in --- milter-manager-2.0.8/package/rpm/centos/milter-manager.spec.in 2016-05-14 04:51:47.589431600 +0000 +++ milter-manager-2.0.9/package/rpm/centos/milter-manager.spec.in 2016-06-15 07:07:29.916418291 +0000 @@ -31,6 +31,8 @@ BuildRequires: %{ruby_build_requires} %if %use_systemd BuildRequires: systemd-units +BuildRequires: systemd +%{systemd_requires} %endif Requires: %{name}-libs = %{version}-%{release} Requires: ruby-milter-client = %{version}-%{release} @@ -282,7 +284,11 @@ fi %post +%if %use_systemd +%systemd_post milter-manager.service +%else /sbin/chkconfig --add milter-manager +%endif /bin/mkdir -p /var/run/milter-manager /bin/chown -R milter-manager:milter-manager /var/run/milter-manager @@ -307,16 +313,23 @@ %postun -n libmilter-server -p /sbin/ldconfig %preun +%if %use_systemd +%systemd_preun milter-manager.service +%else if [ $1 -eq 0 ] ; then /sbin/service milter-manager stop > /dev/null 2>&1 /sbin/chkconfig --del milter-manager fi +%endif %postun +%if %use_systemd +%systemd_postun milter-manager.service +%else if [ $1 -ge 1 ] ; then /sbin/service milter-manager condrestart > /dev/null 2>&1 fi - +%endif if [ $1 -eq 0 ]; then /sbin/ldconfig /usr/sbin/userdel -r milter-manager || \ @@ -346,11 +359,12 @@ %{_mandir}/ja/man1/milter-performance-check.* %{_mandir}/ja/man1/milter-report-statistics.* %{_mandir}/ja/man1/milter-manager.* -%{_initrddir}/milter-manager -%{_sysconfdir}/rc.d/init.d/ -%{_datadir}/milter-manager/milter-manager.service %if %use_systemd %{_unitdir}/milter-manager.service +%{_datadir}/milter-manager/milter-manager.service +%else +%{_initrddir}/milter-manager +%{_sysconfdir}/rc.d/init.d/ %endif %config(noreplace) %{_sysconfdir}/sysconfig/milter-manager %config(noreplace) %{_sysconfdir}/milter-manager/milter-manager.conf @@ -509,7 +523,10 @@ %changelog -* Sun May 29 2016 HAYASHI Kentaro - 2.0.8-1 +* Wed Jun 15 2016 Kenji Okimoto - 2.0.9-1 +- new upstream release. + +* Wed Jun 15 2016 HAYASHI Kentaro - 2.0.8-1 - new upstream release. * Mon Nov 30 2015 Kenji Okimoto - 2.0.7-1 diff -Nru milter-manager-2.0.8/package/ubuntu/Makefile.am milter-manager-2.0.9/package/ubuntu/Makefile.am --- milter-manager-2.0.8/package/ubuntu/Makefile.am 2016-05-13 13:35:17.568387992 +0000 +++ milter-manager-2.0.9/package/ubuntu/Makefile.am 2016-06-15 01:14:55.023371187 +0000 @@ -28,10 +28,12 @@ -e 's/ruby-dev (>= 1:1.9.3)/ruby1.9.1-dev (>= 1.9.1)/g' \ -e '/ruby-gnome2-dev/d' \ -e '/ruby-glib2/d' \ + -e '/dh-systemd/d' \ precise/debian/control sed -i \ -e '/--enable-ruby-milter/i \\t\t--with-ruby=/usr/bin/ruby1.9.1 \\' \ -e 's/ruby -rrbconfig/ruby1.9.1 -rrbconfig/g' \ + -e 's/ --with=sytemd//' \ precise/debian/rules sed -i -e 's,^# ,,' precise/debian/ruby-milter-core.install ./upload.rb \ diff -Nru milter-manager-2.0.8/package/ubuntu/Makefile.in milter-manager-2.0.9/package/ubuntu/Makefile.in --- milter-manager-2.0.8/package/ubuntu/Makefile.in 2016-06-06 12:58:36.213645248 +0000 +++ milter-manager-2.0.9/package/ubuntu/Makefile.in 2016-06-15 07:14:44.781837391 +0000 @@ -596,10 +596,12 @@ -e 's/ruby-dev (>= 1:1.9.3)/ruby1.9.1-dev (>= 1.9.1)/g' \ -e '/ruby-gnome2-dev/d' \ -e '/ruby-glib2/d' \ + -e '/dh-systemd/d' \ precise/debian/control sed -i \ -e '/--enable-ruby-milter/i \\t\t--with-ruby=/usr/bin/ruby1.9.1 \\' \ -e 's/ruby -rrbconfig/ruby1.9.1 -rrbconfig/g' \ + -e 's/ --with=sytemd//' \ precise/debian/rules sed -i -e 's,^# ,,' precise/debian/ruby-milter-core.install ./upload.rb \