[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.3.0-2-4-gec94d30

[Guido Günther]

The following commit has been merged in the master branch:
commit b763c6a96cace0ae45d25992da4697a84b27fc2f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon May 2 21:43:25 2011 +0200

    New patch 0001-Define-semun-on-KFreeBSD.patch
    
    Define semun on KFreeBSD
    
    Closes: #621889
    Thanks: Martin G. Loschwitz

diff --git a/debian/patches/0001-Define-semun-on-KFreeBSD.patch b/debian/patches/0001-Define-semun-on-KFreeBSD.patch
new file mode 100644
index 0000000..2e4faf8
--- /dev/null
+++ b/debian/patches/0001-Define-semun-on-KFreeBSD.patch
@@ -0,0 +1,29 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 2 May 2011 21:42:49 +0200
+Subject: Define semun on KFreeBSD
+
+---
+ lib/coroipcc.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/lib/coroipcc.c b/lib/coroipcc.c
+index bbeb95f..bc161fb 100644
+--- a/lib/coroipcc.c
++++ b/lib/coroipcc.c
+@@ -572,6 +572,15 @@ coroipcc_service_connect (
+ 	struct ipc_instance *ipc_instance;
+ #if _POSIX_THREAD_PROCESS_SHARED < 1
+ 	key_t semkey = 0;
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++        union semun
++        {
++                int val;
++                struct semid_ds *buf;
++                unsigned short int *array;
++                struct seminfo *__buf;
++        };
++#endif
+ 	union semun semun;
+ #endif
+ 	int sys_res;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cafdc53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Define-semun-on-KFreeBSD.patch

-- 
corosync Debian packaging