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

[Tobias Powalowski]

    Date: Tuesday, September 25, 2018 @ 12:30:37
  Author: tpowa
Revision: 335370

upgpkg: hylafax 6.0.7-1

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

--------------------+
 PKGBUILD           |   17 +++++------------
 hylafax-gcc7.patch |   31 -------------------------------
 2 files changed, 5 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-25 07:56:39 UTC (rev 335369)
+++ PKGBUILD	2018-09-25 12:30:37 UTC (rev 335370)
@@ -1,7 +1,7 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 pkgname=hylafax
-pkgver=6.0.6
-pkgrel=8
+pkgver=6.0.7
+pkgrel=1
 pkgdesc="Fax Server"
 arch=('x86_64')
 install='hylafax.install'
@@ -17,14 +17,8 @@
         config.local
         faxq.service
         hfaxd.service
-        faxgetty at .service
-        hylafax-gcc7.patch)
+        faxgetty at .service)
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../hylafax-gcc7.patch # Debian patch
-}
-
 build () {
   cd "$srcdir/${pkgname}-${pkgver}"
   cp ../config.local .
@@ -58,11 +52,10 @@
   chown 10:14 ${pkgdir}/var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
   chown 10:14 -R ${pkgdir}/var/spool/hylafax/etc/templates
 }
-md5sums=('d063d45049c8fcbabefe09d662313067'
+md5sums=('7602e98b882fa61a0722109c2706d1f1'
          '9ef38446d2a2aeac698c4ae178fd5c2b'
          'e5afba881859f018ee88d35fc62a488f'
          '5f3a89fbfb10c47755d3ca19183b8a59'
          'a10aa2ef613551a88d750f6602b5f2f7'
          '38a00db6d9d765d130b2d8d3a98e5c24'
-         'fe10ea597e786fe8c09e4104fbdf16de'
-         '2aa6e02974e497b8d1e42c4a6c0a5b9c')
+         'fe10ea597e786fe8c09e4104fbdf16de')

Deleted: hylafax-gcc7.patch
===================================================================
--- hylafax-gcc7.patch	2018-09-25 07:56:39 UTC (rev 335369)
+++ hylafax-gcc7.patch	2018-09-25 12:30:37 UTC (rev 335370)
@@ -1,31 +0,0 @@
-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,'"'));
-