diff options
Diffstat (limited to 'system/lvm2')
| -rw-r--r-- | system/lvm2/APKBUILD | 10 | ||||
| -rw-r--r-- | system/lvm2/dash.patch | 64 | ||||
| -rw-r--r-- | system/lvm2/fix-stdio-usage.patch | 20 |
3 files changed, 4 insertions, 90 deletions
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index f0cb77a92..17d6a69d3 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 -pkgver=2.03.05 -pkgrel=2 +pkgver=2.03.08 +pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" arch="all" @@ -16,7 +16,6 @@ makedepends_host="$depends_dev util-linux-dev" makedepends="$makedepends_build $makedepends_host" replaces="device-mapper $pkgname-dmeventd" source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz - dash.patch fix-stdio-usage.patch mallinfo.patch mlockall-default-config.patch @@ -88,9 +87,8 @@ udev() { } -sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz -9dbdda2b5b35777ea22be5eedd585de6594e856bf168416f11d003683dad9cc3d8dae5a14e5ae22f251d20809960173cd2e7ea0889949d5d1c1d1e2d10f81508 dash.patch -6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch +sha512sums="411c76de2acd8d7d707b60a4aab3f846004a1fbdc7b1d3f34d21af8ed45716adc0516b11491a26261580da7396d13a506e3994b32f5d1cefdf49c97e5d62d2e3 LVM2.2.03.08.tgz +62dd89e626adc86d1f9d7c575517b4454a362868e2fd3399813b61c1cc407316156456348cd4e8148542ee26124739d6c0e72f3dddee66662a40ca86f1bc3abd fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd diff --git a/system/lvm2/dash.patch b/system/lvm2/dash.patch deleted file mode 100644 index d2ab014f8..000000000 --- a/system/lvm2/dash.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- LVM2.2.03.05/configure -+++ LVM2.2.03.05/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS:-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS:-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS:-"$LDFLAGS"}" - ;; - esac - ---- LVM2.2.03.05/tools/Makefile.in -+++ LVM2.2.03.05/tools/Makefile.in -@@ -167,7 +167,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX) - - command-count.h: $(srcdir)/command-lines.in Makefile - @echo " [GEN] $@" -- $(Q) set -o pipefail && \ -+ $(Q) \ - ( cat $(top_srcdir)/tools/license.inc && \ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ - echo -n "#define COMMAND_COUNT " && \ -@@ -176,7 +176,7 @@ command-count.h: $(srcdir)/command-lines.in Makefile - - cmds.h: $(srcdir)/command-lines.in Makefile - @echo " [GEN] $@" -- $(Q) set -o pipefail && \ -+ $(Q) \ - ( cat $(top_srcdir)/tools/license.inc && \ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ - echo "cmd(CMD_NONE, none)" && \ -@@ -186,11 +186,11 @@ cmds.h: $(srcdir)/command-lines.in Makefile - - command-lines-input.h: $(srcdir)/command-lines.in Makefile - @echo " [GEN] $@" -- $(Q) set -o pipefail && \ -+ $(Q) \ - ( cat $(top_srcdir)/tools/license.inc && \ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ -- echo -en "const char _command_input[] =\n\n\"" && \ -+ printf "const char _command_input[] =\n\n\"" && \ - $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \ -- echo "\\n\";" \ -+ printf "%s\n" "\\n\";" \ - ) > $@ - diff --git a/system/lvm2/fix-stdio-usage.patch b/system/lvm2/fix-stdio-usage.patch index 39ba2e1b4..d5cc43f65 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; ---- ./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) && |