From 538138e9619af12adfc5aa9678684e3461f3c449 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon@pkgsrc.org>
Date: Tue, 28 Sep 2021 09:20:34 +0000
Subject: apg: Pass LDFLAGS to fix RELRO build. Bump PKGREVISION

---
 security/apg/Makefile         |  4 ++--
 security/apg/distinfo         |  4 ++--
 security/apg/patches/patch-aa | 22 ++++++++++++++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'security/apg')

diff --git a/security/apg/Makefile b/security/apg/Makefile
index 8eebc48a9e5..6f2155e9e55 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2021/05/24 19:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2021/09/28 09:20:34 ryoon Exp $
 #
 
 DISTNAME=	apg-2.3.0b
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	security
 #MASTER_SITES=	http://www.adel.nursat.kz/apg/download/
 
diff --git a/security/apg/distinfo b/security/apg/distinfo
index 58139b42422..eceb15488a3 100644
--- a/security/apg/distinfo
+++ b/security/apg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2018/09/26 05:04:09 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2021/09/28 09:20:34 ryoon Exp $
 
 SHA1 (apg-2.3.0b.tar.gz) = d729c939adb659c05fd0ea3d9c03842c6fe86fed
 RMD160 (apg-2.3.0b.tar.gz) = 18f9955d6fdb721bec26613860b312d7fea6fba7
 SHA512 (apg-2.3.0b.tar.gz) = 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 Size (apg-2.3.0b.tar.gz) = 109995 bytes
-SHA1 (patch-aa) = 59d5537da45c7fb05480d12d1e73b04d19eed63f
+SHA1 (patch-aa) = 006bb43f2bb5401c5cd43f0d54f0e8a992ef2d49
 SHA1 (patch-apg.c) = 212c6b8b61127243428ffa2bfbab8424bde0a7da
diff --git a/security/apg/patches/patch-aa b/security/apg/patches/patch-aa
index d157d7ed569..152059d40a2 100644
--- a/security/apg/patches/patch-aa
+++ b/security/apg/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2014/02/14 04:14:40 rodent Exp $
+$NetBSD: patch-aa,v 1.5 2021/09/28 09:20:34 ryoon Exp $
 
-Don't hardcode CC, CFLAGS, PREFIX. Fix installation stage.
+* Don't hardcode CC, CFLAGS, PREFIX. Fix installation stage.
+* Add LDFLAGS to fix RELRO build.
 
 --- Makefile.orig	2003-08-07 15:40:39.000000000 +0000
 +++ Makefile
@@ -25,6 +26,23 @@ Don't hardcode CC, CFLAGS, PREFIX. Fix installation stage.
  
  ####################################################################
  # If you plan to install APG daemon you should look at lines below #
+@@ -129,13 +126,13 @@ cliserv: apgd apgbfm 
+ cygwin: standalone
+ 
+ apg:
+-	${CC} ${CFLAGS} ${STANDALONE_OPTIONS} -o ${PROGNAME} ${SOURCES} ${APG_CLIBS}
++	${CC} ${CFLAGS} ${LDFLAGS} ${STANDALONE_OPTIONS} -o ${PROGNAME} ${SOURCES} ${APG_CLIBS}
+ 
+ apgd:
+-	${CC} ${CFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
++	${CC} ${CFLAGS} ${LDFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
+ 
+ apgbfm:
+-	${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
++	${CC} ${CFLAGS} ${LDFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
+ 
+ strip:
+ 	strip ${PROGNAME}
 @@ -143,24 +140,12 @@ strip:
  	strip ${BFM_PROGNAME}
  
-- 
cgit v1.2.3