[Pkg-voip-commits] r2636 - in libcommoncpp2/trunk/debian: . patches
Mikael Magnusson
mikma-guest at costa.debian.org
Wed Oct 25 07:55:40 UTC 2006
Author: mikma-guest
Date: 2006-10-25 07:55:39 +0000 (Wed, 25 Oct 2006)
New Revision: 2636
Added:
libcommoncpp2/trunk/debian/patches/gnutls.dpatch
libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch
Modified:
libcommoncpp2/trunk/debian/changelog
libcommoncpp2/trunk/debian/patches/00list
Log:
* Link libccext2 against ssl libraries
* Disable REUSEADDR on UDP sockets
Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog 2006-10-25 05:48:43 UTC (rev 2635)
+++ libcommoncpp2/trunk/debian/changelog 2006-10-25 07:55:39 UTC (rev 2636)
@@ -1,9 +1,14 @@
libcommoncpp2 (1.5.1-2) UNRELEASED; urgency=low
+ [ Mark Purcell ]
* NOT RELEASED YET
- -- Mark Purcell <msp at debian.org> Sun, 22 Oct 2006 21:27:10 +0100
+ [ Mikael Magnusson ]
+ * Link libccext2 against ssl libraries
+ * Disable REUSEADDR on UDP sockets
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Wed, 25 Oct 2006 09:41:42 +0200
+
libcommoncpp2 (1.5.1-1) unstable; urgency=low
* New upstream release
Modified: libcommoncpp2/trunk/debian/patches/00list
===================================================================
--- libcommoncpp2/trunk/debian/patches/00list 2006-10-25 05:48:43 UTC (rev 2635)
+++ libcommoncpp2/trunk/debian/patches/00list 2006-10-25 07:55:39 UTC (rev 2636)
@@ -1,2 +1,4 @@
01_debian
#bug360492.dpatch
+gnutls
+no_udp_reuseaddr
Added: libcommoncpp2/trunk/debian/patches/gnutls.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/gnutls.dpatch (rev 0)
+++ libcommoncpp2/trunk/debian/patches/gnutls.dpatch 2006-10-25 07:55:39 UTC (rev 2636)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gnutls.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: libccext2 need to be linked against ssl libraries,
+## DP: but the ssl libs don't need to be added to the pkg-config file.
+
+ at DPATCH@
+diff -urNad libcommoncpp2-1.5.1~/src/Makefile.am libcommoncpp2-1.5.1/src/Makefile.am
+--- libcommoncpp2-1.5.1~/src/Makefile.am 2006-09-30 18:41:53.000000000 +0200
++++ libcommoncpp2-1.5.1/src/Makefile.am 2006-10-25 09:06:10.000000000 +0200
+@@ -45,7 +45,7 @@
+ cidr.cpp private.h nat.h
+
+ if EXTRAS
+-libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
++libccext2_la_LIBADD = @BASE_LIB@ @SSL_LIBS@ @THREAD_LIBS@
+ libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+
+ if GETOPT_LONG
+diff -urNad libcommoncpp2-1.5.1~/src/Makefile.in libcommoncpp2-1.5.1/src/Makefile.in
+--- libcommoncpp2-1.5.1~/src/Makefile.in 2006-10-07 20:14:54.000000000 +0200
++++ libcommoncpp2-1.5.1/src/Makefile.in 2006-10-25 09:06:10.000000000 +0200
+@@ -324,7 +324,7 @@
+ nat.cpp runlist.cpp assoc.cpp pointer.cpp linked.cpp map.cpp \
+ cidr.cpp private.h nat.h
+
+- at EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
++ at EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @SSL_LIBS@ @THREAD_LIBS@
+ @EXTRAS_TRUE at libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ @EXTRAS_TRUE@@GETOPT_LONG_TRUE at optincludedir = $(includedir)/cc++2
+ @EXTRAS_TRUE@@GETOPT_LONG_TRUE at optinclude_HEADERS = getopt.h
+diff -urNad libcommoncpp2-1.5.1~/src/libccext2.pc.in libcommoncpp2-1.5.1/src/libccext2.pc.in
+--- libcommoncpp2-1.5.1~/src/libccext2.pc.in 2006-10-01 15:01:41.000000000 +0200
++++ libcommoncpp2-1.5.1/src/libccext2.pc.in 2006-10-25 09:06:10.000000000 +0200
+@@ -8,6 +8,6 @@
+ Description: GNU Common C++ Extension library
+ Version: @VERSION@
+ Requires: libccgnu2 = @VERSION@
+-Libs: -lccext2 @GETOPT_LIBS@ @SSL_LIBS@
++Libs: -lccext2 @GETOPT_LIBS@
+
+
Property changes on: libcommoncpp2/trunk/debian/patches/gnutls.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch (rev 0)
+++ libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch 2006-10-25 07:55:39 UTC (rev 2636)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_udp_reuseaddr.dpatch by Mikael Magnusson <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't enable SO_REUSEADDR on UDP sockets,
+## DP: it will enable two programs to bind to the same address and port.
+
+ at DPATCH@
+diff -ur libcommoncpp2-1.5.1.orig/src/socket.cpp libcommoncpp2-1.5.1/src/socket.cpp
+--- libcommoncpp2-1.5.1.orig/src/socket.cpp 2006-07-23 13:47:31.000000000 +0200
++++ libcommoncpp2-1.5.1/src/socket.cpp 2006-10-25 09:16:28.000000000 +0200
+@@ -1331,12 +1331,6 @@
+ return;
+ }
+
+-#if defined(SO_REUSEADDR)
+- int opt = 1;
+- setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt,
+- (socklen_t)sizeof(opt));
+-#endif
+-
+ first = list;
+
+ while(list)
+@@ -1434,12 +1428,6 @@
+ addr = (struct sockaddr *)&addr4;
+ }
+
+-#if defined(SO_REUSEADDR)
+- int opt = 1;
+- setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt,
+- (socklen_t)sizeof(opt));
+-#endif
+-
+ if(!bind(so, addr, alen))
+ state = BOUND;
+
+@@ -1478,10 +1466,6 @@
+ peer.ipv4.sin_family = AF_INET;
+ peer.ipv4.sin_addr = getaddress(ia);
+ peer.ipv4.sin_port = htons(port);
+-#if defined(SO_REUSEADDR)
+- int opt = 1;
+- setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
+-#endif
+ if(bind(so, (struct sockaddr *)&peer.ipv4, sizeof(peer.ipv4)))
+ {
+ endSocket();
+@@ -1500,10 +1484,6 @@
+ peer.ipv6.sin6_family = AF_INET6;
+ peer.ipv6.sin6_addr = getaddress(ia);
+ peer.ipv6.sin6_port = htons(port);
+-#if defined(SO_REUSEADDR)
+- int opt = 1;
+- setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, (socklen_t)sizeof(opt));
+-#endif
+ if(bind(so, (struct sockaddr *)&peer.ipv6, sizeof(peer.ipv6)))
+ {
+ endSocket();
More information about the Pkg-voip-commits
mailing list