summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2016-09-18 15:11:22 +0000
committerspz <spz@pkgsrc.org>2016-09-18 15:11:22 +0000
commit7603f1093421396cfc2f0a6972b2e02e266e25e3 (patch)
treed0ddc672b92f94ceabebe482deb72375daf60afc
parent1812cc39435bb416120a02dc1f195c21ec5004fd (diff)
downloadpkgsrc-7603f1093421396cfc2f0a6972b2e02e266e25e3.tar.gz
Pullup ticket #5084 - requested by bsiegert
fonts/fontconfig: security update Revisions pulled up: - fonts/fontconfig/Makefile 1.96 - fonts/fontconfig/distinfo 1.55 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: wiz Date: Fri Aug 19 12:52:30 UTC 2016 Modified Files: pkgsrc/fonts/fontconfig: Makefile distinfo Log Message: Updated fontconfig to 2.12.1. I've released 2.12.1 containing some fixes: - IMPORTANT: properly validate offsets in cache files. see changelog and CVE-2016-5384 for more details. thanks to Tobias Stoeckmann for catching this up! - build issues regarding to Python. - add --with-default-hinting to configure. - fix segfault in FcWeightFromOpenType() To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 pkgsrc/fonts/fontconfig/Makefile cvs rdiff -u -r1.54 -r1.55 pkgsrc/fonts/fontconfig/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: wiz Date: Sun Sep 18 13:18:20 UTC 2016 Modified Files: pkgsrc/fonts/fontconfig: Makefile Log Message: Fix build with native X.org. The installed version of this library was found and used instead of the one build by the package, leading to problems when the pkgsrc one had symbols the native one doesn't have. Add libtool path to compiler search path to fix this. >From spz. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 pkgsrc/fonts/fontconfig/Makefile
-rw-r--r--fonts/fontconfig/Makefile8
-rw-r--r--fonts/fontconfig/distinfo10
2 files changed, 11 insertions, 7 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index cd612ec1f7a..e4637d97843 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2016/06/19 20:48:55 wiz Exp $
+# $NetBSD: Makefile,v 1.95.2.1 2016/09/18 15:11:22 spz Exp $
-DISTNAME= fontconfig-2.12.0
+DISTNAME= fontconfig-2.12.1
CATEGORIES= fonts
MASTER_SITES= http://www.fontconfig.org/release/
EXTRACT_SUFX= .tar.bz2
@@ -86,6 +86,10 @@ TEST_TARGET= check
CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
.endif
+.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
+LDFLAGS+= -L../src/.libs
+.endif
+
post-install:
${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 3c95778529b..39cb0d8df0b 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2016/06/19 20:48:55 wiz Exp $
+$NetBSD: distinfo,v 1.54.2.1 2016/09/18 15:11:22 spz Exp $
-SHA1 (fontconfig-2.12.0.tar.bz2) = 4170b4d11816b10ff739e1b8ce35fae15a45894b
-RMD160 (fontconfig-2.12.0.tar.bz2) = 00b9af80c2abf6c69bf542f4d21a30a32ae728f4
-SHA512 (fontconfig-2.12.0.tar.bz2) = b8f005d56aa9fe6a756be1cb4d843c69c746915c10fe968393527bd3469e4df0401a10edf5b0a69b0e2732cc07f71ad001c19a07726e5dfa881b9d94bb6935f9
-Size (fontconfig-2.12.0.tar.bz2) = 1605355 bytes
+SHA1 (fontconfig-2.12.1.tar.bz2) = 30d832b754fb10a3b70ebac750a38a0275438ad8
+RMD160 (fontconfig-2.12.1.tar.bz2) = 66907dbb317309bcb5013ea45c53dbf5050e6376
+SHA512 (fontconfig-2.12.1.tar.bz2) = a5ba2c1a52272b39aad20394dcc85c202159af0d3d2c1b34b24cbdbc8babb3157005a79d25c21a9bf6ec0459681b1ab05af102b2c0594f485c49e3b3b531067e
+Size (fontconfig-2.12.1.tar.bz2) = 1608901 bytes
SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7