[Pkg-voip-commits] [libzrtpcpp] 03/04: Imported Debian patch 2.3.4-1
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 10:19:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository libzrtpcpp.
commit 7df008b89a0bd3d7eedc02ce86ebedbf1947f8fc
Merge: 8756881 f5177f9
Author: Mark Purcell <msp at debian.org>
Date: Wed Jul 10 00:55:55 2013 +1000
Imported Debian patch 2.3.4-1
.gitignore | 18 +
CMakeLists.txt | 130 +-
ChangeLog | 15 +
NEWS | 25 +
README | 30 -
README.md | 105 ++
cmake/Modules/GeneratePackage.cmake | 2 +
debian/changelog | 28 +
debian/control | 6 +-
debian/docs | 2 +-
debian/watch | 5 +-
demo/CMakeLists.txt | 4 +-
demo/zrtptest.cpp | 62 +-
demo/zrtptestMulti.cpp | 588 +++++---
directive | 3 +
config.h.cmake => libzrtpcpp-config.h.cmake | 0
libzrtpcpp.pc.cmake | 2 +-
libzrtpcpp.spec | 6 +-
libzrtpcpp.spec.cmake | 2 +-
src/CMakeLists.txt | 24 +-
src/ZIDFile.cpp | 5 +-
src/{ZRtp.cpp => Zrtp.cpp} | 776 ++++++----
src/ZrtpCWrapper.cpp | 134 +-
src/ZrtpCallbackWrapper.cpp | 40 +-
src/ZrtpConfigure.cpp | 16 +-
src/ZrtpCrc32.cpp | 0
src/ZrtpPacketCommit.cpp | 2 +-
src/ZrtpPacketConfirm.cpp | 21 +-
src/ZrtpPacketHello.cpp | 10 +-
src/ZrtpPacketRelayAck.cpp | 42 +
src/ZrtpPacketSASrelay.cpp | 75 +
src/ZrtpQueue.cpp | 218 ++-
src/ZrtpStateClass.cpp | 90 +-
src/ZrtpTextData.cpp | 40 +-
src/libzrtpcpp/ZIDFile.h | 1 -
src/libzrtpcpp/ZIDRecord.h | 32 +-
src/libzrtpcpp/ZRtp.h | 251 +++-
src/libzrtpcpp/ZrtpCWrapper.h | 178 ++-
src/libzrtpcpp/ZrtpCallback.h | 32 +-
src/libzrtpcpp/ZrtpCallbackWrapper.h | 17 +-
src/libzrtpcpp/ZrtpCodes.h | 11 +
src/libzrtpcpp/ZrtpConfigure.h | 34 +-
src/libzrtpcpp/ZrtpPacketBase.h | 5 +
src/libzrtpcpp/ZrtpPacketConfirm.h | 18 +-
src/libzrtpcpp/ZrtpPacketHello.h | 14 +-
src/libzrtpcpp/ZrtpPacketRelayAck.h | 56 +
.../{ZrtpPacketConfirm.h => ZrtpPacketSASrelay.h} | 54 +-
src/libzrtpcpp/ZrtpQueue.h | 1513 +++++++++++---------
src/libzrtpcpp/ZrtpStateClass.h | 38 +
src/libzrtpcpp/ZrtpTextData.h | 3 +
src/libzrtpcpp/ZrtpUserCallback.h | 16 +-
src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp | 128 +-
src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp | 6 +-
.../crypto/openssl/InitializeOpenSSL.cpp | 16 +-
src/libzrtpcpp/crypto/twofish.h | 70 +-
src/libzrtpcpp/zrtpPacket.h | 46 +-
src/libzrtpcpp/zrtpccrtp.h | 4 +-
srtp/CryptoContext.cpp | 465 ++++++
srtp/CryptoContext.h | 418 ++++++
srtp/CryptoContextCtrl.cpp | 408 ++++++
srtp/CryptoContextCtrl.h | 327 +++++
srtp/crypto/SrtpSymCrypto.h | 393 +++++
srtp/crypto/brg_endian.h | 148 ++
srtp/crypto/brg_types.h | 188 +++
.../crypto/gcrypt/InitializeGcrypt.cpp | 0
srtp/crypto/gcrypt/gcryptSrtpSymCrypto.cpp | 344 +++++
srtp/crypto/gcrypt/gcrypthmac.cpp | 117 ++
srtp/crypto/hmac.h | 172 +++
srtp/crypto/macSkein.cpp | 89 ++
srtp/crypto/macSkein.h | 148 ++
srtp/crypto/openssl/.kdev_include_paths | 1 +
srtp/crypto/openssl/SrtpSymCrypto.cpp | 326 +++++
srtp/crypto/openssl/hmac.cpp | 106 ++
srtp/crypto/skein.c | 742 ++++++++++
srtp/crypto/skein.h | 327 +++++
srtp/crypto/skeinApi.c | 225 +++
srtp/crypto/skeinApi.h | 253 ++++
srtp/crypto/skein_block.c | 689 +++++++++
srtp/crypto/skein_iv.h | 199 +++
srtp/crypto/skein_port.h | 127 ++
80 files changed, 9535 insertions(+), 1746 deletions(-)
diff --cc debian/changelog
index 2052a99,0000000..7ec7a34
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,209 -1,0 +1,237 @@@
++libzrtpcpp (2.3.4-1) unstable; urgency=medium
++
++ * New upstream release
++ - Fixes "CVE-2013-2221 CVE-2013-2222 CVE-2013-2223" (Closes: #714650)
++
++ -- Mark Purcell <msp at debian.org> Wed, 10 Jul 2013 00:55:55 +1000
++
++libzrtpcpp (2.3.2-2) unstable; urgency=low
++
++ * Upload to unstable
++ * Update debian/watch - Thanks Bart
++ * Update debian/control - Vcs & Standards-Version:
++
++ -- Mark Purcell <msp at debian.org> Sun, 12 May 2013 19:08:46 +1000
++
++libzrtpcpp (2.3.2-1) experimental; urgency=low
++
++ * New upstream release
++
++ -- Mark Purcell <msp at debian.org> Wed, 26 Dec 2012 11:30:07 +1100
++
++libzrtpcpp (2.1.2-1) experimental; urgency=low
++
++ * New upstream release
++ - Fixes "new upstream version available" (Closes: #678975)
++
++ -- Mark Purcell <msp at debian.org> Tue, 26 Jun 2012 07:57:13 +1000
++
+libzrtpcpp (2.0.0-3) unstable; urgency=low
+
+ * wheezy polish - lintian clean
+ * Update Standards-Version: 3.9.3
+ * Add source/format 3.0 (quilt)
+ * Update debian/copyright - fix copyright-refers-to-symlink-license
+ * debian/compat -> 9
+
+ -- Mark Purcell <msp at debian.org> Sun, 24 Jun 2012 22:09:11 +1000
+
+libzrtpcpp (2.0.0-2) unstable; urgency=low
+
+ * Added Build-Depends: cmake
+ * Upstream:
+ - Fixes "FTBFS with gcc-4.7: missing include" (Closes: #672942)
+ - Fixes "FTBFS in sid: No package 'libccrtp1' found" (Closes: #673255)
+
+ -- Mark Purcell <msp at debian.org> Sat, 19 May 2012 21:39:32 +1000
+
+libzrtpcpp (2.0.0-1) unstable; urgency=low
+
+ * New upstream release
+ * NEW package libzrtpcpp2 - match-soname
+ * Upload to unstable - coordinated through debian-release
+ * Switch to dh 7
+ * Add Build-Depends: libucommon & libssl
+ * Ack NMUs - Thanks Matthias & Andreas
+
+ -- Mark Purcell <msp at debian.org> Sat, 19 May 2012 11:16:39 +1000
+
+libzrtpcpp (1.4.6-1.2) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #667261.
+
+ -- Matthias Klose <doko at debian.org> Tue, 17 Apr 2012 08:32:37 +0200
+
+libzrtpcpp (1.4.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Stop shipping libtool la file. Closes: #620607
+ http://wiki.debian.org/ReleaseGoals/LAFileRemoval
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 24 Apr 2011 14:13:20 +0200
+
+libzrtpcpp (1.6.0-1) experimental; urgency=low
+
+ * New upstream release
+ * NEW package libzrtpcpp-1.6-0 - soname bump
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Jan 2011 18:46:47 +1100
+
+libzrtpcpp (1.4.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Fri, 30 Oct 2009 23:00:05 +1100
+
+libzrtpcpp (1.4.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ [ Kilian Krause ]
+ * Remove -N from wget args in get-orig-source target as -O is already
+ used.
+
+ -- Mark Purcell <msp at debian.org> Wed, 15 Jul 2009 20:36:59 +1000
+
+libzrtpcpp (1.4.3-3) unstable; urgency=low
+
+ * Upload to unstable
+ - libcommoncpp2 transition
+
+ -- Mark Purcell <msp at debian.org> Thu, 26 Feb 2009 18:31:25 +1100
+
+libzrtpcpp (1.4.3-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 08 Feb 2009 11:26:39 +1100
+
+libzrtpcpp (1.4.2-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Tue, 03 Feb 2009 21:29:49 +1100
+
+libzrtpcpp (1.4.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Tue, 23 Dec 2008 17:36:27 +1100
+
+libzrtpcpp (1.4.0-1) experimental; urgency=low
+
+ * New upstream release
+ - first release that is conformant to the ZRTP specification
+
+ [ Patrick Matthäi ]
+ * Bumped to Standards-Version 3.8.0.
+
+ [ Mark Purcell ]
+ * NEW libzrtpcpp-1.4-0 - lintian:package-name-doesnt-match-sonames
+ * Add ${misc:Depends} - fixes lintian:debhelper-but-no-misc-depends
+ * debian/watch opts=pasv
+ * Update debian/copyright
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Nov 2008 11:42:37 +1100
+
+libzrtpcpp (1.3.0-1) unstable; urgency=low
+
+ * New upstream release
+ * New Package: libzrtpcpp-1.3-0 - soname bump
+ - Upload discussed with debian-release
+
+ -- Mark Purcell <msp at debian.org> Sun, 22 Jun 2008 10:01:03 +1000
+
+libzrtpcpp (1.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ - Implements latest changes to ZRTP draft
+ * DEB_INSTALL_CHANGELOGS_ALL := NEWS
+ * New Package: libzrtpcpp-1.2-0 soname bump
+ - Upload cleared with debian-release
+
+ -- Mark Purcell <msp at debian.org> Fri, 13 Jun 2008 08:18:39 +1000
+
+libzrtpcpp (1.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Package: libzrtpcpp-1.1-0 due to soname bump
+
+ -- Mark Purcell <msp at debian.org> Tue, 29 Apr 2008 22:52:58 +1000
+
+libzrtpcpp (0.9.2-3) unstable; urgency=low
+
+ [ Mark Purcell ]
+ * Bump LT_RELEASE="0.9.2deb" to cater for upstream ABI breakage
+ - ABI breakage - sendDataRTP removed in 0.9.2 (Closes: #445657)
+ * Cleanup get-orig-source target
+
+ -- Mark Purcell <msp at debian.org> Sat, 20 Oct 2007 12:03:24 +0100
+
+libzrtpcpp (0.9.2-2) unstable; urgency=high
+
+ * Fix package names to reflect new ABI - leaving the internal SOVER
+ unchanged (Closes: #445657)
+ * High urgency due to fixing RC bug.
+ * Add myself to Uploaders to make this a non-NMU
+ * Adjust DEB_DH_MAKESHLIBS_ARGS_libzrtpcpp-0.9-1 := -V"libzrtpcpp-0.9-1"
+
+ -- Kilian Krause <kilian at debian.org> Mon, 15 Oct 2007 21:42:05 +0200
+
+libzrtpcpp (0.9.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ [ Kilian Krause ]
+ * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Sep 2007 12:17:10 +0100
+
+libzrtpcpp (0.9.0-6) unstable; urgency=low
+
+ * DEB_DH_MAKESHLIBS_ARGS_libzrtpcpp-0.9-0 := -V"libzrtpcpp-0.9-0 (>= 0.9.0-4)"
+ - Closes: #434590: twinkle: Crashes on every call when using etch
+ libraries - Debian Bug report logs
+ * Use ${binary:Version} libzrtpcpp source: substvar-source-version-is-
+ deprecated
+
+ -- Mark Purcell <msp at debian.org> Wed, 25 Jul 2007 21:57:34 +0100
+
+libzrtpcpp (0.9.0-5) unstable; urgency=low
+
+ * DEB_DH_MAKESHLIBS_ARGS_libzrtpcpp-0.9-0 := -V"libzrtpcpp-0.9-0 (>= 0.9-4)"
+ * Depends: pkg-config
+
+ -- Mark Purcell <msp at debian.org> Sun, 20 May 2007 16:43:12 +0100
+
+libzrtpcpp (0.9.0-4) unstable; urgency=low
+
+ * Rebuild for libccrtp-dev > 1.5.1 [libccrtp soname]
+
+ -- Mark Purcell <msp at debian.org> Thu, 12 Apr 2007 21:36:27 +0100
+
+libzrtpcpp (0.9.0-3) unstable; urgency=low
+
+ * Rebuild for libccrtp-dev (>= 1.5.0-3) [libcommoncpp2 soname]
+
+ -- Mark Purcell <msp at debian.org> Sun, 7 Jan 2007 06:11:31 +0000
+
+libzrtpcpp (0.9.0-2) unstable; urgency=low
+
+ [ Mikael Magnusson ]
+ * Add Build-Depends: pkg-config
+ * Add Uploaders: Mikael Magnusson <mikma at users.sourceforge.net>
+
+ [ Mark Purcell ]
+ * Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+ * Initial release (Closes: #390591)
+
+ -- Mark Purcell <msp at debian.org> Thu, 12 Oct 2006 23:12:26 +1000
+
+libzrtpcpp (0.9.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #390591)
+
+ -- Mark Purcell <msp at debian.org> Mon, 2 Oct 2006 08:51:56 +0800
+
diff --cc debian/control
index 7588e65,0000000..4c12d9c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,0 +1,33 @@@
+Source: libzrtpcpp
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Kilian Krause <kilian at debian.org>
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, dpkg-dev (>= 1.13.19), cmake,
+ libucommon-dev, libccrtp-dev (>= 2.0.0), libssl-dev, libgcrypt11-dev | libgcrypt-dev
- Standards-Version: 3.9.3
++Standards-Version: 3.9.4
+Section: libs
+Homepage: http://www.gnu.org/software/ccrtp/
- Vcs-Svn: svn://svn.debian.org/pkg-voip/libzrtpcpp/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libzrtpcpp/?op=log
++Vcs-Svn: svn://anonscm.debian.org/pkg-voip/libzrtpcpp/trunk/
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/libzrtpcpp/trunk/
+
+Package: libzrtpcpp-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libzrtpcpp2 (= ${binary:Version}), pkg-config
+Description: Headers and static link library for libzrtpcpp
+ This library is an extension to the GNU RTP Stack, libccrtp,
+ that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
+ encryption, and which can be directly embedded into telephony
+ applications. The current release is conformant to the ZRTP specification.
+ .
+ This package provides the header files, link libraries, and
+ documentation for building applications that use libzrtpcpp.
+
+Package: libzrtpcpp2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ccrtp extension for zrtp/Zfone support
+ This library is an extension to the GNU RTP Stack, libccrtp,
+ that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
+ encryption, and which can be directly embedded into telephony
+ applications. The current release is conformant to the ZRTP specification.
diff --cc debian/docs
index e845566,0000000..b43bf86
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,1 -1,0 +1,1 @@@
- README
++README.md
diff --cc debian/watch
index 55d85f0,0000000..706ebec
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,3 @@@
- # See uscan(1) for format
-
+version=3
- opts=pasv ftp://ftp.gnu.org/pub/gnu/ccrtp/libzrtpcpp-(.*)\.tar\.gz debian svn-upgrade
++http://ftp.gnu.org/gnu/ccrtp/libzrtpcpp(?:[_\-]?|[_\-]v)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz|zip)(?:[^\.]\S*)? debian svn-upgrade
++# Bart Martens <bartm at debian.org> Sat, 02 Mar 2013 16:58:05 +0000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libzrtpcpp.git
More information about the Pkg-voip-commits
mailing list