Package: libcommoncpp2
Severity: important
Version: 1.5.3-2
Tags: patch
Hi,
the current version fails to build on GNU/kFreeBSD.
It needs small fix-up, see attached patch.
It would also be nice if you can ask upstream
to include this change.
Please, also drop "ccgnu2-config.8" chunk from
debian/patches/01_debian.dpatch, as it leads to
"reverting patch 01_debian from ./ ... failed" during rebuild.
Thanks in advance
Petr
only in patch2:
unchanged:
--- libcommoncpp2-1.5.3.orig/src/socket.cpp
+++ libcommoncpp2-1.5.3/src/socket.cpp
@@ -1616,7 +1616,7 @@
int retval = setsockopt(so, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char
*)&group, sizeof(group));
return errSuccess;
-#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) &&
!defined(__FreeBSD__) && !defined(_OSF_SOURCE) && !defined(__hpux) &&
!defined(__GNU__)
+#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) &&
!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE)
&& !defined(__hpux) && !defined(__GNU__)
struct ip_mreqn group;
struct sockaddr_in myaddr;
@@ -1656,7 +1656,7 @@
Socket::Error UDPSocket::getInterfaceIndex(const char *DeviceName,int&
InterfaceIndex)
{
#ifndef WIN32
-#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) &&
!defined(__FreeBSD__) && !defined(_OSF_SOURCE) && !defined(__hpux) &&
!defined(__GNU__)
+#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) &&
!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE)
&& !defined(__hpux) && !defined(__GNU__)
struct ip_mreqn mreqn;
struct ifreq m_ifreq;
