| 1 |
commit: 0c2f4e895ff4309b16b17b408f3be41a1c5d3aad |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 19 23:10:01 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 19 23:19:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2f4e89 |
| 7 |
|
| 8 |
sys-fs/eudev: remove unused patches |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 11 |
|
| 12 |
sys-fs/eudev/files/eudev-exclude-MD.patch | 53 ---------------------- |
| 13 |
sys-fs/eudev/files/eudev-fix-disk-by-id.patch | 43 ------------------ |
| 14 |
sys-fs/eudev/files/eudev-fix-selinux-headers.patch | 32 ------------- |
| 15 |
sys-fs/eudev/files/eudev-fix-selinux-linking.patch | 30 ------------ |
| 16 |
4 files changed, 158 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/eudev/files/eudev-exclude-MD.patch b/sys-fs/eudev/files/eudev-exclude-MD.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index d5602616880..00000000000 |
| 21 |
--- a/sys-fs/eudev/files/eudev-exclude-MD.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,53 +0,0 @@ |
| 24 |
-From 2e5b17d01347d3c3118be2b8ad63d20415dbb1f0 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Kay Sievers <kay@××××.org> |
| 26 |
-Date: Thu, 24 Jul 2014 23:37:35 +0200 |
| 27 |
-Subject: [PATCH] udev: exclude MD from block device ownership event locking |
| 28 |
- |
| 29 |
-MD instantiates devices at open(). This is incomptible with the |
| 30 |
-locking logic, as the "change" event emitted when stopping a |
| 31 |
-device will bring it back. |
| 32 |
---- |
| 33 |
- src/udev/udevd.c | 23 +++++++---------------- |
| 34 |
- 1 file changed, 7 insertions(+), 16 deletions(-) |
| 35 |
- |
| 36 |
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
| 37 |
-index a45d324..db935d6 100644 |
| 38 |
---- a/src/udev/udevd.c |
| 39 |
-+++ b/src/udev/udevd.c |
| 40 |
-@@ -285,26 +285,17 @@ static void worker_new(struct event *event) |
| 41 |
- udev_event->exec_delay = exec_delay; |
| 42 |
- |
| 43 |
- /* |
| 44 |
-- * Take a "read lock" on the device node; this establishes |
| 45 |
-+ * Take a shared lock on the device node; this establishes |
| 46 |
- * a concept of device "ownership" to serialize device |
| 47 |
-- * access. External processes holding a "write lock" will |
| 48 |
-+ * access. External processes holding an exclusive lock will |
| 49 |
- * cause udev to skip the event handling; in the case udev |
| 50 |
-- * acquired the lock, the external process will block until |
| 51 |
-+ * acquired the lock, the external process can block until |
| 52 |
- * udev has finished its event handling. |
| 53 |
- */ |
| 54 |
-- |
| 55 |
-- /* |
| 56 |
-- * <kabi_> since we make check - device seems unused - we try |
| 57 |
-- * ioctl to deactivate - and device is found to be opened |
| 58 |
-- * <kay> sure, you try to take a write lock |
| 59 |
-- * <kay> if you get it udev is out |
| 60 |
-- * <kay> if you can't get it, udev is busy |
| 61 |
-- * <kabi_> we cannot deactivate openned device (as it is in-use) |
| 62 |
-- * <kay> maybe we should just exclude dm from that thing entirely |
| 63 |
-- * <kabi_> IMHO this sounds like a good plan for this moment |
| 64 |
-- */ |
| 65 |
-- if (streq_ptr("block", udev_device_get_subsystem(dev)) && |
| 66 |
-- !startswith(udev_device_get_sysname(dev), "dm-")) { |
| 67 |
-+ if (!streq_ptr(udev_device_get_action(dev), "remove") && |
| 68 |
-+ streq_ptr("block", udev_device_get_subsystem(dev)) && |
| 69 |
-+ !startswith(udev_device_get_sysname(dev), "dm-") && |
| 70 |
-+ !startswith(udev_device_get_sysname(dev), "md")) { |
| 71 |
- struct udev_device *d = dev; |
| 72 |
- |
| 73 |
- if (streq_ptr("partition", udev_device_get_devtype(d))) |
| 74 |
--- |
| 75 |
-1.8.5.5 |
| 76 |
- |
| 77 |
|
| 78 |
diff --git a/sys-fs/eudev/files/eudev-fix-disk-by-id.patch b/sys-fs/eudev/files/eudev-fix-disk-by-id.patch |
| 79 |
deleted file mode 100644 |
| 80 |
index 07bc0c518c6..00000000000 |
| 81 |
--- a/sys-fs/eudev/files/eudev-fix-disk-by-id.patch |
| 82 |
+++ /dev/null |
| 83 |
@@ -1,43 +0,0 @@ |
| 84 |
-diff -ruN eudev-3.2.2-orig/rules/60-persistent-storage.rules eudev-3.2.2-new/rules/60-persistent-storage.rules |
| 85 |
---- eudev-3.2.2-orig/rules/60-persistent-storage.rules 2016-12-11 16:41:58.000000000 +0100 |
| 86 |
-+++ eudev-3.2.2-new/rules/60-persistent-storage.rules 2017-04-26 23:14:04.197109882 +0200 |
| 87 |
-@@ -83,6 +83,9 @@ |
| 88 |
- # by-id (World Wide Name) |
| 89 |
- ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}" |
| 90 |
- ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}-part%n" |
| 91 |
-+#(Temporary) Compatibility rule for old broken WWNs in case some uses them: |
| 92 |
-+ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}" |
| 93 |
-+ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}-part%n" |
| 94 |
- |
| 95 |
- # by-partlabel/by-partuuid links (partition metadata) |
| 96 |
- ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}" |
| 97 |
-diff -ruN eudev-3.2.2-orig/src/ata_id/ata_id.c eudev-3.2.2-new/src/ata_id/ata_id.c |
| 98 |
---- eudev-3.2.2-orig/src/ata_id/ata_id.c 2016-11-17 22:14:19.000000000 +0100 |
| 99 |
-+++ eudev-3.2.2-new/src/ata_id/ata_id.c 2017-04-26 23:18:51.116127146 +0200 |
| 100 |
-@@ -645,10 +645,22 @@ |
| 101 |
- * All other values are reserved. |
| 102 |
- */ |
| 103 |
- word = identify.wyde[108]; |
| 104 |
-- if ((word & 0xf000) == 0x5000) |
| 105 |
-- printf("ID_WWN=0x%1$"PRIu64"x\n" |
| 106 |
-- "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n", |
| 107 |
-- identify.octa[108/4]); |
| 108 |
-+ if ((word & 0xf000) == 0x5000){ |
| 109 |
-+ uint64_t wwn; |
| 110 |
-+ |
| 111 |
-+ wwn = identify.wyde[108]; |
| 112 |
-+ wwn <<= 16; |
| 113 |
-+ wwn |= identify.wyde[109]; |
| 114 |
-+ wwn <<= 16; |
| 115 |
-+ wwn |= identify.wyde[110]; |
| 116 |
-+ wwn <<= 16; |
| 117 |
-+ wwn |= identify.wyde[111]; /* Could possibly done nicer ? */ |
| 118 |
-+ printf("ID_WWN=0x%1$" PRIx64 "\n" |
| 119 |
-+ "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n", |
| 120 |
-+ wwn); |
| 121 |
-+ printf("ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE=0x%" PRIu64 "x\n", |
| 122 |
-+ identify.octa[108/4]); |
| 123 |
-+ } |
| 124 |
- |
| 125 |
- /* from Linux's include/linux/ata.h */ |
| 126 |
- if (identify.wyde[0] == 0x848a || |
| 127 |
|
| 128 |
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch b/sys-fs/eudev/files/eudev-fix-selinux-headers.patch |
| 129 |
deleted file mode 100644 |
| 130 |
index 1d1d8dcc236..00000000000 |
| 131 |
--- a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch |
| 132 |
+++ /dev/null |
| 133 |
@@ -1,32 +0,0 @@ |
| 134 |
-From 361aa273d6fedda161c14b24302f009a58331693 Mon Sep 17 00:00:00 2001 |
| 135 |
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@××××××.net> |
| 136 |
-Date: Tue, 2 Sep 2014 21:20:24 +0200 |
| 137 |
-Subject: [PATCH] fix SELINUX build |
| 138 |
-MIME-Version: 1.0 |
| 139 |
-Content-Type: text/plain; charset=UTF-8 |
| 140 |
-Content-Transfer-Encoding: 8bit |
| 141 |
- |
| 142 |
-Signed-off-by: Amadeusz Sławiński <amade@××××××.net> |
| 143 |
---- |
| 144 |
- src/shared/label.c | 5 +++++ |
| 145 |
- 1 file changed, 5 insertions(+) |
| 146 |
- |
| 147 |
-diff --git a/src/shared/label.c b/src/shared/label.c |
| 148 |
-index 3c6277a..e674241 100644 |
| 149 |
---- a/src/shared/label.c |
| 150 |
-+++ b/src/shared/label.c |
| 151 |
-@@ -23,6 +23,11 @@ |
| 152 |
- #include <sys/socket.h> |
| 153 |
- #include <sys/un.h> |
| 154 |
- |
| 155 |
-+#ifdef HAVE_SELINUX |
| 156 |
-+#include <selinux/selinux.h> |
| 157 |
-+#include <selinux/label.h> |
| 158 |
-+#endif |
| 159 |
-+ |
| 160 |
- #include "label.h" |
| 161 |
- #include "util.h" |
| 162 |
- #include "path-util.h" |
| 163 |
--- |
| 164 |
-2.1.0 |
| 165 |
- |
| 166 |
|
| 167 |
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch |
| 168 |
deleted file mode 100644 |
| 169 |
index 6a5e05bcaf1..00000000000 |
| 170 |
--- a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch |
| 171 |
+++ /dev/null |
| 172 |
@@ -1,30 +0,0 @@ |
| 173 |
-From e7f7217b9b9dbb3304116eae2b0ad90c84ede034 Mon Sep 17 00:00:00 2001 |
| 174 |
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@××××××.net> |
| 175 |
-Date: Wed, 3 Sep 2014 11:01:31 +0200 |
| 176 |
-Subject: [PATCH] link libudev against SELINUX |
| 177 |
-MIME-Version: 1.0 |
| 178 |
-Content-Type: text/plain; charset=UTF-8 |
| 179 |
-Content-Transfer-Encoding: 8bit |
| 180 |
- |
| 181 |
-Signed-off-by: Amadeusz Sławiński <amade@××××××.net> |
| 182 |
---- |
| 183 |
- src/libudev/Makefile.am | 3 ++- |
| 184 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 185 |
- |
| 186 |
-diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am |
| 187 |
-index 868a9fc..72e43bc 100644 |
| 188 |
---- a/src/libudev/Makefile.am |
| 189 |
-+++ b/src/libudev/Makefile.am |
| 190 |
-@@ -54,7 +54,8 @@ libudev_la_LDFLAGS = \ |
| 191 |
- -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym |
| 192 |
- |
| 193 |
- libudev_la_LIBADD = \ |
| 194 |
-- $(top_builddir)/src/shared/libudev_shared.la |
| 195 |
-+ $(top_builddir)/src/shared/libudev_shared.la \ |
| 196 |
-+ $(SELINUX_LIBS) |
| 197 |
- |
| 198 |
- libudev_private_la_SOURCES = \ |
| 199 |
- $(libudev_la_SOURCES) \ |
| 200 |
--- |
| 201 |
-2.1.0 |
| 202 |
- |
Archives