[Pkg-libvirt-commits] [libvirt] 03/07: Update patches:
Guido Guenther
agx at alioth.debian.org
Thu Aug 29 18:46:55 UTC 2013
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.1.2_rc1-1
in repository libvirt.
commit 6c162e3f517cd95a023e12016ac969b4192d6f7f
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Aug 29 18:24:52 2013 +0200
Update patches:
Drop virGetGroupList-always-include-the-primary-group.patch applied
upstream.
---
.../Don-t-fail-if-we-can-t-setup-avahi.patch | 4 +-
...duce-udevadm-settle-timeout-to-10-seconds.patch | 4 +-
.../Allow-libvirt-group-to-access-the-socket.patch | 4 +-
.../debian/Debianize-systemd-service-files.patch | 4 +-
.../Don-t-enable-default-network-on-boot.patch | 8 +--
debian/patches/debian/remove-RHism.diff.patch | 2 +-
debian/patches/series | 1 -
...roupList-always-include-the-primary-group.patch | 73 --------------------
8 files changed, 13 insertions(+), 87 deletions(-)
diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
index 1d3c8db..599c8e0 100644
--- a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -7,10 +7,10 @@ Subject: Don't fail if we can't setup avahi
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index cb770c3..8c15d41 100644
+index 2306e10..05ae649 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
-@@ -1055,8 +1055,7 @@ void virNetServerRun(virNetServerPtr srv)
+@@ -1070,8 +1070,7 @@ void virNetServerRun(virNetServerPtr srv)
virObjectLock(srv);
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index fabb7bc..9629192 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index adcdb3c..328e36e 100644
+index 34f5998..d4c4c9c 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1398,7 +1398,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1432,7 +1432,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index 42acb59..ecc2bd0 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
@@ -8,7 +8,7 @@ Subject: Allow libvirt group to access the socket
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index af4493e..61d08e3 100644
+index 5353927..6632dde 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
@@ -48,7 +48,7 @@ index af4493e..61d08e3 100644
# Change the authentication scheme for TCP sockets.
#
diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
-index 4e3b878..e213f63 100644
+index a7e8515..acd0667 100644
--- a/daemon/test_libvirtd.aug.in
+++ b/daemon/test_libvirtd.aug.in
@@ -9,12 +9,8 @@ module Test_libvirtd =
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 194b6a2..f1f5043 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -8,7 +8,7 @@ Subject: Debianize systemd service files
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index aa5913b..bc4b728 100644
+index 25979ef..ae7bf8e 100644
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
@@ -11,8 +11,8 @@ After=dbus.service
@@ -21,7 +21,7 @@ index aa5913b..bc4b728 100644
+ExecStart=@sbindir@/libvirtd $libvirtd_opts
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
- # Override the maximum number of opened files
+ Restart=on-failure
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
index d41bf2b..35c9959 100644
--- a/tools/libvirt-guests.service.in
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index 0ca4d4f..5041851 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -10,10 +10,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 62e427e..57cbceb 100644
+index d8b943d..755e07a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2362,9 +2362,6 @@ if WITH_NETWORK
+@@ -2423,9 +2423,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
$(DESTDIR)$(confdir)/qemu/networks/default.xml && \
rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -24,10 +24,10 @@ index 62e427e..57cbceb 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index b14c682..540d1c0 100644
+index bb52eb3..99ab81f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -8079,9 +8079,6 @@ install-data-local: install-init install-systemd
+@@ -8195,9 +8195,6 @@ install-data-local: install-init install-systemd
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 69b9a80..f2dc516 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 3ff6da1..e3d9a4a 100644
+index 0ae5178..8c5ec0a 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/series b/debian/patches/series
index f0d885e..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
Reduce-udevadm-settle-timeout-to-10-seconds.patch
debian/Debianize-systemd-service-files.patch
Allow-xen-toolstack-to-find-it-s-binaries.patch
-virGetGroupList-always-include-the-primary-group.patch
diff --git a/debian/patches/virGetGroupList-always-include-the-primary-group.patch b/debian/patches/virGetGroupList-always-include-the-primary-group.patch
deleted file mode 100644
index 05d33a8..0000000
--- a/debian/patches/virGetGroupList-always-include-the-primary-group.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 5 Aug 2013 11:07:27 +0200
-Subject: virGetGroupList: always include the primary group
-
-The change from initgroups to virGetGroupList/setgroups in
-cab36cfe71ba83b71e536ba5c98e596f02b697b0 dropped the primary group from
-processes group list iff the passed in group to virGetGroupList differs
-from the user's primary group.
-
-So always include the primary group to bring back the old behaviour.
-
-Debian has the kvm group as primary group but uses
-libvirt-qemu:libvirt-qemu as user:group to run the kvm process so
-without this change the /dev/kvm is inaccesible.
----
- src/util/virutil.c | 30 +++++++++++++++++++++---------
- 1 file changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 328e36e..247db14 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -972,29 +972,41 @@ virGetGroupID(const char *group, gid_t *gid)
- }
-
-
--/* Compute the list of supplementary groups associated with @uid, and
-- * including @gid in the list (unless it is -1), storing a malloc'd
-- * result into @list. Return the size of the list on success, or -1
-- * on failure with error reported and errno set. May not be called
-- * between fork and exec. */
-+/* Compute the list of groups (primary and supplemental) associated
-+ * with @uid, and including @gid in the list (unless it is -1), storing
-+ * a malloc'd result into @list. Return the size of the list on
-+ * success, or -1 on failure with error reported and errno set. May not
-+ * be called between fork and exec. */
- int
- virGetGroupList(uid_t uid, gid_t gid, gid_t **list)
- {
- int ret = -1;
- char *user = NULL;
-+ gid_t primary;
-
- *list = NULL;
- if (uid == (uid_t)-1)
- return 0;
-
-- if (virGetUserEnt(uid, &user,
-- gid == (gid_t)-1 ? &gid : NULL, NULL) < 0)
-+ if (virGetUserEnt(uid, &user, &primary, NULL) < 0)
- return -1;
-
-- ret = mgetgroups(user, gid, list);
-- if (ret < 0)
-+ ret = mgetgroups(user, primary, list);
-+ if (ret < 0) {
- virReportSystemError(errno,
- _("cannot get group list for '%s'"), user);
-+ goto cleanup;
-+ }
-+
-+ if (gid != (gid_t)-1) {
-+ if (VIR_REALLOC_N(*list, ++ret) < 0) {
-+ VIR_FREE(*list);
-+ goto cleanup;
-+ }
-+ (*list)[ret-1] = gid;
-+ }
-+
-+cleanup:
- VIR_FREE(user);
- return ret;
- }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git
More information about the Pkg-libvirt-commits
mailing list