[Pkg-voip-commits] r8146 - in /libcommoncpp2/trunk/debian: changelog patches/00list patches/const_cast_conversion.dpatch

[msp at alioth.debian.org]

Author: msp
Date: Sat Mar  6 16:56:14 2010
New Revision: 8146

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8146
Log:
* Non-maintainer upload.
* Fix FTBFS due to invalid constant string to char* conversion in
  src/cidr.cpp (added const_cast_conversion.dpatch) (Closes: #560463)

Added:
    libcommoncpp2/trunk/debian/patches/const_cast_conversion.dpatch
Modified:
    libcommoncpp2/trunk/debian/changelog
    libcommoncpp2/trunk/debian/patches/00list

Modified: libcommoncpp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/changelog?rev=8146&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/changelog (original)
+++ libcommoncpp2/trunk/debian/changelog Sat Mar  6 16:56:14 2010
@@ -7,6 +7,14 @@
     used.
 
  -- Mark Purcell <msp at debian.org>  Sun, 07 Mar 2010 03:51:03 +1100
+
+libcommoncpp2 (1.7.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS due to invalid constant string to char* conversion in
+    src/cidr.cpp (added const_cast_conversion.dpatch) (Closes: #560463)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 01 Feb 2010 15:16:29 +0100
 
 libcommoncpp2 (1.7.3-1) unstable; urgency=low
 

Modified: libcommoncpp2/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/00list?rev=8146&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/00list (original)
+++ libcommoncpp2/trunk/debian/patches/00list Sat Mar  6 16:56:14 2010
@@ -1,2 +1,3 @@
 cleaning_doc.dpatch 
+const_cast_conversion.dpatch
 cstdlib_sparc.dpatch

Added: libcommoncpp2/trunk/debian/patches/const_cast_conversion.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/const_cast_conversion.dpatch?rev=8146&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/const_cast_conversion.dpatch (added)
+++ libcommoncpp2/trunk/debian/patches/const_cast_conversion.dpatch Sat Mar  6 16:56:14 2010
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## const_cast_conversion.dpatch by Mehdi Dogguy <mehdi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: constant string to char* conversion
+
+ at DPATCH@
+diff -urNad libcommoncpp2-1.7.3~/src/cidr.cpp libcommoncpp2-1.7.3/src/cidr.cpp
+--- libcommoncpp2-1.7.3~/src/cidr.cpp	2009-01-16 13:27:00.000000000 +0100
++++ libcommoncpp2-1.7.3/src/cidr.cpp	2010-02-01 15:15:53.000000000 +0100
+@@ -202,7 +202,7 @@
+ #if defined(_MSC_VER) && _MSC_VER >= 1500
+ 	ep = (char *)strchr(cp, '/');
+ #else
+- 	ep = strchr(cp, '/');
++ 	ep = strchr(const_cast<char *>(cp), '/');
+ #endif
+ 
+ 	if(ep)
+@@ -332,7 +332,7 @@
+ 	memset(&netmask, 0, sizeof(netmask));
+ 	bitset((bit_t *)&netmask, getMask(cp));
+ 	setString(cbuf, sizeof(cbuf), cp);
+-	ep = strchr(cp, '/');
++	ep = strchr(const_cast<char *>(cp), '/');
+ 	if(ep)
+ 		*ep = 0;
+