From nobody Tue Jan 10 08:08:10 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 4Nrk2g2C98z2r2hM; Tue, 10 Jan 2023 08:08:11 +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 4Nrk2g1df5z4JxN; Tue, 10 Jan 2023 08:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673338091; 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=90FYWGioZMnMDRJqN9pe/UxzpFloK7wiKMr2yDl1Yj8=; b=HVBIh2ubZSxUJTUA+hhxbjk7AARC92FTcFR7PztvDUNP7fR5WogiHqOLvqG08UQ3NQCT3M KZgfbCARlg3lJr5H9AEU8dRfw/dxjGcULCW4TEJkZsVyHbL1uqSw0vIXrP+5iayzRGNxy/ leKM0FxkSMOjcVNZmp5leVKrlroFehckcXEWP0Q8anu+TXMWNi/9gKiy/9Eb4SgVr65sda VJszTijMDNsk58QJxVWdjw12h6qoMk5a7dEHj5sWCUcHQwvSFsNtKCxyWfnlivG7WrACXS XUMfzkdLaxI8RrU4auHtRnPuaZ9jqh5+CdrEI9IN9r5d1g2lRmg0ihbR7lcNZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673338091; 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=90FYWGioZMnMDRJqN9pe/UxzpFloK7wiKMr2yDl1Yj8=; b=ViZwU/xv66+kjm+GkzqjYMVNPzde961pGKzfcyrlCnE4SIRo+QZTxmzPim+5ScnU1KiAvh b/vqt0UHLVTKFsTMuwIS2LEYWrE/hOED7Jyi0zWNNUA+FdJdhL2m/FtfqLMsrMDVp+kMVc H7yOiyzIIfbkix/bh0xdUie5gD/oYaIXP89yqu/K5wUlcC3ykmR6NwKj2kdIITZbJCiOkz 9Sy9HIL4ksUBnk8SR/UnQVGzM0BnrzWSSSyg8gaOnSDLo+VoGOc57AmHq7IJCPrfLms9FD pnogiRKQJlIMtOOjU8guIfaUgT88Zw29DZ3eoFzc3226w/jEClERlpLE+8euYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673338091; a=rsa-sha256; cv=none; b=HkLhltgPK3ErHYngz/hi70zAHUL+xrhFC+1tecevh42HdC1HznCIM1dBcHPC0aTAte52BL pdYZzH5PWPsSLWa0VgMcgxcdq82wzwJmKPvlGMBW0DwOBxyLX0GIApmNXr1Eb4TnOHg2F8 J8uE2+wB9QlTqYFouKdTkyg/FVp2tbg9y6Cw+k/TR/imJgtHZC7XFH7NtywIz933KUT0eg BXcXsPngj22HpuXxdO9+WkeBrvtBsP6TMeukt084NYsS2bY+pnvwAq85ojAHt2LZieQjGh 1jNQ67GQBQrTPVw8gGWoM38aUpqQFbIZtqelpyhd4vstWkfMoqRKAfkuszhoLA== 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 4Nrk2g0gbSz11Hk; Tue, 10 Jan 2023 08:08:11 +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 30A88BQ8000412; Tue, 10 Jan 2023 08:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30A88AxQ000411; Tue, 10 Jan 2023 08:08:10 GMT (envelope-from git) Date: Tue, 10 Jan 2023 08:08:10 GMT Message-Id: <202301100808.30A88AxQ000411@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: c06af015634a - main - archivers/libarchive: Update to 3.6.2 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: c06af015634a05f1f49c9dbe462c164c3e239294 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c06af015634a05f1f49c9dbe462c164c3e239294 commit c06af015634a05f1f49c9dbe462c164c3e239294 Author: Daniel Engberg AuthorDate: 2023-01-10 08:05:57 +0000 Commit: Daniel Engberg CommitDate: 2023-01-10 08:08:06 +0000 archivers/libarchive: Update to 3.6.2 * Backport upstream commit 1f35c466aaa9444335a1b854b0b7223b0d2346c2 to fix iconv issue with .pc file * Patch .pc file when compiled on versions of FreeBSD where we don't provide a .pc file for OpenSSL Changelog: https://github.com/libarchive/libarchive/releases/tag/v3.6.2 PR: 268693 Reviewed by: glewis (maintainer) --- archivers/libarchive/Makefile | 16 ++++++++++++---- archivers/libarchive/distinfo | 10 +++++----- archivers/libarchive/files/extra-patch-pkgconfig-compat | 7 +++++++ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index 49ba0f4b914f..9ff04ead7cd4 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -1,13 +1,12 @@ PORTNAME= libarchive -DISTVERSION= 3.6.1 -PORTREVISION= 1 +DISTVERSION= 3.6.2 PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \ https://libarchive.org/downloads/ PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ -PATCHFILES= bff38efe8c110469c5080d387bec62a6ca15b1a5.patch:-p1 +PATCHFILES= 1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch:-p1 MAINTAINER= glewis@FreeBSD.org COMMENT= Library to create and read several streaming archive formats @@ -27,7 +26,8 @@ OPTIONS_RADIO_CRYPTO= OPENSSL MBEDTLS NETTLE CRYPTO_DESC= Crypto and hashing support NETTLE_DESC= Crypto support via Nettle -USES= cpe iconv libtool localbase:ldflags pathfix tar:xz +USES= autoreconf cpe iconv libtool localbase:ldflags pathfix \ + pkgconfig tar:xz GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -117,4 +117,12 @@ CONFIGURE_ENV+= ac_cv_header_localcharset_h=no \ ac_cv_lib_charset_locale_charset=no .endif +# Prior to 1301508 we didn't ship openssl.pc which libarchive now excepts +# so we need to use the old approach on older versions of FreeBSD +# which is not to define Requires.private in libarchive.pc + +.if ${PORT_OPTIONS:MOPENSSL} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1301508 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-pkgconfig-compat +.endif + .include diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo index 2abdb88e3519..1b971ca6d177 100644 --- a/archivers/libarchive/distinfo +++ b/archivers/libarchive/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1670315616 -SHA256 (libarchive-3.6.1.tar.xz) = 5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 -SIZE (libarchive-3.6.1.tar.xz) = 5241148 -SHA256 (bff38efe8c110469c5080d387bec62a6ca15b1a5.patch) = 4f93c5a102cce1fc672d59888471017b545704bfa9d762c630e84b28215162e7 -SIZE (bff38efe8c110469c5080d387bec62a6ca15b1a5.patch) = 1124 +TIMESTAMP = 1672469724 +SHA256 (libarchive-3.6.2.tar.xz) = 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d +SIZE (libarchive-3.6.2.tar.xz) = 5213196 +SHA256 (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 6db4da971fb4d5b3974bfec4c75a4d920a98b1b3bc9a9ccc381055a02205a272 +SIZE (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 1329 diff --git a/archivers/libarchive/files/extra-patch-pkgconfig-compat b/archivers/libarchive/files/extra-patch-pkgconfig-compat new file mode 100644 index 000000000000..f51609d6d0e9 --- /dev/null +++ b/archivers/libarchive/files/extra-patch-pkgconfig-compat @@ -0,0 +1,7 @@ +--- build/pkgconfig/libarchive.pc.in.orig 2022-12-09 13:38:31 UTC ++++ build/pkgconfig/libarchive.pc.in +@@ -10,4 +10,3 @@ Cflags: -I${includedir} + Cflags.private: -DLIBARCHIVE_STATIC + Libs: -L${libdir} -larchive + Libs.private: @LIBS@ +-Requires.private: @LIBSREQUIRED@