[Pkg-voip-commits] r10365 - in /libcommoncpp2/trunk/debian: changelog control patches/inaddr.patch patches/series rules

msp at alioth.debian.org msp at alioth.debian.org
Sun Dec 29 04:18:27 UTC 2013 

Author: msp
Date: Sun Dec 29 04:17:53 2013
New Revision: 10365

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10365
Log:
* Hardcode Build-Depends: libgnutls28-dev 
  - Fixes "twinkle: indirectly depends on multiple gnutls, ucommon
  versions" (Closes: #725020)
* Update Vcs:
* Update Standards Version: 3.9.5
* Build --with autotools_dev to update config.{sub,guess} for arm64.
  - Thanks William Grant <wgrant at ubuntu.com>
  - Fixes "update config.{sub,guess} for the AArch64 port" (Closes: #727400)
* Apply inaddr.patch from Tristan Matthews 
  - Fixes "crash from buffer overflow" (Closes: #693471)
* +export EXTRA_LIB=-lpthread
  - Fixes "Resolve unresolved symbols in shared libraries" (Closes: #558874)

Added:
    libcommoncpp2/trunk/debian/patches/inaddr.patch
Modified:
    libcommoncpp2/trunk/debian/changelog
    libcommoncpp2/trunk/debian/control
    libcommoncpp2/trunk/debian/patches/series
    libcommoncpp2/trunk/debian/rules

Modified: libcommoncpp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/changelog?rev=10365&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/changelog	(original)
+++ libcommoncpp2/trunk/debian/changelog	Sun Dec 29 04:17:53 2013
@@ -1,3 +1,25 @@
+libcommoncpp2 (1.8.1-7) UNRELEASED; urgency=medium
+
+
+ -- Mark Purcell <msp at debian.org>  Sun, 29 Dec 2013 15:15:28 +1100
+
+libcommoncpp2 (1.8.1-6) unstable; urgency=low
+
+  * Hardcode Build-Depends: libgnutls28-dev 
+    - Fixes "twinkle: indirectly depends on multiple gnutls, ucommon
+    versions" (Closes: #725020)
+  * Update Vcs:
+  * Update Standards Version: 3.9.5
+  * Build --with autotools_dev to update config.{sub,guess} for arm64.
+    - Thanks William Grant <wgrant at ubuntu.com>
+    - Fixes "update config.{sub,guess} for the AArch64 port" (Closes: #727400)
+  * Apply inaddr.patch from Tristan Matthews 
+    - Fixes "crash from buffer overflow" (Closes: #693471)
+  * +export EXTRA_LIB=-lpthread
+    - Fixes "Resolve unresolved symbols in shared libraries" (Closes: #558874)
+
+ -- Mark Purcell <msp at debian.org>  Sun, 29 Dec 2013 14:49:30 +1100
+
 libcommoncpp2 (1.8.1-5) unstable; urgency=low
 
   * wheezey polish

Modified: libcommoncpp2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/control?rev=10365&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/control	(original)
+++ libcommoncpp2/trunk/debian/control	Sun Dec 29 04:17:53 2013
@@ -4,16 +4,16 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), autotools-dev, doxygen,
- libxml2-dev, zlib1g-dev, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev
-Standards-Version: 3.9.3
+ libxml2-dev, zlib1g-dev, libgnutls28-dev | libgnutls-dev, libgcrypt11-dev | libgcrypt-dev
+Standards-Version: 3.9.5
 Homepage: http://www.gnu.org/software/commoncpp/
-Vcs-Svn: svn://svn.debian.org/pkg-voip/libcommoncpp2/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-voip/libcommoncpp2/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/libcommoncpp2/
 
 Package: libcommoncpp2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libccgnu2-1.8-0 (= ${binary:Version}), libgnutls-dev, zlib1g-dev, libgcrypt11-dev | libgcrypt-dev, pkg-config
+Depends: ${misc:Depends}, libccgnu2-1.8-0 (= ${binary:Version}), libgnutls28-dev | libgnutls-dev, zlib1g-dev, libgcrypt11-dev | libgcrypt-dev, pkg-config
 Suggests: libcommoncpp2-doc
 Description: Header files and static libraries for Common C++ "2"
  Common C++ is a GNU package which offers portable "abstraction" of system

Added: libcommoncpp2/trunk/debian/patches/inaddr.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/inaddr.patch?rev=10365&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/inaddr.patch	(added)
+++ libcommoncpp2/trunk/debian/patches/inaddr.patch	Sun Dec 29 04:17:53 2013
@@ -0,0 +1,19 @@
+Description: libcommoncpp2-dev: crash from buffer overflow
+ When using commoncpp2 on 64 bit systems  (as SFLphone does), if gethostbyname
+ fails, libcommoncpp2 will cause a buffer overflow by doing an incorrect memset.
+From: Tristan Matthews <tristan.matthews at savoirfairelinux.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693471
+Upstream: https://github.com/dyfet/ucommon/commit/d530ef040def990b2f44a9dc7da410f233cae2be
+
+
+--- /usr/src/debug/commoncpp2-1.8.1/src/inaddr.cpp	2010-10-31 19:43:40.000000000 -0400
++++ inaddr.cpp	2012-11-16 15:14:16.667082655 -0500
+@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char
+             if(ipaddr)
+                 delete[] ipaddr;
+             ipaddr = new struct in_addr[1];
+-            memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
++            memset((void *)&ipaddr[0], 0, sizeof(ipaddr[0]));
+             return;
+         }
+ 

Modified: libcommoncpp2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/series?rev=10365&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/series	(original)
+++ libcommoncpp2/trunk/debian/patches/series	Sun Dec 29 04:17:53 2013
@@ -3,3 +3,4 @@
 cleaning_doc.dpatch
 fix_ciddr_ftbfs.dpatch
 caddr.diff
+inaddr.patch

Modified: libcommoncpp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/rules?rev=10365&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/rules	(original)
+++ libcommoncpp2/trunk/debian/rules	Sun Dec 29 04:17:53 2013
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autotools_dev
+ 
+export EXTRA_LIB=-lpthread
 
 override_dh_install:
 	dh_install --list-missing

More information about the Pkg-voip-commits mailing list