[Pkg-voip-commits] r3155 - in libcommoncpp2/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-02-17 13:17:56 +0100 (Sat, 17 Feb 2007)
New Revision: 3155

Removed:
   libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch
Modified:
   libcommoncpp2/trunk/debian/changelog
Log:
* delete debian/patches/no_udp_reuseaddr.dpatch - incorporated
  upstream

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-02-17 12:11:45 UTC (rev 3154)
+++ libcommoncpp2/trunk/debian/changelog	2007-02-17 12:17:56 UTC (rev 3155)
@@ -6,8 +6,10 @@
     GNU/kFreeBSD
   * Remove ccgnu2-config.8 from debian/patches/01_debian.dpatch
   * Cleanup gnutls.dpatch for new upstream version
+  * delete debian/patches/no_udp_reuseaddr.dpatch - incorporated
+    upstream
 
- -- Mark Purcell <msp at debian.org>  Sat, 17 Feb 2007 12:10:58 +0000
+ -- Mark Purcell <msp at debian.org>  Sat, 17 Feb 2007 12:17:40 +0000
 
 libcommoncpp2 (1.5.3-4) unstable; urgency=low
 

Deleted: libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch	2007-02-17 12:11:45 UTC (rev 3154)
+++ libcommoncpp2/trunk/debian/patches/no_udp_reuseaddr.dpatch	2007-02-17 12:17:56 UTC (rev 3155)
@@ -1,59 +0,0 @@
-#! /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();