Date: Fri, 1 Jan 2021 16:38:52 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559851 - in head/graphics/libwmf: . files Message-ID: <202101011638.101Gcquj041191@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Jan 1 16:38:52 2021 New Revision: 559851 URL: https://svnweb.freebsd.org/changeset/ports/559851 Log: graphics/libwmf: update 0.2.8.4 -> 0.2.12 - Switch to active fork (removes the need to patch for mutliple CVEs) This is what Alpine Linux, Arch Linux, Debian and Fedora uses. - Add patch to use pkg-config (pkgconfig) to detect freetype(2) References: https://github.com/caolanm/libwmf (no proper release notes available) https://github.com/archlinux/svntogit-packages/blob/packages/libwmf/trunk/libwmf-freetype.patch PR: 252114 Submitted by: daniel.engberg.lists@pyret.net Added: head/graphics/libwmf/files/patch-configure.ac (contents, props changed) head/graphics/libwmf/files/patch-src_extra_gd_gd__png.c - copied, changed from r559850, head/graphics/libwmf/files/patch-gd_png.c Deleted: head/graphics/libwmf/files/patch-CAN-2004-0941 head/graphics/libwmf/files/patch-CVE-2007-0455 head/graphics/libwmf/files/patch-CVE-2007-2756 head/graphics/libwmf/files/patch-CVE-2007-3472 head/graphics/libwmf/files/patch-CVE-2007-3473 head/graphics/libwmf/files/patch-CVE-2007-3477 head/graphics/libwmf/files/patch-CVE-2009-3546 head/graphics/libwmf/files/patch-cve-2006-3376 head/graphics/libwmf/files/patch-cve-2009-1364 head/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 head/graphics/libwmf/files/patch-deb784205-CVE-2015-4695 head/graphics/libwmf/files/patch-gd_png.c head/graphics/libwmf/files/patch-rh1227243-CVE-2015-0848 head/graphics/libwmf/files/patch-rh1227243-CVE-2015-4588 Modified: head/graphics/libwmf/Makefile head/graphics/libwmf/distinfo head/graphics/libwmf/pkg-plist Modified: head/graphics/libwmf/Makefile ============================================================================== --- head/graphics/libwmf/Makefile Fri Jan 1 16:36:05 2021 (r559850) +++ head/graphics/libwmf/Makefile Fri Jan 1 16:38:52 2021 (r559851) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= libwmf -PORTVERSION= 0.2.8.4 -PORTREVISION= 15 +DISTVERSIONPREFIX= v +DISTVERSION= 0.2.12 CATEGORIES= graphics -MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Tools and library for converting Microsoft WMF (windows metafile) @@ -14,16 +13,17 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libgd.so:graphics/gd \ + libexpat.so:textproc/expat2 -USES= gnome jpeg libtool -USE_GNOME= libxml2 +USES= autoreconf:build jpeg libtool localbase pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= caolanm USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-sys-gd=no \ - --with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \ - --with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts +CONFIGURE_ARGS= --with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts INSTALL_TARGET= install-strip PORTDOCS= * @@ -38,9 +38,15 @@ X11_USES= xorg X11_USE= XORG=x11 X11_CONFIGURE_OFF=--with-x=no +pre-configure: + @(cd ${CONFIGURE_WRKSRC} && ${SETENV} AUTOHEADER="${TRUE}" \ + ${LOCALBASE}/bin/autoreconf -vif -Ipatches) + +post-configure: + @${REINPLACE_CMD} -e 's|autoheader|autoheader -Ipatches|g' \ + ${WRKSRC}/Makefile + post-patch: - @${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \ - ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \ s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \ Modified: head/graphics/libwmf/distinfo ============================================================================== --- head/graphics/libwmf/distinfo Fri Jan 1 16:36:05 2021 (r559850) +++ head/graphics/libwmf/distinfo Fri Jan 1 16:38:52 2021 (r559851) @@ -1,2 +1,3 @@ -SHA256 (libwmf-0.2.8.4.tar.gz) = 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 -SIZE (libwmf-0.2.8.4.tar.gz) = 2169375 +TIMESTAMP = 1608812851 +SHA256 (caolanm-libwmf-v0.2.12_GH0.tar.gz) = 464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2 +SIZE (caolanm-libwmf-v0.2.12_GH0.tar.gz) = 3043572 Added: head/graphics/libwmf/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libwmf/files/patch-configure.ac Fri Jan 1 16:38:52 2021 (r559851) @@ -0,0 +1,51 @@ +--- configure.ac.orig 2019-02-01 17:51:32 UTC ++++ configure.ac +@@ -391,40 +391,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use fr + fi + ]) + +-if [ test -n "$FREETYPE_DIR" ]; then +- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH]) +-else +- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config) +-fi ++PKG_CHECK_MODULES(FREETYPE2, freetype2, ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LDFLAGS="$LDFLAGS $FREETYPE2_LIBS", ++ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) ++) + +-if [ test -n "$FREETYPE_CONFIG" ]; then +- if [ test -n "$FREETYPE_DIR" ]; then +- freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include" +- freetype_libs=`$FREETYPE_CONFIG --libs` +- else +- freetype_cflags=`$FREETYPE_CONFIG --cflags` +- freetype_libs=`$FREETYPE_CONFIG --libs` +- fi +-else +- if [ test -n "$FREETYPE_DIR" ]; then +- freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include" +- freetype_libs="-L$FREETYPE_DIR/lib -lfreetype" +- else +- freetype_cflags="" +- freetype_libs="-lfreetype" +- fi +-fi +- +-CPPFLAGS="$freetype_cflags $CPPFLAGS" +-LDFLAGS="$LDFLAGS $freetype_libs" +- + AC_CHECK_LIB(freetype,FT_Init_FreeType,[ +- WMF_FT_LDFLAGS="$freetype_libs" ++ WMF_FT_LDFLAGS="$FREETYPE2_LIBS" + ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) + ]) + AC_CHECK_HEADER(ft2build.h,[ +- WMF_FT_CFLAGS="$freetype_cflags" +- WMF_FT_CONFIG_CFLAGS="$freetype_cflags" ++ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS" ++ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS" + ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) + ]) + Copied and modified: head/graphics/libwmf/files/patch-src_extra_gd_gd__png.c (from r559850, head/graphics/libwmf/files/patch-gd_png.c) ============================================================================== --- head/graphics/libwmf/files/patch-gd_png.c Fri Jan 1 16:36:05 2021 (r559850, copy source) +++ head/graphics/libwmf/files/patch-src_extra_gd_gd__png.c Fri Jan 1 16:38:52 2021 (r559851) @@ -1,6 +1,6 @@ ---- src/extra/gd/gd_png.c.orig 2010-03-28 12:44:53.000000000 +0200 -+++ src/extra/gd/gd_png.c 2010-03-28 12:45:16.000000000 +0200 -@@ -136,7 +136,7 @@ +--- src/extra/gd/gd_png.c.orig 2019-02-01 17:51:32 UTC ++++ src/extra/gd/gd_png.c +@@ -138,7 +138,7 @@ gdImageCreateFromPngCtx (gdIOCtx * infile) /* first do a quick check that the file really is a PNG image; could * have used slightly more general png_sig_cmp() function instead */ gdGetBuf (sig, 8, infile); Modified: head/graphics/libwmf/pkg-plist ============================================================================== --- head/graphics/libwmf/pkg-plist Fri Jan 1 16:36:05 2021 (r559850) +++ head/graphics/libwmf/pkg-plist Fri Jan 1 16:38:52 2021 (r559851) @@ -30,37 +30,38 @@ include/libwmf/svg.h include/libwmf/types.h include/libwmf/x.h lib/libwmf-0.2.so.7 -lib/libwmf-0.2.so.7.1.0 +lib/libwmf-0.2.so.7.1.4 lib/libwmf.a lib/libwmf.so lib/libwmflite-0.2.so.7 -lib/libwmflite-0.2.so.7.0.1 +lib/libwmflite-0.2.so.7.0.5 lib/libwmflite.a lib/libwmflite.so +libdata/pkgconfig/libwmf.pc %%DATADIR%%/fonts/fontmap -%%DATADIR%%/fonts/n019003l.afm -%%DATADIR%%/fonts/n019003l.pfb -%%DATADIR%%/fonts/n019004l.afm -%%DATADIR%%/fonts/n019004l.pfb -%%DATADIR%%/fonts/n019023l.afm -%%DATADIR%%/fonts/n019023l.pfb -%%DATADIR%%/fonts/n019024l.afm -%%DATADIR%%/fonts/n019024l.pfb -%%DATADIR%%/fonts/n021003l.afm -%%DATADIR%%/fonts/n021003l.pfb -%%DATADIR%%/fonts/n021004l.afm -%%DATADIR%%/fonts/n021004l.pfb -%%DATADIR%%/fonts/n021023l.afm -%%DATADIR%%/fonts/n021023l.pfb -%%DATADIR%%/fonts/n021024l.afm -%%DATADIR%%/fonts/n021024l.pfb -%%DATADIR%%/fonts/n022003l.afm -%%DATADIR%%/fonts/n022003l.pfb -%%DATADIR%%/fonts/n022004l.afm -%%DATADIR%%/fonts/n022004l.pfb -%%DATADIR%%/fonts/n022023l.afm -%%DATADIR%%/fonts/n022023l.pfb -%%DATADIR%%/fonts/n022024l.afm -%%DATADIR%%/fonts/n022024l.pfb -%%DATADIR%%/fonts/s050000l.afm -%%DATADIR%%/fonts/s050000l.pfb +%%DATADIR%%/fonts/NimbusMonoPS-Bold.afm +%%DATADIR%%/fonts/NimbusMonoPS-Bold.t1 +%%DATADIR%%/fonts/NimbusMonoPS-BoldItalic.afm +%%DATADIR%%/fonts/NimbusMonoPS-BoldItalic.t1 +%%DATADIR%%/fonts/NimbusMonoPS-Italic.afm +%%DATADIR%%/fonts/NimbusMonoPS-Italic.t1 +%%DATADIR%%/fonts/NimbusMonoPS-Regular.afm +%%DATADIR%%/fonts/NimbusMonoPS-Regular.t1 +%%DATADIR%%/fonts/NimbusRoman-Bold.afm +%%DATADIR%%/fonts/NimbusRoman-Bold.t1 +%%DATADIR%%/fonts/NimbusRoman-BoldItalic.afm +%%DATADIR%%/fonts/NimbusRoman-BoldItalic.t1 +%%DATADIR%%/fonts/NimbusRoman-Italic.afm +%%DATADIR%%/fonts/NimbusRoman-Italic.t1 +%%DATADIR%%/fonts/NimbusRoman-Regular.afm +%%DATADIR%%/fonts/NimbusRoman-Regular.t1 +%%DATADIR%%/fonts/NimbusSans-Bold.afm +%%DATADIR%%/fonts/NimbusSans-Bold.t1 +%%DATADIR%%/fonts/NimbusSans-BoldItalic.afm +%%DATADIR%%/fonts/NimbusSans-BoldItalic.t1 +%%DATADIR%%/fonts/NimbusSans-Italic.afm +%%DATADIR%%/fonts/NimbusSans-Italic.t1 +%%DATADIR%%/fonts/NimbusSans-Regular.afm +%%DATADIR%%/fonts/NimbusSans-Regular.t1 +%%DATADIR%%/fonts/StandardSymbolsPS.afm +%%DATADIR%%/fonts/StandardSymbolsPS.t1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101011638.101Gcquj041191>