diff options
| author | nia <nia@pkgsrc.org> | 2022-05-05 13:37:07 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-05-05 13:37:07 +0000 |
| commit | ab3fac99749d6e93e46768cec74189335ff9b89f (patch) | |
| tree | cac7d78ebe65ea3548f76cab5f3f1ccbeb3c7781 /comms/hylafax | |
| parent | e9d8b676ec0c2be0df5030c9a4859679f9bcedcf (diff) | |
| download | pkgsrc-ab3fac99749d6e93e46768cec74189335ff9b89f.tar.gz | |
hylafax: Respect LDFLAGS. Fixes RELRO build.
Diffstat (limited to 'comms/hylafax')
| -rw-r--r-- | comms/hylafax/distinfo | 6 | ||||
| -rw-r--r-- | comms/hylafax/patches/patch-af | 13 | ||||
| -rw-r--r-- | comms/hylafax/patches/patch-ag | 16 |
3 files changed, 28 insertions, 7 deletions
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo index dddc803d726..a2bd8e4f0a9 100644 --- a/comms/hylafax/distinfo +++ b/comms/hylafax/distinfo @@ -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) = 5ee930814178223fa66dd308f365ff400559fd1d 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 diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af index b6d81123426..58b336573dc 100644 --- a/comms/hylafax/patches/patch-af +++ b/comms/hylafax/patches/patch-af @@ -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:29 adam Exp $ 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 diff --git a/comms/hylafax/patches/patch-ag b/comms/hylafax/patches/patch-ag index cbf9c0e06ed..f362327a8b6 100644 --- a/comms/hylafax/patches/patch-ag +++ b/comms/hylafax/patches/patch-ag @@ -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 |