| 1 |
commit: dd9fb6a3d6ce7edde08be0493686bcca41381ed1 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Nov 27 01:22:30 2016 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Nov 27 01:22:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dd9fb6a3 |
| 7 |
|
| 8 |
sys-fs/lvm2: Forgot musl patches for 2.02.166 |
| 9 |
|
| 10 |
sys-fs/lvm2/Manifest | 2 + |
| 11 |
.../lvm2/files/lvm2-2.02.166-fix-stdio-usage.patch | 53 ++++++++++++++++++++++ |
| 12 |
sys-fs/lvm2/files/lvm2-2.02.166-portability.patch | 40 ++++++++++++++++ |
| 13 |
3 files changed, 95 insertions(+) |
| 14 |
|
| 15 |
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest |
| 16 |
index f05d1e3..34abb31 100644 |
| 17 |
--- a/sys-fs/lvm2/Manifest |
| 18 |
+++ b/sys-fs/lvm2/Manifest |
| 19 |
@@ -16,6 +16,8 @@ AUX lvm2-2.02.129-example.conf.in.patch 1844 SHA256 0a5f5dfbeb36da9320c936752fa4 |
| 20 |
AUX lvm2-2.02.129-static-pkgconfig-libs.patch 3299 SHA256 fb8ca89e330096a0a0abb80db1922b54b4ed84408863de07ec3dc7a2d882b302 SHA512 28906793a51737679e51bf83298388ea3ca081f513d34b4c38f3fa09f574c9957f4eedfde0179e31be90631e12d41c78b3bb4bb74c069a99a69ae703f3a2f2f7 WHIRLPOOL 9f0f25896dae3f750262514a0e2f8a29a8edb1f949fc41518da98cf991d24e8216003aff7a3fba535ac1a75e8686d8dc297375da52f2188cd7b309b8067758d6 |
| 21 |
AUX lvm2-2.02.130-pthread-pkgconfig.patch 915 SHA256 7df0c39dcbb0e24381327e5b08e377fc80bc7e5d990abf4f3f2b3e0fc5158adc SHA512 1e45ccb3bf824fd2f8276b4ca103e95960e401e793944af68a16929040015b42d601b09adbb8f01e833071d501440a20381fe263fd1884d8fb2e7d7f5463da6d WHIRLPOOL bc5805586fd58db54c538d4d87621389ebfb4b7146b46390719c4c3d983222ec51616667b2871ff754a0348f47b210288f8fe3cbe17f95206d97a61cc1b32b8f |
| 22 |
AUX lvm2-2.02.139-dynamic-static-ldflags.patch 2874 SHA256 2f09df6fe503f426e9970e9243e6380654dd4037b8475a371e56ee6ed4287c46 SHA512 3486c6d0500f233cbedfe28a2c20f03e4a80301e011fa0fd41b3765eed71dc5e00c8f6f09d40c3702ea87e372db3e4dae64c32e4ffe45700bbbf137804b748fa WHIRLPOOL 427e8be7dab3afcd4bfa8bbec86d691ed99d98eb52ebe7c740eec7a90bb42dce92fc127ca3ef0a6f6da07041a3682f59b1937b836ccd0a8733200e538e53ccc0 |
| 23 |
+AUX lvm2-2.02.166-fix-stdio-usage.patch 1554 SHA256 4569db8160a3d2cf93d5ef49589743dfabd4cd93c9c25c3a0f0189044cce268e SHA512 ebbbe2b7f3be8def90f4ebaeda879b3970da3ca3b3597ef2ee5406dc723e716d3887e5b21724f33f83745f70e3b0e63ed30426d90f40773da7adf8d5e132e259 WHIRLPOOL 605cd74484aaea84ff68c1b9fbc7d87f6faea83222a140926c626b331783980b3da0a0d1048b23e397f05cdae9585c0e565d121d93d8648bec0ed328e221a3de |
| 24 |
+AUX lvm2-2.02.166-portability.patch 1289 SHA256 f22bb0c3b228fef0563b4ed2c19125710acf22156e3e698e08ad65a6d613cfe4 SHA512 d3b4600ed7ad1e1cf191c81eab4681023e4ea9e257808e2da8656841f70c6e1880642f5dc68ce1032e40d8a4bf7aedf82ec4d6b17fb24923a32c4afa83b6dd5f WHIRLPOOL 31e368f2c48dc6b85bd227ac25dbe47a19bff81c247d28bfc8b750e48bc6a0e45b3a20cfb0b5760dbfc3ac75f0bad9f75a9c0530e6a89edbe0c04f8700961d6a |
| 25 |
AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 SHA256 b892d0544e05350e78ea400c16e6fd3657671d9bdf50bfae70505fd79bdda081 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de WHIRLPOOL cb533df528be0aae4bf50966285ef7a238f810d955ee86d5b446f43944d093732eff6ef8178d1654c4a2c075049ffc11994a99de6291bab1140cb8812be8b8a0 |
| 26 |
AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21 SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c WHIRLPOOL f273c893acedfd658e7947abb5f4b528f15de9808ae3862ec8a9189ba7de4ea6998dc67dbc7af642ca3a27bba2ef8eabfd48337f532145f88500988f564313b1 |
| 27 |
AUX lvm2-2.02.67-createinitrd.patch 660 SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 WHIRLPOOL b358a31a9ee669a4fccf42280da5342c214932bfd83deee92d41351eb37dc6c0b2e5dc7419f2304128b5d285fed92db5b2e1634a71bbf1310d36b54d1a353bb0 |
| 28 |
|
| 29 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.166-fix-stdio-usage.patch b/sys-fs/lvm2/files/lvm2-2.02.166-fix-stdio-usage.patch |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..43964e2 |
| 32 |
--- /dev/null |
| 33 |
+++ b/sys-fs/lvm2/files/lvm2-2.02.166-fix-stdio-usage.patch |
| 34 |
@@ -0,0 +1,53 @@ |
| 35 |
+diff -Naur LVM2.2.02.166.orig/lib/log/log.c LVM2.2.02.166/lib/log/log.c |
| 36 |
+--- LVM2.2.02.166.orig/lib/log/log.c 2016-09-26 06:21:54.000000000 -0700 |
| 37 |
++++ LVM2.2.02.166/lib/log/log.c 2016-10-23 15:54:11.538608214 -0700 |
| 38 |
+@@ -161,6 +161,7 @@ |
| 39 |
+ * Close and reopen standard stream on file descriptor fd. |
| 40 |
+ */ |
| 41 |
+ int reopen_standard_stream(FILE **stream, const char *mode) |
| 42 |
++#if defined(__GLIBC__) |
| 43 |
+ { |
| 44 |
+ int fd, fd_copy, new_fd; |
| 45 |
+ const char *name; |
| 46 |
+@@ -207,6 +208,11 @@ |
| 47 |
+ *stream = new_stream; |
| 48 |
+ return 1; |
| 49 |
+ } |
| 50 |
++#else |
| 51 |
++{ |
| 52 |
++ return freopen(NULL, mode, *stream) != NULL; |
| 53 |
++} |
| 54 |
++#endif |
| 55 |
+ |
| 56 |
+ void init_log_fn(lvm2_log_fn_t log_fn) |
| 57 |
+ { |
| 58 |
+diff -Naur LVM2.2.02.166.orig/tools/lvmcmdline.c LVM2.2.02.166/tools/lvmcmdline.c |
| 59 |
+--- LVM2.2.02.166.orig/tools/lvmcmdline.c 2016-09-26 06:21:55.000000000 -0700 |
| 60 |
++++ LVM2.2.02.166/tools/lvmcmdline.c 2016-10-23 15:49:07.910610692 -0700 |
| 61 |
+@@ -1818,7 +1818,7 @@ |
| 62 |
+ int err = is_valid_fd(STDERR_FILENO); |
| 63 |
+ |
| 64 |
+ if (!is_valid_fd(STDIN_FILENO) && |
| 65 |
+- !(stdin = fopen(_PATH_DEVNULL, "r"))) { |
| 66 |
++ !(freopen(_PATH_DEVNULL, "r", stdin))) { |
| 67 |
+ if (err) |
| 68 |
+ perror("stdin stream open"); |
| 69 |
+ else |
| 70 |
+@@ -1828,7 +1828,7 @@ |
| 71 |
+ } |
| 72 |
+ |
| 73 |
+ if (!is_valid_fd(STDOUT_FILENO) && |
| 74 |
+- !(stdout = fopen(_PATH_DEVNULL, "w"))) { |
| 75 |
++ !(freopen(_PATH_DEVNULL, "w", stdout))) { |
| 76 |
+ if (err) |
| 77 |
+ perror("stdout stream open"); |
| 78 |
+ /* else no stdout */ |
| 79 |
+@@ -1836,7 +1836,7 @@ |
| 80 |
+ } |
| 81 |
+ |
| 82 |
+ if (!is_valid_fd(STDERR_FILENO) && |
| 83 |
+- !(stderr = fopen(_PATH_DEVNULL, "w"))) { |
| 84 |
++ !(freopen(_PATH_DEVNULL, "w", stderr))) { |
| 85 |
+ printf("stderr stream open: %s\n", |
| 86 |
+ strerror(errno)); |
| 87 |
+ return 0; |
| 88 |
|
| 89 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.166-portability.patch b/sys-fs/lvm2/files/lvm2-2.02.166-portability.patch |
| 90 |
new file mode 100644 |
| 91 |
index 0000000..5957aef |
| 92 |
--- /dev/null |
| 93 |
+++ b/sys-fs/lvm2/files/lvm2-2.02.166-portability.patch |
| 94 |
@@ -0,0 +1,40 @@ |
| 95 |
+diff -Naur LVM2.2.02.166.orig/lib/mm/memlock.c LVM2.2.02.166/lib/mm/memlock.c |
| 96 |
+--- LVM2.2.02.166.orig/lib/mm/memlock.c 2016-09-26 06:21:54.000000000 -0700 |
| 97 |
++++ LVM2.2.02.166/lib/mm/memlock.c 2016-10-23 15:43:03.957002700 -0700 |
| 98 |
+@@ -173,6 +173,7 @@ |
| 99 |
+ * MMAP'd memory directly. Since MMAP-as-MORECORE does not munmap the |
| 100 |
+ * memory on free(), this is good enough for our purposes. |
| 101 |
+ */ |
| 102 |
++#ifdef __GLIBC__ |
| 103 |
+ while (missing > 0) { |
| 104 |
+ struct mallinfo inf = mallinfo(); |
| 105 |
+ hblks = inf.hblks; |
| 106 |
+@@ -200,14 +201,17 @@ |
| 107 |
+ break; |
| 108 |
+ } |
| 109 |
+ } |
| 110 |
++#endif |
| 111 |
+ |
| 112 |
+ if ((_malloc_mem = malloc(_size_malloc))) |
| 113 |
+ _touch_memory(_malloc_mem, _size_malloc); |
| 114 |
+ |
| 115 |
++#ifdef __GLIBC__ |
| 116 |
+ /* free up the reserves so subsequent malloc's can use that memory */ |
| 117 |
+ for (i = 0; i < area; ++i) |
| 118 |
+ free(areas[i]); |
| 119 |
+ #endif |
| 120 |
++#endif |
| 121 |
+ } |
| 122 |
+ |
| 123 |
+ static void _release_memory(void) |
| 124 |
+diff -Naur LVM2.2.02.166.orig/libdaemon/server/daemon-server.c LVM2.2.02.166/libdaemon/server/daemon-server.c |
| 125 |
+--- LVM2.2.02.166.orig/libdaemon/server/daemon-server.c 2016-09-26 06:21:55.000000000 -0700 |
| 126 |
++++ LVM2.2.02.166/libdaemon/server/daemon-server.c 2016-10-23 15:43:25.962220845 -0700 |
| 127 |
+@@ -18,6 +18,7 @@ |
| 128 |
+ #include "daemon-server.h" |
| 129 |
+ #include "daemon-log.h" |
| 130 |
+ |
| 131 |
++#include <fcntl.h> |
| 132 |
+ #include <dlfcn.h> |
| 133 |
+ #include <errno.h> |
| 134 |
+ #include <pthread.h> |
Archives