[arch-commits] Commit in isdn4k-utils/trunk (PKGBUILD va_list.patch)

[Tobias Powalowski]

    Date: Tuesday, November 4, 2014 @ 08:36:12
  Author: tpowa
Revision: 225599

upgpkg: isdn4k-utils 3.27-1

bump to latest version

Added:
  isdn4k-utils/trunk/va_list.patch
Modified:
  isdn4k-utils/trunk/PKGBUILD

---------------+
 PKGBUILD      |   29 +++++++++++++++--------------
 va_list.patch |   21 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-04 05:35:51 UTC (rev 225598)
+++ PKGBUILD	2014-11-04 07:36:12 UTC (rev 225599)
@@ -3,49 +3,50 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=isdn4k-utils
-pkgver=3.25_20130409
-pkgrel=3
+pkgver=3.27
+pkgrel=1
 pkgdesc="User space administration programs and tools for ISDN"
 arch=('i686' 'x86_64')
 url="http://www.isdn4linux.de/"
 license=('GPL')
+makedepends=('git')
 depends=('ncurses' 'sh') 
 backup=(etc/isdn/{callerid.conf,isdn.conf,rate.conf,isdnlog.isdnctrl0.options})
 options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/isdn4k-utils/${pkgname}-${pkgver}.tar.gz
-        isdn4k-utils-3.25-build.patch
-        config)
+source=(isdn4k-utils::git+git://git.misdn.eu/isdn4k-utils.git#tag=v${pkgver}
+        config
+        va_list.patch)
 replaces=('capi4k-utils')
+md5sums=('SKIP'
+         'ea3c71054234f9ef6bcf9325e36c4a38'
+         '81709ee10336a2df684a5398f42ef514')
 
 prepare() {
   CPPFLAGS="$CPPFLAGS -O2"
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname
+  patch -Np1 -i $srcdir/va_list.patch
   cp $srcdir/config ./.config
-  patch -Np0 -i $srcdir/isdn4k-utils-3.25-build.patch
   cd capiinfo
   aclocal
   automake --add-missing
   autoreconf
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname
   cd capifax
   aclocal 
   automake --add-missing
   autoreconf
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname
   make subconfig
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname
   install -dm755 $pkgdir/usr/bin
   make DESTDIR=$pkgdir install
   chmod 755 $pkgdir/usr/bin/*
 }
-md5sums=('0c464e0e104d548e4fde0e623b4b943a'
-         'dfd9590d3300020a5612c565d5add266'
-         'ea3c71054234f9ef6bcf9325e36c4a38')

Added: va_list.patch
===================================================================
--- va_list.patch	                        (rev 0)
+++ va_list.patch	2014-11-04 07:36:12 UTC (rev 225599)
@@ -0,0 +1,21 @@
+diff -u -r -N isdn4k-utils-3.25_20130409.orig/ipppd/main.c isdn4k-utils-3.25_20130409/ipppd/main.c
+--- isdn4k-utils-3.25_20130409.orig/ipppd/main.c	2013-01-05 14:59:12.000000000 +0100
++++ isdn4k-utils-3.25_20130409/ipppd/main.c	2014-09-21 13:36:09.104294210 +0200
+@@ -1205,7 +1205,7 @@
+     unsigned long val=0;
+     char *str, *f, *buf0;
+     unsigned char *p;
+-    va_list a;
++    void *a;
+     char num[32];
+     time_t t;
+     static char hexchars[] = "0123456789abcdef";
+@@ -1297,7 +1297,7 @@
+         break;
+     case 'r':
+         f = va_arg(args, char *);
+-        a = va_arg(args, va_list);
++        a = va_arg(args, void *);
+ #ifdef __alpha__       /* always do this? */
+ 	n = fmtmsg(buf, buflen + 1, f, a);
+ #else