[arch-commits] Commit in ccrtp/repos (8 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Tue Dec 24 09:52:10 UTC 2013
Date: Tuesday, December 24, 2013 @ 10:52:10
Author: andrea
Revision: 202672
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
ccrtp/repos/staging-i686/
ccrtp/repos/staging-i686/PKGBUILD
(from rev 202671, ccrtp/trunk/PKGBUILD)
ccrtp/repos/staging-i686/ccrtp.install
(from rev 202671, ccrtp/trunk/ccrtp.install)
ccrtp/repos/staging-i686/libgcrypt160.patch
(from rev 202671, ccrtp/trunk/libgcrypt160.patch)
ccrtp/repos/staging-x86_64/
ccrtp/repos/staging-x86_64/PKGBUILD
(from rev 202671, ccrtp/trunk/PKGBUILD)
ccrtp/repos/staging-x86_64/ccrtp.install
(from rev 202671, ccrtp/trunk/ccrtp.install)
ccrtp/repos/staging-x86_64/libgcrypt160.patch
(from rev 202671, ccrtp/trunk/libgcrypt160.patch)
-----------------------------------+
staging-i686/PKGBUILD | 39 +++++++++++++++++++++++++++
staging-i686/ccrtp.install | 22 +++++++++++++++
staging-i686/libgcrypt160.patch | 52 ++++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 39 +++++++++++++++++++++++++++
staging-x86_64/ccrtp.install | 22 +++++++++++++++
staging-x86_64/libgcrypt160.patch | 52 ++++++++++++++++++++++++++++++++++++
6 files changed, 226 insertions(+)
Copied: ccrtp/repos/staging-i686/PKGBUILD (from rev 202671, ccrtp/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-12-24 09:52:10 UTC (rev 202672)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff Mickey <jeff at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ccrtp
+pkgver=2.0.6
+pkgrel=2
+pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/ccrtp/"
+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')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/libgcrypt160.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Copied: ccrtp/repos/staging-i686/ccrtp.install (from rev 202671, ccrtp/trunk/ccrtp.install)
===================================================================
--- staging-i686/ccrtp.install (rev 0)
+++ staging-i686/ccrtp.install 2013-12-24 09:52:10 UTC (rev 202672)
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(ccrtp.info)
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ccrtp/repos/staging-i686/libgcrypt160.patch (from rev 202671, ccrtp/trunk/libgcrypt160.patch)
===================================================================
--- staging-i686/libgcrypt160.patch (rev 0)
+++ staging-i686/libgcrypt160.patch 2013-12-24 09:52:10 UTC (rev 202672)
@@ -0,0 +1,52 @@
+--- 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
Copied: ccrtp/repos/staging-x86_64/PKGBUILD (from rev 202671, ccrtp/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-12-24 09:52:10 UTC (rev 202672)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff Mickey <jeff at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+pkgname=ccrtp
+pkgver=2.0.6
+pkgrel=2
+pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/ccrtp/"
+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')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/libgcrypt160.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Copied: ccrtp/repos/staging-x86_64/ccrtp.install (from rev 202671, ccrtp/trunk/ccrtp.install)
===================================================================
--- staging-x86_64/ccrtp.install (rev 0)
+++ staging-x86_64/ccrtp.install 2013-12-24 09:52:10 UTC (rev 202672)
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(ccrtp.info)
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ccrtp/repos/staging-x86_64/libgcrypt160.patch (from rev 202671, ccrtp/trunk/libgcrypt160.patch)
===================================================================
--- staging-x86_64/libgcrypt160.patch (rev 0)
+++ staging-x86_64/libgcrypt160.patch 2013-12-24 09:52:10 UTC (rev 202672)
@@ -0,0 +1,52 @@
+--- 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
More information about the arch-commits
mailing list