On Mon, Aug 14, 2023 at 08:44:25AM +0200, Stefan Hagen wrote:
> Hi,
>
> there's a bug in gmime, which is affecting mail/mu. It doesn't look like
> there will be a new gmime release anytime soon. Can we cherry-pick this fix?
>
> Maintainer on CC.
I am OK with this but could you use a regular patch instead of fetching from
github?
> Best,
> Stefan
>
> Index: mail/gmime30/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/gmime30/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- mail/gmime30/Makefile 5 Nov 2022 17:06:28 -0000 1.23
> +++ mail/gmime30/Makefile 14 Aug 2023 06:39:31 -0000
> @@ -4,7 +4,7 @@ GH_ACCOUNT= jstedfast
> GH_PROJECT= gmime
> GH_TAGNAME= 3.2.13
> PKGNAME= gmime30-${GH_TAGNAME}
> -REVISION= 0
> +REVISION= 1
>
> SHARED_LIBS += gmime-3.0 2.2 # 213.0
>
> @@ -18,6 +18,13 @@ PERMIT_PACKAGE= Yes
> WANTLIB += assuan ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
> WANTLIB += gpg-error gpgme gthread-2.0 iconv idn2 intl pcre2-8 pthread
> WANTLIB += unistring z
> +
> +# Fixed rfc2047 token decoding logic for base64 encodings
> +# Bug report: https://github.com/djcb/mu/issues/2429
> +# can be removed in next version (3.2.14)
> +MASTER_SITES0 = https://github.com/jstedfast/gmime/commit/
> +PATCHFILES = 1a33a55baafc73b0a6d7f83cf4c30ad9e169669f.diff:0
> +PATCH_DIST_STRIP = -p1
>
> USE_GMAKE= Yes
>
> Index: mail/gmime30/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/gmime30/distinfo,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 distinfo
> --- mail/gmime30/distinfo 19 Aug 2022 08:25:52 -0000 1.17
> +++ mail/gmime30/distinfo 14 Aug 2023 06:39:31 -0000
> @@ -1,2 +1,4 @@
> +SHA256 (1a33a55baafc73b0a6d7f83cf4c30ad9e169669f.diff) =
> vc8D67Z1OKYLSI7/LfVOuN7prc2/4tRtEtjt+W03ZNc=
> SHA256 (gmime-3.2.13.tar.gz) = G6Uz5PvJ2nBZtcXdi04LTPYHMehvvD2PVHswXT4eFHE=
> +SIZE (1a33a55baafc73b0a6d7f83cf4c30ad9e169669f.diff) = 1760
> SIZE (gmime-3.2.13.tar.gz) = 7896568
--
Antoine
