Received: by mail.netbsd.org (Postfix, from userid 605) id E56A984DFC; Sun, 14 Feb 2021 15:36:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 615D584DFC for ; Sun, 14 Feb 2021 15:33:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ihakRERcTORU for ; Sun, 14 Feb 2021 15:33:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DC8C584D71 for ; Sun, 14 Feb 2021 15:33:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D9BFDFA95; Sun, 14 Feb 2021 15:33:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1613316782291060" MIME-Version: 1.0 Date: Sun, 14 Feb 2021 15:33:02 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/mail/milter-manager To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20210214153302.D9BFDFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1613316782291060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sun Feb 14 15:33:02 UTC 2021 Modified Files: pkgsrc/mail/milter-manager: Makefile PLIST distinfo Added Files: pkgsrc/mail/milter-manager/patches: patch-module_configuration_ruby_milter-manager-ruby-configuration.c Log Message: mail/milter-manager: update to 2.1.5 pkgsrc changes * switch to use GitHub release. * Portability fix for Ruby 3.0. Changes from 2.0.5 are too many to write here, please refer in detail. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 pkgsrc/mail/milter-manager/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/milter-manager/PLIST cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/milter-manager/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/mail/milter-manager/patches/patch-module_configuration_ruby_milter-manager-ruby-configuration.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1613316782291060 Content-Disposition: inline Content-Length: 18140 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/milter-manager/Makefile diff -u pkgsrc/mail/milter-manager/Makefile:1.48 pkgsrc/mail/milter-manager/Makefile:1.49 --- pkgsrc/mail/milter-manager/Makefile:1.48 Fri Mar 20 11:57:58 2020 +++ pkgsrc/mail/milter-manager/Makefile Sun Feb 14 15:33:02 2021 @@ -1,15 +1,17 @@ -# $NetBSD: Makefile,v 1.48 2020/03/20 11:57:58 nia Exp $ +# $NetBSD: Makefile,v 1.49 2021/02/14 15:33:02 taca Exp $ # -DISTNAME= milter-manager-2.0.5 -PKGREVISION= 4 +DISTNAME= milter-manager-${VERSION} CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=milter-manager/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=milter-manager/} +GITHUB_RELEASE= ${VERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://milter-manager.sourceforge.net/ COMMENT= Milter to use milters effectively +VERSION= 2.1.5 + GNU_CONFIGURE= yes USE_TOOLS+= pkg-config intltool msgfmt USE_LIBTOOL= yes @@ -31,7 +33,7 @@ SUBST_CLASSES+= libev_inc SUBST_STAGE.libev_inc= pre-configure SUBST_MESSAGE.libev_inc= Adjust include path for libevent from pkgsrc. SUBST_FILES.libev_inc= configure -SUBST_SED.libev_inc= 's,/include/ev.h,/include/ev/ev.h,g' +SUBST_SED.libev_inc= -e 's,/include/ev.h,/include/ev/ev.h,g' PKG_SYSCONFSUBDIR= ${PKGBASE} @@ -67,6 +69,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/run/milter-m .for conf in milter-manager.conf \ applicable-conditions/authentication.conf \ + applicable-conditions/dnsbl.conf \ applicable-conditions/remote-network.conf \ applicable-conditions/restrict-accounts.conf \ applicable-conditions/s25r.conf \ Index: pkgsrc/mail/milter-manager/PLIST diff -u pkgsrc/mail/milter-manager/PLIST:1.19 pkgsrc/mail/milter-manager/PLIST:1.20 --- pkgsrc/mail/milter-manager/PLIST:1.19 Thu Dec 11 09:05:07 2014 +++ pkgsrc/mail/milter-manager/PLIST Sun Feb 14 15:33:02 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2014/12/11 09:05:07 obache Exp $ +@comment $NetBSD: PLIST,v 1.20 2021/02/14 15:33:02 taca Exp $ bin/milter-manager-log-analyzer bin/milter-performance-check bin/milter-report-statistics @@ -112,7 +112,9 @@ lib/milter-manager/binding/lib/milter/ma lib/milter-manager/binding/lib/milter/manager/clamav-milter-config-parser.rb lib/milter-manager/binding/lib/milter/manager/condition-table.rb lib/milter-manager/binding/lib/milter/manager/connection-check-context.rb +lib/milter-manager/binding/lib/milter/manager/debian-detector.rb lib/milter-manager/binding/lib/milter/manager/debian-init-detector.rb +lib/milter-manager/binding/lib/milter/manager/debian-systemd-detector.rb lib/milter-manager/binding/lib/milter/manager/detector.rb lib/milter-manager/binding/lib/milter/manager/enma-socket-detector.rb lib/milter-manager/binding/lib/milter/manager/exception.rb @@ -130,7 +132,11 @@ lib/milter-manager/binding/lib/milter/ma lib/milter-manager/binding/lib/milter/manager/rcng-detector.rb lib/milter-manager/binding/lib/milter/manager/redhat-detector.rb lib/milter-manager/binding/lib/milter/manager/redhat-init-detector.rb +lib/milter-manager/binding/lib/milter/manager/redhat-systemd-detector.rb lib/milter-manager/binding/lib/milter/manager/redhat-upstart-detector.rb +lib/milter-manager/binding/lib/milter/manager/rmilter-socket-detector.rb +lib/milter-manager/binding/lib/milter/manager/rspamd-proxy-detector.rb +lib/milter-manager/binding/lib/milter/manager/systemd-detector.rb lib/milter-manager/binding/lib/milter/server.rb lib/milter-manager/binding/lib/milter/server/testing.rb lib/milter-manager/libmilter.la @@ -161,18 +167,22 @@ man/man1/milter-report-statistics.1 man/man1/milter-test-client.1 man/man1/milter-test-server.1 sbin/milter-manager +share/doc/milter-manager/MilterClientContext.html +share/doc/milter-manager/MilterErrorEmittable.html +share/doc/milter-manager/MilterFinishedEmittable.html +share/doc/milter-manager/MilterServerContext.html share/doc/milter-manager/available-milters.html share/doc/milter-manager/commands.html share/doc/milter-manager/configuration.html share/doc/milter-manager/home.png share/doc/milter-manager/index.html -share/doc/milter-manager/index.sgml share/doc/milter-manager/install-options-to-centos.html share/doc/milter-manager/install-options-to-debian.html share/doc/milter-manager/install-options-to-freebsd.html share/doc/milter-manager/install-options-to-ubuntu.html share/doc/milter-manager/install-to-centos.html share/doc/milter-manager/install-to-centos5.html +share/doc/milter-manager/install-to-centos6.html share/doc/milter-manager/install-to-debian.html share/doc/milter-manager/install-to-freebsd.html share/doc/milter-manager/install-to-others.html @@ -180,28 +190,74 @@ share/doc/milter-manager/install-to-ubun share/doc/milter-manager/install-to.html share/doc/milter-manager/install.html share/doc/milter-manager/introduction.html +share/doc/milter-manager/ja/MilterClientContext.html +share/doc/milter-manager/ja/MilterErrorEmittable.html +share/doc/milter-manager/ja/MilterFinishedEmittable.html +share/doc/milter-manager/ja/MilterServerContext.html +share/doc/milter-manager/ja/api-index-2.1.0.xml share/doc/milter-manager/ja/api-index-deprecated.xml share/doc/milter-manager/ja/api-index-full.xml +share/doc/milter-manager/ja/available-milters.html share/doc/milter-manager/ja/client.xml +share/doc/milter-manager/ja/commands.html +share/doc/milter-manager/ja/configuration.html share/doc/milter-manager/ja/core.xml +share/doc/milter-manager/ja/home.png +share/doc/milter-manager/ja/index.html +share/doc/milter-manager/ja/install-options-to-centos.html +share/doc/milter-manager/ja/install-options-to-debian.html +share/doc/milter-manager/ja/install-options-to-freebsd.html +share/doc/milter-manager/ja/install-options-to-ubuntu.html +share/doc/milter-manager/ja/install-to-centos.html +share/doc/milter-manager/ja/install-to-centos5.html +share/doc/milter-manager/ja/install-to-centos6.html +share/doc/milter-manager/ja/install-to-debian.html +share/doc/milter-manager/ja/install-to-freebsd.html +share/doc/milter-manager/ja/install-to-others.html +share/doc/milter-manager/ja/install-to-ubuntu.html +share/doc/milter-manager/ja/install-to.html +share/doc/milter-manager/ja/install.html +share/doc/milter-manager/ja/introduction.html +share/doc/milter-manager/ja/left-insensitive.png +share/doc/milter-manager/ja/left.png share/doc/milter-manager/ja/libmilter-compatible.xml +share/doc/milter-manager/ja/libmilter-mfapi.h.html +share/doc/milter-manager/ja/libmilter.html +share/doc/milter-manager/ja/log-list.html +share/doc/milter-manager/ja/maintenance-policy.html share/doc/milter-manager/ja/manager.xml share/doc/milter-manager/ja/mfapi.xml share/doc/milter-manager/ja/mfdef.xml share/doc/milter-manager/ja/milter-agent.xml share/doc/milter-manager/ja/milter-client-context.xml share/doc/milter-manager/ja/milter-client-enum-types.xml +share/doc/milter-manager/ja/milter-client-objects.xml +share/doc/milter-manager/ja/milter-client-private.xml +share/doc/milter-manager/ja/milter-client-runner.xml +share/doc/milter-manager/ja/milter-client-single-thread-runner.xml +share/doc/milter-manager/ja/milter-client.html +share/doc/milter-manager/ja/milter-client.xml share/doc/milter-manager/ja/milter-command-decoder.xml share/doc/milter-manager/ja/milter-command-encoder.xml share/doc/milter-manager/ja/milter-connection.xml +share/doc/milter-manager/ja/milter-core-internal.xml +share/doc/milter-manager/ja/milter-core.html share/doc/milter-manager/ja/milter-decoder.xml share/doc/milter-manager/ja/milter-encoder.xml share/doc/milter-manager/ja/milter-enum-types.xml share/doc/milter-manager/ja/milter-error-emittable.xml +share/doc/milter-manager/ja/milter-esmtp.xml +share/doc/milter-manager/ja/milter-event-loop.xml share/doc/milter-manager/ja/milter-finished-emittable.xml +share/doc/milter-manager/ja/milter-glib-compatible.xml +share/doc/milter-manager/ja/milter-glib-event-loop.xml share/doc/milter-manager/ja/milter-headers.xml +share/doc/milter-manager/ja/milter-libev-event-loop.xml share/doc/milter-manager/ja/milter-logger.xml share/doc/milter-manager/ja/milter-macros-requests.xml +share/doc/milter-manager/ja/milter-manager-Client-library.html +share/doc/milter-manager/ja/milter-manager-Core-library.html +share/doc/milter-manager/ja/milter-manager-MilterProtocol.html share/doc/milter-manager/ja/milter-manager-applicable-condition.xml share/doc/milter-manager/ja/milter-manager-child.xml share/doc/milter-manager/ja/milter-manager-children.xml @@ -211,6 +267,7 @@ share/doc/milter-manager/ja/milter-manag share/doc/milter-manager/ja/milter-manager-control-protocol.xml share/doc/milter-manager/ja/milter-manager-control-reply-decoder.xml share/doc/milter-manager/ja/milter-manager-control-reply-encoder.xml +share/doc/milter-manager/ja/milter-manager-controller-context.xml share/doc/milter-manager/ja/milter-manager-controller.xml share/doc/milter-manager/ja/milter-manager-egg.xml share/doc/milter-manager/ja/milter-manager-enum-types.xml @@ -219,6 +276,7 @@ share/doc/milter-manager/ja/milter-manag share/doc/milter-manager/ja/milter-manager-launch-protocol.xml share/doc/milter-manager/ja/milter-manager-leader.xml share/doc/milter-manager/ja/milter-manager-log-analyzer-graphs.png +share/doc/milter-manager/ja/milter-manager-log-analyzer.html share/doc/milter-manager/ja/milter-manager-module-impl.xml share/doc/milter-manager/ja/milter-manager-module.xml share/doc/milter-manager/ja/milter-manager-objects.xml @@ -226,42 +284,86 @@ share/doc/milter-manager/ja/milter-manag share/doc/milter-manager/ja/milter-manager-reply-decoder.xml share/doc/milter-manager/ja/milter-manager-reply-encoder.xml share/doc/milter-manager/ja/milter-manager-reply-protocol.xml +share/doc/milter-manager/ja/milter-manager.devhelp2 +share/doc/milter-manager/ja/milter-manager.html share/doc/milter-manager/ja/milter-manager.xml +share/doc/milter-manager/ja/milter-memory-profile.xml +share/doc/milter-manager/ja/milter-message-result.xml share/doc/milter-manager/ja/milter-option.xml +share/doc/milter-manager/ja/milter-performance-check.html share/doc/milter-manager/ja/milter-protocol-agent.xml share/doc/milter-manager/ja/milter-protocol.xml share/doc/milter-manager/ja/milter-reader.xml share/doc/milter-manager/ja/milter-reply-decoder.xml share/doc/milter-manager/ja/milter-reply-encoder.xml share/doc/milter-manager/ja/milter-reply-signals.xml +share/doc/milter-manager/ja/milter-report-statistics.html share/doc/milter-manager/ja/milter-server-context.xml share/doc/milter-manager/ja/milter-server-enum-types.xml +share/doc/milter-manager/ja/milter-server.html +share/doc/milter-manager/ja/milter-session-result.xml share/doc/milter-manager/ja/milter-syslog-logger.xml +share/doc/milter-manager/ja/milter-test-client.html +share/doc/milter-manager/ja/milter-test-server.html share/doc/milter-manager/ja/milter-utils.xml share/doc/milter-manager/ja/milter-version.xml share/doc/milter-manager/ja/milter-writer.xml share/doc/milter-manager/ja/mta-and-milter-manager-and-child-milter-ja.png share/doc/milter-manager/ja/mta-and-milter-manager-and-child-milter.png +share/doc/milter-manager/ja/news.html +share/doc/milter-manager/ja/readme.html +share/doc/milter-manager/ja/reference.html +share/doc/milter-manager/ja/reverse-dictionary.html +share/doc/milter-manager/ja/right-insensitive.png +share/doc/milter-manager/ja/right.png +share/doc/milter-manager/ja/ruby-milter-configuration.html +share/doc/milter-manager/ja/ruby-milter-reference.html +share/doc/milter-manager/ja/ruby-milter-tutorial.html +share/doc/milter-manager/ja/ruby.html share/doc/milter-manager/ja/sendmail-and-milter-ja.png share/doc/milter-manager/ja/sendmail-and-milter.png share/doc/milter-manager/ja/sendmail-and-postfix-and-milter-ja.png share/doc/milter-manager/ja/sendmail-and-postfix-and-milter.png +share/doc/milter-manager/ja/server.xml +share/doc/milter-manager/ja/start.html +share/doc/milter-manager/ja/style.css +share/doc/milter-manager/ja/up-insensitive.png +share/doc/milter-manager/ja/up.png +share/doc/milter-manager/ja/upgrade-on-centos.html +share/doc/milter-manager/ja/upgrade-on-debian.html +share/doc/milter-manager/ja/upgrade-on-freebsd.html +share/doc/milter-manager/ja/upgrade-on-ubuntu.html +share/doc/milter-manager/ja/upgrade-options-on-centos.html +share/doc/milter-manager/ja/upgrade-options-on-debian.html +share/doc/milter-manager/ja/upgrade-options-on-freebsd.html +share/doc/milter-manager/ja/upgrade-options-on-ubuntu.html +share/doc/milter-manager/ja/upgrade.html +share/doc/milter-manager/ja/users.html share/doc/milter-manager/left-insensitive.png share/doc/milter-manager/left.png +share/doc/milter-manager/libmilter-mfapi.h.html +share/doc/milter-manager/libmilter.html share/doc/milter-manager/log-list.html share/doc/milter-manager/maintenance-policy.html +share/doc/milter-manager/milter-client.html +share/doc/milter-manager/milter-core.html +share/doc/milter-manager/milter-manager-Client-library.html +share/doc/milter-manager/milter-manager-Core-library.html +share/doc/milter-manager/milter-manager-MilterProtocol.html share/doc/milter-manager/milter-manager-log-analyzer-graphs.png share/doc/milter-manager/milter-manager-log-analyzer.html share/doc/milter-manager/milter-manager.devhelp2 share/doc/milter-manager/milter-manager.html share/doc/milter-manager/milter-performance-check.html share/doc/milter-manager/milter-report-statistics.html +share/doc/milter-manager/milter-server.html share/doc/milter-manager/milter-test-client.html share/doc/milter-manager/milter-test-server.html share/doc/milter-manager/mta-and-milter-manager-and-child-milter-ja.png share/doc/milter-manager/mta-and-milter-manager-and-child-milter.png share/doc/milter-manager/news.html share/doc/milter-manager/readme.html +share/doc/milter-manager/reference.html share/doc/milter-manager/reverse-dictionary.html share/doc/milter-manager/right-insensitive.png share/doc/milter-manager/right.png @@ -288,6 +390,7 @@ share/doc/milter-manager/upgrade-options share/doc/milter-manager/upgrade.html share/doc/milter-manager/users.html share/examples/milter-manager/applicable-conditions/authentication.conf +share/examples/milter-manager/applicable-conditions/dnsbl.conf share/examples/milter-manager/applicable-conditions/remote-network.conf share/examples/milter-manager/applicable-conditions/restrict-accounts.conf share/examples/milter-manager/applicable-conditions/s25r.conf @@ -312,6 +415,7 @@ share/milter-manager/munin/plugins/sendm share/milter-manager/sample/ruby/milter-regexp.rb share/milter-manager/sample/ruby/milter-reject-empty-body.rb share/milter-manager/sample/ruby/milter-reject-nil-sender.rb +share/milter-manager/sample/ruby/milter-replace.rb share/milter-manager/sample/ruby/milter-tarpit.rb share/milter-manager/sample/ruby/milter-test-client-composite.rb share/milter-manager/sample/ruby/milter-test-client.rb Index: pkgsrc/mail/milter-manager/distinfo diff -u pkgsrc/mail/milter-manager/distinfo:1.27 pkgsrc/mail/milter-manager/distinfo:1.28 --- pkgsrc/mail/milter-manager/distinfo:1.27 Tue Nov 3 23:27:10 2015 +++ pkgsrc/mail/milter-manager/distinfo Sun Feb 14 15:33:02 2021 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.27 2015/11/03 23:27:10 agc Exp $ +$NetBSD: distinfo,v 1.28 2021/02/14 15:33:02 taca Exp $ -SHA1 (milter-manager-2.0.5.tar.gz) = 47982e63d3515c1df3599c5e70b3aed9fd4662f6 -RMD160 (milter-manager-2.0.5.tar.gz) = c0d64c5001c42d49954f0bafdbc2c6d241ed3e70 -SHA512 (milter-manager-2.0.5.tar.gz) = c78254de0129406cf6c9d747b00e5331d48b7f206718106ba6a4a40265d48d30d0b35b62cea12b1bf0a7a2cfa67d50b713ddbe72ad50f87013439956d8aa05c8 -Size (milter-manager-2.0.5.tar.gz) = 5873997 bytes +SHA1 (milter-manager-2.1.5.tar.gz) = 26f084ac36a7b0a0c2e30af2afb9bb41fe82184c +RMD160 (milter-manager-2.1.5.tar.gz) = cf95f4d24f8ee3c680436b30b81810c7d50a96bd +SHA512 (milter-manager-2.1.5.tar.gz) = a2f01deb6c8cece24d3686e87cd401e460fcc7d8e4f1a41481815864525cfa37828f0f75533f0eb8d7f8d5c8395d5a77dac177b79b7c15cab49e604ea8ae2668 +Size (milter-manager-2.1.5.tar.gz) = 6583279 bytes SHA1 (patch-configure) = ee1f31e83354c4c6b38ae1c0d4fda40f28ad92b6 -SHA1 (patch-libev-4.15_ev.c) = 8393cc727fda6a812931e42507e5db2fdf370c33 +SHA1 (patch-module_configuration_ruby_milter-manager-ruby-configuration.c) = 50722053e3db2404d792900f92323ab886ba607a Added files: Index: pkgsrc/mail/milter-manager/patches/patch-module_configuration_ruby_milter-manager-ruby-configuration.c diff -u /dev/null pkgsrc/mail/milter-manager/patches/patch-module_configuration_ruby_milter-manager-ruby-configuration.c:1.1 --- /dev/null Sun Feb 14 15:33:02 2021 +++ pkgsrc/mail/milter-manager/patches/patch-module_configuration_ruby_milter-manager-ruby-configuration.c Sun Feb 14 15:33:02 2021 @@ -0,0 +1,39 @@ +$NetBSD: patch-module_configuration_ruby_milter-manager-ruby-configuration.c,v 1.1 2021/02/14 15:33:02 taca Exp $ + +Don't use RETSIGTYPE but simply void. + +--- module/configuration/ruby/milter-manager-ruby-configuration.c.orig 2019-09-09 09:17:06.177788299 +0000 ++++ module/configuration/ruby/milter-manager-ruby-configuration.c +@@ -166,18 +166,18 @@ milter_manager_ruby_configuration_regist + static void + ruby_init_without_signal_change (void) + { +- RETSIGTYPE (*sigint_handler)_((int)); ++ void (*sigint_handler)_((int)); + #ifdef SIGHUP +- RETSIGTYPE (*sighup_handler)_((int)); ++ void (*sighup_handler)_((int)); + #endif + #ifdef SIGQUIT +- RETSIGTYPE (*sigquit_handler)_((int)); ++ void (*sigquit_handler)_((int)); + #endif + #ifdef SIGTERM +- RETSIGTYPE (*sigterm_handler)_((int)); ++ void (*sigterm_handler)_((int)); + #endif + #ifdef SIGSEGV +- RETSIGTYPE (*sigsegv_handler)_((int)); ++ void (*sigsegv_handler)_((int)); + #endif + + sigint_handler = signal(SIGINT, SIG_DFL); +@@ -386,7 +386,7 @@ MILTER_MANAGER_MODULE_IMPL_INIT (GTypeMo + static void + ruby_cleanup_without_signal_change (int exit_code) + { +- RETSIGTYPE (*sigint_handler)_((int)); ++ void (*sigint_handler)_((int)); + #ifdef HAVE_RB_THREAD_RESET_TIMER_THREAD + const gchar *milter_manager_ruby_reset_timer_thread_before_cleanup = NULL; + #endif --_----------=_1613316782291060--