| 1 |
commit: 3f4f2848e4367278a8866d8fc189cc8159280fa0 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 2 17:55:24 2019 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 3 08:09:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4f2848 |
| 7 |
|
| 8 |
app-emulation/libvirt: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/12379 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 13 |
|
| 14 |
.../libvirt-3.10.0-r2-fix_paths_for_apparmor.patch | 77 -------- |
| 15 |
.../files/libvirt-4.5.0-do_not_use_sysconf.patch | 216 --------------------- |
| 16 |
2 files changed, 293 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index f1360ae4e4e..00000000000 |
| 21 |
--- a/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,77 +0,0 @@ |
| 24 |
-diff --git a/examples/Makefile.am b/examples/Makefile.am |
| 25 |
-index ef2f79db3..d8cdb9b3f 100644 |
| 26 |
---- a/examples/Makefile.am |
| 27 |
-+++ b/examples/Makefile.am |
| 28 |
-@@ -23,7 +23,7 @@ EXTRA_DIST = \ |
| 29 |
- apparmor/TEMPLATE.lxc \ |
| 30 |
- apparmor/libvirt-qemu \ |
| 31 |
- apparmor/libvirt-lxc \ |
| 32 |
-- apparmor/usr.lib.libvirt.virt-aa-helper \ |
| 33 |
-+ apparmor/usr.libexec.virt-aa-helper \ |
| 34 |
- apparmor/usr.sbin.libvirtd \ |
| 35 |
- lxcconvert/virt-lxc-convert \ |
| 36 |
- polkit/libvirt-acl.rules \ |
| 37 |
-@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c |
| 38 |
- if WITH_APPARMOR_PROFILES |
| 39 |
- apparmordir = $(sysconfdir)/apparmor.d/ |
| 40 |
- apparmor_DATA = \ |
| 41 |
-- apparmor/usr.lib.libvirt.virt-aa-helper \ |
| 42 |
-+ apparmor/usr.libexec.virt-aa-helper \ |
| 43 |
- apparmor/usr.sbin.libvirtd \ |
| 44 |
- $(NULL) |
| 45 |
- |
| 46 |
-diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu |
| 47 |
-index d4fad85a1..0b22009e5 100644 |
| 48 |
---- a/examples/apparmor/libvirt-qemu |
| 49 |
-+++ b/examples/apparmor/libvirt-qemu |
| 50 |
-@@ -86,6 +86,8 @@ |
| 51 |
- /usr/share/AAVMF/** r, |
| 52 |
- /usr/share/qemu-efi/** r, |
| 53 |
- /usr/share/slof/** r, |
| 54 |
-+ /usr/share/seavgabios/** r, |
| 55 |
-+ /usr/share/edk2-ovmf/** r, |
| 56 |
- |
| 57 |
- # access PKI infrastructure |
| 58 |
- /etc/pki/libvirt-vnc/** r, |
| 59 |
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper |
| 60 |
-similarity index 92% |
| 61 |
-rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper |
| 62 |
-rename to examples/apparmor/usr.libexec.virt-aa-helper |
| 63 |
-index bd6181d00..4086f140a 100644 |
| 64 |
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper |
| 65 |
-+++ b/examples/apparmor/usr.libexec.virt-aa-helper |
| 66 |
-@@ -1,7 +1,7 @@ |
| 67 |
- # Last Modified: Mon Apr 5 15:10:27 2010 |
| 68 |
- #include <tunables/global> |
| 69 |
- |
| 70 |
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { |
| 71 |
-+profile virt-aa-helper /usr/libexec/virt-aa-helper { |
| 72 |
- #include <abstractions/base> |
| 73 |
- |
| 74 |
- # needed for searching directories |
| 75 |
-@@ -32,7 +32,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { |
| 76 |
- deny /dev/mapper/ r, |
| 77 |
- deny /dev/mapper/* r, |
| 78 |
- |
| 79 |
-- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, |
| 80 |
-+ /usr/libexec/virt-aa-helper mr, |
| 81 |
- /{usr/,}sbin/apparmor_parser Ux, |
| 82 |
- |
| 83 |
- /etc/apparmor.d/libvirt/* r, |
| 84 |
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd |
| 85 |
-index 8d61d154e..656a5595b 100644 |
| 86 |
---- a/examples/apparmor/usr.sbin.libvirtd |
| 87 |
-+++ b/examples/apparmor/usr.sbin.libvirtd |
| 88 |
-@@ -84,8 +84,10 @@ |
| 89 |
- audit deny /sys/kernel/security/apparmor/.* rwxl, |
| 90 |
- /sys/kernel/security/apparmor/profiles r, |
| 91 |
- /usr/{lib,lib64}/libvirt/* PUxr, |
| 92 |
-- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix, |
| 93 |
-- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, |
| 94 |
-+ /usr/libexec/virt-aa-helper PUxr, |
| 95 |
-+ /usr/libexec/libvirt_lxc PUxr, |
| 96 |
-+ /usr/libexec/libvirt_parthelper ix, |
| 97 |
-+ /usr/libexec/libvirt_iohelper ix, |
| 98 |
- /etc/libvirt/hooks/** rmix, |
| 99 |
- /etc/xen/scripts/** rmix, |
| 100 |
- |
| 101 |
|
| 102 |
diff --git a/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch |
| 103 |
deleted file mode 100644 |
| 104 |
index 3e430cba1d2..00000000000 |
| 105 |
--- a/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch |
| 106 |
+++ /dev/null |
| 107 |
@@ -1,216 +0,0 @@ |
| 108 |
-From a365e2d5b4af1ab2be743773412fe265579a9a0b Mon Sep 17 00:00:00 2001 |
| 109 |
-Message-Id: <a365e2d5b4af1ab2be743773412fe265579a9a0b.1529989118.git.mprivozn@××××××.com> |
| 110 |
-From: Michal Privoznik <mprivozn@××××××.com> |
| 111 |
-Date: Tue, 26 Jun 2018 06:51:06 +0200 |
| 112 |
-Subject: [PATCH] gentoo: do not use sysconf |
| 113 |
- |
| 114 |
-Signed-off-by: Michal Privoznik <mprivozn@××××××.com> |
| 115 |
---- |
| 116 |
- src/Makefile.am | 29 ++++++----------------------- |
| 117 |
- src/locking/virtlockd.service.in | 3 +-- |
| 118 |
- src/logging/virtlogd.service.in | 3 +-- |
| 119 |
- src/remote/libvirtd.service.in | 3 +-- |
| 120 |
- tools/Makefile.am | 17 ++++------------- |
| 121 |
- tools/libvirt-guests.service.in | 2 +- |
| 122 |
- tools/libvirt-guests.sysconf | 7 +++++++ |
| 123 |
- 7 files changed, 21 insertions(+), 43 deletions(-) |
| 124 |
- |
| 125 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 126 |
-index db8c8ebd1a..63d7a9ca46 100644 |
| 127 |
---- a/src/Makefile.am |
| 128 |
-+++ b/src/Makefile.am |
| 129 |
-@@ -757,23 +757,6 @@ endif WITH_SETUID_RPC_CLIENT |
| 130 |
- |
| 131 |
- EXTRA_DIST += $(SYSCONF_FILES) |
| 132 |
- |
| 133 |
--install-sysconfig: |
| 134 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
| 135 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
| 136 |
-- do \ |
| 137 |
-- tgt=`basename $$f`; \ |
| 138 |
-- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ |
| 139 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
| 140 |
-- done |
| 141 |
-- |
| 142 |
--uninstall-sysconfig: |
| 143 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
| 144 |
-- do \ |
| 145 |
-- tgt=`basename $$f`; \ |
| 146 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
| 147 |
-- done |
| 148 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
| 149 |
-- |
| 150 |
- SYSVINIT_FILES_IN += \ |
| 151 |
- locking/virtlockd.init.in \ |
| 152 |
- $(NULL) |
| 153 |
-@@ -814,14 +797,14 @@ uninstall-logrotate: |
| 154 |
- endif ! WITH_LIBVIRTD |
| 155 |
- |
| 156 |
- if LIBVIRT_INIT_SCRIPT_RED_HAT |
| 157 |
--install-init:: $(SYSVINIT_FILES) install-sysconfig |
| 158 |
-+install-init:: $(SYSVINIT_FILES) |
| 159 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d |
| 160 |
- for f in $(SYSVINIT_FILES:%.init=%) ; \ |
| 161 |
- do \ |
| 162 |
- $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \ |
| 163 |
- done |
| 164 |
- |
| 165 |
--uninstall-init:: uninstall-sysconfig |
| 166 |
-+uninstall-init:: |
| 167 |
- rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) |
| 168 |
- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : |
| 169 |
- |
| 170 |
-@@ -859,14 +842,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) |
| 171 |
- BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) |
| 172 |
- DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) |
| 173 |
- |
| 174 |
--install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig |
| 175 |
-+install-systemd: $(SYSTEMD_UNIT_FILES) |
| 176 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
| 177 |
- for f in $(SYSTEMD_UNIT_FILES); \ |
| 178 |
- do \ |
| 179 |
- $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ |
| 180 |
- done |
| 181 |
- |
| 182 |
--uninstall-systemd: uninstall-sysconfig |
| 183 |
-+uninstall-systemd: |
| 184 |
- rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) |
| 185 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : |
| 186 |
- else ! LIBVIRT_INIT_SCRIPT_SYSTEMD |
| 187 |
-@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES) |
| 188 |
- if WITH_LIBVIRTD |
| 189 |
- if LIBVIRT_INIT_SCRIPT_UPSTART |
| 190 |
- |
| 191 |
--install-upstart: install-sysconfig |
| 192 |
-+install-upstart: |
| 193 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d |
| 194 |
- for f in $(UPSTART_FILES:%.upstart=%); \ |
| 195 |
- do \ |
| 196 |
-@@ -893,7 +876,7 @@ install-upstart: install-sysconfig |
| 197 |
- $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ |
| 198 |
- done |
| 199 |
- |
| 200 |
--uninstall-upstart: uninstall-sysconfig |
| 201 |
-+uninstall-upstart: |
| 202 |
- for f in $(UPSTART_FILES:%.upstart=%); \ |
| 203 |
- do \ |
| 204 |
- tgt=`basename $$f` ; \ |
| 205 |
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
| 206 |
-index 3c9d587032..2449b201d9 100644 |
| 207 |
---- a/src/locking/virtlockd.service.in |
| 208 |
-+++ b/src/locking/virtlockd.service.in |
| 209 |
-@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) |
| 210 |
- Documentation=https://libvirt.org |
| 211 |
- |
| 212 |
- [Service] |
| 213 |
--EnvironmentFile=-/etc/sysconfig/virtlockd |
| 214 |
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
| 215 |
-+ExecStart=@sbindir@/virtlockd |
| 216 |
- ExecReload=/bin/kill -USR1 $MAINPID |
| 217 |
- # Loosing the locks is a really bad thing that will |
| 218 |
- # cause the machine to be fenced (rebooted), so make |
| 219 |
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in |
| 220 |
-index 3d9ae36150..43736191d5 100644 |
| 221 |
---- a/src/logging/virtlogd.service.in |
| 222 |
-+++ b/src/logging/virtlogd.service.in |
| 223 |
-@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) |
| 224 |
- Documentation=https://libvirt.org |
| 225 |
- |
| 226 |
- [Service] |
| 227 |
--EnvironmentFile=-/etc/sysconfig/virtlogd |
| 228 |
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
| 229 |
-+ExecStart=@sbindir@/virtlogd |
| 230 |
- ExecReload=/bin/kill -USR1 $MAINPID |
| 231 |
- # Loosing the logs is a really bad thing that will |
| 232 |
- # cause the machine to be fenced (rebooted), so make |
| 233 |
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in |
| 234 |
-index 7f689e08a8..239beeced9 100644 |
| 235 |
---- a/src/remote/libvirtd.service.in |
| 236 |
-+++ b/src/remote/libvirtd.service.in |
| 237 |
-@@ -22,8 +22,7 @@ Documentation=https://libvirt.org |
| 238 |
- |
| 239 |
- [Service] |
| 240 |
- Type=notify |
| 241 |
--EnvironmentFile=-/etc/sysconfig/libvirtd |
| 242 |
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
| 243 |
-+ExecStart=@sbindir@/libvirtd |
| 244 |
- ExecReload=/bin/kill -HUP $MAINPID |
| 245 |
- KillMode=process |
| 246 |
- Restart=on-failure |
| 247 |
-diff --git a/tools/Makefile.am b/tools/Makefile.am |
| 248 |
-index 1452d984a0..cef08741cb 100644 |
| 249 |
---- a/tools/Makefile.am |
| 250 |
-+++ b/tools/Makefile.am |
| 251 |
-@@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \ |
| 252 |
- uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ |
| 253 |
- uninstall-bash-completion |
| 254 |
- |
| 255 |
--install-sysconfig: |
| 256 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
| 257 |
-- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
| 258 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
| 259 |
-- |
| 260 |
--uninstall-sysconfig: |
| 261 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
| 262 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: |
| 263 |
-- |
| 264 |
- EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in |
| 265 |
- |
| 266 |
- install-initscript: libvirt-guests.init |
| 267 |
-@@ -359,8 +350,8 @@ uninstall-initscript: |
| 268 |
- |
| 269 |
- if LIBVIRT_INIT_SCRIPT_RED_HAT |
| 270 |
- BUILT_SOURCES += libvirt-guests.init |
| 271 |
--install-init: install-sysconfig install-initscript |
| 272 |
--uninstall-init: uninstall-sysconfig uninstall-initscript |
| 273 |
-+install-init: install-initscript |
| 274 |
-+uninstall-init: uninstall-initscript |
| 275 |
- else ! LIBVIRT_INIT_SCRIPT_RED_HAT |
| 276 |
- install-init: |
| 277 |
- uninstall-init: |
| 278 |
-@@ -391,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in |
| 279 |
- SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
| 280 |
- |
| 281 |
- if LIBVIRT_INIT_SCRIPT_SYSTEMD |
| 282 |
--install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
| 283 |
-+install-systemd: libvirt-guests.service libvirt-guests.sh |
| 284 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
| 285 |
- $(INSTALL_DATA) libvirt-guests.service \ |
| 286 |
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
| 287 |
- |
| 288 |
--uninstall-systemd: uninstall-sysconfig |
| 289 |
-+uninstall-systemd: |
| 290 |
- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
| 291 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: |
| 292 |
- |
| 293 |
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
| 294 |
-index 491ca62138..f0f417bffb 100644 |
| 295 |
---- a/tools/libvirt-guests.service.in |
| 296 |
-+++ b/tools/libvirt-guests.service.in |
| 297 |
-@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) |
| 298 |
- Documentation=https://libvirt.org |
| 299 |
- |
| 300 |
- [Service] |
| 301 |
--EnvironmentFile=-/etc/sysconfig/libvirt-guests |
| 302 |
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
| 303 |
- # Hack just call traditional service until we factor |
| 304 |
- # out the code |
| 305 |
- ExecStart=@libexecdir@/libvirt-guests.sh start |
| 306 |
-diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf |
| 307 |
-index 669b046507..45b0b9ea46 100644 |
| 308 |
---- a/tools/libvirt-guests.sysconf |
| 309 |
-+++ b/tools/libvirt-guests.sysconf |
| 310 |
-@@ -1,3 +1,10 @@ |
| 311 |
-+# |
| 312 |
-+# Warning: This configuration file is only sourced by the systemd |
| 313 |
-+# libvirt-guests.service unit. The coresponding openrc facility is in |
| 314 |
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
| 315 |
-+# |
| 316 |
-+ |
| 317 |
-+ |
| 318 |
- # URIs to check for running guests |
| 319 |
- # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' |
| 320 |
- #URIS=default |
| 321 |
--- |
| 322 |
-2.16.4 |
| 323 |
- |
Archives