svn commit: r459561 - in head/graphics/libfpx: . files
Mikhail Teterin
mi at FreeBSD.org
Sun Jan 21 01:09:19 UTC 2018
Author: mi
Date: Sun Jan 21 01:09:18 2018
New Revision: 459561
URL: https://svnweb.freebsd.org/changeset/ports/459561
Log:
Upgrade from 1.3.1-4 to 1.3.1-10 (security fixes).
Resolve errors triggered on -current by the use of C++17
PR: 225299
Modified:
head/graphics/libfpx/Makefile
head/graphics/libfpx/distinfo
head/graphics/libfpx/files/Makefile.bsd
head/graphics/libfpx/files/patch-null-casts
Modified: head/graphics/libfpx/Makefile
==============================================================================
--- head/graphics/libfpx/Makefile Sun Jan 21 00:38:29 2018 (r459560)
+++ head/graphics/libfpx/Makefile Sun Jan 21 01:09:18 2018 (r459561)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libfpx
-DISTVERSION= 1.3.1-4
-PORTREVISION= 1
+DISTVERSION= 1.3.1-10
CATEGORIES= graphics
MASTER_SITES= http://imagemagick.mirrorcatalogs.com/delegates/ \
http://www.imagemagick.org/download/delegates/ \
Modified: head/graphics/libfpx/distinfo
==============================================================================
--- head/graphics/libfpx/distinfo Sun Jan 21 00:38:29 2018 (r459560)
+++ head/graphics/libfpx/distinfo Sun Jan 21 01:09:18 2018 (r459561)
@@ -1,2 +1,3 @@
-SHA256 (libfpx-1.3.1-4.tar.xz) = 638875039246e11a3646ca34c2c8f1f790c54aa00b878301bb127f30eeea7b5d
-SIZE (libfpx-1.3.1-4.tar.xz) = 1896560
+TIMESTAMP = 1516495685
+SHA256 (libfpx-1.3.1-10.tar.xz) = 491b55535580d27355669c45fe995446bd34df5dbcdc15312e58c3ebecc6a455
+SIZE (libfpx-1.3.1-10.tar.xz) = 1907580
Modified: head/graphics/libfpx/files/Makefile.bsd
==============================================================================
--- head/graphics/libfpx/files/Makefile.bsd Sun Jan 21 00:38:29 2018 (r459560)
+++ head/graphics/libfpx/files/Makefile.bsd Sun Jan 21 01:09:18 2018 (r459561)
@@ -8,12 +8,11 @@ LIBDIR = ${PREFIX}/lib
INCSDIR = ${PREFIX}/include
INCDIR = ${INCSDIR} # for pre-bsd.incs.mk API
-NO_PROFILE= Don't want it
-NOPROFILE= ${NO_PROFILE}
+MK_PROFILE= no
HAVES= -DHAVE_WCHAR_H -DHAVE_DLFCN_H \
-DHAVE_SYS_TIME_H \
-DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H
-CFLAGS+= ${HAVES}
+CFLAGS+= ${HAVES} -Dregister=
CPPS != find ${.CURDIR} -name \*.cpp -print
# Some of the .cxx files are #include-ed into others, so can't use `find' here:
@@ -23,7 +22,7 @@ OLESS := ascii.cxx cdocfile.cxx chinst.cxx dffuncs.cxx
iter.cxx mem.cxx msf.cxx msfiter.cxx mstream.cxx page.cxx \
refilb.cxx rexpdf.cxx sstream.cxx storage.cxx time.cxx \
vect.cxx wchar.c
-JPGS != find ${.CURDIR}/jpeg -name \*.c
+JPGS != find ${.CURDIR}/jpeg -name \*.c -not -name dllmain.c
CPPS += ${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}
Modified: head/graphics/libfpx/files/patch-null-casts
==============================================================================
--- head/graphics/libfpx/files/patch-null-casts Sun Jan 21 00:38:29 2018 (r459560)
+++ head/graphics/libfpx/files/patch-null-casts Sun Jan 21 01:09:18 2018 (r459561)
@@ -1,5 +1,5 @@
--- oless/expdf.cxx 2013-09-02 11:47:00.000000000 -0400
-+++ oless/expdf.cxx 2014-02-14 14:29:24.000000000 -0500
++++ oless/expdf.cxx 2018-01-20 19:59:14.495701000 -0500
@@ -610,5 +610,5 @@
olErr(EH_Err, STG_E_INVALIDFUNCTION);
olChk(Validate());
@@ -21,3 +21,26 @@
+ 0, &pstmsrc));
// It's a stream
+@@ -1575,5 +1575,5 @@
+ olMemTo(EH_pst, pstExp = new CExposedStream());
+ olChkTo(EH_pstExp, pstExp->Init(pstDirect, this,
+- df, pdfnName, (ULONG)NULL));
++ df, pdfnName, 0));
+ *ppStream = pstExp;
+ return S_OK;
+@@ -1624,5 +1624,5 @@
+ olMemTo(EH_pst, pstExp = new CExposedStream());
+ olChkTo(EH_pstExp, pstExp->Init(pstDirect, this,
+- df, pdfnName, (ULONG)NULL));
++ df, pdfnName, 0));
+ *ppStream = pstExp;
+ return S_OK;
+--- oless/storage.cxx 2013-09-02 11:47:00.000000000 -0400
++++ oless/storage.cxx 2018-01-20 20:03:24.664133000 -0500
+@@ -144,5 +144,5 @@
+
+ olChk(ValidateNameW(pwcsName, CBMAXPATHCOMPLEN));
+- olMem(pilb = new CFileILB(pwcsName, (DWORD)NULL, FALSE));
++ olMem(pilb = new CFileILB(pwcsName, 0, FALSE));
+ olChk(pilb->Open(STGM_READ));
+ sc = GetScode( StgIsStorageILockBytes(pilb) );
More information about the svn-ports-all
mailing list