diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-10 09:21:09 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-10 08:35:29 +0000 |
| commit | 9f5237e8ed2641b406d961ed1e6222f80c5a3131 (patch) | |
| tree | 835128bc5732d5db29b3cc7052cef69fbb696623 /main/lvm2 | |
| parent | 935edadb405ae4fedd132ec75d1d6c7341c44a4b (diff) | |
| download | aports-9f5237e8ed2641b406d961ed1e6222f80c5a3131.tar.bz2 aports-9f5237e8ed2641b406d961ed1e6222f80c5a3131.tar.xz | |
main/lvm2: upgrade to 2.02.117
Diffstat (limited to 'main/lvm2')
| -rw-r--r-- | main/lvm2/APKBUILD | 18 | ||||
| -rw-r--r-- | main/lvm2/fix-vgchange-mknodes-regression.patch | 30 | ||||
| -rw-r--r-- | main/lvm2/mallinfo.patch | 11 |
3 files changed, 20 insertions, 39 deletions
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index fb73a58d09..55c93c5eb1 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.112 -pkgrel=2 +pkgver=2.02.117 +pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" arch="all" @@ -11,7 +11,7 @@ depends_dev="linux-headers" makedepends="$depends_dev" source="ftp://sources.redhat.com/pub/$pkgname/LVM2.$pkgver.tgz fix-stdio-usage.patch - fix-vgchange-mknodes-regression.patch + mallinfo.patch lvm.initd lvm.confd dmeventd.initd @@ -90,21 +90,21 @@ libs() { mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/ } -md5sums="1f4033b750f68b68e9bd66d3661a2c3f LVM2.2.02.112.tgz +md5sums="ab5889dae7924b44ed2444161058a419 LVM2.2.02.117.tgz 2395ae17f924ebf25e9737d02f758f8f fix-stdio-usage.patch -72f9634cf6022ce00bd5cc0a2cddd0d8 fix-vgchange-mknodes-regression.patch +3f4a9d57620f240f6bf389c1debc2ba5 mallinfo.patch 96fb132147486b3f6e5ae8964c16375d lvm.initd ec36d5fe4561220304e406c5c797e71f lvm.confd 73e7108a91e3c8ffdeab5699bf5cc639 dmeventd.initd" -sha256sums="495fced8ec1a8b14912359f4eb97299e0b2d2bc0dfc9a50820daf7bbb3ff67e5 LVM2.2.02.112.tgz +sha256sums="e09bbec3a72d682be7307ae2f2f188ca3d2b20e06924ac3757d6dcf0c3bfb835 LVM2.2.02.117.tgz 79c5379cbf660f8dabd45359463c77a40b5a83153b54c67ce36049260dac9071 fix-stdio-usage.patch -035b7224c74eaaa86f0767a240abee9cbf90233812b602ceffcdbb487b784e3e fix-vgchange-mknodes-regression.patch +40d2def3e99c13e3ecbaeb79bb863f42e7ae0e47762ebbc0d025962022a6dc3c mallinfo.patch d935e06f732892a8abf0ead47b3a5e64fbe8367ed2a2b08c780c5446c2f7a943 lvm.initd e2ff57977ace6098e1a2efc8a1f6796e8bf6e5dd148e4c105bb647ffc6f79230 lvm.confd 0c051388991ba69afbf2f6baf36ba227d7c26fc8f0d7588d8de76d9a74886d79 dmeventd.initd" -sha512sums="a885e2fbdeb582542f0f0e044955edc43f8cdcd8bdfacf99002b807cbf3cce3df500d27c2661d0b049682b54eb4597aae2726209817cdb8ef4f122b8ba175d26 LVM2.2.02.112.tgz +sha512sums="230a66203471c2f87b92a1fbbd51adfa4086a80af6767339fcbf17590e9838f975d0adea6c786e73d765b457b52b10cf72160fe05ccbb1c1fc05817805e99191 LVM2.2.02.117.tgz c4d55b366a60926baadf431dd382012eb808490c0bb514e01503d526cfd7ae573efa2d60a92bd5f6f451b54b11fb5cf827f45cec35cfcdee6aa291674cc776dd fix-stdio-usage.patch -6a4d080b380aef41c9bd966832ddca9c64e85e70f2b2a0fbb1a66885c34cdfcaad23fab3498fd61f7849d1757c51b5f34edcfc11ddb52af725534ff167353cf6 fix-vgchange-mknodes-regression.patch +9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch 00e6790e857fe369265f3215b7d20a1f6792a10ced7f68e10f6fc9dca77150e1b0ed95503ca84305b47e0f9b7f907e4e5107e9e0d2fc978287b28bf1645eeb23 lvm.initd 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd 523b54d63592c500394243632f4ed60838d04a8c386a85bb2a0fda6f756607467ec025c1490104d8c73035e37646eeea55dcafd3f05eab85e035bbedcebf0406 dmeventd.initd" diff --git a/main/lvm2/fix-vgchange-mknodes-regression.patch b/main/lvm2/fix-vgchange-mknodes-regression.patch deleted file mode 100644 index 67fdf380a1..0000000000 --- a/main/lvm2/fix-vgchange-mknodes-regression.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4dc602f79bd6579eef15a9227aee99fe832a7610 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Fri, 21 Nov 2014 19:36:51 +0100 -Subject: dev_manager: fix mknodes - -Fix regression introduced with a2c1024f6ac7e22ac5c010a267d0c1df331ee416 - -_setup_task(mknodes ? name : NULL... - -has been replaced with: - -_setup_task(type != MKNODES ? name : NULL.... - -Use '==' - -index 44b273d..e336933 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -206,7 +206,7 @@ static int _info_run(info_type_t type, const char *name, const char *dlid, - return 0; - } - -- if (!(dmt = _setup_task(type != MKNODES ? name : NULL, dlid, 0, dmtask, -+ if (!(dmt = _setup_task((type == MKNODES) ? name : NULL, dlid, 0, dmtask, - major, minor, with_open_count))) - return_0; - --- -cgit v0.10.2 - diff --git a/main/lvm2/mallinfo.patch b/main/lvm2/mallinfo.patch new file mode 100644 index 0000000000..471a6b2551 --- /dev/null +++ b/main/lvm2/mallinfo.patch @@ -0,0 +1,11 @@ +--- ./lib/mm/memlock.c.orig 2015-03-09 11:18:41.560028850 -0100 ++++ ./lib/mm/memlock.c 2015-03-09 11:19:54.504373309 -0100 +@@ -137,7 +137,7 @@ + + static void _allocate_memory(void) + { +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + void *stack_mem; + struct rlimit limit; + int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; |