Attachment 230100 Details for Bug 259829 – Updated patch file

[patch] Updated patch file

mail_rspamd.patch (text/plain), 3.33 KB, created by Yasuhiro Kimura on 2021-12-14 05:19:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-12-14 05:19:48 UTC

Size: 3.33 KB

patch

obsolete

>From 02481528c7cb10545bdc89132fc77991a00e936f Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Sun, 14 Nov 2021 23:57:57 +0900
>Subject: [PATCH] mail/{rspamd,rspamd-devel}: Switch to use PCRE2
>
>* PCRE1 has reached its end-of-life. So switch to use PCRE2.
>* Update mail/rspamd-devel to latest snapshot that uses PCRE2 by
>  default.
>
>Reference:	https://www.pcre.org/
>---
> mail/rspamd-devel/Makefile  | 7 ++++---
> mail/rspamd-devel/distinfo  | 6 +++---
> mail/rspamd-devel/pkg-plist | 1 +
> mail/rspamd/Makefile        | 4 +++-
> 4 files changed, 11 insertions(+), 7 deletions(-)
>
>diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
>index 2c165abb665e..0a6d56e3172b 100644
>--- a/mail/rspamd-devel/Makefile
>+++ b/mail/rspamd-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	rspamd
>-PORTVERSION=	3.2.a1.20211113
>+PORTVERSION=	3.2.a1.20211214
>+PORTREVISION=	1
> CATEGORIES=	mail
> PKGNAMESUFFIX=	-devel
> 
>@@ -11,14 +12,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
> 
> BUILD_DEPENDS=	ragel:devel/ragel
> LIB_DEPENDS=	libicui18n.so:devel/icu \
>-		libpcre.so:devel/pcre \
>+		libpcre2-8.so:devel/pcre2 \
> 		libsodium.so:security/libsodium
> RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
> 
> USES=		cmake compiler:c++17-lang cpe gnome perl5 pkgconfig sqlite ssl
> CPE_VENDOR=	${PORTNAME}_project
> USE_GITHUB=	yes
>-GH_TAGNAME=	6e83edb
>+GH_TAGNAME=	93430bb
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
> USE_PERL5=	build run
>diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
>index 91bdd42d0c8b..57d9bf2e7d65 100644
>--- a/mail/rspamd-devel/distinfo
>+++ b/mail/rspamd-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1636784689
>-SHA256 (rspamd-rspamd-3.2.a1.20211113-6e83edb_GH0.tar.gz) = d5b4c7323c532ac8dad628ac239cb4808916934335cfd83529ad4c03d434ec4d
>-SIZE (rspamd-rspamd-3.2.a1.20211113-6e83edb_GH0.tar.gz) = 5576127
>+TIMESTAMP = 1639458536
>+SHA256 (rspamd-rspamd-3.2.a1.20211214-93430bb_GH0.tar.gz) = 1c1f672e68bb45dbe741819ed05369364cc0ca8f3661d8dabb4bad86c8f60ada
>+SIZE (rspamd-rspamd-3.2.a1.20211214-93430bb_GH0.tar.gz) = 5631698
>diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
>index 6f27dfc42025..d29895bbf26d 100644
>--- a/mail/rspamd-devel/pkg-plist
>+++ b/mail/rspamd-devel/pkg-plist
>@@ -233,6 +233,7 @@ man/man8/rspamd.8.gz
> %%DATADIR%%/lualib/rspamadm/keypair.lua
> %%DATADIR%%/lualib/rspamadm/mime.lua
> %%DATADIR%%/lualib/rspamadm/neural_test.lua
>+%%DATADIR%%/lualib/rspamadm/publicsuffix.lua
> %%DATADIR%%/lualib/rspamadm/rescore.lua
> %%DATADIR%%/lualib/rspamadm/stat_convert.lua
> %%DATADIR%%/lualib/rspamadm/statistics_dump.lua
>diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
>index b5408a3d0221..dee7370df482 100644
>--- a/mail/rspamd/Makefile
>+++ b/mail/rspamd/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	rspamd
> PORTVERSION=	3.1
>+PORTREVISION=	1
> CATEGORIES=	mail
> 
> MAINTAINER=	vsevolod@FreeBSD.org
>@@ -10,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
> 
> BUILD_DEPENDS=	ragel:devel/ragel
> LIB_DEPENDS=	libicui18n.so:devel/icu \
>-		libpcre.so:devel/pcre \
>+		libpcre2-8.so:devel/pcre2 \
> 		libsodium.so:security/libsodium
> RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
> 
>@@ -26,6 +27,7 @@ CMAKE_ARGS+=	-DBUILD_PORT=yes \
> 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
> 		-DCONFDIR=${PREFIX}/etc/rspamd \
> 		-DDBDIR=/var/db/rspamd \
>+		-DENABLE_PCRE2=ON \
> 		-DLIBDIR=${PREFIX}/lib/rspamd \
> 		-DLOGDIR=/var/log/rspamd \
> 		-DMANDIR=${MANPREFIX}/man \
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 259829: 229487 | 230100 | 230103