mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 04:16:46 +02:00
main/lvm2: upgrade to 2.02.166
This commit is contained in:
Carlo Landmeter
parent
73433bea16
commit
ea1e601d50
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=lvm2
|
||||
pkgver=2.02.162
|
||||
pkgver=2.02.166
|
||||
pkgrel=0
|
||||
pkgdesc="Logical Volume Manager 2 utilities"
|
||||
url="http://sourceware.org/lvm2/"
|
||||
@ -23,19 +23,10 @@ source="ftp://sources.redhat.com/pub/$pkgname/LVM2.$pkgver.tgz
|
||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-dmeventd device-mapper:dm
|
||||
$pkgname-libs"
|
||||
|
||||
_builddir="$srcdir/LVM2.$pkgver"
|
||||
|
||||
prepare() {
|
||||
cd "$_builddir"
|
||||
for i in $source; do
|
||||
case $i in
|
||||
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
builddir="$srcdir/LVM2.$pkgver"
|
||||
|
||||
build () {
|
||||
cd "$_builddir"
|
||||
cd "$builddir"
|
||||
|
||||
# during cross-compilation malloc test goes wrong
|
||||
export ac_cv_func_malloc_0_nonnull=yes
|
||||
@ -63,20 +54,16 @@ build () {
|
||||
CLDFLAGS="$LDFLAGS" \
|
||||
|| return 1
|
||||
|
||||
# TODO: fix parallel builds
|
||||
make || return 1
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$_builddir"
|
||||
make -j1 DESTDIR="$pkgdir" \
|
||||
install || return 1
|
||||
#usrlibdir="$pkgdir"/lib \
|
||||
cd "$builddir"
|
||||
make -j1 DESTDIR="$pkgdir" install || return 1
|
||||
install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup
|
||||
install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm
|
||||
install -Dm644 "$srcdir"/lvm.confd "$pkgdir"/etc/conf.d/lvm
|
||||
cd "$pkgdir"/lib || return 1
|
||||
ln -s libdevmapper.so.1.02 libdevmapper.so || return 1
|
||||
ln -s libdevmapper.so.1.02 "$pkgdir"/lib/libdevmapper.so || return 1
|
||||
}
|
||||
|
||||
dmeventd() {
|
||||
@ -98,24 +85,25 @@ libs() {
|
||||
mkdir -p "$subpkgdir"/lib
|
||||
mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
|
||||
}
|
||||
md5sums="cc108c19b1e1b5b2002fb0a9bcb2d077 LVM2.2.02.162.tgz
|
||||
2395ae17f924ebf25e9737d02f758f8f fix-stdio-usage.patch
|
||||
|
||||
md5sums="c5a54ee0b86703daaad6e856439e115a LVM2.2.02.166.tgz
|
||||
861c959f143b40277b8b70e63f24312d fix-stdio-usage.patch
|
||||
3f4a9d57620f240f6bf389c1debc2ba5 mallinfo.patch
|
||||
d718e3301f035ebd2e2bbf25df34e817 library_dir-default-config.patch
|
||||
dd19d7dfb6b6a846f79693efd4b4d6f3 mlockall-default-config.patch
|
||||
cdefa1dbd95caabbf92198764f18a54e lvm.initd
|
||||
ec36d5fe4561220304e406c5c797e71f lvm.confd
|
||||
3bec717f7092c1934909962d38038eb3 dmeventd.initd"
|
||||
sha256sums="5d2ee0820de37185b2d289d85913a4f58a8cfbf37579acfe9dab35735ca6b4ed LVM2.2.02.162.tgz
|
||||
79c5379cbf660f8dabd45359463c77a40b5a83153b54c67ce36049260dac9071 fix-stdio-usage.patch
|
||||
sha256sums="e120b066b85b224552efda40204488c5123de068725676fd6e5c8bc655051b94 LVM2.2.02.166.tgz
|
||||
0a978e6a5e76c057ee1f89e269550d687ea87a7083d069e985388718cd8f32d4 fix-stdio-usage.patch
|
||||
40d2def3e99c13e3ecbaeb79bb863f42e7ae0e47762ebbc0d025962022a6dc3c mallinfo.patch
|
||||
303e19a3933c9ad48112dd3c7ae0dfd86e12b88593c7508d745ba2a885286ffb library_dir-default-config.patch
|
||||
083bc96cb4f6e81ea11ed925cfdd7e8394048c8a4365a384c6e1a28fa892f5d1 mlockall-default-config.patch
|
||||
9eea2a296d63794f6200351a625d317e028c0cafcbb6ad6083ea98acc5454e29 lvm.initd
|
||||
e2ff57977ace6098e1a2efc8a1f6796e8bf6e5dd148e4c105bb647ffc6f79230 lvm.confd
|
||||
05fad3581e8c22ecd81c78aa97fd79b521e622963d519d2d200a06823007d48d dmeventd.initd"
|
||||
sha512sums="9544bb7706488ac128d477af7294bcfd7b7e47cb0b1d604ea52c4545d6c3a5a71311945994dd1114cb1ce086d2006a35ef1d8b0fdd3082dfe5cc468cb0168057 LVM2.2.02.162.tgz
|
||||
c4d55b366a60926baadf431dd382012eb808490c0bb514e01503d526cfd7ae573efa2d60a92bd5f6f451b54b11fb5cf827f45cec35cfcdee6aa291674cc776dd fix-stdio-usage.patch
|
||||
sha512sums="8bebe9b474f791b5edf5366b0bd24861fbbaf8a83afa2a9e2a8e3917e05e4ecbf6877f018be03ffb4e9b4c8832208264165b85182bf79a07661adf35128b4a21 LVM2.2.02.166.tgz
|
||||
6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch
|
||||
9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch
|
||||
33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch
|
||||
d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch
|
||||
|
||||
@ -1,87 +1,5 @@
|
||||
--- LVM2.2.02.103.orig/lib/commands/toolcontext.c
|
||||
+++ LVM2.2.02.103/lib/commands/toolcontext.c
|
||||
@@ -1336,7 +1336,10 @@
|
||||
/*
|
||||
* Close and reopen stream on file descriptor fd.
|
||||
*/
|
||||
-static int _reopen_stream(FILE *stream, int fd, const char *mode, const char *name, FILE **new_stream)
|
||||
+#ifdef __GLIBC__
|
||||
+#define _reopen_stream(stream, fd, mode, name) __reopen_stream(stream, fd, mode, name, &stream)
|
||||
+
|
||||
+static int __reopen_stream(FILE *stream, int fd, const char *mode, const char *name, FILE **new_stream)
|
||||
{
|
||||
int fd_copy, new_fd;
|
||||
|
||||
@@ -1363,6 +1366,9 @@
|
||||
|
||||
return 1;
|
||||
}
|
||||
+#else
|
||||
+#define _reopen_stream(stream, fd, mode, name) (freopen(NULL, mode, stream) != NULL)
|
||||
+#endif
|
||||
|
||||
/* Entry point */
|
||||
struct cmd_context *create_toolcontext(unsigned is_long_lived,
|
||||
@@ -1371,7 +1377,6 @@
|
||||
unsigned threaded)
|
||||
{
|
||||
struct cmd_context *cmd;
|
||||
- FILE *new_stream;
|
||||
int flags;
|
||||
|
||||
#ifdef M_MMAP_MAX
|
||||
@@ -1421,9 +1426,8 @@
|
||||
if (is_valid_fd(STDIN_FILENO) &&
|
||||
((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
|
||||
(flags & O_ACCMODE) != O_WRONLY) {
|
||||
- if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream))
|
||||
+ if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin"))
|
||||
goto_out;
|
||||
- stdin = new_stream;
|
||||
if (setvbuf(stdin, cmd->linebuffer, _IOLBF, linebuffer_size)) {
|
||||
log_sys_error("setvbuf", "");
|
||||
goto out;
|
||||
@@ -1433,9 +1437,8 @@
|
||||
if (is_valid_fd(STDOUT_FILENO) &&
|
||||
((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
|
||||
(flags & O_ACCMODE) != O_RDONLY) {
|
||||
- if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream))
|
||||
+ if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout"))
|
||||
goto_out;
|
||||
- stdout = new_stream;
|
||||
if (setvbuf(stdout, cmd->linebuffer + linebuffer_size,
|
||||
_IOLBF, linebuffer_size)) {
|
||||
log_sys_error("setvbuf", "");
|
||||
@@ -1715,7 +1718,6 @@
|
||||
void destroy_toolcontext(struct cmd_context *cmd)
|
||||
{
|
||||
struct dm_config_tree *cft_cmdline;
|
||||
- FILE *new_stream;
|
||||
int flags;
|
||||
|
||||
if (cmd->dump_filter && cmd->filter && cmd->filter->dump &&
|
||||
@@ -1752,8 +1754,7 @@
|
||||
if (is_valid_fd(STDIN_FILENO) &&
|
||||
((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
|
||||
(flags & O_ACCMODE) != O_WRONLY) {
|
||||
- if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) {
|
||||
- stdin = new_stream;
|
||||
+ if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin")) {
|
||||
setlinebuf(stdin);
|
||||
} else
|
||||
cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */
|
||||
@@ -1762,8 +1763,7 @@
|
||||
if (is_valid_fd(STDOUT_FILENO) &&
|
||||
((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
|
||||
(flags & O_ACCMODE) != O_RDONLY) {
|
||||
- if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) {
|
||||
- stdout = new_stream;
|
||||
+ if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout")) {
|
||||
setlinebuf(stdout);
|
||||
} else
|
||||
cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */
|
||||
--- LVM2.2.02.103.orig/tools/lvmcmdline.c
|
||||
+++ LVM2.2.02.103/tools/lvmcmdline.c
|
||||
--- ./tools/lvmcmdline.c
|
||||
+++ ./tools/lvmcmdline.c
|
||||
@@ -1252,7 +1252,7 @@
|
||||
int err = is_valid_fd(STDERR_FILENO);
|
||||
|
||||
@ -109,3 +27,23 @@
|
||||
printf("stderr stream open: %s\n",
|
||||
strerror(errno));
|
||||
return 0;
|
||||
--- ./lib/commands/toolcontext.c.orig
|
||||
+++ ./lib/commands/toolcontext.c
|
||||
@@ -1860,7 +1860,7 @@
|
||||
/* 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) {
|
||||
/* Allocate 2 buffers */
|
||||
@@ -2241,7 +2241,7 @@
|
||||
if (cmd->libmem)
|
||||
dm_pool_destroy(cmd->libmem);
|
||||
|
||||
-#ifndef VALGRIND_POOL
|
||||
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
|
||||
if (cmd->linebuffer) {
|
||||
/* Reset stream buffering to defaults */
|
||||
if (is_valid_fd(STDIN_FILENO) &&
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user