Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-16 20:55:20 +03:00
Code Issues Wiki Activity

main/lvm2: upgrade to 2.03.28

Browse source
This commit is contained in:
Krassy Boykinov 2024-11-18 13:12:30 +01:00 • committed by Natanael Copa
parent 1d6d12ed6f
commit 197d22d7cb
3 changed files with 17 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main/lvm2/APKBUILD
View file

@ -1,8 +1,8 @@
# Contributor: Jacek Migacz <jacekmigacz@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lvm2
pkgver=2.03.23
pkgrel=5
pkgver=2.03.28
pkgrel=0
pkgdesc="Logical Volume Manager 2 utilities"
url="https://sourceware.org/lvm2/"
arch="all"
@ -20,6 +20,7 @@ source="https://mirrors.kernel.org/sourceware/lvm2/LVM2.$pkgver.tgz
no-systemd.patch
fix-implicit-basename.patch
0001-lvresize-use-POSIX-shell.patch
lvm.initd
lvm.confd
lvmlockd.initd
@ -176,13 +177,13 @@ lockd_openrc() {
}
sha512sums="
293430a80c7f599d14e77610456d0f44cac8164e6159cd0e2e287462278a89787e289fdb4d481eb8fd6b5eea07a6535c41cb7fdc3deee83df7fea9bf77dcbdaa LVM2.2.03.23.tgz
6b203dcf71ec91e663512458a6b25ebee4c7ee699c67f26ad42a74c054d157bd7f74f8f17f4217dd660b4bf421dd26ee1dd6048f321696168c9e81b354a8393a LVM2.2.03.28.tgz
ce526e0b58236d26fcb21c81090f8a5baecc0909e645696dccf4c9c7b7adc31fb6f2ababb158217a81324aca14a55631d2fac3176177d81f0bbd35032c0b9979 default-udev-sync.patch
c65ef16840321d8a58373e872713eeccbc315a84bb35beebccb6bc6063295b0f54b7c0726c799efd8cafedd011c21f51ec8e85f8a50d0d5df80b7428aedf29c3 fix-stdio-usage.patch
32323efccf920b9b44c80134e12032b521b410ec67c6513174dfddba915b84112d363940628c247e8f88310b81185ce200776d839033eb6f92e8af70a0911584 fix-stdio-usage.patch
b790cfcb55aa0362c7046c26a8e050708edecaf0233946adbb34d9c1d967d3614bc19e0c91695da4fd12d7b18adb74041ae11239cd635310cc44b8a7079ccbec library_dir-default-config.patch
07f77491cffa0d9dcda86004e2df428d5d52652a3bda8037a4b09c9c786146253314a11bae42512231c664a8fae110fec815bd12135fc3c6152b94e2101f8213 mlockall-default-config.patch
dfcda00e5607606ae8f10e5765de048af933afd05e0719b14036ba84ebc3b4eb07b138e5ce9af9f653416b4a6cc42161591e6f93ee3a36721a2b7396d70d5d91 no-systemd.patch
4e673f15d7531c3f3d31d4b994f8565f4d22945001939d52ee6603a90ea607b84c7d6ddef0bd6382f5bf4237d2ca7864fbc09a05c560b68cfc2a731be003f27c fix-implicit-basename.patch
fe813f2a129e060e8ffb2d441a3da5e6d844a93b3f36537125a34634d17a2ed00d144153b01ffb01b5b8ab0829f3a483916b2ed2dacb7cba53389d5eaa31f5d6 fix-implicit-basename.patch
3cec0a44e44b15dcfc0bb22f8a4318e76bf719fe9a550b6cf99160ea4181707f81ba6a50c8dafedc942638b1ae8bfde901eeff83ba0d6cb8383a178274ba54a5 0001-lvresize-use-POSIX-shell.patch
714e6aaba3437b43af38b0b559d0f983b2cea023e2bc64e0c3763e9c78ae4ca125fb75839fda52128e7044a4add81940fd69e92439d30d232cf20a4204f0e321 lvm.initd
07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd

13
main/lvm2/fix-implicit-basename.patch
View file

@ -1,13 +1,14 @@
See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16103
diff -upr LVM2.2.03.23.orig/lib/device/device_id.c LVM2.2.03.23/lib/device/device_id.c
--- LVM2.2.03.23.orig/lib/device/device_id.c 2024-05-12 12:05:45.824137483 +0200
+++ LVM2.2.03.23/lib/device/device_id.c 2024-05-12 12:06:00.537497883 +0200
@@ -30,6 +30,7 @@
diff --git a/lib/device/device_id.c b/lib/device/device_id.c
index 06788db..d8da035 100644
--- a/lib/device/device_id.c
+++ b/lib/device/device_id.c
@@ -32,6 +32,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
+#include <libgen.h>
#include <dirent.h>
#include <locale.h>
#include <sys/types.h>
#include <sys/file.h>
#include <sys/sysmacros.h>

43
main/lvm2/fix-stdio-usage.patch
View file

@ -1,40 +1,8 @@
From 63b1c7332bee6080bffecf9ce9d75ff15d799166 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 16 Nov 2022 10:42:39 +0100
Subject: [PATCH] fix stdio usage
---
lib/commands/toolcontext.c | 4 ++--
tools/lvmcmdline.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index b630554a9..f20080d18 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
/* 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
@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
dm_hash_destroy(cmd->cft_def_hash);
dm_device_list_destroy(&cmd->cache_dm_devs);
-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
if (cmd->linebuffer) {
/* Reset stream buffering to defaults */
if (is_valid_fd(STDIN_FILENO) &&
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index a5bb6a5c5..0ebfa375c 100644
index 7209ebd..778c8c0 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void)
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@ -43,7 +11,7 @@ index a5bb6a5c5..0ebfa375c 100644
if (err)
perror("stdin stream open");
else
@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@ -52,7 +20,7 @@ index a5bb6a5c5..0ebfa375c 100644
if (err)
perror("stdout stream open");
/* else no stdout */
@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&
@ -61,6 +29,3 @@ index a5bb6a5c5..0ebfa375c 100644
printf("stderr stream open: %s\n",
strerror(errno));
return 0;
--
2.38.1