From owner-svn-ports-branches@freebsd.org Thu Oct 22 16:22:51 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D7EE744C88D; Thu, 22 Oct 2020 16:22:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CHCMH5NC3z45DN; Thu, 22 Oct 2020 16:22:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81648195DE; Thu, 22 Oct 2020 16:22:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09MGMpuQ099315; Thu, 22 Oct 2020 16:22:51 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09MGMpSW099314; Thu, 22 Oct 2020 16:22:51 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202010221622.09MGMpSW099314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 22 Oct 2020 16:22:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r552992 - branches/2020Q4/print/ghostscript9-agpl-base/files X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: branches/2020Q4/print/ghostscript9-agpl-base/files X-SVN-Commit-Revision: 552992 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2020 16:22:51 -0000 Author: tcberner Date: Thu Oct 22 16:22:51 2020 New Revision: 552992 URL: https://svnweb.freebsd.org/changeset/ports/552992 Log: MFH: r552930 print/ghostscript9-agpl-base: prepare for freetype2 update PR: 250375 Obtained from: https://www.openwall.com/lists/oss-security/2020/10/20/7 Security: CVE-2020-15999 Approved by: ports-secteam (implicit) Added: branches/2020Q4/print/ghostscript9-agpl-base/files/patch-git_41ef9a0 - copied unchanged from r552930, head/print/ghostscript9-agpl-base/files/patch-git_41ef9a0 Modified: Directory Properties: branches/2020Q4/ (props changed) Copied: branches/2020Q4/print/ghostscript9-agpl-base/files/patch-git_41ef9a0 (from r552930, head/print/ghostscript9-agpl-base/files/patch-git_41ef9a0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q4/print/ghostscript9-agpl-base/files/patch-git_41ef9a0 Thu Oct 22 16:22:51 2020 (r552992, copy of r552930, head/print/ghostscript9-agpl-base/files/patch-git_41ef9a0) @@ -0,0 +1,51 @@ +From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 20 Oct 2020 09:49:45 +0100 +Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def + +From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what +we used when defining our callbacks from Freetype. + +No guidance forthcoming from the Freetype developer who made those changes, +so change to explicitly declaring the callbacks file static. + +Should fix the reported build failures. +--- + base/fapi_ft.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dcf4..21aef2f06 100644 +--- base/fapi_ft.c ++++ base/fapi_ft.c +@@ -125,7 +125,7 @@ static void + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + +-FT_CALLBACK_DEF(void *) ++static void * + FF_alloc(FT_Memory memory, long size) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) + return (gs_malloc(mem, size, 1, "FF_alloc")); + } + +-FT_CALLBACK_DEF(void *) ++static void * + FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) + return (tmp); + } + +-FT_CALLBACK_DEF(void) ++static void + FF_free(FT_Memory memory, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +-- +2.17.1 + +