On 10/11 12:42, Stuart Henderson wrote:
> On 2020/10/10 23:39, Daniel Dickman wrote:
> > This update includes a fix for CVE-2020-11979.
> >
> > To summarize, the fix for CVE-2020-1945 that was done in ant 1.10.8 did
> > not work as intended so a new release of ant was made to try again.
> >
> > Diff below includes a quirks update.
> >
> > The consumers of ant were compile tested with the update below:
> >
> > editors/libreoffice
> > graphics/opencv
> > math/rstudio
> > textproc/link-grammar
> >
> > ok?
>
> OK. I built the other consumers too - apart from a problem in jruby
> unrelated to the ant update, they were also OK.
>
> Jeremy: jruby builds libffi using g++ rather than using the system
> compiler (noticed because I "rm -rf /usr/bin/{gcc,g++} /usr/lib/gcc-lib"
> in /etc/rc.local) - OK for this?
As a style issue, I would move the MAKE_ENV above WRKDIST, but either
way, OK jeremy@.
Thanks,
Jeremy
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/jruby/Makefile,v
> retrieving revision 1.88
> diff -u -p -r1.88 Makefile
> --- Makefile 5 Aug 2020 21:33:25 -0000 1.88
> +++ Makefile 11 Oct 2020 11:39:34 -0000
> @@ -6,6 +6,7 @@ ONLY_FOR_ARCHS = amd64
> COMMENT = pure-Java implementation of the Ruby language
>
> V = 9.2.13.0
> +REVISION = 0
> DISTNAME = jruby-dist-${V}-bin
> PKGNAME = jruby-${V}
> CATEGORIES = lang lang/ruby
> @@ -54,6 +55,8 @@ post-extract:
> cd ${WRKSRC} && mkdir jruby-launcher \
> && cd jruby-launcher && tar zxf ../../data.tar.gz \
> && rm -f ../../data.tar.gz
> +
> +MAKE_ENV+= CXX=${CXX}
>
> do-configure:
> ${SUBST_CMD} ${WRKSRC}/jruby-launcher/jrubyexe.cpp \
>
