Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3e02ee200521b84d2aed04dcfbf82607a9dad5e7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3e02ee200521b84d2aed04dcfbf82607a9dad5e7)
  • Date: Sun, 11 Dec 2022 00:31:13 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

archive-libs/libarchive/DEPENDS
| 7 +
archive-libs/libarchive/DETAILS
| 4
archive-libs/libarchive/HISTORY
| 7 +

archive-libs/libarchive/patches/0001-libarchive-Do-not-include-sys-mount.h.patch
| 41 ----------
4 files changed, 15 insertions(+), 44 deletions(-)

New commits:
commit 3e02ee200521b84d2aed04dcfbf82607a9dad5e7
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

archive-libs/libarchive: optionally depends on libiconv

commit e1b1441209c8fbb95d333b2430bf117da10ff613
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

Revert "Revert "archive-libs/libarchive: version 3.6.2""

This reverts commit aad30e86315e0b94ae1ecf68f909682aad3ea071.

the fix is to add optional dependency on libiconv and is coming next

diff --git a/archive-libs/libarchive/DEPENDS b/archive-libs/libarchive/DEPENDS
index 0cd704c..0c00c5e 100755
--- a/archive-libs/libarchive/DEPENDS
+++ b/archive-libs/libarchive/DEPENDS
@@ -52,4 +52,9 @@ fi &&
optional_depends expat \
"--with-expat" \
"--without-expat" \
- "for xar support through expat"
+ "for xar support through expat" &&
+
+optional_depends libiconv \
+ "--with-iconv" \
+ "--without-iconv" \
+ "for iconv support"
diff --git a/archive-libs/libarchive/DETAILS b/archive-libs/libarchive/DETAILS
index 53e8df2..9d600fb 100755
--- a/archive-libs/libarchive/DETAILS
+++ b/archive-libs/libarchive/DETAILS
@@ -1,11 +1,11 @@
SPELL=libarchive
- VERSION=3.6.1
+ VERSION=3.6.2
SECURITY_PATCH=10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.libarchive.org

SOURCE_URL[0]=https://github.com/libarchive/libarchive/releases/download/v${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:58f7ac0c52116f73326a07dec10ff232be33b318862078785dc39f1fb2f8773b5194eabfa14764bb51ce6a5a1aa8820526e7f4c76087a6f4fcbe7789a22275b4
+
SOURCE_HASH=sha512:24e476465054a29a2d48adf3c197a171b5361fa5038729a1f14d578c6701424de4e5dd6a2b20a6b697969ab43bdd8afc1585f8de0465c266f455d7eaa19e5048
ENTERED=20080629
LICENSE[0]=BSD
KEYWORDS="archive"
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index db90fef..3490bc0 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,10 @@
+2022-12-10 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPEDS: added optional libiconv
+
+2022-12-10 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 3.6.2
+ * patches/0001-libarchive-Do-not-include-sys-mount.h.patch: removed
+
2022-08-31 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, patches/0001-libarchive-Do-not-include-sys-mount.h.patch:
added fix to build with glibc 2.36
diff --git
a/archive-libs/libarchive/patches/0001-libarchive-Do-not-include-sys-mount.h.patch

b/archive-libs/libarchive/patches/0001-libarchive-Do-not-include-sys-mount.h.patch
deleted file mode 100644
index 7c88ca1..0000000
---
a/archive-libs/libarchive/patches/0001-libarchive-Do-not-include-sys-mount.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem AT gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
- present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
----
- libarchive/archive_read_disk_posix.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_posix.c
b/libarchive/archive_read_disk_posix.c
-index 2b39e672b..a96008db7 100644
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
- * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3e02ee200521b84d2aed04dcfbf82607a9dad5e7), Pavel Vinogradov, 12/10/2022

Archive powered by MHonArc 2.6.24.

Top of Page