[med-svn] r15479 - in trunk/packages/socket++/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-12-10 10:59:56 +0000 (Tue, 10 Dec 2013)
New Revision: 15479

Added:
   trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch
Modified:
   trunk/packages/socket++/trunk/debian/changelog
   trunk/packages/socket++/trunk/debian/patches/series
Log:
Prepare next upload

Modified: trunk/packages/socket++/trunk/debian/changelog
===================================================================
--- trunk/packages/socket++/trunk/debian/changelog	2013-12-10 09:34:43 UTC (rev 15478)
+++ trunk/packages/socket++/trunk/debian/changelog	2013-12-10 10:59:56 UTC (rev 15479)
@@ -1,3 +1,9 @@
+socket++ (1.12.13-2) unstable; urgency=low
+
+  * Fix compilation on hurd/kFreeBSD
+
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 10 Dec 2013 11:58:39 +0100
+
 socket++ (1.12.13-1) unstable; urgency=low
 
   * Initial release. (Closes: #278940)

Added: trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch	                        (rev 0)
+++ trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch	2013-12-10 10:59:56 UTC (rev 15479)
@@ -0,0 +1,30 @@
+Description: Fix compilation issue on kFreeBSD and HURD
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+Index: socket++-1.12.13/socket++/local.h
+===================================================================
+--- socket++-1.12.13.orig/socket++/local.h	2013-12-10 11:53:17.000000000 +0100
++++ socket++-1.12.13/socket++/local.h	2013-12-10 11:54:26.000000000 +0100
+@@ -91,7 +91,7 @@
+ 
+ #if !(defined (__linux__) || defined(__FreeBSD__))
+   extern "C" int gethostname (char* hostname, int len);
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
+   extern char* SYS_SIGLIST [];
+ #endif
+ #endif
+Index: socket++-1.12.13/socket++/sockstream.cpp
+===================================================================
+--- socket++-1.12.13.orig/socket++/sockstream.cpp	2013-12-10 11:56:48.000000000 +0100
++++ socket++-1.12.13/socket++/sockstream.cpp	2013-12-10 11:57:23.000000000 +0100
+@@ -232,7 +232,7 @@
+   case EWOULDBLOCK:
+ // On FreeBSD (and probably on Linux too) 
+ // EAGAIN has the same value as EWOULDBLOCK
+-#if !defined(__linux__) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) // LN
++#if defined(EAGAIN) && (EAGAIN != EWOULDBLOCK)
+   case EAGAIN:
+ #endif
+     return true;

Modified: trunk/packages/socket++/trunk/debian/patches/series
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/series	2013-12-10 09:34:43 UTC (rev 15478)
+++ trunk/packages/socket++/trunk/debian/patches/series	2013-12-10 10:59:56 UTC (rev 15479)
@@ -1 +1,2 @@
 fixinfo.patch
+kfreebsd.patch