[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.5-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 36865044eab8670c0d1dbed0caaf2443151bb598
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri May 3 06:23:07 2013 +0200

    virInitctlRequest: Don't hardcode 384 bytes size
    
    another kFreeBSD build fix

diff --git a/debian/patches/series b/debian/patches/series
index 6079eb3..7a3fd87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
 virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
 Add-sanitytest.py.patch
+virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
diff --git a/debian/patches/virInitctlRequest-Don-t-hardcode-384-bytes-size.patch b/debian/patches/virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
new file mode 100644
index 0000000..1956533
--- /dev/null
+++ b/debian/patches/virInitctlRequest-Don-t-hardcode-384-bytes-size.patch
@@ -0,0 +1,27 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 1 May 2013 22:35:44 +0200
+Subject: virInitctlRequest: Don't hardcode 384 bytes size
+
+When MAXHOSTNAMELEN is set we have to take it's value into account.
+Otherwise the build fails on kFreeBSD (FreeBSD kernel and GNU userland)
+---
+ src/util/virinitctl.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
+index 1618ffa..9a3e8a3 100644
+--- a/src/util/virinitctl.c
++++ b/src/util/virinitctl.c
+@@ -103,7 +103,11 @@ struct virInitctlRequest {
+     } i;
+ };
+ 
+-verify(sizeof(struct virInitctlRequest) == 384);
++# ifdef MAXHOSTNAMELEN
++  verify(sizeof(struct virInitctlRequest) == 320 + MAXHOSTNAMELEN);
++# else
++  verify(sizeof(struct virInitctlRequest) == 384);
++#endif
+ 
+ /*
+  * Send a message to init to change the runlevel

-- 
Libvirt Debian packaging