[Pkg-voip-commits] [libccscript3] 05/06: Imported Debian patch 1.8.1-6

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository libccscript3.

commit fee946c04a2f0fe78416ae8a01a61046fee8cff9
Author: Mark Purcell <msp at debian.org>
Date:   Sun Dec 29 14:49:30 2013 +1100

    Imported Debian patch 1.8.1-6
---
 debian/changelog            | 15 +++++++++++++++
 debian/control              | 10 +++++-----
 debian/patches/inaddr.patch | 18 ++++++++++++++++++
 debian/patches/series       |  1 +
 debian/rules                |  4 ++--
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9aaee6..9dc7c20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+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)
+
+ -- Mark Purcell <msp at debian.org>  Sun, 29 Dec 2013 14:49:30 +1100
+
 libcommoncpp2 (1.8.1-5) unstable; urgency=low
 
   * wheezey polish
diff --git a/debian/control b/debian/control
index b93f44b..3e40e80 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,16 @@ Priority: optional
 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
diff --git a/debian/patches/inaddr.patch b/debian/patches/inaddr.patch
new file mode 100644
index 0000000..2668161
--- /dev/null
+++ b/debian/patches/inaddr.patch
@@ -0,0 +1,18 @@
+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
+Applied-Upstream: https://github.com/dyfet/ucommon/commit/d530ef040def990b2f44a9dc7da410f233cae2be
+
+--- a/src/inaddr.cpp	2010-10-31 19:43:40.000000000 -0400
++++ b/src/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;
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e7386da..487d40c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ applog-inc-fcntl.patch
 cleaning_doc.dpatch
 fix_ciddr_ftbfs.dpatch
 caddr.diff
+inaddr.patch
diff --git a/debian/rules b/debian/rules
index d711eb4..7322036 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --parallel
-
+	dh $@ --parallel --with autotools_dev
+ 
 override_dh_install:
 	dh_install --list-missing
 	# Drop content of dependency_libs to avoid having to recompile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libccscript3.git