[SCM] crtmpserver/master: Update the kfreebsd platform specific header to unbreak compilation, Closes: #713515

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 80521b2129bdf9ffd068b1f5f27a4054a8adfcb3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 23 18:29:53 2013 +0200

    Update the kfreebsd platform specific header to unbreak compilation, Closes: #713515
    
    It seems that the "dfreebsd" platform requires some updates to allow compilation on
    (modern?) kfreebsd systems.

diff --git a/debian/patches/21_fix_ftbfs_kfreebsd.diff b/debian/patches/21_fix_ftbfs_kfreebsd.diff
new file mode 100644
index 0000000..9ebadc7
--- /dev/null
+++ b/debian/patches/21_fix_ftbfs_kfreebsd.diff
@@ -0,0 +1,42 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: Update the kfreebsd platform specific header to unbreak compilation
+Forwarded-Upstream: not-yet
+Bug-Debian: http://bugs.debian.org/713840
+
+It seems that the "dfreebsd" platform requires some updates to allow compilation on
+(modern?) kfreebsd systems.
+
+Index: crtmpserver/common/include/platform/dfreebsd/dfreebsdplatform.h
+===================================================================
+--- crtmpserver.orig/common/include/platform/dfreebsd/dfreebsdplatform.h	2013-06-23 16:23:56.000000000 +0000
++++ crtmpserver/common/include/platform/dfreebsd/dfreebsdplatform.h	2013-06-23 16:23:56.000000000 +0000
+@@ -48,6 +48,7 @@
+ #include <sstream>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <unistd.h>
+ #include <string>
+ #include <sys/event.h>
+ #include <sys/mman.h>
+@@ -79,8 +80,10 @@
+ #define WRITE_FD write
+ #define SOCKET int32_t
+ #define LASTSOCKETERROR					errno
+-#define SOCKERROR_CONNECT_IN_PROGRESS	EINPROGRESS
+-#define SOCKERROR_SEND_IN_PROGRESS		EAGAIN
++#define SOCKERROR_EINPROGRESS			EINPROGRESS
++#define SOCKERROR_EAGAIN				EAGAIN
++#define SOCKERROR_ECONNRESET			ECONNRESET
++#define SOCKERROR_ENOBUFS				ENOBUFS
+ #define LIB_HANDLER void *
+ #define FREE_LIBRARY(libHandler) dlclose((libHandler))
+ #define LOAD_LIBRARY(file,flags) dlopen((file), (flags))
+@@ -156,7 +159,7 @@
+ #define IOVEC iovec
+ #define MSGHDR_MSG_IOV msg_iov
+ #define MSGHDR_MSG_IOVLEN msg_iovlen
+-#define MSGHDR_MSG_IOVLEN_TYPE size_t
++#define MSGHDR_MSG_IOVLEN_TYPE int
+ #define MSGHDR_MSG_NAME msg_name
+ #define MSGHDR_MSG_NAMELEN msg_namelen
+ #define IOVEC_IOV_BASE iov_base
diff --git a/debian/patches/series b/debian/patches/series
index a132500..7c7b60a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 16_add_header_install.diff
 18_enable_cmake_find_default_paths.diff
 20_use_pkgconfig_for_tinyxml.diff
+21_fix_ftbfs_kfreebsd.diff

-- 
crtmpserver packaging