From nobody Mon Jul 31 11:15:58 2023 X-Original-To: dev-commits-src-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 4RDwfF18kGz4q3J9; Mon, 31 Jul 2023 11:15:59 +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 4RDwf71hxKz3rq1; Mon, 31 Jul 2023 11:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690802159; 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=1ECTDzqdjd3SGgRq5ZCMEmGaUgl94H6NMSwq3H/a5ro=; b=BBl9IfffwIOZOR5WdX1mNRTXj1MKVGRrrI4mgDKuZGFFl37YZvMb/67Q6klFHiP7SD3bbj 4gSnu89mQPG4oq3LGBEqDIcUvKywuNZjsTdtq8xzonK1Rg/TUUdNeUcgjeqZX3hZBzrx78 A1BfVZC+aKrlzZkWujtI/qHXaKt39wsUSm4Adi6ofDGTmDdUMh5H+vbp/KAcCR0uPbcwL1 ZYnWceiyvetWU1Ieb0NvyTvq/XjPnJbHlVmdhdfz9U7rCRe6G7OjbAb2up6W9JBSjZZ4R6 X5ILeIKOBku3uKz4y/XH85TujGy6f4uL/dlseVydkH7a29OF4g369Zu+g3Aqhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690802159; 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=1ECTDzqdjd3SGgRq5ZCMEmGaUgl94H6NMSwq3H/a5ro=; b=cHtHBpoQBeVsO8Bd1TXJNLbIkQ38+k+1Q2vzGdMnW9vbLULogDyBsE2SkCyLBICuYAbZrt 2ZR8Q9Ffgq/gCPFuKdJg62r5QxpqOXdGwtSBZcAMYsf3N7PSZIAIECwew/cwKOd7DXrFe0 ZMItPLn+XgwLPDjgEvSAm8kOUR8b5MMHC3BPj71tq2/7ud/kJ0l85AKNdR1RpcjyTJrc4d OLyLvF4Sdth15SCUHmuLm3K2yZh6IxHmSYwO1I8XyDgIGibYsqmxz+UFsZ36A+ILOZTQ6Z aCgTnYSIw0R0QfaKw20MCSWIuXbhuLLV9w8lekf74N5NOVW5mjCr3l3HXSxzUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690802159; a=rsa-sha256; cv=none; b=fJMJKDatwZJCTmMtZcpraOhq3ZApaxCaELX0QJKnCbz8rpdvQ09pT+ASPgIOGhwIJIftcO dMKjjtXjSsTTjWDIHkuFHHz4sujWRKMKLl/BPdb/Flx/r/7oCweOaqUub5kfENbgJdUJu0 BKQufkiFEFOSufOt9h/KEp/Y+rdAQWv4qrAiVNgT8kud4d7K95UzstyNt9W4NdkyI1FD0l JYURym2LxG7y3NtbPlnEyUcByH2io7F8mSN+bBcQEz361ZfZ0IdPPdyFlWXL/bl0FvZgbi fYOQRq9jLf0a0sThQUA+LtGV0YtQvhQzeD5bIvm3mYI1muhY8QwvbFwVMc5tdw== 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 4RDwf66YmdztTJ; Mon, 31 Jul 2023 11:15:58 +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 36VBFwPj028367; Mon, 31 Jul 2023 11:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VBFwcj028359; Mon, 31 Jul 2023 11:15:58 GMT (envelope-from git) Date: Mon, 31 Jul 2023 11:15:58 GMT Message-Id: <202307311115.36VBFwcj028359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: d91bfe0fb7fa - main - libarchive: merge from vendor branch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 commit d91bfe0fb7faab2e1f0b8e160b0cf59afb8576c4 Merge: 896809e29675 f8035ed8e513 Author: Martin Matuska AuthorDate: 2023-07-31 11:13:30 +0000 Commit: Martin Matuska CommitDate: 2023-07-31 11:15:12 +0000 libarchive: merge from vendor branch Changes to not yet connected unzip only. MFC after: 1 week contrib/libarchive/cat/cmdline.c | 12 +- contrib/libarchive/unzip/bsdunzip.c | 66 +++++-- contrib/libarchive/unzip/bsdunzip.h | 63 +++++++ contrib/libarchive/unzip/cmdline.c | 250 +++++++++++++++++++++++++++ contrib/libarchive/unzip/test/test.h | 2 +- contrib/libarchive/unzip/test/test_version.c | 34 ++++ 6 files changed, 402 insertions(+), 25 deletions(-) diff --cc contrib/libarchive/unzip/bsdunzip.h index 000000000000,12b65cefb466..12b65cefb466 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/bsdunzip.h +++ b/contrib/libarchive/unzip/bsdunzip.h diff --cc contrib/libarchive/unzip/cmdline.c index 000000000000,95d4f99b8242..95d4f99b8242 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/cmdline.c +++ b/contrib/libarchive/unzip/cmdline.c diff --cc contrib/libarchive/unzip/test/test_version.c index 000000000000,efa797982d57..efa797982d57 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/test/test_version.c +++ b/contrib/libarchive/unzip/test/test_version.c