From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 6/9] libarchive: version bump 3.3.2 -> 3.5.1
Date: Sun, 16 May 2021 20:52:29 +0200 [thread overview]
Message-ID: <20210516185231.5680-6-rhi@pengutronix.de> (raw)
In-Reply-To: <20210516185231.5680-1-rhi@pengutronix.de>
The COPYING file mentions some triple-licensed files, and updated the
copyright year.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/libarchive.make | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/rules/libarchive.make b/rules/libarchive.make
index 13d61a1da314..6e9e0ff28ef3 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
#
# Paths and names
#
-LIBARCHIVE_VERSION := 3.3.2
-LIBARCHIVE_MD5 := 4583bd6b2ebf7e0e8963d90879eb1b27
+LIBARCHIVE_VERSION := 3.5.1
+LIBARCHIVE_MD5 := c96040b75a14c8ba73238c284147e87f
LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION)
LIBARCHIVE_SUFFIX := tar.gz
LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
LIBARCHIVE_SOURCE := $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
LIBARCHIVE_DIR := $(BUILDDIR)/$(LIBARCHIVE)
-LIBARCHIVE_LICENSE := BSD-2-Clause AND BSD-3-Clause AND public_domain
-LIBARCHIVE_LICENSE_FILES := file://COPYING;md5=ed99aca006bc346974bb745a35336425
+LIBARCHIVE_LICENSE := BSD-2-Clause AND BSD-3-Clause AND public_domain AND \
+ (CC-0-1.0 OR OpenSSL OR Apache-2.0)
+LIBARCHIVE_LICENSE_FILES := file://COPYING;md5=d499814247adaee08d88080841cb5665
# ----------------------------------------------------------------------------
# Prepare
@@ -49,11 +50,14 @@ LIBARCHIVE_CONF_OPT := \
$(GLOBAL_LARGE_FILE_OPTION) \
--with-zlib \
--$(call ptx/wwo, PTXCONF_LIBARCHIVE_BZIP2)-bz2lib \
+ --without-libb2 \
--without-iconv \
--without-lz4 \
+ --without-zstd \
--$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
--without-lzo2 \
--without-cng \
+ --without-mbedtls \
--without-nettle \
--without-openssl \
--without-xml2 \
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-05-16 18:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-16 18:52 [ptxdist] [PATCH 1/9] bzip2: add upstream URL, switch to HTTPS Roland Hieber
2021-05-16 18:52 ` [ptxdist] [PATCH 2/9] bzip2: add license files Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 3/9] bzip2: version bump 1.0.6 -> 1.0.8 Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 4/9] libarchive: move to HTTPS URL Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 5/9] libarchive: add license files Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` Roland Hieber [this message]
2021-05-27 6:45 ` [ptxdist] [APPLIED] libarchive: version bump 3.3.2 -> 3.5.1 Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 7/9] unzip: version bump 5.52 -> 6.00 Roland Hieber
2021-05-21 9:35 ` Michael Olbrich
2021-05-24 18:36 ` Roland Hieber
2021-05-16 18:52 ` [ptxdist] [PATCH 8/9] sqlite: version bump 3.28 -> 3.35.5 Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 9/9] dhcp: move to HTTPS URL Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-27 6:45 ` [ptxdist] [APPLIED] bzip2: add upstream URL, switch to HTTPS Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210516185231.5680-6-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox