Rediff patches

debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch

@@ -13,10 +13,10 @@ require the 'TERM' environment variable to be set to the terminal type.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 55de3b2..743e4f8 100644
+index 4f7b6d5..64f80fb 100644
 --- a/src/rpc/virnetsocket.c
 +++ b/src/rpc/virnetsocket.c
-@@ -846,6 +846,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
+@@ -844,6 +844,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
      virCommandAddEnvPassBlockSUID(cmd, "KRB5CCNAME", NULL);
      virCommandAddEnvPassBlockSUID(cmd, "SSH_AUTH_SOCK", NULL);
      virCommandAddEnvPassBlockSUID(cmd, "SSH_ASKPASS", NULL);

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 974cffc..c1dd2e9 100644
+index 5251b66..8093ace 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1629,7 +1629,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1626,7 +1626,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
  void virWaitForDevices(void)
  {
  # ifdef UDEVADM

debian/patches/Skip-vircgrouptest.patch

@@ -9,10 +9,10 @@ without sysfs mounted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index ea352c1..9240460 100644
+index 20f4c57..76108ae 100644
 --- a/tests/vircgrouptest.c
 +++ b/tests/vircgrouptest.c
-@@ -22,7 +22,7 @@
+@@ -20,7 +20,7 @@
  
  #include "testutils.h"
  
@@ -20,4 +20,4 @@ index ea352c1..9240460 100644
 +#if defined HAVE_SYSFS_MOCK
  
  
- # define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+ # define LIBVIRT_VIRCGROUPPRIV_H_ALLOW

debian/patches/apparmor-Allow-virt-aa-helper-to-access-the-name-service-.patch

@@ -4,13 +4,13 @@ Subject: apparmor: Allow virt-aa-helper to access the name service switch
 
 Closes: #882979
 ---
- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 1 +
+ src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 index 60c1d50..665094a 100644
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
++++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -3,6 +3,7 @@
  
  profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 001798e..42606ef 100644
+index 999a91c..9bd8ab2 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -13301,8 +13301,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+@@ -13358,8 +13358,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
  @WITH_NETWORK_TRUE@	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

debian/patches/debian/Prefer-sbin-over-usr-sbin.patch

@@ -11,7 +11,7 @@ Closes: #895145
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index d793431..dc5b687 100644
+index ac52189..28d63e5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -110,7 +110,7 @@ then

debian/patches/debian/Use-upstreams-polkit-rule.patch

@@ -4,58 +4,45 @@ Subject: Use upstreams polkit rule
 
 As of 1.2.16 upstream ships a Polkit rule like Debian does.
 ---
- src/Makefile.am            | 1 -
  src/Makefile.in            | 4 ++--
  src/remote/Makefile.inc.am | 4 ++--
- 3 files changed, 4 insertions(+), 5 deletions(-)
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 33ff280..075a990 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -810,7 +810,6 @@ else ! WITH_LIBVIRTD
- install-logrotate:
- uninstall-logrotate:
- endif ! WITH_LIBVIRTD
--
- if LIBVIRT_INIT_SCRIPT_RED_HAT
- install-init:: $(SYSVINIT_FILES) install-sysconfig
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 42606ef..cdc372b 100644
+index 9bd8ab2..fb6d3c2 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -13350,12 +13350,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(policydir)/org.libvirt.unix.policy
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d
+@@ -13403,12 +13403,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(MKDIR_P) $(DESTDIR)$(polkitrulesdir)
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
--@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
-+@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(datadir)/polkit-1/rules.d/60-libvirt.rules
+-@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
++@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
  
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@uninstall-polkit::
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rmdir $(DESTDIR)$(policydir) || :
--@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
-+@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/60-libvirt.rules
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || :
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rmdir $(DESTDIR)$(polkitactionsdir) || :
+-@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
++@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
+ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rmdir $(DESTDIR)$(polkitrulesdir) || :
  
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_FALSE@install-polkit::
+ .PHONY: \
 diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
-index eb8d6fe..9467eaf 100644
+index 0988435..1e4287b 100644
 --- a/src/remote/Makefile.inc.am
 +++ b/src/remote/Makefile.inc.am
-@@ -218,12 +218,12 @@ install-polkit::
- 		$(DESTDIR)$(policydir)/org.libvirt.unix.policy
- 	$(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d
+@@ -219,12 +219,12 @@ install-polkit::
+ 		$(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
+ 	$(MKDIR_P) $(DESTDIR)$(polkitrulesdir)
  	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
--		$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
-+		$(DESTDIR)$(datadir)/polkit-1/rules.d/60-libvirt.rules
+-		$(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
++		$(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
  
  uninstall-polkit::
- 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- 	rmdir $(DESTDIR)$(policydir) || :
--	rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
-+	rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/60-libvirt.rules
- 	rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || :
+ 	rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
+ 	rmdir $(DESTDIR)$(polkitactionsdir) || :
+-	rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
++	rm -f $(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
+ 	rmdir $(DESTDIR)$(polkitrulesdir) || :
  
- else ! WITH_POLKIT
+ INSTALL_DATA_LOCAL += install-polkit

debian/patches/debian/apparmor_profiles_local_include.patch

@@ -4,14 +4,14 @@ Subject: apparmor_profiles_local_include
 
 Include local apparmor profile
 ---
- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 1 +
- examples/apparmor/usr.sbin.libvirtd              | 3 +++
+ src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 1 +
+ src/security/apparmor/usr.sbin.libvirtd              | 3 +++
  2 files changed, 4 insertions(+)
 
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 index de94368..60c1d50 100644
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
++++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -63,5 +63,6 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
    /**.[iI][sS][oO] r,
    /**/disk{,.*} r,
@@ -19,10 +19,10 @@ index de94368..60c1d50 100644
 +  # Site-specific additions and overrides. See local/README for details.
    #include <local/usr.lib.libvirt.virt-aa-helper>
  }
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
+diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd
 index f0ffc53..c7c52c6 100644
---- a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
+--- a/src/security/apparmor/usr.sbin.libvirtd
++++ b/src/security/apparmor/usr.sbin.libvirtd
 @@ -128,4 +128,7 @@
  
     /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,

debian/patches/openpty-Skip-test-if-no-pty-is-available.patch

@@ -12,7 +12,7 @@ Works around #817236
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/gnulib/tests/test-openpty.c b/gnulib/tests/test-openpty.c
-index 4b9f675..bb3a5c6 100644
+index 267b403..c300938 100644
 --- a/gnulib/tests/test-openpty.c
 +++ b/gnulib/tests/test-openpty.c
 @@ -25,6 +25,7 @@

debian/patches/test-posix_openpt-don-t-fail-on-EACCESS.patch

@@ -10,7 +10,7 @@ Works around #817236
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gnulib/tests/test-posix_openpt.c b/gnulib/tests/test-posix_openpt.c
-index a2dfb03..2fe4462 100644
+index 32f518c..f55d281 100644
 --- a/gnulib/tests/test-posix_openpt.c
 +++ b/gnulib/tests/test-posix_openpt.c
 @@ -43,7 +43,7 @@ main (void)