lvm2: remove unneeded patches

extra/lvm2/build

@@ -1,13 +1,10 @@
 #!/bin/sh -e
 
-# A painful collection of patches, some written for KISS and
-# the others ported and modified from much older versions of LVM.
+# A painful few patches, some written for KISS and the others
+# ported and modified from much older versions of LVM.
 patch -p1 < portability.patch
 patch -p1 < fix-stdio-usage.patch
-patch -p1 < mlockall-default-config.patch
-patch -p1 < musl-fix-include.patch
 patch -p1 < disable-symver.patch
-patch -p1 < 001-include_fix.patch
 
 # LVM2 calls 'fmt -1' throughout the build process.
 # This is a part of the GNU coreutils and is not included

extra/lvm2/checksums

@@ -1,7 +1,4 @@
 ca52815c999b20c6d25e3192f142f081b93d01f07b9d787e99664b169dba2700  LVM2.2.03.05.tgz
 1936f44db53a7cd2eea4cb98303994c091aa32349d9d90aa4408f0b89dd32aa6  fix-stdio-usage.patch
-352ec9eff8b5f796b6767cdab6df1cac0f94d37365a33988fdb9bff11f72c547  mlockall-default-config.patch
 d1f78c5a07f0ba66856e00e498c0f62164cabbcd9f0d9abcda1c25501eb235ff  portability.patch
-bec8a087dfb72fedc0884848959d4558c9ddbfa0b51ea404ad111b44e72d27fa  musl-fix-include.patch
 e785546d0fa6551364ad2a26e50672ace1262d60439727356d28970a80f30a91  disable-symver.patch
-ef22a160a903bb50bfba86644eab86de381c4ec29bd0129f1088c5d61e2298b9  001-include_fix.patch

extra/lvm2/patches/001-include_fix.patch

@@ -1,13 +0,0 @@
-diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
-index 4e35220..16ae94e 100644
---- a/lib/device/dev-type.c
-+++ b/lib/device/dev-type.c
-@@ -23,7 +23,7 @@
- #include "lib/label/label.h"
- 
- #ifdef BLKID_WIPING_SUPPORT
--#include <blkid.h>
-+#include <blkid/blkid.h>
- #endif
- 
- #ifdef UDEV_SYNC_SUPPORT

extra/lvm2/patches/mlockall-default-config.patch

@@ -1,14 +0,0 @@
---- ./lib/config/defaults.h.orig	2017-04-27 18:16:05.879936377 +0200
-+++ ./lib/config/defaults.h	2017-04-27 18:16:35.141849047 +0200
-@@ -55,7 +55,11 @@
- #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3
- #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10
- #define DEFAULT_PRIORITISE_WRITE_LOCKS 1
-+#ifdef __GLIBC__
- #define DEFAULT_USE_MLOCKALL 0
-+#else
-+#define DEFAULT_USE_MLOCKALL 1
-+#endif
- #define DEFAULT_METADATA_READ_ONLY 0
- #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0
- #define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]"

extra/lvm2/patches/musl-fix-include.patch

@@ -1,12 +0,0 @@
-diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
-index 79b54d0..e768e7e 100644
---- a/libdaemon/server/daemon-server.c
-+++ b/libdaemon/server/daemon-server.c
-@@ -30,6 +30,7 @@
- #include <sys/un.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <fcntl.h>
- 
- #include <syslog.h> /* FIXME. For the global closelog(). */
- 

extra/lvm2/sources

@@ -1,7 +1,4 @@
 https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.2.03.05.tgz
 patches/fix-stdio-usage.patch
-patches/mlockall-default-config.patch
 patches/portability.patch
-patches/musl-fix-include.patch
 patches/disable-symver.patch
-patches/001-include_fix.patch