summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/lvm2/APKBUILD8
-rw-r--r--system/lvm2/add-sys-file.patch20
-rw-r--r--system/lvm2/fix-stdio-usage.patch20
3 files changed, 3 insertions, 45 deletions
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 24eaafdc3..6df06c99c 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lvm2
-pkgver=2.03.13
+pkgver=2.03.15
pkgrel=0
pkgdesc="Logical Volume Manager 2 utilities"
url="https://sourceware.org/lvm2/"
@@ -19,7 +19,6 @@ source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
fix-stdio-usage.patch
mallinfo.patch
mlockall-default-config.patch
- add-sys-file.patch
lvm.initd
lvm.confd
dmeventd.initd
@@ -88,11 +87,10 @@ udev() {
}
-sha512sums="8b4fb6da5dd46ddeb754436189072bea79be594fab6d57d9be63c6ce3e3cb68d38601a2c031c493681321281cfb1f1459ace19974c00beb569364f44863cfc4a LVM2.2.03.13.tgz
-bc4473c2f48ff6cab121f92211cd1b67589a6abadd8e32ffa366fed6ddbf9c87be695aa54a6e97b5b79203bf1a7d22cdb5974da84d38b4977592ef7a061612e7 fix-stdio-usage.patch
+sha512sums="ad3cc33b9d54eebcbb79ada71baa7fdf2e76eca01d593a6aaa3649ef9345dc2fa939f09598486520c0548afde5a7691af13a35d8c1d431e5bbe51c41bbe6c2e9 LVM2.2.03.15.tgz
+47e35a2f89bae51c23ae44df1edcf2ae5635cddd4ad92eefa2b8be4c6aabbf3a212bcd26da9c6f4faf640c0142f36750795a5e3e7cf0e01668364eb748ad3161 fix-stdio-usage.patch
9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch
0f1feeddf35a7208a240b13d87f479eeb5410ccb534ccd62714355b10721c4eff77d725c72a2b5270320bef12828c32d60003f187db990fad3fef37ec08c1dff mlockall-default-config.patch
-be5236a6b7ab91547603a266620b4f626854e3022036e2ed4b7e64b03941ddef3892804473c3440d913f41f820bccd78281a3979a822cae5c29304e21295ab1a add-sys-file.patch
a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd
07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd
ca06220065525e93347efb7a5746a367cf55cb03574e50eed29bd7c4eae036bdd199b52c42d81811b6e742649e73ab8e66525f663bed66f9d1d82d0efde50332 dmeventd.initd"
diff --git a/system/lvm2/add-sys-file.patch b/system/lvm2/add-sys-file.patch
deleted file mode 100644
index d21f5cdfc..000000000
--- a/system/lvm2/add-sys-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./lib/device/dev-cache.c 2021-10-04 10:26:46.747943865 +0000
-+++ ./lib/device/dev-cache.c 2021-10-04 10:23:55.715876227 +0000
-@@ -29,6 +29,7 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <locale.h>
-+#include <sys/file.h>
-
- struct dev_iter {
- struct btree_iter *current;
---- ./tools/lvmdevices.c 2021-10-04 10:34:16.660694727 +0000
-+++ ./tools/lvmdevices.c 2021-10-04 10:34:33.718908403 +0000
-@@ -16,6 +16,7 @@
- #include "lib/cache/lvmcache.h"
- #include "lib/device/device_id.h"
- #include "lib/device/dev-type.h"
-+#include <sys/file.h>
-
- static void _search_devs_for_pvids(struct cmd_context *cmd, struct dm_list *search_pvids, struct dm_list *found_devs)
- {
diff --git a/system/lvm2/fix-stdio-usage.patch b/system/lvm2/fix-stdio-usage.patch
index 6b7ee0eaa..69832c004 100644
--- a/system/lvm2/fix-stdio-usage.patch
+++ b/system/lvm2/fix-stdio-usage.patch
@@ -27,23 +27,3 @@
printf("stderr stream open: %s\n",
strerror(errno));
return 0;
---- LVM2.2.03.08/lib/commands/toolcontext.c 2020-02-11 03:59:27.000000000 -0600
-+++ LVM2.2.03.08/lib/commands/toolcontext.c 2020-03-22 16:18:35.130101016 -0500
-@@ -1599,7 +1599,7 @@ struct cmd_context *create_toolcontext(u
- /* FIXME Make this configurable? */
- reset_lvm_errno(1);
-
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- /* Set in/out stream buffering before glibc */
- if (set_buffering
- #ifdef SYS_gettid
-@@ -1980,7 +1980,7 @@ void destroy_toolcontext(struct cmd_cont
-
- if (cmd->pending_delete_mem)
- dm_pool_destroy(cmd->pending_delete_mem);
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- if (cmd->linebuffer) {
- /* Reset stream buffering to defaults */
- if (is_valid_fd(STDIN_FILENO) &&