From nobody Thu Nov 9 21:43:52 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRFp06l08z50gs6; Thu, 9 Nov 2023 21:43:52 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRFp05DWkz4DrS; Thu, 9 Nov 2023 21:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699566232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31s7HmTojEUyTZH4M/psD9bAceByOm+CZ1unZJUfv7c=; b=GCPR8LBDfDdXLInYhnTJAtgqKOhxD0Id9lxjMkFob0lOf92Yf6ekdfW1IkrZ3Eve7Ula6h jR172V27G49d1e9OLHFBJdx4JvZMIg8CieZrmH/1smBVUanWIwAZSaRhdqIolmC28FqsX+ E55UShZ2KemFsixNJDtzwXqQFbP0rL+jmgbJ98Jlghh4BXNCo1v3rM9014eiZYwF9IH8VE sQItr+0dotZatvKXzz7KAU9lhb9q7D7aSQ/SmPw+R+edSf6OujU+B9FTDctijV3LtNmHtt GRVlLDmRzSl7T4Kh6t1W1vN9ij6sAqV9tvGzOQJPF8HYPFG7rynPGB8Zhgs8ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699566232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31s7HmTojEUyTZH4M/psD9bAceByOm+CZ1unZJUfv7c=; b=O0U174UfEAPHfIkgRQRIiSSUpwP/rBrcfX3j3kk3O2YYm2lyrHSGWI6HLpcr8a+vqWe0v7 CMY++eHNORP2jLSgfgyZixO8UG+67cHG74aboZgvQIn/0/Gs1T7OZ4iQpu7R4I8WQOLlru dIvJbkshN0xJbvTsM76feiSmZfyVGKd5u6jBhat64nfSFLPbRBKfvW7EQi073ywtjXDT6P gCIRSBmI7FgcbymkXl8PcT/ycQ9eeW9YP9QG2BN4QXd08Zy+CVgviuSDGw0dhvhT9STdqd 9hwYCTn+05fG/THGLwnUZsRXb7STKkfnJCt4RoCDExH1OJSARLoUHomyx7TB7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699566232; a=rsa-sha256; cv=none; b=Yt/+v9P0kS2cWTat2OSead4LZ5MVWXe+uwKH1/b9xhFO2b469h2y3ePNUPhRCGIa2oxhrJ hYijVrm7/Xi2/q3hiFwwiYP8XVo0eP/I4G80pPoqWZVq9Yc78ltECTPXxXezCFJnXQbj5Y ZUB4rdJPaucWhDimRI1GOAq0dWlyZ2NYstcpvsZ8tmCP6xeSoziv1LBJU/2rOQkcTIyRw/ SG1cMSaS3nIoo32Jwtw6MeMMwRDjNd2/P0wKL4HNRIADAtpCs/wAA3HrbkRKuMfkMFH+6S 6NNNfka90CgAZGlaWdgxbrm4Nwm0KAxE/E7d4FzITWBhXQGCQnWYEStqAeSIuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRFp046CPzXVR; Thu, 9 Nov 2023 21:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9LhqPB082718; Thu, 9 Nov 2023 21:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9LhqJs082715; Thu, 9 Nov 2023 21:43:52 GMT (envelope-from git) Date: Thu, 9 Nov 2023 21:43:52 GMT Message-Id: <202311092143.3A9LhqJs082715@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 76614e4b5529 - main - graphics/optipng: Update to 0.7.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76614e4b55292c4da8be42183c21f7197ace04c2 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=76614e4b55292c4da8be42183c21f7197ace04c2 commit 76614e4b55292c4da8be42183c21f7197ace04c2 Author: Thomas Hurst AuthorDate: 2023-11-09 20:24:26 +0000 Commit: Daniel Engberg CommitDate: 2023-11-09 21:43:31 +0000 graphics/optipng: Update to 0.7.8 - CVE fix is now upstreamed - Remove old compile fix related patches - Remove gmake dependency Changelog: https://optipng.sourceforge.net/history.txt --- graphics/optipng/Makefile | 8 +++----- graphics/optipng/distinfo | 6 +++--- graphics/optipng/files/patch-src_gifread_gifread.c | 14 -------------- graphics/optipng/files/patch-src_pngxtern_pngxmem.c | 11 ----------- 4 files changed, 6 insertions(+), 33 deletions(-) diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index acbe6053199d..352873275a8f 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -1,8 +1,7 @@ PORTNAME= optipng -DISTVERSION= 0.7.7 -PORTREVISION= 1 +DISTVERSION= 0.7.8 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/OptiPNG/${PORTNAME}-${DISTVERSION} MAINTAINER= tom@hur.st COMMENT= Optimizer for PNG files @@ -13,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libpng.so:graphics/png -USES= cpe gmake localbase:ldflags +USES= cpe localbase:ldflags CPE_VENDOR= optipng_project HAS_CONFIGURE= yes @@ -30,7 +29,6 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ - ${INSTALL} -d ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/ diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo index f4199736a041..23b9bcb85bc9 100644 --- a/graphics/optipng/distinfo +++ b/graphics/optipng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515280833 -SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452 -SIZE (optipng-0.7.7.tar.gz) = 2329555 +TIMESTAMP = 1699204767 +SHA256 (optipng-0.7.8.tar.gz) = 25a3bd68481f21502ccaa0f4c13f84dcf6b20338e4c4e8c51f2cefbd8513398c +SIZE (optipng-0.7.8.tar.gz) = 3294014 diff --git a/graphics/optipng/files/patch-src_gifread_gifread.c b/graphics/optipng/files/patch-src_gifread_gifread.c deleted file mode 100644 index bfc0112026c5..000000000000 --- a/graphics/optipng/files/patch-src_gifread_gifread.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/gifread/gifread.c.orig 2017-12-10 23:49:00 UTC -+++ src/gifread/gifread.c -@@ -363,6 +363,11 @@ static int LZWGetCode(int code_size, int init_flag, FI - lastbit = (2 + count) * 8; - } - -+ if (code_size && (size_t)(curbit + code_size - 1) / 8 >= sizeof(buffer)) { -+ GIFError("Malformed GIF (CVE-2023-43907)"); -+ return -1; -+ } -+ - ret = 0; - for (i = curbit, j = 0; j < code_size; ++i, ++j) - ret |= ((buffer[i / 8] & (1 << (i % 8))) != 0) << j; diff --git a/graphics/optipng/files/patch-src_pngxtern_pngxmem.c b/graphics/optipng/files/patch-src_pngxtern_pngxmem.c deleted file mode 100644 index cdf321697a5e..000000000000 --- a/graphics/optipng/files/patch-src_pngxtern_pngxmem.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pngxtern/pngxmem.c.orig 2018-01-06 23:22:33 UTC -+++ src/pngxtern/pngxmem.c -@@ -35,7 +35,7 @@ pngx_malloc_rows_extended(png_structp pn - row_size = png_get_rowbytes(png_ptr, info_ptr); - /* libpng sets row_size to 0 when the width is too large to process. */ - if (row_size == 0 || -- (pngx_alloc_size_t)height > (pngx_alloc_size_t)(-1) / sizeof(png_bytep)) -+ (pngx_alloc_size_t)height > (pngx_alloc_size_t)(-1U) / sizeof(png_bytep)) - png_error(png_ptr, "Can't handle exceedingly large image dimensions"); - if (row_size < min_row_size) - row_size = min_row_size;