CVS commit: pkgsrc/comms/hylafax

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  5 13:37:07 UTC 2022

Modified Files:
        pkgsrc/comms/hylafax: distinfo
        pkgsrc/comms/hylafax/patches: patch-af patch-ag

Log Message:
hylafax: Respect LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/comms/hylafax/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/comms/hylafax/patches/patch-af
cvs rdiff -u -r1.6 -r1.7 pkgsrc/comms/hylafax/patches/patch-ag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/hylafax/distinfo
diff -u pkgsrc/comms/hylafax/distinfo:1.34 pkgsrc/comms/hylafax/distinfo:1.35
--- pkgsrc/comms/hylafax/distinfo:1.34  Tue Oct 26 10:06:00 2021
+++ pkgsrc/comms/hylafax/distinfo       Thu May  5 13:37:07 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2021/10/26 10:06:00 nia Exp $
+$NetBSD: distinfo,v 1.35 2022/05/05 13:37:07 nia Exp $
 
 BLAKE2s (hylafax-6.0.7.tar.gz) = f70778040fdf08fd33da6d8648fd722655c74414eb2cb8800e5b0563595aafd5
 SHA512 (hylafax-6.0.7.tar.gz) = fc57feb416772a7a4bfaf5c3c76a0c2254ead2f63a72b3dfa465444327d440345a0402b7c7dad14f6d03029302ef39cf160c8ef5bfdee2c966fd15fbaac230a3
@@ -8,8 +8,8 @@ SHA1 (patch-ab) = 5ee930814178223fa66dd3
 SHA1 (patch-ac) = b2051ac2e43d0635797043605d96f128e535c976
 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
 SHA1 (patch-ae) = 5e5d1f36af88b215baf109ecd1c5f3c12571162d
-SHA1 (patch-af) = f1dd817fcd086bfdd354351dc0b92027250edcba
-SHA1 (patch-ag) = 52024e0184e2607c6cfb2c6c19c9f31b3c37ec95
+SHA1 (patch-af) = 9ec5625f52527e6e78cbe47d1ecfed563e0f32f3
+SHA1 (patch-ag) = 4faf87821e02b97d4d14b5f1e214165df58de58b
 SHA1 (patch-ah) = 8558a0f9d970ce1cddbeb76fc87a1c450bd0941d
 SHA1 (patch-ai) = 85ae0baa95f012593b908b3394280e49ba3b7f24
 SHA1 (patch-al) = a0f006412918c047176945d911042264aa050fc0

Index: pkgsrc/comms/hylafax/patches/patch-af
diff -u pkgsrc/comms/hylafax/patches/patch-af:1.9 pkgsrc/comms/hylafax/patches/patch-af:1.10
--- pkgsrc/comms/hylafax/patches/patch-af:1.9   Fri Mar 14 15:59:29 2014
+++ pkgsrc/comms/hylafax/patches/patch-af       Thu May  5 13:37:07 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.9 2014/03/14 15:59:29 adam Exp $
+$NetBSD: patch-af,v 1.10 2022/05/05 13:37:07 nia Exp $
 
---- defs.in.orig       2012-06-06 00:58:38.000000000 +0000
+--- defs.in.orig       2018-09-18 18:51:17.000000000 +0000
 +++ defs.in
 @@ -48,12 +48,13 @@ ABI_PATCH        = @ABI_PATCH@
  # to insufficient; you are better off rerunning the
@@ -22,6 +22,15 @@ $NetBSD: patch-af,v 1.9 2014/03/14 15:59
  FONTMAP               = @FONTMAP@
  FONTPATH      = @FONTPATH@
  SENDMAIL      = @SENDMAIL@
+@@ -262,7 +263,7 @@ GC++DEFS   = @ANSICXXPP@
+ #     then its make file should override the setting of SHDLIBC with a
+ #     line such as "SHDLIBC=".
+ #
+-LDFLAGS               = ${LDOPTS} ${LDLIBS}
++LDFLAGS               += ${LDOPTS} ${LDLIBS}
+ 
+ LDOPTS                = ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
+ LDLIBS                = ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
 @@ -328,7 +329,7 @@ INCLDIR            = /usr/include
  # MANSYS      subdirectory for server & server-related apps
  # MANFILES    subdirectory for file format info 

Index: pkgsrc/comms/hylafax/patches/patch-ag
diff -u pkgsrc/comms/hylafax/patches/patch-ag:1.6 pkgsrc/comms/hylafax/patches/patch-ag:1.7
--- pkgsrc/comms/hylafax/patches/patch-ag:1.6   Fri Mar 14 15:59:29 2014
+++ pkgsrc/comms/hylafax/patches/patch-ag       Thu May  5 13:37:07 2022
@@ -1,7 +1,19 @@
-$NetBSD: patch-ag,v 1.6 2014/03/14 15:59:29 adam Exp $
+$NetBSD: patch-ag,v 1.7 2022/05/05 13:37:07 nia Exp $
 
---- etc/Makefile.in.orig       2012-06-06 00:58:38.000000000 +0000
+--- etc/Makefile.in.orig       2018-09-18 18:51:17.000000000 +0000
 +++ etc/Makefile.in
+@@ -70,9 +70,9 @@ xferfaxlog:
+ config.fax:
+       ${ECHO} on >config.fax
+ lockname: ${SRCDIR}/lockname.c
+-      ${CCF} -o $@ ${SRCDIR}/lockname.c
++      ${CCF} -o $@ ${SRCDIR}/lockname.c ${LDFLAGS}
+ ondelay: ${SRCDIR}/ondelay.c
+-      ${CCF} -o $@ ${SRCDIR}/ondelay.c
++      ${CCF} -o $@ ${SRCDIR}/ondelay.c ${LDFLAGS}
+ 
+ PUTSERVER     = ${INSTALL} -idb ${PRODUCT}.sw.server
+ PUTSAMPLE     = ${PUTSERVER} -u ${FAXUSER} -g ${FAXGROUP} \
 @@ -86,25 +86,25 @@ install: default
                -src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
        done