[arch-commits] Commit in hylafax/trunk (PKGBUILD hylafax hylafax-gcc7.patch)

[Antonio Rojas]

    Date: Tuesday, June 5, 2018 @ 21:10:16
  Author: arojas
Revision: 325958

BUILDINFO rebuild

Added:
  hylafax/trunk/hylafax-gcc7.patch
Modified:
  hylafax/trunk/PKGBUILD
Deleted:
  hylafax/trunk/hylafax

--------------------+
 PKGBUILD           |   13 +++++++--
 hylafax            |   71 ---------------------------------------------------
 hylafax-gcc7.patch |   31 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-05 21:04:27 UTC (rev 325957)
+++ PKGBUILD	2018-06-05 21:10:16 UTC (rev 325958)
@@ -2,7 +2,7 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=7
+pkgrel=8
 pkgdesc="Fax Server"
 arch=('x86_64')
 install='hylafax.install'
@@ -18,8 +18,14 @@
         config.local
         faxq.service
         hfaxd.service
-        faxgetty at .service)
+        faxgetty at .service
+        hylafax-gcc7.patch)
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../hylafax-gcc7.patch # Debian patch
+}
+
 build () {
   cd "$srcdir/${pkgname}-${pkgver}"
   cp ../config.local .
@@ -59,4 +65,5 @@
          '5f3a89fbfb10c47755d3ca19183b8a59'
          'a10aa2ef613551a88d750f6602b5f2f7'
          '38a00db6d9d765d130b2d8d3a98e5c24'
-         'fe10ea597e786fe8c09e4104fbdf16de')
+         'fe10ea597e786fe8c09e4104fbdf16de'
+         '2aa6e02974e497b8d1e42c4a6c0a5b9c')

Deleted: hylafax
===================================================================
--- hylafax	2018-06-05 21:04:27 UTC (rev 325957)
+++ hylafax	2018-06-05 21:10:16 UTC (rev 325958)
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="hylafax"
-FAXQ_BIN=/usr/sbin/faxq
-FAXQ_PID=`pidof -o %PPID $FAXQ_BIN`
-HFAXD_BIN=/usr/lib/fax/hfaxd
-HFAXD_PID=`pidof -o %PPID $HFAXD_BIN`
-HFAXD_OPTS="-i hylafax"
-FAXQUIT_BIN=/usr/sbin/faxquit
-
-. /var/spool/hylafax/etc/setup.cache
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ -z "$FAXQ_PID" ] && $FAXQ_BIN
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      echo `pidof -o %PPID $FAXQ_BIN` > /var/run/faxq.pid
-    fi
-    [ -z "$HFAXD_PID" ] && $HFAXD_BIN $HFAXD_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      echo `pidof -o %PPID $HFAXD_BIN` > /var/run/hfaxd.pid
-    fi
-    add_daemon $DAEMON_NAME
-    stat_done
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-	 $FAXQUIT_BIN >/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      [ ! -z "$FAXQ_PID" ]  && kill $FAXQ_PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        rm /var/run/faxq.pid &> /dev/null
-      fi
-    else
-      rm /var/run/faxq.pid &> /dev/null
-    fi
-    [ ! -z "$HFAXD_PID" ]  && kill $HFAXD_PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm /var/run/hfaxd.pid &> /dev/null
-    fi
-    rm_daemon $DAEMON_NAME
-    stat_done
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Added: hylafax-gcc7.patch
===================================================================
--- hylafax-gcc7.patch	                        (rev 0)
+++ hylafax-gcc7.patch	2018-06-05 21:10:16 UTC (rev 325958)
@@ -0,0 +1,31 @@
+Package:     hylafax
+Subject:     Make hylafax compile using gcc-7
+Author:      Giuseppe Sacco <giuseppe at eppesuigoccas.homedns.org>
+Bug-Debian:  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853448
+Forwarded:   yes
+Last-Update: 2017-08-28
+
+Index: hylafax-6.0.6/faxd/ModemConfig.c++
+===================================================================
+--- hylafax-6.0.6.orig/faxd/ModemConfig.c++
++++ hylafax-6.0.6/faxd/ModemConfig.c++
+@@ -817,4 +817,4 @@ ModemConfig::setConfigItem(const char* t
+ }
+ #undef N
+ 
+-fxIMPLEMENT_ObjArray(IDConfArray, id_config);
++fxIMPLEMENT_ObjArray(IDConfArray, id_config)
+Index: hylafax-6.0.6/libhylafax/FaxRecvInfo.c++
+===================================================================
+--- hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++
++++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++
+@@ -112,7 +112,7 @@ FaxRecvInfo::decode(const char* cp)
+     if (cp == NULL || cp[1] != ',' || cp[2] != '"')
+ 	return (false);
+     u_int i = 0;
+-    while (cp+2 != '\0') {
++    while (*(cp+2) != '\0') {
+ 	callid[i] = cp+3;		// +1 for "/+1 for ,/+1 for "
+ 	if (*cp == '\"') break;
+ 	callid[i].resize(callid[i].next(0,'"'));
+