Sun Sep 18 15:11:22 2016 UTC ()
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


(spz)
diff -r1.95 -r1.95.2.1 pkgsrc/fonts/fontconfig/Makefile
diff -r1.54 -r1.54.2.1 pkgsrc/fonts/fontconfig/distinfo
cvs diff -r1.95 -r1.95.2.1 pkgsrc/fonts/fontconfig/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2016/06/19 20:48:55 1.95
+++ pkgsrc/fonts/fontconfig/Makefile 2016/09/18 15:11:22 1.95.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.95 2016/06/19 20:48:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.95.2.1 2016/09/18 15:11:22 spz Exp $
2 2
3DISTNAME= fontconfig-2.12.0 3DISTNAME= fontconfig-2.12.1
4CATEGORIES= fonts 4CATEGORIES= fonts
5MASTER_SITES= http://www.fontconfig.org/release/ 5MASTER_SITES= http://www.fontconfig.org/release/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.fontconfig.org/ 9HOMEPAGE= http://www.fontconfig.org/
10COMMENT= Library for configuring and customizing font access 10COMMENT= Library for configuring and customizing font access
11#LICENSE= x11? 11#LICENSE= x11?
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/share/fonts/X11 16CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/share/fonts/X11
@@ -76,20 +76,24 @@ FC_STDCONF+= 30-pkgsrc-aliases.conf @@ -76,20 +76,24 @@ FC_STDCONF+= 30-pkgsrc-aliases.conf
76.for f in ${FC_STDCONF} 76.for f in ${FC_STDCONF}
77CONF_FILES+= ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f} 77CONF_FILES+= ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f}
78.endfor 78.endfor
79 79
80MAKE_DIRS+= ${VARBASE}/cache 80MAKE_DIRS+= ${VARBASE}/cache
81BUILD_DEFS+= VARBASE 81BUILD_DEFS+= VARBASE
82 82
83TEST_TARGET= check 83TEST_TARGET= check
84 84
85.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 85.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
86CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 86CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
87.endif 87.endif
88 88
 89.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
 90LDFLAGS+= -L../src/.libs
 91.endif
 92
89post-install: 93post-install:
90 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR} 94 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
91 95
92.include "../../devel/zlib/buildlink3.mk" 96.include "../../devel/zlib/buildlink3.mk"
93.include "../../graphics/freetype2/buildlink3.mk" 97.include "../../graphics/freetype2/buildlink3.mk"
94.include "../../textproc/expat/buildlink3.mk" 98.include "../../textproc/expat/buildlink3.mk"
95.include "../../mk/bsd.pkg.mk" 99.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.54.2.1 pkgsrc/fonts/fontconfig/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/distinfo 2016/06/19 20:48:55 1.54
+++ pkgsrc/fonts/fontconfig/distinfo 2016/09/18 15:11:22 1.54.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.54 2016/06/19 20:48:55 wiz Exp $ 1$NetBSD: distinfo,v 1.54.2.1 2016/09/18 15:11:22 spz Exp $
2 2
3SHA1 (fontconfig-2.12.0.tar.bz2) = 4170b4d11816b10ff739e1b8ce35fae15a45894b 3SHA1 (fontconfig-2.12.1.tar.bz2) = 30d832b754fb10a3b70ebac750a38a0275438ad8
4RMD160 (fontconfig-2.12.0.tar.bz2) = 00b9af80c2abf6c69bf542f4d21a30a32ae728f4 4RMD160 (fontconfig-2.12.1.tar.bz2) = 66907dbb317309bcb5013ea45c53dbf5050e6376
5SHA512 (fontconfig-2.12.0.tar.bz2) = b8f005d56aa9fe6a756be1cb4d843c69c746915c10fe968393527bd3469e4df0401a10edf5b0a69b0e2732cc07f71ad001c19a07726e5dfa881b9d94bb6935f9 5SHA512 (fontconfig-2.12.1.tar.bz2) = a5ba2c1a52272b39aad20394dcc85c202159af0d3d2c1b34b24cbdbc8babb3157005a79d25c21a9bf6ec0459681b1ab05af102b2c0594f485c49e3b3b531067e
6Size (fontconfig-2.12.0.tar.bz2) = 1605355 bytes 6Size (fontconfig-2.12.1.tar.bz2) = 1608901 bytes
7SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12 7SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
8SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803 8SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
9SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7 9SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
10SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e 10SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e
11SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200 11SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
12SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a 12SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
13SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff 13SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
14SHA1 (patch-src_fcint.h) = 13602cc605d7dadd2f7c30633236454bb134a50a 14SHA1 (patch-src_fcint.h) = 13602cc605d7dadd2f7c30633236454bb134a50a
15SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9 15SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9
16SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09 16SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09