Rediff patches

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

@@ -13,7 +13,7 @@ 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 4f7b6d5..64f80fb 100644
+index bfa1952..bbc70e2 100644
 --- a/src/rpc/virnetsocket.c
 +++ b/src/rpc/virnetsocket.c
 @@ -844,6 +844,8 @@ int virNetSocketNewConnectSSH(const char *nodename,

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

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

@@ -8,7 +8,7 @@ Closes: #882979
  1 file changed, 1 insertion(+)
 
 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
+index 3c61f0f..2d43057 100644
 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -3,6 +3,7 @@

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

@@ -9,21 +9,21 @@ 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 999a91c..9bd8ab2 100644
+index 25f1b9d..f4e3fa5 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -13358,8 +13358,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+@@ -13372,8 +13372,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 && \
 -@WITH_NETWORK_TRUE@	  rm -f default.xml && \
 -@WITH_NETWORK_TRUE@	  $(LN_S) ../default.xml default.xml )
 +@WITH_NETWORK_TRUE@	  rm -f default.xml )
- 
- @WITH_NETWORK_TRUE@uninstall-data-network:
- @WITH_NETWORK_TRUE@	rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
+ @WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
+ @WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
+ @WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@	  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
 diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
-index 508c8c0..b0df5ec 100644
+index cbaaa7e..cb0228d 100644
 --- a/src/network/Makefile.inc.am
 +++ b/src/network/Makefile.inc.am
 @@ -85,8 +85,7 @@ install-data-network:
@@ -33,6 +33,6 @@ index 508c8c0..b0df5ec 100644
 -	  rm -f default.xml && \
 -	  $(LN_S) ../default.xml default.xml )
 +	  rm -f default.xml )
- 
- uninstall-data-network:
- 	rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
+ if WITH_FIREWALLD_ZONE
+ 	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
+ 	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \

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 ac52189..28d63e5 100644
+index 4dcdd12..94438db 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -110,7 +110,7 @@ then

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

@@ -9,17 +9,17 @@ As of 1.2.16 upstream ships a Polkit rule like Debian does.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 9bd8ab2..fb6d3c2 100644
+index f4e3fa5..99a185e 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -13403,12 +13403,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+@@ -13421,12 +13421,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)$(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@uninstall-polkit:
  @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
@@ -28,17 +28,17 @@ index 9bd8ab2..fb6d3c2 100644
  
  .PHONY: \
 diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
-index 0988435..1e4287b 100644
+index 3d0ff29..7835ed8 100644
 --- a/src/remote/Makefile.inc.am
 +++ b/src/remote/Makefile.inc.am
-@@ -219,12 +219,12 @@ install-polkit::
+@@ -219,12 +219,12 @@ install-polkit:
  		$(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
  	$(MKDIR_P) $(DESTDIR)$(polkitrulesdir)
  	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
 -		$(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
 +		$(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
  
- uninstall-polkit::
+ uninstall-polkit:
  	rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
  	rmdir $(DESTDIR)$(polkitactionsdir) || :
 -	rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules

debian/patches/debian/apparmor_profiles_local_include.patch

@@ -9,10 +9,10 @@ Include local apparmor profile
  2 files changed, 4 insertions(+)
 
 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
+index 78994bc..3c61f0f 100644
 --- 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 {
+@@ -66,5 +66,6 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
    /**.[iI][sS][oO] r,
    /**/disk{,.*} r,
  
@@ -20,10 +20,10 @@ index de94368..60c1d50 100644
    #include <local/usr.lib.libvirt.virt-aa-helper>
  }
 diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd
-index f0ffc53..c7c52c6 100644
+index 29f9936..a66452b 100644
 --- a/src/security/apparmor/usr.sbin.libvirtd
 +++ b/src/security/apparmor/usr.sbin.libvirtd
-@@ -128,4 +128,7 @@
+@@ -131,4 +131,7 @@ profile libvirtd /usr/sbin/libvirtd flags=(attach_disconnected) {
  
     /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,
    }