[arch-commits] Commit in ccrtp/trunk (PKGBUILD libgcrypt160.patch)

[Eric Bélanger]

    Date: Tuesday, August 12, 2014 @ 02:29:50
  Author: eric
Revision: 219591

upgpkg: ccrtp 2.0.9-1

Upstream update, Remove old patch

Modified:
  ccrtp/trunk/PKGBUILD
Deleted:
  ccrtp/trunk/libgcrypt160.patch

--------------------+
 PKGBUILD           |   17 ++++------------
 libgcrypt160.patch |   52 ---------------------------------------------------
 2 files changed, 5 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-12 00:29:45 UTC (rev 219590)
+++ PKGBUILD	2014-08-12 00:29:50 UTC (rev 219591)
@@ -6,8 +6,8 @@
 # Contributor: Alexander Rødseth <rodseth at gmail.com>
 
 pkgname=ccrtp
-pkgver=2.0.6
-pkgrel=2
+pkgver=2.0.9
+pkgrel=1
 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ccrtp/"
@@ -14,17 +14,10 @@
 license=('GPL' 'custom')
 depends=('ucommon' 'libgcrypt')
 install=$pkgname.install
-source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        'libgcrypt160.patch')
-md5sums=('ca0a7a184b242d660d81caf6101a2c0c'
-         'SKIP'
-         '8ca785e2613b4e056685d3dca3fe8670')
+source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('f2e143c2558fbbe5715a1f04be2fb692'
+         'SKIP')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/libgcrypt160.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Deleted: libgcrypt160.patch
===================================================================
--- libgcrypt160.patch	2014-08-12 00:29:45 UTC (rev 219590)
+++ libgcrypt160.patch	2014-08-12 00:29:50 UTC (rev 219591)
@@ -1,52 +0,0 @@
---- ccrtp-2.0.6/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp~	2013-12-24 09:48:10.679538751 +0000
-+++ ccrtp-2.0.6/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp	2013-12-24 09:48:29.149404720 +0000
-@@ -22,40 +22,6 @@
- #include <errno.h>
- #include <gcrypt.h>
- 
--/*
-- * The following macro was copied from gcrypt.h and modified to explicitly
-- * cast the pointer types to keep the compiler happy.
-- */
--#define GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL                                   \
--static int gcry_pthread_mutex_init (void **priv)                              \
--{                                                                             \
--  int err = 0;                                                                \
--  pthread_mutex_t *lock = (pthread_mutex_t *)malloc (sizeof (pthread_mutex_t)); \
--                                                                              \
--  if (!lock)                                                                  \
--    err = ENOMEM;                                                             \
--  if (!err)                                                                   \
--{                                                                         \
--      err = pthread_mutex_init (lock, NULL);                                  \
--      if (err)                                                                \
--        free (lock);                                                          \
--      else                                                                    \
--        *priv = lock;                                                         \
--}                                                                         \
--  return err;                                                                 \
--}                                                                             \
--static int gcry_pthread_mutex_destroy (void **lock)                           \
--{ int err = pthread_mutex_destroy ((pthread_mutex_t *)*lock);  free (*lock); return err; }     \
--static int gcry_pthread_mutex_lock (void **lock)                              \
--{ return pthread_mutex_lock ((pthread_mutex_t *)*lock); }                     \
--static int gcry_pthread_mutex_unlock (void **lock)                            \
--{ return pthread_mutex_unlock ((pthread_mutex_t *)*lock); }                   \
--                                                                              \
--static struct gcry_thread_cbs gcry_threads_pthread =                          \
--{ GCRY_THREAD_OPTION_PTHREAD, NULL,                                           \
--  gcry_pthread_mutex_init, gcry_pthread_mutex_destroy,                        \
--  gcry_pthread_mutex_lock, gcry_pthread_mutex_unlock }
--
- /** Implement the locking callback functions for libgcrypt.
-  *
-  */
-@@ -65,7 +31,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL;
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
- #ifdef __cplusplus
- }
- #endif