Date: Friday, January 5, 2018 @ 11:29:16 Author: tpowa Revision: 314083
archrelease: copy trunk to extra-x86_64 Added: misdnuser/repos/extra-x86_64/PKGBUILD (from rev 314082, misdnuser/trunk/PKGBUILD) misdnuser/repos/extra-x86_64/c2faxrecv-mISDNcapid.service (from rev 314082, misdnuser/trunk/c2faxrecv-mISDNcapid.service) misdnuser/repos/extra-x86_64/fix-compile-gcc48.patch (from rev 314082, misdnuser/trunk/fix-compile-gcc48.patch) misdnuser/repos/extra-x86_64/mISDNcapid.conf (from rev 314082, misdnuser/trunk/mISDNcapid.conf) misdnuser/repos/extra-x86_64/mISDNcapid.service (from rev 314082, misdnuser/trunk/mISDNcapid.service) Deleted: misdnuser/repos/extra-x86_64/PKGBUILD misdnuser/repos/extra-x86_64/c2faxrecv-mISDNcapid.service misdnuser/repos/extra-x86_64/fix-compile-gcc48.patch misdnuser/repos/extra-x86_64/mISDNcapid.conf misdnuser/repos/extra-x86_64/mISDNcapid.service ------------------------------+ PKGBUILD | 101 ++++++++++++++++++++--------------------- c2faxrecv-mISDNcapid.service | 22 ++++---- fix-compile-gcc48.patch | 30 ++++++------ mISDNcapid.conf | 2 mISDNcapid.service | 22 ++++---- 5 files changed, 89 insertions(+), 88 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-05 11:29:01 UTC (rev 314082) +++ PKGBUILD 2018-01-05 11:29:16 UTC (rev 314083) @@ -1,50 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> - -pkgname=misdnuser -pkgver=2.0.19 -pkgrel=2 -pkgdesc="Tools and library for mISDN" -arch=('i686' 'x86_64') -url="http://www.misdn.org" -license=('GPL') -makedepends=('git') -depends=('isdn4k-utils' 'spandsp') -backup=('etc/capi20.conf') -options=('!makeflags' '!strip') -source=(misdnuser::git+git://git.misdn.eu/mISDNuser.git#tag=v${pkgver} - mISDNcapid.service - c2faxrecv-mISDNcapid.service - mISDNcapid.conf) - -build() { - # only enable for debugging! - #export CFLAGS+=" -g -O0" - #export CXXFLAGS+=" -g -O0" - cd ${srcdir}/${pkgname} - make - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp --localstatedir=/var - make -} - -package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install - # fix udev rule - mkdir -p ${pkgdir}/usr/lib/udev/rules.d - mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d - rm -r ${pkgdir}/etc/udev/ - # add systemd files - install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service - # mISDNcapid: - # tends to crash on avmfritz card, add an extra systemd file for - # restarting the services until segfaults are fixed! - install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service - install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf - # remove /var/run/mISDNcapid - rm -r ${pkgdir}/var -} -md5sums=('SKIP' - 'bfd47480a54b41394ba5cc3f53587130' - '32ead7f063e007c784aa883d441f33c2' - '42c3b46880a68c3883ee1ed00af34b45') Copied: misdnuser/repos/extra-x86_64/PKGBUILD (from rev 314082, misdnuser/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-05 11:29:16 UTC (rev 314083) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> + +pkgname=misdnuser +pkgver=2.0.22 +pkgrel=1 +pkgdesc="Tools and library for mISDN" +arch=('x86_64') +url="http://www.misdn.org" +license=('GPL') +makedepends=('git') +depends=('isdn4k-utils' 'spandsp') +backup=('etc/capi20.conf') +options=('!makeflags' '!strip') +source=(misdnuser::git+https://github.com/ISDN4Linux/mISDNuser#commit=0f8548b3d2b05ae2e876bf3ca7dd7b10c88ff57a + mISDNcapid.service + c2faxrecv-mISDNcapid.service + mISDNcapid.conf) + +build() { + # only enable for debugging! + #export CFLAGS+=" -g -O0" + #export CXXFLAGS+=" -g -O0" + cd ${srcdir}/${pkgname} + make + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp --localstatedir=/var + make +} + +package() { + cd ${srcdir}/${pkgname} + mkdir ${pkgdir}/var + make DESTDIR=${pkgdir} install + # fix udev rule + mkdir -p ${pkgdir}/usr/lib/udev/rules.d + mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d + rm -r ${pkgdir}/etc/udev/ + # add systemd files + install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service + # mISDNcapid: + # tends to crash on avmfritz card, add an extra systemd file for + # restarting the services until segfaults are fixed! + install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service + install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf + # remove /var/run/mISDNcapid + rm -r ${pkgdir}/var +} +md5sums=('SKIP' + 'bfd47480a54b41394ba5cc3f53587130' + '32ead7f063e007c784aa883d441f33c2' + '42c3b46880a68c3883ee1ed00af34b45') Deleted: c2faxrecv-mISDNcapid.service =================================================================== --- c2faxrecv-mISDNcapid.service 2018-01-05 11:29:01 UTC (rev 314082) +++ c2faxrecv-mISDNcapid.service 2018-01-05 11:29:16 UTC (rev 314083) @@ -1,11 +0,0 @@ -[Unit] -Description=mISDN CAPI to fax receive -Requires=faxq.service mISDNcapid.service -After=faxq.service mISDNcapid.service - -[Service] -ExecStart=/usr/bin/c2faxrecv -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target Copied: misdnuser/repos/extra-x86_64/c2faxrecv-mISDNcapid.service (from rev 314082, misdnuser/trunk/c2faxrecv-mISDNcapid.service) =================================================================== --- c2faxrecv-mISDNcapid.service (rev 0) +++ c2faxrecv-mISDNcapid.service 2018-01-05 11:29:16 UTC (rev 314083) @@ -0,0 +1,11 @@ +[Unit] +Description=mISDN CAPI to fax receive +Requires=faxq.service mISDNcapid.service +After=faxq.service mISDNcapid.service + +[Service] +ExecStart=/usr/bin/c2faxrecv +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Deleted: fix-compile-gcc48.patch =================================================================== --- fix-compile-gcc48.patch 2018-01-05 11:29:01 UTC (rev 314082) +++ fix-compile-gcc48.patch 2018-01-05 11:29:16 UTC (rev 314083) @@ -1,15 +0,0 @@ -X-Git-Url: http://misdn.eu/?p=projects%2FmISDNuser.git;a=blobdiff_plain;f=lib%2Flayer3%2Fq931.c;h=75716fe121a48a3c62fb785af85d856a688889bf;hp=705caf3e167bb5c50828c464151fcfe49af89e64;hb=ec4ac2763f737dc9100f9f4f9e91f4d7064a77b2;hpb=1dc4c24d27ed9c46e2fdbf7fb4b178e549a58e8d - -diff --git a/lib/layer3/q931.c b/lib/layer3/q931.c -index 705caf3..75716fe 100644 ---- a/lib/layer3/q931.c -+++ b/lib/layer3/q931.c -@@ -357,7 +357,7 @@ mi_encode_hlc(struct l3_msg *l3m, int hlc, int ehlc) - ie[1] = hlc & 0x7f; - - if (ehlc < 0) -- ie[1] | 0x80; -+ ie[1] |= 0x80; - else { - l = 3; - ie[2] = 0x80 | (ehlc & 0x7f); Copied: misdnuser/repos/extra-x86_64/fix-compile-gcc48.patch (from rev 314082, misdnuser/trunk/fix-compile-gcc48.patch) =================================================================== --- fix-compile-gcc48.patch (rev 0) +++ fix-compile-gcc48.patch 2018-01-05 11:29:16 UTC (rev 314083) @@ -0,0 +1,15 @@ +X-Git-Url: http://misdn.eu/?p=projects%2FmISDNuser.git;a=blobdiff_plain;f=lib%2Flayer3%2Fq931.c;h=75716fe121a48a3c62fb785af85d856a688889bf;hp=705caf3e167bb5c50828c464151fcfe49af89e64;hb=ec4ac2763f737dc9100f9f4f9e91f4d7064a77b2;hpb=1dc4c24d27ed9c46e2fdbf7fb4b178e549a58e8d + +diff --git a/lib/layer3/q931.c b/lib/layer3/q931.c +index 705caf3..75716fe 100644 +--- a/lib/layer3/q931.c ++++ b/lib/layer3/q931.c +@@ -357,7 +357,7 @@ mi_encode_hlc(struct l3_msg *l3m, int hlc, int ehlc) + ie[1] = hlc & 0x7f; + + if (ehlc < 0) +- ie[1] | 0x80; ++ ie[1] |= 0x80; + else { + l = 3; + ie[2] = 0x80 | (ehlc & 0x7f); Deleted: mISDNcapid.conf =================================================================== --- mISDNcapid.conf 2018-01-05 11:29:01 UTC (rev 314082) +++ mISDNcapid.conf 2018-01-05 11:29:16 UTC (rev 314083) @@ -1 +0,0 @@ -D /var/run/mISDNcapid 0755 root root - Copied: misdnuser/repos/extra-x86_64/mISDNcapid.conf (from rev 314082, misdnuser/trunk/mISDNcapid.conf) =================================================================== --- mISDNcapid.conf (rev 0) +++ mISDNcapid.conf 2018-01-05 11:29:16 UTC (rev 314083) @@ -0,0 +1 @@ +D /var/run/mISDNcapid 0755 root root - Deleted: mISDNcapid.service =================================================================== --- mISDNcapid.service 2018-01-05 11:29:01 UTC (rev 314082) +++ mISDNcapid.service 2018-01-05 11:29:16 UTC (rev 314083) @@ -1,11 +0,0 @@ -[Unit] -Description=mISDN CAPI daemon - -[Service] -Type=forking -ExecStart=/usr/bin/mISDNcapid -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: misdnuser/repos/extra-x86_64/mISDNcapid.service (from rev 314082, misdnuser/trunk/mISDNcapid.service) =================================================================== --- mISDNcapid.service (rev 0) +++ mISDNcapid.service 2018-01-05 11:29:16 UTC (rev 314083) @@ -0,0 +1,11 @@ +[Unit] +Description=mISDN CAPI daemon + +[Service] +Type=forking +ExecStart=/usr/bin/mISDNcapid +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target