Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/libarchive: bump to version 3.6.2
@ 2022-12-14 18:50 Francois Perrad
  2022-12-14 18:57 ` Baruch Siach via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Francois Perrad @ 2022-12-14 18:50 UTC (permalink / raw)
  To: buildroot

remove merged patch

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 ...chive-Handle-a-calloc-returning-NULL.patch | 38 -------------------
 package/libarchive/Config.in                  |  2 +-
 package/libarchive/libarchive.hash            |  2 +-
 package/libarchive/libarchive.mk              |  2 +-
 4 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch

diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch
deleted file mode 100644
index 75ce6112f..000000000
--- a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
-From: obiwac <obiwac@gmail.com>
-Date: Fri, 22 Jul 2022 22:41:10 +0200
-Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
-
-[Retrieved from:
-https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- libarchive/archive_write.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
-index 66592e826..27626b541 100644
---- a/libarchive/archive_write.c
-+++ b/libarchive/archive_write.c
-@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
- 	struct archive_write_filter *f;
- 
- 	f = calloc(1, sizeof(*f));
-+
-+	if (f == NULL)
-+		return (NULL);
-+
- 	f->archive = _a;
- 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
- 	if (a->filter_first == NULL)
-@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
- 	a->client_data = client_data;
- 
- 	client_filter = __archive_write_allocate_filter(_a);
-+
-+	if (client_filter == NULL)
-+		return (ARCHIVE_FATAL);
-+
- 	client_filter->open = archive_write_client_open;
- 	client_filter->write = archive_write_client_write;
- 	client_filter->close = archive_write_client_close;
diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in
index fd429acb6..ffa4cff7b 100644
--- a/package/libarchive/Config.in
+++ b/package/libarchive/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE
 	  Libarchive is a reusable C library for reading and writing a
 	  variety of streaming archive formats.
 
-	  http://www.libarchive.org/
+	  https://www.libarchive.org/
 
 if BR2_PACKAGE_LIBARCHIVE
 
diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash
index ca580b497..b03bef3de 100644
--- a/package/libarchive/libarchive.hash
+++ b/package/libarchive/libarchive.hash
@@ -1,4 +1,4 @@
 # From https://www.libarchive.de/downloads/sha256sums
-sha256  5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6  libarchive-3.6.1.tar.xz
+sha256  9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d  libarchive-3.6.2.tar.xz
 # Locally computed:
 sha256  b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba  COPYING
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 649b7dd4d..00c80bbb6 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBARCHIVE_VERSION = 3.6.1
+LIBARCHIVE_VERSION = 3.6.2
 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz
 LIBARCHIVE_SITE = https://www.libarchive.de/downloads
 LIBARCHIVE_INSTALL_STAGING = YES
-- 
2.37.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH] package/libarchive: bump to version 3.6.2
  2022-12-14 18:50 [Buildroot] [PATCH] package/libarchive: bump to version 3.6.2 Francois Perrad
@ 2022-12-14 18:57 ` Baruch Siach via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Baruch Siach via buildroot @ 2022-12-14 18:57 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

Hi Francois,

On Wed, Dec 14 2022, Francois Perrad wrote:
> remove merged patch

This patch should also remove obsolete LIBARCHIVE_IGNORE_CVES.

baruch

> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  ...chive-Handle-a-calloc-returning-NULL.patch | 38 -------------------
>  package/libarchive/Config.in                  |  2 +-
>  package/libarchive/libarchive.hash            |  2 +-
>  package/libarchive/libarchive.mk              |  2 +-
>  4 files changed, 3 insertions(+), 41 deletions(-)
>  delete mode 100644 package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch
>
> diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch
> deleted file mode 100644
> index 75ce6112f..000000000
> --- a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
> -From: obiwac <obiwac@gmail.com>
> -Date: Fri, 22 Jul 2022 22:41:10 +0200
> -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
> -
> -[Retrieved from:
> -https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - libarchive/archive_write.c | 8 ++++++++
> - 1 file changed, 8 insertions(+)
> -
> -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
> -index 66592e826..27626b541 100644
> ---- a/libarchive/archive_write.c
> -+++ b/libarchive/archive_write.c
> -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
> - 	struct archive_write_filter *f;
> - 
> - 	f = calloc(1, sizeof(*f));
> -+
> -+	if (f == NULL)
> -+		return (NULL);
> -+
> - 	f->archive = _a;
> - 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
> - 	if (a->filter_first == NULL)
> -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
> - 	a->client_data = client_data;
> - 
> - 	client_filter = __archive_write_allocate_filter(_a);
> -+
> -+	if (client_filter == NULL)
> -+		return (ARCHIVE_FATAL);
> -+
> - 	client_filter->open = archive_write_client_open;
> - 	client_filter->write = archive_write_client_write;
> - 	client_filter->close = archive_write_client_close;
> diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in
> index fd429acb6..ffa4cff7b 100644
> --- a/package/libarchive/Config.in
> +++ b/package/libarchive/Config.in
> @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE
>  	  Libarchive is a reusable C library for reading and writing a
>  	  variety of streaming archive formats.
>  
> -	  http://www.libarchive.org/
> +	  https://www.libarchive.org/
>  
>  if BR2_PACKAGE_LIBARCHIVE
>  
> diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash
> index ca580b497..b03bef3de 100644
> --- a/package/libarchive/libarchive.hash
> +++ b/package/libarchive/libarchive.hash
> @@ -1,4 +1,4 @@
>  # From https://www.libarchive.de/downloads/sha256sums
> -sha256  5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6  libarchive-3.6.1.tar.xz
> +sha256  9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d  libarchive-3.6.2.tar.xz
>  # Locally computed:
>  sha256  b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba  COPYING
> diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
> index 649b7dd4d..00c80bbb6 100644
> --- a/package/libarchive/libarchive.mk
> +++ b/package/libarchive/libarchive.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -LIBARCHIVE_VERSION = 3.6.1
> +LIBARCHIVE_VERSION = 3.6.2
>  LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz
>  LIBARCHIVE_SITE = https://www.libarchive.de/downloads
>  LIBARCHIVE_INSTALL_STAGING = YES


-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-14 18:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-14 18:50 [Buildroot] [PATCH] package/libarchive: bump to version 3.6.2 Francois Perrad
2022-12-14 18:57 ` Baruch Siach via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox