summaryrefslogtreecommitdiffstats
path: root/archive-libs
diff options
context:
space:
mode:
Diffstat (limited to 'archive-libs')
-rwxr-xr-xarchive-libs/libarchive/DEPENDS7
-rwxr-xr-xarchive-libs/libarchive/DETAILS8
-rw-r--r--archive-libs/libarchive/HISTORY11
-rw-r--r--archive-libs/libarchive/patches/0001-libarchive-Do-not-include-sys-mount.h.patch41
-rwxr-xr-xarchive-libs/lzo/DETAILS1
-rwxr-xr-xarchive-libs/minizip/DEPENDS2
-rwxr-xr-xarchive-libs/minizip/DETAILS13
-rw-r--r--archive-libs/minizip/HISTORY6
-rwxr-xr-xarchive-libs/snappy/DETAILS4
-rw-r--r--archive-libs/snappy/HISTORY3
-rw-r--r--archive-libs/ucl/HISTORY2
-rwxr-xr-xarchive-libs/zlib-ng/DETAILS4
-rw-r--r--archive-libs/zlib-ng/HISTORY3
-rw-r--r--archive-libs/zlib/0002-fix-crc32.patch53
-rwxr-xr-xarchive-libs/zlib/BUILD6
-rwxr-xr-xarchive-libs/zlib/DETAILS12
-rw-r--r--archive-libs/zlib/HISTORY13
-rwxr-xr-xarchive-libs/zlib/PRE_BUILD2
18 files changed, 71 insertions, 120 deletions
diff --git a/archive-libs/libarchive/DEPENDS b/archive-libs/libarchive/DEPENDS
index 0cd704cc73..0c00c5e178 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 53e8df26bc..d60b14d21a 100755
--- a/archive-libs/libarchive/DETAILS
+++ b/archive-libs/libarchive/DETAILS
@@ -1,11 +1,11 @@
SPELL=libarchive
- VERSION=3.6.1
- SECURITY_PATCH=10
+ VERSION=3.7.2
+ SECURITY_PATCH=11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.libarchive.org
+ WEB_SITE=https://www.libarchive.org
SOURCE_URL[0]=https://github.com/libarchive/libarchive/releases/download/v${VERSION}/${SOURCE}
- SOURCE_HASH=sha512:58f7ac0c52116f73326a07dec10ff232be33b318862078785dc39f1fb2f8773b5194eabfa14764bb51ce6a5a1aa8820526e7f4c76087a6f4fcbe7789a22275b4
+ SOURCE_HASH=sha512:1af253203df3014d1fbf3e99ebdc7aa2a3f036c7c2606d0f0550c49973b0fff99ee7262f4a6e20090c0806c40e964731334360daa3b718bde40108183eacc8a1
ENTERED=20080629
LICENSE[0]=BSD
KEYWORDS="archive"
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index db90fef40c..088b5d7224 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,14 @@
+2023-10-15 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3.7.2
+ SECURITY_PATCH++ fixes PAX
+
+2022-12-10 Pavel Vinogradov <public@sourcemage.org>
+ * DEPEDS: added optional libiconv
+
+2022-12-10 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: version 3.6.2
+ * patches/0001-libarchive-Do-not-include-sys-mount.h.patch: removed
+
2022-08-31 Pavel Vinogradov <public@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 7c88ca1b1c..0000000000
--- 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@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.
diff --git a/archive-libs/lzo/DETAILS b/archive-libs/lzo/DETAILS
index adcbba60b1..ddb6da8e86 100755
--- a/archive-libs/lzo/DETAILS
+++ b/archive-libs/lzo/DETAILS
@@ -5,6 +5,7 @@
SOURCE_HASH=sha1:4924676a9bae5db58ef129dc1cebce3baa3c4b5d:UPSTREAM_HASH
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# Watch: https://www.oberhumer.com/opensource/lzo/download/
SOURCE_URL[0]=http://www.oberhumer.com/opensource/lzo/download/$SOURCE
WEB_SITE=http://www.oberhumer.com/opensource/lzo
ENTERED=20020531
diff --git a/archive-libs/minizip/DEPENDS b/archive-libs/minizip/DEPENDS
index 702356a8e4..829862b311 100755
--- a/archive-libs/minizip/DEPENDS
+++ b/archive-libs/minizip/DEPENDS
@@ -4,4 +4,4 @@ optional_depends LZMA "-DMZ_LZMA=ON" "-DMZ_ZLIB=OFF" "for xz support"
optional_depends zlib "-DMZ_ZLIB=ON" "-DMZ_ZLIB=OFF" "for zlib support" &&
optional_depends zstd "-DMZ_ZSTD=ON" "-DMZ_ZSTD=OFF" "for zstd support" &&
optional_depends libbsd "-DMZ_LIBBSD=ON" "-DMZ_LIBBSD=OFF" "for libbsd random support" &&
-optional_depends openssl ' -DMZ_OPENSSL=1' ' -DMZ_OPENSSL=0' 'crypto support'
+optional_depends SSL -DMZ_OPENSSL={1,0} 'for cryptographic support'
diff --git a/archive-libs/minizip/DETAILS b/archive-libs/minizip/DETAILS
index 5ddb90ff72..43f47528b0 100755
--- a/archive-libs/minizip/DETAILS
+++ b/archive-libs/minizip/DETAILS
@@ -1,10 +1,11 @@
+# Watch: https://github.com/zlib-ng/minizip-ng/tags /tags/([0-9.]+)[.]tar
SPELL=minizip
- VERSION=3.0.2
- SOURCE_HASH=sha512:eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
- LICENSE[0]=LGPL
- WEB_SITE=https://github.com/nmoinvaz/minizip
+ VERSION=3.0.9
+ SOURCE_HASH=sha512:a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd
+ SOURCE=$SPELL-ng-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.?z}
+ LICENSE[0]=Zlib
+ WEB_SITE=https://github.com/zlib-ng/minizip-ng
SOURCE_URL[0]=$WEB_SITE/archive/${VERSION}.tar.gz
KEYWORDS="archive libs"
ENTERED=20171008
diff --git a/archive-libs/minizip/HISTORY b/archive-libs/minizip/HISTORY
index 98007e588e..48bd617de5 100644
--- a/archive-libs/minizip/HISTORY
+++ b/archive-libs/minizip/HISTORY
@@ -1,3 +1,9 @@
+2023-04-05 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated WEB_SITE
+ fixed LICENSE
+ updated spell to 3.0.9
+ * DEPENDS: fixed SSL dependency
+
2021-05-31 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 3.0.2
* BUILD: disable compatibility layer to avoid conflict with libzip
diff --git a/archive-libs/snappy/DETAILS b/archive-libs/snappy/DETAILS
index d6562d07cc..4567f9f05a 100755
--- a/archive-libs/snappy/DETAILS
+++ b/archive-libs/snappy/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${SNAPPY_BRANCH}
SOURCE_URL[0]=git://github.com/google/${SPELL}.git
SOURCE_IGNORE=volatile
else
- VERSION=1.1.9
- SOURCE_HASH=sha512:f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
+ VERSION=1.1.10
+ SOURCE_HASH=sha512:3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/google/snappy/archive/${VERSION}.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/archive-libs/snappy/HISTORY b/archive-libs/snappy/HISTORY
index 10b75c1d0f..22320ad2e8 100644
--- a/archive-libs/snappy/HISTORY
+++ b/archive-libs/snappy/HISTORY
@@ -1,3 +1,6 @@
+2021-05-09 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: 1.1.10
+
2021-06-02 Treeve Jelbert <treeve@sourcemage.org>
* PRE_BUILD: fix for gcc-11
* BUILD: suppress some warnings
diff --git a/archive-libs/ucl/HISTORY b/archive-libs/ucl/HISTORY
index 885a0744ff..26b4a015a2 100644
--- a/archive-libs/ucl/HISTORY
+++ b/archive-libs/ucl/HISTORY
@@ -2,7 +2,7 @@
* PRE_BUILD: Fixed build against musl
2022-07-15 Florian Franzmann <bwlf@bandrate.org>
- * BUILD: fix compile error
+ * BUILD: fix compile error
2015-04-30 Vlad Glagolev <stealth@sourcemage.org>
* BUILD: added, to build shared library
diff --git a/archive-libs/zlib-ng/DETAILS b/archive-libs/zlib-ng/DETAILS
index 8321de5c93..78a6ae8328 100755
--- a/archive-libs/zlib-ng/DETAILS
+++ b/archive-libs/zlib-ng/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=zlib-ng
- VERSION=2.0.6
- SOURCE_HASH=sha512:4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
+ VERSION=2.1.2
+ SOURCE_HASH=sha512:2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/zlib-ng/zlib-ng
diff --git a/archive-libs/zlib-ng/HISTORY b/archive-libs/zlib-ng/HISTORY
index c93a23eb3b..d8c7268dd6 100644
--- a/archive-libs/zlib-ng/HISTORY
+++ b/archive-libs/zlib-ng/HISTORY
@@ -1,3 +1,6 @@
+2023-06-08 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.1.2
+
2022-08-04 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.0.6
diff --git a/archive-libs/zlib/0002-fix-crc32.patch b/archive-libs/zlib/0002-fix-crc32.patch
deleted file mode 100644
index 9546308cc0..0000000000
--- a/archive-libs/zlib/0002-fix-crc32.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# From https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch
-From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Wed, 30 Mar 2022 11:14:53 -0700
-Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
-
-The previous releases of zlib were not sensitive to incorrect CRC
-inputs with bits set above the low 32. This commit restores that
-behavior, so that applications with such bugs will continue to
-operate as before.
----
- crc32.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/crc32.c b/crc32.c
-index a1bdce5c2..451887bc7 100644
---- a/crc32.c
-+++ b/crc32.c
-@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
-
- /* Pre-condition the CRC */
-- crc ^= 0xffffffff;
-+ crc = (~crc) & 0xffffffff;
-
- /* Compute the CRC up to a word boundary. */
- while (len && ((z_size_t)buf & 7) != 0) {
-@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
-
- /* Pre-condition the CRC */
-- crc ^= 0xffffffff;
-+ crc = (~crc) & 0xffffffff;
-
- #ifdef W
-
-@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
- #ifdef DYNAMIC_CRC_TABLE
- once(&made, make_crc_table);
- #endif /* DYNAMIC_CRC_TABLE */
-- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
-+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
- }
-
- /* ========================================================================= */
-@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
- uLong crc2;
- uLong op;
- {
-- return multmodp(op, crc1) ^ crc2;
-+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
- }
-
diff --git a/archive-libs/zlib/BUILD b/archive-libs/zlib/BUILD
index 6885a7ae23..41f5b5d98a 100755
--- a/archive-libs/zlib/BUILD
+++ b/archive-libs/zlib/BUILD
@@ -4,7 +4,11 @@ CFLAGS="$CFLAGS -DPIC -fPIC" &&
CFLAGS="${CFLAGS//-O[gs0-9]/-O3}" &&
CFLAGS="${CFLAGS//-Ofast/-O3}" &&
CFLAGS="${CFLAGS//-O /-O3 }" &&
-CFLAGS+=" -fno-tree-vectorize -mstackrealign -DUNALIGNED_OK" &&
+CFLAGS+=" -fno-tree-vectorize" &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32"
+ || "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ CFLAGS+=" -mstackrealign -DUNALIGNED_OK"
+fi &&
sedit "s/-O/$CFLAGS/" Makefile &&
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index a86839333d..6b794ab7d3 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,13 +1,13 @@
+# Watch: https://zlib.net/
SPELL=zlib
- VERSION=1.2.12
- SOURCE_HASH=sha512:cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
+ VERSION=1.3.1
+ SOURCE_HASH=sha512:580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.zlib.net/$SOURCE
- SOURCE_URL[1]=http://prdownloads.sourceforge.net/libpng/${SOURCE}
- PATCHLEVEL=1
- WEB_SITE=http://www.zlib.net/
+ SOURCE_URL[0]=https://www.zlib.net/$SOURCE
+ SOURCE_URL[1]=https://prdownloads.sourceforge.net/libpng/${SOURCE}
+ WEB_SITE=https://www.zlib.net/
ENTERED=20010922
LICENSE[0]=ZLIB
KEYWORDS="archive libs"
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index d64f8e091a..232fe02052 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,16 @@
+2024-02-25 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.3.1
+
+2023-08-18 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.3, removed Watch line duplicate
+
+2022-11-19 Remko van der Vossen <wich@sourcemage.org>
+ * BUILD: -mstackrealign -DUNALIGNED_OK only for x86*
+
+2022-10-14 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.2.13
+ * PRE_BUILD, 0002-fix-crc32.patch: dropped, merged in upstream
+
2022-06-13 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Apply 0002-fix-crc32.patch
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 534bad3441..3756c5f364 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -2,8 +2,6 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch -p1 < "$SPELL_DIRECTORY/0001-fix-zlib.pc-install-path.patch" &&
-message "${MESSAGE_COLOR}Fix CRC32 'bug'...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/0002-fix-crc32.patch &&
mk_source_dir "$SOURCE_DIRECTORY.static" &&
cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 23:34:40 +0000