From nobody Fri Aug 18 17:35:05 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 4RS8CF2HzWz4qq0W; Fri, 18 Aug 2023 17:35:05 +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 4RS8CF1snqz3Xf2; Fri, 18 Aug 2023 17:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692380105; 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=2EXkUDNH6AYnupT9fkIFf5w9Kbpr4d6WHtNRfD+71UU=; b=s090bX8PpzGjFMh6uM4b0IXxlYYKtjGh1df4gk9rF8vSjrKGNfG8k7d4qBrpylniVWyYl8 ItymPBrez6x3w2atK9ZALZXpOV1vl7mcWxJf5vidhAH6tCbmYkSNPnQSrwmwrZTYhFMePa zo4ZFs4f1txkASzbIUjyNSqQKwliXZn71846JTDQk85TJU/rCGjMeJJ5xU88dKlh/Nzkqy lCS7T6DAXPcz727uJ896VryKIkT53dsn4KoWFRkICQ80rfG6SYe7Y8gDh+YwDPK2UmaS2e 2w7MXcM2Z+JDvVRg6YiguYGHLJ+NncHplJVkA3HS97pQVdblJm2OXohCrHDXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692380105; 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=2EXkUDNH6AYnupT9fkIFf5w9Kbpr4d6WHtNRfD+71UU=; b=ve8my8l2lskyZh2IH97SQv9Ks8avuWQzXBvDIYit4RMZb7n3OnmU0AzN9RgBByPRhzXFT0 x2PvEpOToy8U6ctHKxDAsaNei+xGq1ej+gCatHFLJCcd4L/KE1ipaCMl65riORhaQFPjEs iXeekiMrmHv3cS6TrmYrJ6MCWbhueAjcR+DQq6Qzl8YgIclwfk7+K3T6B8nTYrPmmyJ5Y2 aR1wsEkoQ/gWKmSAVFA3CCYg99w6TLQAgPbLkfSRayqQHQgStR0gOFxQhX1vgIgDSCbp5+ mKi3GQqklnzo+Pvh27zEKSTdii5nXO4/+85/n3AAP0dfHqkwR2kKEIzwrysYvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692380105; a=rsa-sha256; cv=none; b=E2+B04/u0Xc4si6Xs2inmRH1+YKz3FokKnnQuF4NaKaus61SY9SdBLEfDQLn24OoOFkfRf bUj8bM2xHBl9sebDjwylsycSnfWlItxHYFBIVGngyXYHlfLNCR9/yYv8pJRIqBB+aD9PTG v/0/tL8zAqbvkk2C9cQrvAKw9+rKhsJvl/yAcN0hk2XgtqFAKahzMJU5zNMSNFGgPbe0oU kUyKezSKXX+DxIBLt4UaIs6/YYn4Kbdb95q9nuIoFw6z9YDmJoCPr2TFtBJdlNk4fmDZAJ l6s+TfXRi7jyXDEnfFuJ8trieari2VCZwmnWBJexN8D3cm/HxSKDqX2BrbAjBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RS8CF0y6qz9Ts; Fri, 18 Aug 2023 17:35:05 +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 37IHZ57Q050836; Fri, 18 Aug 2023 17:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IHZ5A0050833; Fri, 18 Aug 2023 17:35:05 GMT (envelope-from git) Date: Fri, 18 Aug 2023 17:35:05 GMT Message-Id: <202308181735.37IHZ5A0050833@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: bdb933b4223e - main - archivers/libarchive: Update to 3.7.1 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: bdb933b4223ee1ec70a278e2a51b89fb3d3e918d Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bdb933b4223ee1ec70a278e2a51b89fb3d3e918d commit bdb933b4223ee1ec70a278e2a51b89fb3d3e918d Author: Daniel Engberg AuthorDate: 2023-08-18 17:01:06 +0000 Commit: Daniel Engberg CommitDate: 2023-08-18 17:34:14 +0000 archivers/libarchive: Update to 3.7.1 * Move plist from Makefile to pkg-list Changelog: https://github.com/libarchive/libarchive/releases/tag/v3.7.1 PR: 272577 Reviewed by: glewis (maintainer) Sponsored by: Blinkinblox --- archivers/libarchive/Makefile | 80 ++++------------------ archivers/libarchive/distinfo | 8 +-- .../patch-libarchive-archive_openssl_evp_private.h | 12 ---- archivers/libarchive/pkg-plist | 55 +++++++++++++++ 4 files changed, 70 insertions(+), 85 deletions(-) diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index 9ff04ead7cd4..ec64e856df42 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -1,13 +1,10 @@ PORTNAME= libarchive -DISTVERSION= 3.6.2 +DISTVERSION= 3.7.1 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= 1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch:-p1 - MAINTAINER= glewis@FreeBSD.org COMMENT= Library to create and read several streaming archive formats WWW= https://libarchive.org/ @@ -17,78 +14,25 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 -OPTIONS_DEFINE= LZ4 LZO ZSTD -OPTIONS_DEFAULT=LZ4 ZSTD OPENSSL - -OPTIONS_RADIO= CRYPTO -OPTIONS_RADIO_CRYPTO= OPENSSL MBEDTLS NETTLE - -CRYPTO_DESC= Crypto and hashing support -NETTLE_DESC= Crypto support via Nettle - USES= autoreconf cpe iconv libtool localbase:ldflags pathfix \ pkgconfig tar:xz -GNU_CONFIGURE= yes USE_LDCONFIG= yes +GNU_CONFIGURE= yes + INSTALL_TARGET= install-strip TEST_TARGET= check CONFIGURE_ARGS= --disable-static --without-xml2 -PLIST_FILES= bin/bsdcat \ - bin/bsdcpio \ - bin/bsdtar \ - include/archive.h \ - include/archive_entry.h \ - lib/libarchive.so \ - lib/libarchive.so.13 \ - lib/libarchive.so.1${DISTVERSION} \ - libdata/pkgconfig/libarchive.pc \ - man/man1/bsdcat.1.gz \ - man/man1/bsdcpio.1.gz \ - man/man1/bsdtar.1.gz \ - man/man3/archive_entry.3.gz \ - man/man3/archive_entry_acl.3.gz \ - man/man3/archive_entry_linkify.3.gz \ - man/man3/archive_entry_misc.3.gz \ - man/man3/archive_entry_paths.3.gz \ - man/man3/archive_entry_perms.3.gz \ - man/man3/archive_entry_stat.3.gz \ - man/man3/archive_entry_time.3.gz \ - man/man3/archive_read.3.gz \ - man/man3/archive_read_add_passphrase.3.gz \ - man/man3/archive_read_data.3.gz \ - man/man3/archive_read_disk.3.gz \ - man/man3/archive_read_extract.3.gz \ - man/man3/archive_read_filter.3.gz \ - man/man3/archive_read_format.3.gz \ - man/man3/archive_read_free.3.gz \ - man/man3/archive_read_header.3.gz \ - man/man3/archive_read_new.3.gz \ - man/man3/archive_read_open.3.gz \ - man/man3/archive_read_set_options.3.gz \ - man/man3/archive_util.3.gz \ - man/man3/archive_write.3.gz \ - man/man3/archive_write_blocksize.3.gz \ - man/man3/archive_write_data.3.gz \ - man/man3/archive_write_disk.3.gz \ - man/man3/archive_write_filter.3.gz \ - man/man3/archive_write_finish_entry.3.gz \ - man/man3/archive_write_format.3.gz \ - man/man3/archive_write_free.3.gz \ - man/man3/archive_write_header.3.gz \ - man/man3/archive_write_new.3.gz \ - man/man3/archive_write_open.3.gz \ - man/man3/archive_write_set_options.3.gz \ - man/man3/archive_write_set_passphrase.3.gz \ - man/man3/libarchive.3.gz \ - man/man3/libarchive_changes.3.gz \ - man/man3/libarchive_internals.3.gz \ - man/man5/cpio.5.gz \ - man/man5/libarchive-formats.5.gz \ - man/man5/mtree.5.gz \ - man/man5/tar.5.gz +OPTIONS_DEFINE= LZ4 LZO ZSTD +OPTIONS_DEFAULT=LZ4 ZSTD OPENSSL + +OPTIONS_RADIO= CRYPTO +OPTIONS_RADIO_CRYPTO= OPENSSL MBEDTLS NETTLE + +CRYPTO_DESC= Crypto and hashing support +NETTLE_DESC= Crypto support via Nettle LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 LZO_CONFIGURE_WITH= lzo2 @@ -117,7 +61,7 @@ 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 +# Prior to 1301508 we didn't ship openssl.pc which libarchive now expects # so we need to use the old approach on older versions of FreeBSD # which is not to define Requires.private in libarchive.pc diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo index 1b971ca6d177..77986d1b4fab 100644 --- a/archivers/libarchive/distinfo +++ b/archivers/libarchive/distinfo @@ -1,5 +1,3 @@ -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 +TIMESTAMP = 1690759351 +SHA256 (libarchive-3.7.1.tar.xz) = b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f +SIZE (libarchive-3.7.1.tar.xz) = 5254260 diff --git a/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h b/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h deleted file mode 100644 index 0b00e15fe55c..000000000000 --- a/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libarchive/archive_openssl_evp_private.h.orig 2017-01-29 05:06:27 UTC -+++ libarchive/archive_openssl_evp_private.h -@@ -28,7 +28,8 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #include /* malloc, free */ - #include /* memset */ - static inline EVP_MD_CTX *EVP_MD_CTX_new(void) diff --git a/archivers/libarchive/pkg-plist b/archivers/libarchive/pkg-plist new file mode 100644 index 000000000000..4bbe0d741284 --- /dev/null +++ b/archivers/libarchive/pkg-plist @@ -0,0 +1,55 @@ +bin/bsdcat +bin/bsdcpio +bin/bsdtar +bin/bsdunzip +include/archive.h +include/archive_entry.h +lib/libarchive.so +lib/libarchive.so.13 +lib/libarchive.so.13.7.1 +libdata/pkgconfig/libarchive.pc +man/man1/bsdcat.1.gz +man/man1/bsdcpio.1.gz +man/man1/bsdtar.1.gz +man/man1/bsdunzip.1.gz +man/man3/archive_entry.3.gz +man/man3/archive_entry_acl.3.gz +man/man3/archive_entry_linkify.3.gz +man/man3/archive_entry_misc.3.gz +man/man3/archive_entry_paths.3.gz +man/man3/archive_entry_perms.3.gz +man/man3/archive_entry_stat.3.gz +man/man3/archive_entry_time.3.gz +man/man3/archive_read.3.gz +man/man3/archive_read_add_passphrase.3.gz +man/man3/archive_read_data.3.gz +man/man3/archive_read_disk.3.gz +man/man3/archive_read_extract.3.gz +man/man3/archive_read_filter.3.gz +man/man3/archive_read_format.3.gz +man/man3/archive_read_free.3.gz +man/man3/archive_read_header.3.gz +man/man3/archive_read_new.3.gz +man/man3/archive_read_open.3.gz +man/man3/archive_read_set_options.3.gz +man/man3/archive_util.3.gz +man/man3/archive_write.3.gz +man/man3/archive_write_blocksize.3.gz +man/man3/archive_write_data.3.gz +man/man3/archive_write_disk.3.gz +man/man3/archive_write_filter.3.gz +man/man3/archive_write_finish_entry.3.gz +man/man3/archive_write_format.3.gz +man/man3/archive_write_free.3.gz +man/man3/archive_write_header.3.gz +man/man3/archive_write_new.3.gz +man/man3/archive_write_open.3.gz +man/man3/archive_write_set_options.3.gz +man/man3/archive_write_set_passphrase.3.gz +man/man3/libarchive.3.gz +man/man3/libarchive_changes.3.gz +man/man3/libarchive_internals.3.gz +man/man5/cpio.5.gz +man/man5/libarchive-formats.5.gz +man/man5/mtree.5.gz +man/man5/tar.5.gz