aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-09-15 15:33:00 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-09-16 04:25:52 +0000
commite0cca2f08bfd2adf4726e458d87a5448e3602ed2 (patch)
treed69caba96bb61fb1f40e7228ed37a8132075e8b8
parentc1e5aee2eed879dd9a163c0f3c6275a0f627dd4b (diff)
downloadaports-e0cca2f08bfd2adf4726e458d87a5448e3602ed2.tar.gz
aports-e0cca2f08bfd2adf4726e458d87a5448e3602ed2.tar.bz2
aports-e0cca2f08bfd2adf4726e458d87a5448e3602ed2.tar.xz
main/cryptsetup: upgrade to 2.4.1
-rw-r--r--main/cryptsetup/0001-Fix-symbol-version-test-if-dlvsym-is-not-available.patch121
-rw-r--r--main/cryptsetup/APKBUILD8
2 files changed, 3 insertions, 126 deletions
diff --git a/main/cryptsetup/0001-Fix-symbol-version-test-if-dlvsym-is-not-available.patch b/main/cryptsetup/0001-Fix-symbol-version-test-if-dlvsym-is-not-available.patch
deleted file mode 100644
index f7b3109678..0000000000
--- a/main/cryptsetup/0001-Fix-symbol-version-test-if-dlvsym-is-not-available.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 20b678c9f3a25c5777c8790f21a773f5657c60f0 Mon Sep 17 00:00:00 2001
-From: Milan Broz <gmazyland@gmail.com>
-Date: Sat, 21 Aug 2021 13:33:13 +0200
-Subject: [PATCH] Fix symbol version test if dlvsym() is not available.
-
-If we have no dlvsym(), just run dlsym() test.
----
- configure.ac | 5 +++
- tests/all-symbols-test.c | 71 ++++++++++++++++++++++++++--------------
- 2 files changed, 52 insertions(+), 24 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 61fa8b63..48098b41 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,6 +101,11 @@ AC_CHECK_LIB(uuid, uuid_clear, ,[AC_MSG_ERROR([You need the uuid library.])])
- AC_SUBST(UUID_LIBS, $LIBS)
- LIBS=$saved_LIBS
-
-+saved_LIBS=$LIBS
-+AC_SEARCH_LIBS([dlsym],[dl])
-+AC_CHECK_FUNCS([dlvsym])
-+LIBS=$saved_LIBS
-+
- AC_SEARCH_LIBS([clock_gettime],[rt posix4])
- AC_CHECK_FUNCS([posix_memalign clock_gettime posix_fallocate explicit_bzero])
-
-diff --git a/tests/all-symbols-test.c b/tests/all-symbols-test.c
-index d1bafbdd..adc56162 100644
---- a/tests/all-symbols-test.c
-+++ b/tests/all-symbols-test.c
-@@ -68,34 +68,57 @@ static void test_logf(int level, const char *format, ...)
- #define log_std(x...) test_logf(LOG_NORMAL, x)
- #define log_err(x...) test_logf(LOG_ERROR, x)
-
--static int check_all_symbols(void *h)
-+static int check_dlvsym(void *h, const char *symbol, const char *version)
-+{
-+#ifdef HAVE_DLVSYM
-+ void *sym;
-+ char *err;
-+
-+ log_dbg("Checking %s@%s...", symbol, version);
-+ sym = dlvsym(h, symbol, version);
-+ UNUSED(sym);
-+ err = dlerror();
-+
-+ if (err) {
-+ log_err("%s.", err);
-+ return 1;
-+ }
-+
-+ log_dbg("OK\n");
-+#endif
-+ return 0;
-+}
-+
-+static int check_dlsym(void *h, const char *symbol)
- {
- void *sym;
- char *err;
-+
-+ log_dbg("Checking %s...", symbol);
-+ sym = dlsym(h, symbol);
-+ UNUSED(sym);
-+ err = dlerror();
-+
-+ if (err) {
-+ log_err("%s", err);
-+ return 1;
-+ }
-+
-+ log_dbg("OK\n");
-+ return 0;
-+}
-+
-+static int check_all_symbols(void *h)
-+{
- unsigned scount = 0;
-
--#define CHECK_SYMBOL(SYM, VER) \
--do { \
-- log_dbg("Checking " #SYM "@" #VER "..."); \
-- sym = dlvsym(h, #SYM, #VER); \
-- UNUSED(sym); \
-- err = dlerror(); \
-- \
-- if (err) { \
-- log_err("%s.", err); \
-- return 1; \
-- } \
-- \
-- log_dbg("OK\nChecking " #SYM "..."); \
-- sym = dlsym(h, #SYM); \
-- UNUSED(sym); \
-- err = dlerror(); \
-- if (err) { \
-- log_err("%s", err); \
-- return 1; \
-- } \
-- log_dbg("OK\n"); \
-- scount++; \
-+#define CHECK_SYMBOL(SYM, VER) \
-+do { \
-+ if (check_dlvsym(h, #SYM, #VER)) \
-+ return 1; \
-+ if (check_dlsym(h, #SYM)) \
-+ return 1; \
-+ scount++; \
- } while (0);
-
- #include "test-symbols-list.h"
-@@ -106,7 +129,7 @@ do { \
- return 1;
- }
-
-- log_std("Performed %u symbol checks in total\n.", scount);
-+ log_std("Performed %u symbol checks in total.\n", scount);
-
- return 0;
- }
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 045b23c646..28da200842 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
-pkgver=2.4.0 # XXX: remove automake/autoconf when upgrading to 2.5.0
-pkgrel=3
+pkgver=2.4.1 # XXX: remove automake/autoconf when upgrading to 2.5.0
+pkgrel=0
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
@@ -18,7 +18,6 @@ source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptset
dmcrypt.confd
flush-stdout.patch
- 0001-Fix-symbol-version-test-if-dlvsym-is-not-available.patch
"
# secfixes:
@@ -67,9 +66,8 @@ libs() {
}
sha512sums="
-0572a1c213a1343b7cee89e1d5355e61ee2e334b0814eceac4028376e70c0f9582c6be6984bcffca48dfec4377834fc9766a3a260d69091c4eb075d69a80abc4 cryptsetup-2.4.0.tar.gz
+b12589181e48c8ae7e95fa7d0642caa479a0000c76ac4c2f9dcacb9319512f0c079d037c6fe596639481a62b6290dd7d0bf826ac5e096c526435a8241386fe0e cryptsetup-2.4.1.tar.gz
a3ca3e648749136ee724692b61488cd855f118eb93435942c2b04964a34fe49d0f0da4ef64cd2531c1c0f650e77808cf5d802789fd7664398248ead668bb35e5 dmcrypt.initd
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
529187851def5fbc08e995eba90d3f013f1cf8469dcb9344f83d1e3c73c71467ca4ed62c8282ec27ebfa30ccc33653fdd1aea8d1d80e1ac4293d51865c9a6200 flush-stdout.patch
-1255ca3507d1476145f210b9e13f972ec1eb77e1325f69ee8d3748871819dd6f6d02e2eccf101ebd30478d2676d2486a51ed204b2fe23ed10eb56ce4a7c441f8 0001-Fix-symbol-version-test-if-dlvsym-is-not-available.patch
"