[Pkg-voip-commits] r9695 - in /libcommoncpp2/trunk/debian: changelog patches/fix_ciddr_ftbfs.dpatch patches/series

[msp at alioth.debian.org]

Author: msp
Date: Sat May 19 01:01:36 2012
New Revision: 9695

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9695
Log:
* Fix "Getting rid of unneeded *.la / emptying dependency_libs"
  added overide_dh_install (Closes: #633280)
* Fix "overwriting const argument in cidr::set" patch from Stefan Potyra
  (Closes: #547352)

Added:
    libcommoncpp2/trunk/debian/patches/fix_ciddr_ftbfs.dpatch
Modified:
    libcommoncpp2/trunk/debian/changelog
    libcommoncpp2/trunk/debian/patches/series

Modified: libcommoncpp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/changelog?rev=9695&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/changelog (original)
+++ libcommoncpp2/trunk/debian/changelog Sat May 19 01:01:36 2012
@@ -3,6 +3,10 @@
   * source/format -> 3.0 quilt
   * Switch to dh - drop cdbs/ dpatch
   * Fix gcc-4.7 FTBFS debian/patches/applog-inc-fcntl.patch
+  * Fix "Getting rid of unneeded *.la / emptying dependency_libs"
+    added overide_dh_install (Closes: #633280)
+  * Fix "overwriting const argument in cidr::set" patch from Stefan Potyra
+    (Closes: #547352)
 
  -- Mark Purcell <msp at debian.org>  Sat, 19 May 2012 10:40:33 +1000
 

Added: libcommoncpp2/trunk/debian/patches/fix_ciddr_ftbfs.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/fix_ciddr_ftbfs.dpatch?rev=9695&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/fix_ciddr_ftbfs.dpatch (added)
+++ libcommoncpp2/trunk/debian/patches/fix_ciddr_ftbfs.dpatch Sat May 19 01:01:36 2012
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_ciddr_ftbfs.dpatch by Stefan Potyra <sistpoty at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: do not overwrite the const argument, but rather make use of the
+## DP: buffer in ciddr::set
+
+ at DPATCH@
+Index: libcommoncpp2-1.8.1/src/cidr.cpp
+===================================================================
+--- libcommoncpp2-1.8.1.orig/src/cidr.cpp	2010-11-01 10:15:28.000000000 +1100
++++ libcommoncpp2-1.8.1/src/cidr.cpp	2012-05-19 10:52:26.000000000 +1000
+@@ -199,7 +199,7 @@
+     bitset((bit_t *)&netmask, getMask(cp));
+     setString(cbuf, sizeof(cbuf), cp);
+ 
+-    ep = (char *)strchr(cp, '/');
++    ep = (char *)strchr(cbuf, '/');
+ 
+     if(ep)
+         *ep = 0;
+@@ -328,7 +328,7 @@
+     memset(&netmask, 0, sizeof(netmask));
+     bitset((bit_t *)&netmask, getMask(cp));
+     setString(cbuf, sizeof(cbuf), cp);
+-    ep = (char *)strchr(cp, '/');
++    ep = (char *)strchr(cbuf, '/');
+     if(ep)
+         *ep = 0;
+ 

Modified: libcommoncpp2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/series?rev=9695&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/series (original)
+++ libcommoncpp2/trunk/debian/patches/series Sat May 19 01:01:36 2012
@@ -1,2 +1,3 @@
 applog-inc-fcntl.patch
 cleaning_doc.dpatch
+fix_ciddr_ftbfs.dpatch