Date: Tuesday, November 3, 2015 @ 16:51:34
Author: spupykin
Revision: 145842
upgpkg: bzrtp 1.0.3-1
upd
Modified:
bzrtp/trunk/PKGBUILD
bzrtp/trunk/mbedtls2.patch
----------------+
PKGBUILD | 8 ++++----
mbedtls2.patch | 43 +++++++++++++++++--------------------------
2 files changed, 21 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-03 15:51:31 UTC (rev 145841)
+++ PKGBUILD 2015-11-03 15:51:34 UTC (rev 145842)
@@ -3,8 +3,8 @@
# Contributor: Antonio Rojas <aro...@archlinux.org>
pkgname=bzrtp
-pkgver=1.0.2
-pkgrel=3
+pkgver=1.0.3
+pkgrel=1
pkgdesc="Opensource implementation of ZRTP keys exchange protocol"
arch=('i686' 'x86_64')
url="http://www.linphone.org/";
@@ -13,9 +13,9 @@
validpgpkeys=('9774BC1725758EB16D639F8B3ECD52DEE2F56985')
source=("http://download.savannah.gnu.org/releases/linphone/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
mbedtls2.patch)
-md5sums=('b52fa670fb319022166cb10d641da4e6'
+md5sums=('0d0c694e114d85420d351b94f0e9d867'
'SKIP'
- 'a5c77d9bcfda0aed17572a32b4cab69d')
+ '5d181d8b367a4bb50a49222f00cb6751')
prepare() {
cd ${pkgname}-${pkgver}
Modified: mbedtls2.patch
===================================================================
--- mbedtls2.patch 2015-11-03 15:51:31 UTC (rev 145841)
+++ mbedtls2.patch 2015-11-03 15:51:34 UTC (rev 145842)
@@ -1,30 +1,21 @@
-diff -wbBur bzrtp-1.0.2/configure bzrtp-1.0.2,my/configure
---- bzrtp-1.0.2/configure 2015-05-07 18:49:06.000000000 +0300
-+++ bzrtp-1.0.2,my/configure 2015-09-21 22:13:24.471826101 +0300
-@@ -12488,7 +12488,7 @@
- POLARSSL_LIBS="-L${polarssl_prefix}/lib"
- fi
+diff -wbBur bzrtp-1.0.3/configure.ac bzrtp-1.0.3.my/configure.ac
+--- bzrtp-1.0.3/configure.ac 2015-11-02 16:41:21.000000000 +0300
++++ bzrtp-1.0.3.my/configure.ac 2015-11-03 18:28:22.098298959 +0300
+@@ -44,9 +44,9 @@
--POLARSSL_LIBS="$POLARSSL_LIBS -lpolarssl"
-+POLARSSL_LIBS="$POLARSSL_LIBS -lmbedtls"
-
-
-
-diff -wbBur bzrtp-1.0.2/configure.ac bzrtp-1.0.2,my/configure.ac
---- bzrtp-1.0.2/configure.ac 2015-05-07 18:45:29.000000000 +0300
-+++ bzrtp-1.0.2,my/configure.ac 2015-09-21 22:13:00.985159704 +0300
-@@ -42,7 +42,7 @@
- POLARSSL_LIBS="-L${polarssl_prefix}/lib"
- fi
-
--POLARSSL_LIBS="$POLARSSL_LIBS -lpolarssl"
-+POLARSSL_LIBS="$POLARSSL_LIBS -lmbedtls"
-
- AC_SUBST(POLARSSL_LIBS)
- AC_SUBST(POLARSSL_CFLAGS)
-diff -wbBur bzrtp-1.0.2/src/cryptoPolarssl.c
bzrtp-1.0.2,my/src/cryptoPolarssl.c
---- bzrtp-1.0.2/src/cryptoPolarssl.c 2015-05-07 18:14:36.000000000 +0300
-+++ bzrtp-1.0.2,my/src/cryptoPolarssl.c 2015-09-21 22:21:04.521820813
+0300
+ LIBS_save=$LIBS
+ LIBS="$LIBS $POLARSSL_LIBS"
+-AC_CHECK_LIB(mbedtls, ssl_init , [POLARSSL_LIBS="$POLARSSL_LIBS -lmbedtls"],
++AC_CHECK_LIB(mbedtls, mbedtls_ssl_init , [POLARSSL_LIBS="$POLARSSL_LIBS
-lmbedtls"],
+ [
+- AC_CHECK_LIB(polarssl, ssl_init,
[POLARSSL_LIBS="$POLARSSL_LIBS -lpolarssl"],
++ AC_CHECK_LIB(polarssl,
mbedtls_ssl_init, [POLARSSL_LIBS="$POLARSSL_LIBS -lmbedtls"],
+ [ AC_MSG_ERROR([Polarssl or mbedTLS
library not found]) ]
+ )
+ ])
+diff -wbBur bzrtp-1.0.3/src/cryptoPolarssl.c
bzrtp-1.0.3.my/src/cryptoPolarssl.c
+--- bzrtp-1.0.3/src/cryptoPolarssl.c 2015-11-02 16:41:21.000000000 +0300
++++ bzrtp-1.0.3.my/src/cryptoPolarssl.c 2015-11-03 18:23:56.821626356
+0300
@@ -25,17 +25,18 @@
#include <string.h>
