update to 4.7, fixed type error with patch

3 files changed, 52 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 891fe70f14e7..1cbc54a0318e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Feb 10 05:44:29 UTC 2017
 pkgbase = libzrtpcpp
 	pkgdesc = A C++ implementation of Phil Zimmermann's ZRTP specification
-	pkgver = 4.6.3
+	pkgver = 4.7.0
 	pkgrel = 1
 	url = https://github.com/wernerd/ZRTPCPP
 	arch = i686
@@ -10,8 +8,8 @@ pkgbase = libzrtpcpp
 	license = GPL3
 	makedepends = cmake
 	depends = ccrtp
-	source = libzrtpcpp-4.6.3.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/V4.6.3.tar.gz
-	md5sums = ccfaab35e2103033d9c414fee3d46a75
+	source = libzrtpcpp-4.7.0.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/4.7.0.tar.gz
+	md5sums = 24bcaa5ee64083e9da76ee3cb68c90a3
 
 pkgname = libzrtpcpp
 
diff --git a/PKGBUILD b/PKGBUILD
index f09b563db821..5196251a309b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Michel Brabants <michel.brabants@euphonynet.be>
 
 pkgname=libzrtpcpp
-pkgver=4.6.3
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
 arch=('i686' 'x86_64')
@@ -12,11 +12,12 @@ url='https://github.com/wernerd/ZRTPCPP'
 license=('GPL3')
 depends=('ccrtp')
 makedepends=('cmake')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/V$pkgver.tar.gz")
-md5sums=('ccfaab35e2103033d9c414fee3d46a75')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/$pkgver.tar.gz")
+md5sums=('24bcaa5ee64083e9da76ee3cb68c90a3')
 
 prepare() {
   sed 's/lib64/lib/g' -i ZRTPCPP-${pkgver}/CMakeLists.txt
+  git -C "$srcdir/ZRTPCPP-${pkgver}" apply -v "${srcdir}/.."/*patch
 }
 
 build() {
@@ -25,7 +26,7 @@ build() {
   cmake ../ZRTPCPP-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
-  make
+  make ${MAKEFLAGS:--j1}
 }
 
 package() {
diff --git a/type_fix.patch b/type_fix.patch
new file mode 100644
index 000000000000..39a1a583d68b
--- /dev/null
+++ b/type_fix.patch
@@ -0,0 +1,44 @@
+diff --git a/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.cpp b/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.cpp
+index 64db1d2..b4f58c1 100644
+--- a/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.cpp
++++ b/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.cpp
+@@ -108,7 +108,7 @@ int ZrtpRandom::getRandomData(uint8_t* buffer, uint32_t length) {
+ }
+ 
+ 
+-int ZrtpRandom::addEntropy(const uint8_t *buffer, uint32_t length, bool isLocked)
++int ZrtpRandom::addEntropy(const uint8_t *buffer, uint32_t length, int32_t isLocked)
+ {
+ 
+     uint8_t newSeed[64];
+@@ -161,7 +161,7 @@ size_t ZrtpRandom::getSystemSeed(uint8_t *seed, size_t length)
+     return num;
+ }
+ 
+-int zrtp_AddEntropy(const uint8_t *buffer, uint32_t length, bool isLocked) {
++int zrtp_AddEntropy(const uint8_t *buffer, uint32_t length, int32_t isLocked) {
+     return ZrtpRandom::addEntropy(buffer, length, isLocked);
+ }
+ 
+diff --git a/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.h b/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.h
+index d1837ef..bb31b18 100644
+--- a/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.h
++++ b/src/ZRTPCPP-4.7.0/cryptcommon/ZrtpRandom.h
+@@ -49,7 +49,7 @@ public:
+      *         bytes added may be bigger then @c length because of added system
+      *         entropy.
+      */
+-    static int addEntropy(const uint8_t *buffer, uint32_t length, bool isLocked = false);
++    static int addEntropy(const uint8_t *buffer, uint32_t length, int32_t isLocked = false);
+ 
+     /**
+      * @brief Get some random data.
+@@ -74,7 +74,7 @@ extern "C"
+ {
+ #endif
+ 
+-int zrtp_AddEntropy(const uint8_t *buffer, uint32_t length, bool isLocked);
++int zrtp_AddEntropy(const uint8_t *buffer, uint32_t length, int32_t isLocked);
+ 
+ int zrtp_getRandomData(uint8_t *buffer, uint32_t length);
+