[arch-commits] Commit in isdn4k-utils/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Sep 8 11:42:02 UTC 2015
Date: Tuesday, September 8, 2015 @ 13:42:02
Author: foutrelis
Revision: 245527
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
isdn4k-utils/repos/staging-i686/
isdn4k-utils/repos/staging-i686/PKGBUILD
(from rev 245526, isdn4k-utils/trunk/PKGBUILD)
isdn4k-utils/repos/staging-i686/config
(from rev 245526, isdn4k-utils/trunk/config)
isdn4k-utils/repos/staging-i686/gnu89-inline.patch
(from rev 245526, isdn4k-utils/trunk/gnu89-inline.patch)
isdn4k-utils/repos/staging-i686/va_list.patch
(from rev 245526, isdn4k-utils/trunk/va_list.patch)
isdn4k-utils/repos/staging-x86_64/
isdn4k-utils/repos/staging-x86_64/PKGBUILD
(from rev 245526, isdn4k-utils/trunk/PKGBUILD)
isdn4k-utils/repos/staging-x86_64/config
(from rev 245526, isdn4k-utils/trunk/config)
isdn4k-utils/repos/staging-x86_64/gnu89-inline.patch
(from rev 245526, isdn4k-utils/trunk/gnu89-inline.patch)
isdn4k-utils/repos/staging-x86_64/va_list.patch
(from rev 245526, isdn4k-utils/trunk/va_list.patch)
-----------------------------------+
staging-i686/PKGBUILD | 55 +++++++++++++++++++
staging-i686/config | 102 ++++++++++++++++++++++++++++++++++++
staging-i686/gnu89-inline.patch | 18 ++++++
staging-i686/va_list.patch | 21 +++++++
staging-x86_64/PKGBUILD | 55 +++++++++++++++++++
staging-x86_64/config | 102 ++++++++++++++++++++++++++++++++++++
staging-x86_64/gnu89-inline.patch | 18 ++++++
staging-x86_64/va_list.patch | 21 +++++++
8 files changed, 392 insertions(+)
Copied: isdn4k-utils/repos/staging-i686/PKGBUILD (from rev 245526, isdn4k-utils/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-09-08 11:42:02 UTC (rev 245527)
@@ -0,0 +1,55 @@
+# $Id$
+# Contributor: Dennis "Gyroplast" Herbrich <dennis at archlinux.org>, dorphell <dorphell at archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=isdn4k-utils
+pkgver=3.27
+pkgrel=2
+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=(isdn4k-utils::git+git://git.misdn.eu/isdn4k-utils.git#tag=v${pkgver}
+ config
+ gnu89-inline.patch
+ va_list.patch)
+replaces=('capi4k-utils')
+md5sums=('SKIP'
+ 'ea3c71054234f9ef6bcf9325e36c4a38'
+ '165084a9096cc1ad043cc00a5cc05c0b'
+ '81709ee10336a2df684a5398f42ef514')
+
+prepare() {
+ CPPFLAGS="$CPPFLAGS -O2"
+ cd $srcdir/$pkgname
+ patch -Np1 -i $srcdir/gnu89-inline.patch
+ patch -Np1 -i $srcdir/va_list.patch
+ cp $srcdir/config ./.config
+ cd capiinfo
+ aclocal
+ automake --add-missing
+ autoreconf
+ cd $srcdir/$pkgname
+ cd capifax
+ aclocal
+ automake --add-missing
+ autoreconf
+ cd $srcdir/$pkgname
+ make subconfig
+}
+
+build() {
+ cd $srcdir/$pkgname
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname
+ install -dm755 $pkgdir/usr/bin
+ make DESTDIR=$pkgdir install
+ chmod 755 $pkgdir/usr/bin/*
+}
Copied: isdn4k-utils/repos/staging-i686/config (from rev 245526, isdn4k-utils/trunk/config)
===================================================================
--- staging-i686/config (rev 0)
+++ staging-i686/config 2015-09-08 11:42:02 UTC (rev 245527)
@@ -0,0 +1,102 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# General configuration
+#
+# CONFIG_BUILDX11 is not set
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/usr/bin'
+CONFIG_LIBDIR='/usr/lib'
+CONFIG_MANDIR='/usr/share/man'
+CONFIG_RUNDIR='/var/run'
+CONFIG_LOCKDIR='/var/lock'
+CONFIG_LOCKFILE='LCK..'
+CONFIG_I4LCONFDIR='/etc/isdn'
+CONFIG_CONFFILE='isdn.conf'
+CONFIG_CALLERIDFILE='callerid.conf'
+CONFIG_USERCONFFILE='~/.isdn'
+CONFIG_COUNTRYCODE='49'
+CONFIG_AREACODE=''
+CONFIG_COUNTRY_PREFIX='+'
+CONFIG_AREA_PREFIX='0'
+CONFIG_DATADIR='/usr/lib/isdn'
+CONFIG_LIB_AREACODE=y
+
+
+#
+# Runtime configuration tools
+#
+CONFIG_ISDNCTRL=y
+CONFIG_ISDNCTRL_CONF=y
+CONFIG_ISDNCTRL_TIMRU=y
+CONFIG_IPROFD=y
+
+#
+# Card configuration tools
+#
+# CONFIG_TELESCTRL is not set
+CONFIG_HISAXCTRL=y
+CONFIG_ICNCTRL=y
+# CONFIG_ICNCTRL_DEBUG is not set
+CONFIG_PCBITCTL=y
+CONFIG_AVMCAPICTRL=y
+# CONFIG_LOOPCTRL is not set
+# CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+# CONFIG_LOOPCTRL_DEBUG is not set
+
+
+#
+# Tools for monitoring activity
+#
+CONFIG_IMON=y
+CONFIG_IMONTTY=y
+CONFIG_ISDNLOG=y
+
+#
+# Options for isdnlog package
+#
+CONFIG_ISDNLOG_SERV_PORT=20011
+CONFIG_ISDNLOG_USERFILE='isdnlog.users'
+CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
+CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
+CONFIG_ISDNLOG_RELOADCMD='reload'
+CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
+CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
+CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
+# CONFIG_ISDNLOG_POSTGRES is not set
+# CONFIG_ISDNLOG_MYSQLDB is not set
+CONFIG_ISDN_LOG_DE=y
+CONFIG_IPPPSTATS=y
+# CONFIG_XISDNLOAD is not set
+# CONFIG_XMONISDN is not set
+
+#
+# Applications
+#
+# CONFIG_VBOX is not set
+CONFIG_IPPPD=y
+
+#
+# Options for ipppd
+#
+CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_RADIUS is not set
+# CONFIG_RADIUS_WTMP_LOGGING is not set
+RADIUS_CLIENT_CONFIG_FILE=''
+CONFIG_CAPIFAX=y
+CONFIG_RCAPID=y
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+# CONFIG_FAQ is not set
Copied: isdn4k-utils/repos/staging-i686/gnu89-inline.patch (from rev 245526, isdn4k-utils/trunk/gnu89-inline.patch)
===================================================================
--- staging-i686/gnu89-inline.patch (rev 0)
+++ staging-i686/gnu89-inline.patch 2015-09-08 11:42:02 UTC (rev 245527)
@@ -0,0 +1,18 @@
+Description: fix build failure with GCC5:
+ build isdnlog with -fgnu89-inline
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777920
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2015-07-20
+
+--- a/isdnlog/Makefile.in
++++ b/isdnlog/Makefile.in
+@@ -1719,7 +1719,7 @@
+
+ # export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+
+-export CFLAGS = -Wall -pipe
++export CFLAGS = -Wall -pipe -fgnu89-inline
+ ifndef _CC
+ export _CC = gcc
+ endif
Copied: isdn4k-utils/repos/staging-i686/va_list.patch (from rev 245526, isdn4k-utils/trunk/va_list.patch)
===================================================================
--- staging-i686/va_list.patch (rev 0)
+++ staging-i686/va_list.patch 2015-09-08 11:42:02 UTC (rev 245527)
@@ -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
Copied: isdn4k-utils/repos/staging-x86_64/PKGBUILD (from rev 245526, isdn4k-utils/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-09-08 11:42:02 UTC (rev 245527)
@@ -0,0 +1,55 @@
+# $Id$
+# Contributor: Dennis "Gyroplast" Herbrich <dennis at archlinux.org>, dorphell <dorphell at archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=isdn4k-utils
+pkgver=3.27
+pkgrel=2
+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=(isdn4k-utils::git+git://git.misdn.eu/isdn4k-utils.git#tag=v${pkgver}
+ config
+ gnu89-inline.patch
+ va_list.patch)
+replaces=('capi4k-utils')
+md5sums=('SKIP'
+ 'ea3c71054234f9ef6bcf9325e36c4a38'
+ '165084a9096cc1ad043cc00a5cc05c0b'
+ '81709ee10336a2df684a5398f42ef514')
+
+prepare() {
+ CPPFLAGS="$CPPFLAGS -O2"
+ cd $srcdir/$pkgname
+ patch -Np1 -i $srcdir/gnu89-inline.patch
+ patch -Np1 -i $srcdir/va_list.patch
+ cp $srcdir/config ./.config
+ cd capiinfo
+ aclocal
+ automake --add-missing
+ autoreconf
+ cd $srcdir/$pkgname
+ cd capifax
+ aclocal
+ automake --add-missing
+ autoreconf
+ cd $srcdir/$pkgname
+ make subconfig
+}
+
+build() {
+ cd $srcdir/$pkgname
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname
+ install -dm755 $pkgdir/usr/bin
+ make DESTDIR=$pkgdir install
+ chmod 755 $pkgdir/usr/bin/*
+}
Copied: isdn4k-utils/repos/staging-x86_64/config (from rev 245526, isdn4k-utils/trunk/config)
===================================================================
--- staging-x86_64/config (rev 0)
+++ staging-x86_64/config 2015-09-08 11:42:02 UTC (rev 245527)
@@ -0,0 +1,102 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# General configuration
+#
+# CONFIG_BUILDX11 is not set
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/usr/bin'
+CONFIG_LIBDIR='/usr/lib'
+CONFIG_MANDIR='/usr/share/man'
+CONFIG_RUNDIR='/var/run'
+CONFIG_LOCKDIR='/var/lock'
+CONFIG_LOCKFILE='LCK..'
+CONFIG_I4LCONFDIR='/etc/isdn'
+CONFIG_CONFFILE='isdn.conf'
+CONFIG_CALLERIDFILE='callerid.conf'
+CONFIG_USERCONFFILE='~/.isdn'
+CONFIG_COUNTRYCODE='49'
+CONFIG_AREACODE=''
+CONFIG_COUNTRY_PREFIX='+'
+CONFIG_AREA_PREFIX='0'
+CONFIG_DATADIR='/usr/lib/isdn'
+CONFIG_LIB_AREACODE=y
+
+
+#
+# Runtime configuration tools
+#
+CONFIG_ISDNCTRL=y
+CONFIG_ISDNCTRL_CONF=y
+CONFIG_ISDNCTRL_TIMRU=y
+CONFIG_IPROFD=y
+
+#
+# Card configuration tools
+#
+# CONFIG_TELESCTRL is not set
+CONFIG_HISAXCTRL=y
+CONFIG_ICNCTRL=y
+# CONFIG_ICNCTRL_DEBUG is not set
+CONFIG_PCBITCTL=y
+CONFIG_AVMCAPICTRL=y
+# CONFIG_LOOPCTRL is not set
+# CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+# CONFIG_LOOPCTRL_DEBUG is not set
+
+
+#
+# Tools for monitoring activity
+#
+CONFIG_IMON=y
+CONFIG_IMONTTY=y
+CONFIG_ISDNLOG=y
+
+#
+# Options for isdnlog package
+#
+CONFIG_ISDNLOG_SERV_PORT=20011
+CONFIG_ISDNLOG_USERFILE='isdnlog.users'
+CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
+CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
+CONFIG_ISDNLOG_RELOADCMD='reload'
+CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
+CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
+CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
+# CONFIG_ISDNLOG_POSTGRES is not set
+# CONFIG_ISDNLOG_MYSQLDB is not set
+CONFIG_ISDN_LOG_DE=y
+CONFIG_IPPPSTATS=y
+# CONFIG_XISDNLOAD is not set
+# CONFIG_XMONISDN is not set
+
+#
+# Applications
+#
+# CONFIG_VBOX is not set
+CONFIG_IPPPD=y
+
+#
+# Options for ipppd
+#
+CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_RADIUS is not set
+# CONFIG_RADIUS_WTMP_LOGGING is not set
+RADIUS_CLIENT_CONFIG_FILE=''
+CONFIG_CAPIFAX=y
+CONFIG_RCAPID=y
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+# CONFIG_FAQ is not set
Copied: isdn4k-utils/repos/staging-x86_64/gnu89-inline.patch (from rev 245526, isdn4k-utils/trunk/gnu89-inline.patch)
===================================================================
--- staging-x86_64/gnu89-inline.patch (rev 0)
+++ staging-x86_64/gnu89-inline.patch 2015-09-08 11:42:02 UTC (rev 245527)
@@ -0,0 +1,18 @@
+Description: fix build failure with GCC5:
+ build isdnlog with -fgnu89-inline
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777920
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2015-07-20
+
+--- a/isdnlog/Makefile.in
++++ b/isdnlog/Makefile.in
+@@ -1719,7 +1719,7 @@
+
+ # export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+
+-export CFLAGS = -Wall -pipe
++export CFLAGS = -Wall -pipe -fgnu89-inline
+ ifndef _CC
+ export _CC = gcc
+ endif
Copied: isdn4k-utils/repos/staging-x86_64/va_list.patch (from rev 245526, isdn4k-utils/trunk/va_list.patch)
===================================================================
--- staging-x86_64/va_list.patch (rev 0)
+++ staging-x86_64/va_list.patch 2015-09-08 11:42:02 UTC (rev 245527)
@@ -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
More information about the arch-commits
mailing list