[arch-commits] Commit in (14 files)
Sergej Pupykin
spupykin at archlinux.org
Wed Aug 31 17:22:27 UTC 2016
Date: Wednesday, August 31, 2016 @ 17:22:27
Author: spupykin
Revision: 188159
upd linphone stuff
Added:
bctoolbox/
bctoolbox/repos/
bctoolbox/trunk/
bctoolbox/trunk/PKGBUILD
cunit/
cunit/repos/
cunit/trunk/
cunit/trunk/PKGBUILD
Modified:
belle-sip/trunk/PKGBUILD
bzrtp/trunk/PKGBUILD
linphone/trunk/PKGBUILD
mediastreamer/trunk/PKGBUILD
ortp/trunk/PKGBUILD
Deleted:
bzrtp/trunk/mbedtls2.patch
------------------------------+
bctoolbox/trunk/PKGBUILD | 23 +++++++++
belle-sip/trunk/PKGBUILD | 12 ++--
bzrtp/trunk/PKGBUILD | 20 ++-----
bzrtp/trunk/mbedtls2.patch | 104 -----------------------------------------
cunit/trunk/PKGBUILD | 34 +++++++++++++
linphone/trunk/PKGBUILD | 12 ++--
mediastreamer/trunk/PKGBUILD | 19 +++----
ortp/trunk/PKGBUILD | 18 ++-----
8 files changed, 93 insertions(+), 149 deletions(-)
Added: bctoolbox/trunk/PKGBUILD
===================================================================
--- bctoolbox/trunk/PKGBUILD (rev 0)
+++ bctoolbox/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -0,0 +1,23 @@
+pkgname=bctoolbox
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="A library written in C that allows you to create and run audio and video streams"
+arch=('i686' 'x86_64')
+url="http://www.linphone.org/"
+license=('GPL')
+depends=('mbedtls')
+makedepends=('cunit')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz")
+md5sums=('6c04712c62919a5fe200cf3377027c89')
+
+build() {
+ cd ${pkgname}-$pkgver
+ [ -x ./configure ] || ./autogen.sh
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
Modified: belle-sip/trunk/PKGBUILD
===================================================================
--- belle-sip/trunk/PKGBUILD 2016-08-31 17:21:49 UTC (rev 188158)
+++ belle-sip/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -3,19 +3,20 @@
# Contributor: Darwin Bautista <djclue917 at gmail.com>
pkgname=belle-sip
-pkgver=1.4.2
+pkgver=1.5.0
pkgrel=1
pkgdesc="A Voice-over-IP phone"
arch=('i686' 'x86_64')
url="http://www.linphone.org/index.php/eng"
license=('GPL')
-depends=('libantlr3c' 'gcc-libs' 'mbedtls')
+depends=('libantlr3c' 'gcc-libs' 'mbedtls' 'bctoolbox')
makedepends=('java-runtime')
options=('!emptydirs')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/belle-sip/belle-sip-$pkgver.tar.gz"
+#source=("http://download-mirror.savannah.gnu.org/releases/linphone/belle-sip/belle-sip-$pkgver.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/belle-sip/archive/$pkgver.tar.gz"
"antlr.jar::https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true")
noextract=('antlr.jar')
-md5sums=('dbb58649225adefbad87241141fbea93'
+md5sums=('b1587edb9c082d0cc5a1299a489a4259'
'1b91dea1c7d480b3223f7c8a9aa0e172')
prepare() {
@@ -23,11 +24,12 @@
sed -i \
-e "s#antlr_java_prefixes=.*#antlr_java_prefixes=$srcdir#" \
-e "s|-Werror||g" \
- configure{,.ac}
+ configure.ac
}
build() {
cd $pkgname-$pkgver
+ [ -x ./configure ] || ./autogen.sh
./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
--disable-tests --disable-static --enable-tls
make
Modified: bzrtp/trunk/PKGBUILD
===================================================================
--- bzrtp/trunk/PKGBUILD 2016-08-31 17:21:49 UTC (rev 188158)
+++ bzrtp/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -3,28 +3,22 @@
# Contributor: Antonio Rojas <arojas at archlinux.org>
pkgname=bzrtp
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=1
pkgdesc="Opensource implementation of ZRTP keys exchange protocol"
arch=('i686' 'x86_64')
url="http://www.linphone.org/"
license=('GPL2')
-depends=('libxml2' 'mbedtls')
+depends=('libxml2' 'mbedtls' 'bctoolbox')
+makedepends=('cunit')
validpgpkeys=('9774BC1725758EB16D639F8B3ECD52DEE2F56985')
-source=("http://download.savannah.gnu.org/releases/linphone/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
- mbedtls2.patch)
-md5sums=('0d0c694e114d85420d351b94f0e9d867'
- 'SKIP'
- '5d181d8b367a4bb50a49222f00cb6751')
+#source=("http://download.savannah.gnu.org/releases/linphone/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bzrtp/archive/$pkgver.tar.gz")
+md5sums=('0f36322012dd6cc248aa356555744a8e')
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 <$srcdir/mbedtls2.patch
- autoreconf
-}
-
build() {
cd ${pkgname}-${pkgver}
+ [ -x ./configure ] || ./autogen.sh
./configure --prefix=/usr
make
}
Deleted: bzrtp/trunk/mbedtls2.patch
===================================================================
--- bzrtp/trunk/mbedtls2.patch 2016-08-31 17:21:49 UTC (rev 188158)
+++ bzrtp/trunk/mbedtls2.patch 2016-08-31 17:22:27 UTC (rev 188159)
@@ -1,104 +0,0 @@
-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 @@
-
- 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>
-
- /* Random number generator */
--#include "polarssl/entropy.h"
--#include "polarssl/ctr_drbg.h"
-+#include "mbedtls/compat-1.3.h"
-+#include "mbedtls/entropy.h"
-+#include "mbedtls/ctr_drbg.h"
-
- /* Hash function sha1(sha2 is different for polarssl v1.2 and v1.3 ) */
--#include "polarssl/sha1.h"
-+#include "mbedtls/md.h"
-
- /* Asymmetrics encryption */
--#include "polarssl/dhm.h"
-+#include "mbedtls/dhm.h"
-
- /* Symmetric encryption */
--#include "polarssl/aes.h"
-+#include "mbedtls/aes.h"
-
- #include "cryptoWrapper.h"
-
-@@ -133,7 +134,8 @@
-
- entropy_init(&(polarsslContext->entropyContext)); /* init the polarssl entropy engine */
- /* init the polarssl rng context */
-- if (ctr_drbg_init(&(polarsslContext->rngContext), entropy_func, &(polarsslContext->entropyContext), (const unsigned char *)entropyString, entropyStringLength) != 0) {
-+ ctr_drbg_init(&(polarsslContext->rngContext));
-+ if (mbedtls_ctr_drbg_seed(&(polarsslContext->rngContext), entropy_func, &(polarsslContext->entropyContext), (const unsigned char *)entropyString, entropyStringLength) != 0) {
- return NULL;
- }
-
-@@ -183,7 +185,8 @@
- uint8_t *output)
- {
- uint8_t hmacOutput[20];
-- sha1_hmac(key, keyLength, input, inputLength, hmacOutput);
-+ const mbedtls_md_info_t *mdinfo = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
-+ mbedtls_md_hmac(mdinfo, key, keyLength, input, inputLength, hmacOutput);
-
- /* check output length, can't be>20 */
- if (hmacLength>20) {
-@@ -396,11 +399,11 @@
- /*** End of code common to polarSSL version 1.2 and 1.3 ***/
-
- /* check polarssl version */
--#include <polarssl/version.h>
-+#include <mbedtls/version.h>
- #if POLARSSL_VERSION_NUMBER >= 0x01030000 /* for Polarssl version 1.3 */
-
- /* Hashs */
--#include "polarssl/sha256.h"
-+#include "mbedtls/sha256.h"
-
- /*
- * @brief SHA256 wrapper
-@@ -444,7 +447,8 @@
- uint8_t *output)
- {
- uint8_t hmacOutput[32];
-- sha256_hmac(key, keyLength, input, inputLength, hmacOutput, 0); /* last param to zero to select SHA256 and not SHA224 */
-+ const mbedtls_md_info_t *mdinfo = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
-+ mbedtls_md_hmac(mdinfo, key, keyLength, input, inputLength, hmacOutput);
-
- /* check output length, can't be>32 */
- if (hmacLength>32) {
-@@ -464,7 +468,7 @@
- /* compute the secret key */
- keyLength = context->primeLength; /* undocumented but this value seems to be in/out, so we must set it to the expected key length */
- context->key = (uint8_t *)malloc(keyLength*sizeof(uint8_t)); /* allocate key buffer */
-- dhm_calc_secret((dhm_context *)(context->cryptoModuleData), context->key, &keyLength, (int (*)(void *, unsigned char *, size_t))rngFunction, rngContext);
-+ dhm_calc_secret((dhm_context *)(context->cryptoModuleData), context->key, keyLength, &keyLength, (int (*)(void *, unsigned char *, size_t))rngFunction, rngContext);
- }
-
-
-@@ -472,7 +476,7 @@
- #else /* POLAR SSL VERSION 1.2 */
-
- /* Hashs */
--#include "polarssl/sha2.h"
-+#include "mbedtls/sha2.h"
-
- /*
- * @brief SHA256 wrapper
Added: cunit/trunk/PKGBUILD
===================================================================
--- cunit/trunk/PKGBUILD (rev 0)
+++ cunit/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -0,0 +1,34 @@
+# Maintainer: Daniel Milde <daniel at milde dot cz>
+# Contributor: Danibspi danibspi <at> gmail <dot> com
+
+pkgname=cunit
+pkgver=2.1_3
+pkgrel=1
+pkgdesc="Lightweight system for writing, administering, and running unit tests in C"
+arch=(i686 x86_64)
+url="http://cunit.sourceforge.net/"
+license=('LGPL2')
+depends=('glibc')
+options=('!libtool')
+source=(https://downloads.sourceforge.net/project/cunit/CUnit/${pkgver/_/-}/CUnit-${pkgver/_/-}.tar.bz2)
+sha256sums=('f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214')
+
+build() {
+ cd "$srcdir/CUnit-${pkgver/_/-}"
+ libtoolize --force
+ aclocal
+ autoheader
+ automake --force-missing --add-missing
+ autoconf
+ ./configure --prefix=/usr
+ make || return 1
+}
+
+package() {
+ cd "$srcdir/CUnit-${pkgver/_/-}"
+ make DESTDIR="$pkgdir" install
+ mv $pkgdir/usr/doc $pkgdir/usr/share/doc
+}
+
+
+
Modified: linphone/trunk/PKGBUILD
===================================================================
--- linphone/trunk/PKGBUILD 2016-08-31 17:21:49 UTC (rev 188158)
+++ linphone/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -4,20 +4,20 @@
# Contributor: Mark Lee <mark at markelee.com>
pkgname=linphone
-pkgver=3.9.1
-pkgrel=2
+pkgver=3.10.2
+pkgrel=1
pkgdesc="A Voice-over-IP phone"
arch=('i686' 'x86_64')
-url="http://www.linphone.org/index.php/eng"
+url="http://www.linphone.org"
license=('GPL')
depends=('alsa-lib' 'ffmpeg' 'gtk2' 'speex' 'libv4l' 'libglade' 'v4l-utils'
'libpulse' 'libxv' 'mediastreamer' 'ortp' 'bzrtp' 'bcg729' 'libsoup'
'belle-sip' 'libnotify')
-makedepends=('pkg-config' 'perl-xml-parser' 'intltool' 'sgmltools-lite')
+makedepends=('pkg-config' 'perl-xml-parser' 'intltool' 'sgmltools-lite' 'cunit')
optdepends=('pulseaudio')
options=('!emptydirs')
-source=("http://download-mirror.savannah.gnu.org/releases/${pkgname}/3.9.x/sources/${pkgname}-$pkgver.tar.gz")
-md5sums=('c1c3a63b7ee963360e0e89cf5e5ff406')
+source=("http://www.linphone.org/releases/sources/linphone/linphone-$pkgver.tar.gz")
+md5sums=('0b080e4f46bf944f4dc7fc11a76f13a1')
build() {
cd $pkgname-$pkgver
Modified: mediastreamer/trunk/PKGBUILD
===================================================================
--- mediastreamer/trunk/PKGBUILD 2016-08-31 17:21:49 UTC (rev 188158)
+++ mediastreamer/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -6,22 +6,23 @@
# Contributor: Mark Lee <mark at markelee.com>
pkgname=mediastreamer
-pkgver=2.12.1
-pkgrel=12
+pkgver=2.14.0
+pkgrel=1
pkgdesc="A library written in C that allows you to create and run audio and video streams"
arch=('i686' 'x86_64')
url="http://www.linphone.org/"
license=('GPL')
-depends=('ortp' 'ffmpeg' 'libxv' 'libupnp' 'bzrtp' 'glew' 'libsrtp' 'mbedtls')
+depends=('ortp' 'ffmpeg' 'libxv' 'libupnp' 'bzrtp' 'glew' 'libsrtp' 'mbedtls' 'bctoolbox')
# xxd from Vim is needed to build
-makedepends=('intltool' 'vim')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+makedepends=('intltool' 'vim' 'cunit')
+#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/mediastreamer2/archive/$pkgver.tar.gz")
validpgpkeys=('9774BC1725758EB16D639F8B3ECD52DEE2F56985')
-md5sums=('1ca115e94a718638fbecf8352c169861'
- 'SKIP')
+md5sums=('ba7c44433b10e924036c01fdbee44040')
build() {
- cd $pkgname-$pkgver
+ cd ${pkgname}2-$pkgver
+ [ -x ./configure ] || ./autogen.sh
./configure --prefix=/usr \
--enable-glx --enable-xv --enable-zrtp --enable-external-ortp \
--disable-strict
@@ -29,6 +30,6 @@
}
package() {
- cd $pkgname-$pkgver
+ cd ${pkgname}2-$pkgver
make DESTDIR="${pkgdir}" install
}
Modified: ortp/trunk/PKGBUILD
===================================================================
--- ortp/trunk/PKGBUILD 2016-08-31 17:21:49 UTC (rev 188158)
+++ ortp/trunk/PKGBUILD 2016-08-31 17:22:27 UTC (rev 188159)
@@ -5,27 +5,21 @@
# Contributor: William Rea <sillywilly at gmail.com>
pkgname=ortp
-pkgver=0.25.0
+pkgver=0.27.0
pkgrel=1
pkgdesc="A Real-time Transport Protocol (RTP) library"
arch=('i686' 'x86_64')
url="http://www.linphone.org/index.php/eng/code_review/ortp"
license=('GPL3')
-depends=('glibc')
-source=("http://download.savannah.gnu.org/releases/linphone/$pkgname/sources/$pkgname-$pkgver.tar.gz"{,.sig})
-sha1sums=('bf2954d29b95ea53c06af6a73f57b73662faa3b7'
- 'SKIP')
+depends=('bctoolbox')
validpgpkeys=('9774BC1725758EB16D639F8B3ECD52DEE2F56985')
-sha1sums=('63db811bb841e6b8e74063a4c2b79ce6cfa8988b'
- 'SKIP')
-sha1sums=('626160c6020b1f2c1543fe43492ace1d29b66f8c'
- 'SKIP')
-sha1sums=('ac4e4ed7a67bef1a57c0c2c8168f4f0bc470d7c4'
- 'SKIP')
+#source=("http://download.savannah.gnu.org/releases/linphone/$pkgname/sources/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/ortp/archive/$pkgver.tar.gz")
+md5sums=('d99207c041b50a3a5dbdf08d2620967a')
build() {
cd ${pkgname}-${pkgver}
-
+ [ -x ./configure ] || ./autogen.sh
./configure --prefix=/usr \
--disable-strict
make
More information about the arch-commits
mailing list