Request for Test: mail/milter-manager: Update to 2.2.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Nov 2024 03:11:22 UTC
木村です。
私自身は使っていないにもかかわらず過去mail/milter-managerの更新に何度
か関わってきたのですが、その縁はまだ続いていたようでひょんなことから新
しいバージョンが出ていることを知ったので、最新バージョンである2.2.7に
更新するパッチを作成してみました。
取り敢えず最新のports treeのmainブランチとpoudriereと14.1-RELEASE
amd64のjailの組み合わせでビルドが成功することは確認したのですが、正常
に動作するかが私では確認できないのでどなたかテストしていただけないでしょ
うか。
よろしくお願いいたします。
From 14c32a6bd89ed9374a9a81b70f1a55627dc6d51f Mon Sep 17 00:00:00 2001
From: Yasuhiro Kimura <yasu@FreeBSD.org>
Date: Thu, 21 Nov 2024 11:28:13 +0900
Subject: [PATCH] mail/milter-manager: Update to 2.2.7
ChangeLog: https://github.com/milter-manager/milter-manager/releases
---
mail/milter-manager/Makefile | 14 ++-----------
mail/milter-manager/distinfo | 6 +++---
mail/milter-manager/files/patch-Makefile.in | 14 ++++++-------
mail/milter-manager/files/patch-configure | 20 +++++++++---------
.../files/patch-libev-4.19__ev.c | 18 ----------------
mail/milter-manager/pkg-plist | 21 +++++++++++--------
6 files changed, 34 insertions(+), 59 deletions(-)
delete mode 100644 mail/milter-manager/files/patch-libev-4.19__ev.c
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 94cb968a6772..44a376c1c382 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,6 +1,5 @@
PORTNAME= milter-manager
-DISTVERSION= 2.1.6
-PORTREVISION= 2
+DISTVERSION= 2.2.7
CATEGORIES= mail ruby
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
@@ -23,30 +22,21 @@ USE_LDCONFIG= yes
USE_RC_SUBR= milter-manager
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--with-libev \
--with-package-platform=freebsd
INSTALL_TARGET= install-strip
-CFLAGS+= -fdeclspec
-
PORTDOCS= *
PORTEXAMPLES= *
OPTIONS_DEFINE= DOCS EXAMPLES
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-CFLAGS+= -Wno-error=incompatible-function-pointer-types
-.endif
-
post-patch:
@${FIND} ${WRKSRC} -type f -name Makefile.in -exec \
${REINPLACE_CMD} -e "s#\$$(datadir)/@PACKAGE@#${DATADIR}#" \
-e "s#\$$(datarootdir)/\$$(PACKAGE)#${DATADIR}#" {} +
@${REINPLACE_CMD} -e "s#\\\\\$$(pkgdatadir)/sample#${EXAMPLESDIR}#" ${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 23d7e7f80a0f..d9ee7dae114d 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644938800
-SHA256 (milter-manager-2.1.6.tar.gz) = 3e656abd3d60677b68a02e35b31d9f7b1d0939fe47dd38425618458b5a5e703f
-SIZE (milter-manager-2.1.6.tar.gz) = 6086564
+TIMESTAMP = 1732155037
+SHA256 (milter-manager-2.2.7.tar.gz) = f5dc1bc5240856b68c50af164c5e1d90fba3dd7a55c7e8f5d45bfe8ea0858f7a
+SIZE (milter-manager-2.2.7.tar.gz) = 5278536
diff --git a/mail/milter-manager/files/patch-Makefile.in b/mail/milter-manager/files/patch-Makefile.in
index f9ae17b5bbe1..7facf144d7d5 100644
--- a/mail/milter-manager/files/patch-Makefile.in
+++ b/mail/milter-manager/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2018-03-18 11:34:18 UTC
+--- Makefile.in.orig 2024-11-21 01:59:51 UTC
+++ Makefile.in
-@@ -510,7 +510,7 @@ SUBDIRS = $(am__append_1) milter libmilt
- data test po build doc html license package vendor
+@@ -512,7 +512,7 @@ pkgconfig_DATA = milter-core.pc milter-client.pc milte
+
pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = milter-core.pc milter-client.pc milter-server.pc \
-- milter-manager.pc libmilter.pc $(am__append_2)
-+ milter-manager.pc $(am__append_2)
+- milter-manager.pc libmilter.pc $(am__append_1)
++ milter-manager.pc $(am__append_1)
EXTRA_DIST = \
- autogen.sh \
- gpg_uid \
+ NEWS \
+ NEWS.ja \
diff --git a/mail/milter-manager/files/patch-configure b/mail/milter-manager/files/patch-configure
index ba66440dbb59..888c5683d98d 100644
--- a/mail/milter-manager/files/patch-configure
+++ b/mail/milter-manager/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig 2017-06-28 06:21:45 UTC
+--- configure.orig 2022-09-28 02:08:37 UTC
+++ configure
-@@ -14803,7 +14803,7 @@ fi
- end
- end
- ruby_glib2_path = ruby_glib2_gem.full_gem_path
-- print("-I ", File.join(ruby_glib2_path, "ext", "glib2"))')
-+ print("-I ", File.join(ruby_glib2_path, "lib"))')
- if test $? -eq 0; then
- CFLAGS="$CFLAGS $RUBY_GLIB2_CFLAGS"
- else
+@@ -14423,7 +14423,7 @@ fi
+
+ ruby_glib2_gem_dir="$($RUBY -rglib2 -e 'print(Gem::Specification.find_by_name(%(glib2)).gem_dir)')"
+ if test -d "$ruby_glib2_gem_dir"; then
+- RUBY_GLIB2_CFLAGS="-I$ruby_glib2_gem_dir/ext/glib2"
++ RUBY_GLIB2_CFLAGS="-I$ruby_glib2_gem_dir/lib"
+ else
+
+ if test -n "$RUBY_VENDOR_ARCH_DIR"; then
diff --git a/mail/milter-manager/files/patch-libev-4.19__ev.c b/mail/milter-manager/files/patch-libev-4.19__ev.c
deleted file mode 100644
index af4e590da374..000000000000
--- a/mail/milter-manager/files/patch-libev-4.19__ev.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libev-4.19/ev.c.orig 2016-07-20 07:58:51 UTC
-+++ libev-4.19/ev.c
-@@ -1022,12 +1022,12 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
- }
- #endif
-
--#if ECB_GCC_VERSION(4,5)
-+#if ECB_GCC_VERSION(4,5) || defined __clang__
- #define ecb_unreachable() __builtin_unreachable ()
- #else
- /* this seems to work fine, but gcc always emits a warning for it :/ */
-- ecb_inline void ecb_unreachable (void) ecb_noreturn;
-- ecb_inline void ecb_unreachable (void) { }
-+ ecb_inline ecb_noreturn ecb_unreachable (void);
-+ ecb_inline ecb_noreturn ecb_unreachable (void) { }
- #endif
-
- /* try to tell the compiler that some condition is definitely true */
diff --git a/mail/milter-manager/pkg-plist b/mail/milter-manager/pkg-plist
index e6927e57a4e2..156781b5da80 100644
--- a/mail/milter-manager/pkg-plist
+++ b/mail/milter-manager/pkg-plist
@@ -17,6 +17,9 @@ etc/cron.d/milter-manager-log
%%ETCDIR%%/defaults/freebsd.conf
%%ETCDIR%%/defaults/pkgsrc.conf
%%ETCDIR%%/defaults/redhat.conf
+%%ETCDIR%%/defaults/redhat7.conf
+%%ETCDIR%%/defaults/redhat8.conf
+%%ETCDIR%%/defaults/redhat9.conf
%%ETCDIR%%/milter-manager.conf
%%ETCDIR%%/models/example.rb
include/milter-manager/libmilter/libmilter/mfapi.h
@@ -46,7 +49,6 @@ include/milter-manager/milter/core/milter-headers.h
include/milter-manager/milter/core/milter-libev-event-loop.h
include/milter-manager/milter/core/milter-logger.h
include/milter-manager/milter/core/milter-macros-requests.h
-include/milter-manager/milter/core/milter-memory-profile.h
include/milter-manager/milter/core/milter-message-result.h
include/milter-manager/milter/core/milter-option.h
include/milter-manager/milter/core/milter-protocol-agent.h
@@ -90,17 +92,17 @@ include/milter-manager/milter/server.h
include/milter-manager/milter/server/milter-server-context.h
include/milter-manager/milter/server/milter-server-enum-types.h
lib/libmilter-client.so
-lib/libmilter-client.so.0
-lib/libmilter-client.so.0.0.0
+lib/libmilter-client.so.2
+lib/libmilter-client.so.2.0.0
lib/libmilter-core.so
-lib/libmilter-core.so.0
-lib/libmilter-core.so.0.0.0
+lib/libmilter-core.so.2
+lib/libmilter-core.so.2.0.0
lib/libmilter-manager.so
-lib/libmilter-manager.so.0
-lib/libmilter-manager.so.0.0.0
+lib/libmilter-manager.so.2
+lib/libmilter-manager.so.2.0.0
lib/libmilter-server.so
-lib/libmilter-server.so.0
-lib/libmilter-server.so.0.0.0
+lib/libmilter-server.so.2
+lib/libmilter-server.so.2.0.0
lib/milter-manager/binding/ext/milter_client.so
lib/milter-manager/binding/ext/milter_core.so
lib/milter-manager/binding/ext/milter_manager.so
@@ -122,6 +124,7 @@ lib/milter-manager/binding/lib/milter/client/session.rb
lib/milter-manager/binding/lib/milter/client/testing.rb
lib/milter-manager/binding/lib/milter/core.rb
lib/milter-manager/binding/lib/milter/core/callback.rb
+lib/milter-manager/binding/lib/milter/core/command-runner.rb
lib/milter-manager/binding/lib/milter/core/compatible.rb
lib/milter-manager/binding/lib/milter/core/logger.rb
lib/milter-manager/binding/lib/milter/core/macro.rb
--
2.47.0
---
木村 康浩