[arch-commits] Commit in misdnuser/trunk (3 files)

[Tobias Powalowski]

    Date: Monday, May 20, 2013 @ 19:16:56
  Author: tpowa
Revision: 186031

upgpkg: misdnuser 2.0.17_20120917-2

remove rc.d script move /usr/sbin to /usr/bin

Added:
  misdnuser/trunk/fix-compile-gcc48.patch
Modified:
  misdnuser/trunk/PKGBUILD
  misdnuser/trunk/mISDNcapid.service

-------------------------+
 PKGBUILD                |   16 ++++++++++++++--
 fix-compile-gcc48.patch |   15 +++++++++++++++
 mISDNcapid.service      |    2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-20 17:10:21 UTC (rev 186030)
+++ PKGBUILD	2013-05-20 17:16:56 UTC (rev 186031)
@@ -14,15 +14,22 @@
 source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz
         mISDNcapid.service
         c2faxrecv-mISDNcapid.service
-        mISDNcapid.conf)
+        mISDNcapid.conf
+        fix-compile-gcc48.patch)
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # fix gcc48 compile error
+  patch -Np1 -i ${srcdir}/fix-compile-gcc48.patch
+}
+
 build() {
   # only enable for debugging!
   #export CFLAGS+=" -g -O0"
   #export CXXFLAGS+=" -g -O0"
   cd ${srcdir}/${pkgname}-${pkgver}
   make
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp
   make
 }
 
@@ -41,3 +48,8 @@
   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
 }
+md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8'
+         'bfd47480a54b41394ba5cc3f53587130'
+         '32ead7f063e007c784aa883d441f33c2'
+         '42c3b46880a68c3883ee1ed00af34b45'
+         'b291e9a04378decec33c420a62a5a4b7')

Added: fix-compile-gcc48.patch
===================================================================
--- fix-compile-gcc48.patch	                        (rev 0)
+++ fix-compile-gcc48.patch	2013-05-20 17:16:56 UTC (rev 186031)
@@ -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);

Modified: mISDNcapid.service
===================================================================
--- mISDNcapid.service	2013-05-20 17:10:21 UTC (rev 186030)
+++ mISDNcapid.service	2013-05-20 17:16:56 UTC (rev 186031)
@@ -3,7 +3,7 @@
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/mISDNcapid
+ExecStart=/usr/bin/mISDNcapid
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort