[Pkg-libvirt-commits] [libvirt] 04/05: Rediff patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.20-1
in repository libvirt.

commit c0ad56188d8f332df5745fc3504111c306df033c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Oct 14 17:35:07 2015 +0200

    Rediff patches
    
    Dropped Use-daemon-log-facility-for-journald.patch: <REASON>
---
 .../Use-daemon-log-facility-for-journald.patch     | 24 ----------------------
 .../Don-t-enable-default-network-on-boot.patch     |  6 +++---
 debian/patches/debian/remove-RHism.diff.patch      |  2 +-
 ...onitorTextGetMigrationStatus-to-intercept.patch |  2 +-
 debian/patches/series                              |  1 -
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/patches/Use-daemon-log-facility-for-journald.patch b/debian/patches/Use-daemon-log-facility-for-journald.patch
deleted file mode 100644
index a73a991..0000000
--- a/debian/patches/Use-daemon-log-facility-for-journald.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 21 Sep 2015 20:06:55 +0200
-Subject: Use daemon log facility for journald
-
-otherwise messages end up in /var/log/kern.log if journald forwards to
-syslog.
-
-Closes: #799633
----
- src/util/virlog.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util/virlog.c b/src/util/virlog.c
-index b45ee91..627f4cb 100644
---- a/src/util/virlog.c
-+++ b/src/util/virlog.c
-@@ -920,6 +920,7 @@ virLogOutputToJournald(virLogSourcePtr source,
-     journalAddString(&state, "MESSAGE", rawstr);
-     journalAddInt(&state, "PRIORITY",
-                   virLogPrioritySyslog(priority));
-+    journalAddInt(&state, "SYSLOG_FACILITY", LOG_DAEMON);
-     journalAddString(&state, "LIBVIRT_SOURCE", source->name);
-     if (filename)
-         journalAddString(&state, "CODE_FILE", filename);
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 422ab24..819e1eb 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
@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 4291375..d5440c4 100644
+index 07d5879..5156d9b 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2840,9 +2840,6 @@ if WITH_NETWORK
+@@ -2841,9 +2841,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; }
@@ -23,7 +23,7 @@ index 4291375..d5440c4 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 3e164c9..de72e91 100644
+index 4cf6dd1..5e0937d 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -10588,9 +10588,6 @@ install-data-local: install-init install-systemd
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index bb28657..81ce9b5 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 83c445d3..fceab91 100644
+index 0212e7a..3739f9d 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 4023594..426f0cc 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index d5ef089..7e39a9d 100644
+index f44da20..039e023 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
 @@ -1471,7 +1471,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
diff --git a/debian/patches/series b/debian/patches/series
index 1cd8d85..a1b31c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ debian/Use-upstreams-polkit-rule.patch
 Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
-Use-daemon-log-facility-for-journald.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git