From nobody Mon Jan 17 19:41:59 2022 X-Original-To: dev-commits-ports-all@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 22FFA195BED1; Mon, 17 Jan 2022 19:42:00 +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 4Jd2NS0VqWz3tHb; Mon, 17 Jan 2022 19:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642448520; 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=br5c6sciSsn2safco1O7hPqqEwKON5SDJCNsU7HJj/0=; b=iRFVQBVD+Aa+Rr712mn414iXIj65Q8n8BXPcEHQEUxPHusSOcoWpzH+v4r2gPOMNs/4wSq yQPSdK+bSGTc4CfuT6u5QWqngiinY/taEFrItJxMPnx+0LbnMAEQa9wGn4v3kfzFtJdPb5 56ha8tyHlPxbAY46g2F2AoB3pz2IB23ScR8ugLZqcBzSOCo1UzPyJhtYhznw5ALliPBZzG w9M0kiJwJfWJ4tdn0AugX8UVI8/SFlB0Qzf2IHx10PMPF/mSF7MyK8i+Ij+XBWt5bd/CR/ nCQs9DBG46CFFoy2ZaR2BtjSo9t0QYzLX1bNfItbSPuihn+698VRJzVPWg4ZBw== 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 E5C2613D70; Mon, 17 Jan 2022 19:41:59 +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 20HJfxNZ083904; Mon, 17 Jan 2022 19:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HJfxun083903; Mon, 17 Jan 2022 19:41:59 GMT (envelope-from git) Date: Mon, 17 Jan 2022 19:41:59 GMT Message-Id: <202201171941.20HJfxun083903@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: f48a28f9c5f6 - main - archivers/pigz: update to 2.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f48a28f9c5f60e4aeacc662b984e13e9251743ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642448520; 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=br5c6sciSsn2safco1O7hPqqEwKON5SDJCNsU7HJj/0=; b=w25Hhs3uYZIdWPOT8oQJiO1GK7lPmmP/0qutHVxmv+3zWtvUDrJTNsUvQ5goSj8BJq4sr9 UCWeXw1w1M1TouCtlc5SP4xQ9r6xiQqaw1MxEzeQoxeBGrwfylG+aE0nJ7kooaVWKOv5pW ISFXXspEz9KrSbr1svPJrrZ7D56usNvN01B3e9ubPzeSk6qVJU6hoC1axlB8Ty5aNPSYsN pKV3Ty8hMPiV1NJOkFSiKzLG7ni77Y1hIjpnxGj9uG2Eb8KTsiOwlGp/VCON4VBkD/xZqD 3Cg8rjZ5EvURIC+xNczZ5MFE7isUHvq8eFigTMrEfFe0dNDAmQb8UT5tvt9vIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642448520; a=rsa-sha256; cv=none; b=lnHgj8/UTX19x5y6cmU/jhhpc1xLPgUDibgG4jx+6j1e2l7J/5r42PV1TBEELAmTOtcBHW tzf2U2VEXo68UAJ0vHLZ/QC4JwhlvZ+PrJKNBzTJR1CVolQ617zifHsbLOGtaxMvs0sE5J NrquwGJwIhJNCHOCYZtMx8S8+IIOK/84NtCSJ81oag7q/tTonnVUod3T63E+nd+TwzYwYU mxhYEIPEfYHqqVEL0HH/rKCxhPxkUtuvKJzR75xDLIhIruD5dZNDkGMQ2cyRaca/kYHAoa BtB8lk4F/v7QyRNliUbXFPI1jGaR2VBPnlQL3lBBO6lyqaf93iCiyyw/8PMMrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=f48a28f9c5f60e4aeacc662b984e13e9251743ea commit f48a28f9c5f60e4aeacc662b984e13e9251743ea Author: Xin LI AuthorDate: 2022-01-17 19:36:05 +0000 Commit: Xin LI CommitDate: 2022-01-17 19:36:05 +0000 archivers/pigz: update to 2.7 --- archivers/pigz/Makefile | 7 ++++-- archivers/pigz/distinfo | 6 +++--- archivers/pigz/files/patch-pigz.c | 45 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/archivers/pigz/Makefile b/archivers/pigz/Makefile index def21c804a23..c5a3f312e76f 100644 --- a/archivers/pigz/Makefile +++ b/archivers/pigz/Makefile @@ -1,7 +1,7 @@ # Created by: Gea-Suan Lin PORTNAME= pigz -PORTVERSION= 2.6 +PORTVERSION= 2.7 CATEGORIES= archivers MASTER_SITES= http://www.zlib.net/pigz/ \ http://freebsd.unixfreunde.de/sources/ @@ -23,7 +23,10 @@ PLIST_FILES= bin/pigz bin/pigzn bin/pigzt bin/unpigz PLIST_FILES+= share/man/man1/pigz.1.gz post-patch: - ${REINPLACE_CMD} -e 's/$${ZOPFLI}.*//' \ + ${REINPLACE_CMD} -e 's/$$(ZOPFLI).*//' \ + -e 's/$$(ZOP).*//' \ + ${WRKSRC}/Makefile + ${REINPLACE_CMD} -E -e 's/-o pigz(t?) /-pthread -o pigz\1 /' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's,zopfli/src/,,' \ ${WRKSRC}/pigz.c diff --git a/archivers/pigz/distinfo b/archivers/pigz/distinfo index 8fbea7f075a3..7088bee9bb43 100644 --- a/archivers/pigz/distinfo +++ b/archivers/pigz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635727738 -SHA256 (pigz-2.6.tar.gz) = 2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d -SIZE (pigz-2.6.tar.gz) = 106840 +TIMESTAMP = 1642392318 +SHA256 (pigz-2.7.tar.gz) = b4c9e60344a08d5db37ca7ad00a5b2c76ccb9556354b722d56d55ca7e8b1c707 +SIZE (pigz-2.7.tar.gz) = 108102 diff --git a/archivers/pigz/files/patch-pigz.c b/archivers/pigz/files/patch-pigz.c new file mode 100644 index 000000000000..72fe98af1c5f --- /dev/null +++ b/archivers/pigz/files/patch-pigz.c @@ -0,0 +1,45 @@ +--- pigz.c.orig 2022-01-17 19:06:15 UTC ++++ pigz.c +@@ -558,9 +558,7 @@ local struct { + int procs; // maximum number of compression threads (>= 1) + int setdict; // true to initialize dictionary in each thread + size_t block; // uncompressed input size per thread (>= 32K) +-#ifndef NOTHREAD + crc_t shift; // pre-calculated CRC-32 shift for length block +-#endif + + // saved gzip/zip header data for decompression, testing, and listing + time_t stamp; // time stamp from gzip header +@@ -1338,9 +1336,6 @@ local long zlib_vernum(void) { + return left < 2 ? num << (left << 2) : -1; + } + +-#ifndef NOTHREAD +-// -- threaded portions of pigz -- +- + // -- check value combination routines for parallel calculation -- + + #define COMB(a,b,c) (g.form == 1 ? adler32_comb(a,b,c) : crc32_comb(a,b,c)) +@@ -1421,6 +1416,9 @@ local unsigned long adler32_comb(unsigned long adler1, + return sum1 | (sum2 << 16); + } + ++#ifndef NOTHREAD ++// -- threaded portions of pigz -- ++ + // -- pool of spaces for buffer management -- + + // These routines manage a pool of spaces. Each pool specifies a fixed size +@@ -4337,11 +4335,11 @@ local void defaults(void) { + ZopfliInitOptions(&g.zopts); + #endif + g.block = 131072UL; // 128K ++ g.shift = x2nmodp(g.block, 3); + #ifdef NOTHREAD + g.procs = 1; + #else + g.procs = nprocs(8); +- g.shift = x2nmodp(g.block, 3); + #endif + g.rsync = 0; // don't do rsync blocking + g.setdict = 1; // initialize dictionary each thread