| Message ID | 20241022205103.532134-1-francois.perrad@gadz.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/libarchive: bump to version 3.7.7 | expand |
On Tue, 22 Oct 2024 22:51:03 +0200 Francois Perrad <francois.perrad@gadz.org> wrote: > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> > --- > ...1-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch | 2 +- > .../0002-autotools-do-not-add-iconv-for-Requires.private.patch | 2 +- > package/libarchive/libarchive.hash | 2 +- > package/libarchive/libarchive.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas
On 10/22/24 22:51, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
This is again listed as a security fix release, so applied to 2024.02.x
and 2024.08.x after marking it as such, thanks.
diff --git a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch index e630c51fe..31ac4b0b5 100644 --- a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch +++ b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 93f7af94..204a4e69 100644 --- a/configure.ac +++ b/configure.ac -@@ -449,9 +449,7 @@ if test "x$with_iconv" != "xno"; then +@@ -455,9 +455,7 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch index aca2dab9d..a5b4c86a2 100644 --- a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch +++ b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch @@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac index 99bff20d1..f245d0c55 100644 --- a/configure.ac +++ b/configure.ac -@@ -449,7 +449,6 @@ if test "x$with_iconv" != "xno"; then +@@ -455,7 +455,6 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 08920b61c..c0b04b0f4 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 0a2efdcb185da2eb1e7cd8421434cb9a6119f72417a13335cca378d476fd3ba0 libarchive-3.7.6.tar.xz +sha256 879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee libarchive-3.7.7.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index d3a447552..70123ee2b 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.6 +LIBARCHIVE_VERSION = 3.7.7 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- ...1-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch | 2 +- .../0002-autotools-do-not-add-iconv-for-Requires.private.patch | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)