From nobody Fri Nov 19 09:53:47 2021 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 1822C189F7CE; Fri, 19 Nov 2021 09:53:48 +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 4HwX700BRXz3qjs; Fri, 19 Nov 2021 09:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DA5C5265C9; Fri, 19 Nov 2021 09:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AJ9rl3G062985; Fri, 19 Nov 2021 09:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AJ9rloY062984; Fri, 19 Nov 2021 09:53:47 GMT (envelope-from git) Date: Fri, 19 Nov 2021 09:53:47 GMT Message-Id: <202111190953.1AJ9rloY062984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: 684b29d2c771 - main - archivers/advancecomp: Update to 2.1-6 and take maintainership 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: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 684b29d2c7710765c50bd3541723ea4f58b1d474 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=684b29d2c7710765c50bd3541723ea4f58b1d474 commit 684b29d2c7710765c50bd3541723ea4f58b1d474 Author: Robert Clausecker AuthorDate: 2021-11-19 09:50:36 +0000 Commit: Guangyuan Yang CommitDate: 2021-11-19 09:50:36 +0000 archivers/advancecomp: Update to 2.1-6 and take maintainership - Switch to new upstream - Unbundle libdeflate - Hookup test suite - Add a BZIP2 option PR: 259534 MFH: 2021Q4 (security fix) Security: 0bf816f6-3cfe-11ec-86cd-dca632b19f10 --- archivers/advancecomp/Makefile | 27 +++++++++++++++++++-------- archivers/advancecomp/distinfo | 6 +++--- archivers/advancecomp/files/patch-Makefile.am | 11 +++++++++++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile index c8f5defd529d..417d4220f346 100644 --- a/archivers/advancecomp/Makefile +++ b/archivers/advancecomp/Makefile @@ -1,24 +1,35 @@ # Created by: Radim Kolar PORTNAME= advancecomp -PORTVERSION= 1.23 +DISTVERSIONPREFIX= v +DISTVERSION= 2.1-6 +DISTVERSIONSUFFIX= -g7b08f7a CATEGORIES= archivers -MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Recompression utilities for .ZIP, .PNG, .MNG, and .GZ files LICENSE= GPLv3 -LIB_DEPENDS= libzopfli.so:archivers/zopfli - -USES= cpe +LIB_DEPENDS= libzopfli.so:archivers/zopfli \ + libdeflate.so:archivers/libdeflate +USES= autoreconf cpe +USE_GITHUB= yes +GH_ACCOUNT= amadvance CPE_VENDOR= advancemame GNU_CONFIGURE= yes -MAKE_ARGS= zopfli_SOURCES="" am__objects_3="" +TEST_TARGET= check +MAKE_ARGS= zopfli_SOURCES="" am__objects_3="" \ + libdeflate_SOURCES="" am__objects_2="" CPPFLAGS+= -I${LOCALBASE}/include/zopfli -LDFLAGS+= -L${LOCALBASE}/lib -lzopfli +LDFLAGS+= -L${LOCALBASE}/lib -lzopfli -ldeflate + +OPTIONS_DEFINE= BZIP2 +BZIP2_CONFIGURE_ON= --enable-bzip2 + +pre-test-BZIP2-on: + @${ECHO_MSG} Warning: test suite is known to fail with option BZIP2 enabled .include diff --git a/archivers/advancecomp/distinfo b/archivers/advancecomp/distinfo index d2d8a0a0425c..b8d823a7b10e 100644 --- a/archivers/advancecomp/distinfo +++ b/archivers/advancecomp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479818446 -SHA256 (advancecomp-1.23.tar.gz) = 75a2c97ab0cd53e71b6a3dd7f07c001fa02351c9d781a4c586718f7fea3e88ba -SIZE (advancecomp-1.23.tar.gz) = 1288937 +TIMESTAMP = 1636103106 +SHA256 (amadvance-advancecomp-v2.1-6-g7b08f7a_GH0.tar.gz) = d87a6b3838a0331541dd784fe5c40ec3194a5672db0b44a3fbf951cdf3cc42d9 +SIZE (amadvance-advancecomp-v2.1-6-g7b08f7a_GH0.tar.gz) = 1195162 diff --git a/archivers/advancecomp/files/patch-Makefile.am b/archivers/advancecomp/files/patch-Makefile.am new file mode 100644 index 000000000000..3bf0a8dfd1f2 --- /dev/null +++ b/archivers/advancecomp/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2021-10-29 17:10:27 UTC ++++ Makefile.am +@@ -332,7 +332,7 @@ check-local: ./advzip$(EXEEXT) test/test.lst + @cp $(srcdir)/test/basn2c08.png $(srcdir)/test/basn3p01.png $(srcdir)/test/basn3p02.png $(srcdir)/test/basn3p04.png $(srcdir)/test/basn3p08.png $(srcdir)/test/basn6a08.png $(srcdir)/test/basn6a04.png . + $(TESTENV) ./advpng$(EXEEXT) -f -z basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png basn6a04.png + $(TESTENV) ./advpng$(EXEEXT) -L basn2c08.png basn3p01.png basn3p02.png basn3p04.png basn3p08.png basn6a08.png basn6a04.png >> check.lst +- cat check.lst | $(DTOU) | cmp $(srcdir)/test/test.lst ++ cat check.lst | $(DTOU) | cmp - $(srcdir)/test/test.lst + @echo Success! + + DISTDOS_ROOT = \