[pkgsrc/trunk]: pkgsrc/mail/spamdyke Fix build with PKGSRC_USE_SSP, and suppo...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c291442a0d4
branches:  trunk
changeset: 365035:7c291442a0d4
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Jul 09 16:16:32 2017 +0000

description:
Fix build with PKGSRC_USE_SSP, and support PKGSRC_USE_FORTIFY.
While here, remove reference to LOCALBASE.

diffstat:

 mail/spamdyke/Makefile                 |   6 ++++--
 mail/spamdyke/distinfo                 |   5 +++--
 mail/spamdyke/patches/patch-aa         |  15 ---------------
 mail/spamdyke/patches/patch-md5.c      |  15 +++++++++++++++
 mail/spamdyke/patches/patch-spamdyke.h |  15 +++++++++++++++
 5 files changed, 37 insertions(+), 19 deletions(-)

diffs (97 lines):

diff -r 7e3d84614db6 -r 7c291442a0d4 mail/spamdyke/Makefile
--- a/mail/spamdyke/Makefile    Sun Jul 09 15:29:41 2017 +0000
+++ b/mail/spamdyke/Makefile    Sun Jul 09 16:16:32 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/03/05 11:28:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2017/07/09 16:16:32 schmonz Exp $
 #
 
 DISTNAME=              spamdyke-5.0.1
@@ -16,13 +16,15 @@
 
 GNU_CONFIGURE=         yes
 BUILD_TARGET=          ${PKGBASE}
+MAKE_FLAGS+=           CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 
 # anonymous inner functions
 ONLY_FOR_COMPILER=     gcc
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     spamdyke.h
-SUBST_SED.paths=       -e 's,@LOCALBASE@,${LOCALBASE:Q},g'
+SUBST_SED.paths=       -e 's,@PREFIX@,${PREFIX:Q},g'
 SUBST_SED.paths+=      -e 's,@QMAILDIR@,${QMAILDIR:Q},g'
 SUBST_STAGE.paths=     do-configure
 
diff -r 7e3d84614db6 -r 7c291442a0d4 mail/spamdyke/distinfo
--- a/mail/spamdyke/distinfo    Sun Jul 09 15:29:41 2017 +0000
+++ b/mail/spamdyke/distinfo    Sun Jul 09 16:16:32 2017 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2015/11/03 23:27:21 agc Exp $
+$NetBSD: distinfo,v 1.32 2017/07/09 16:16:32 schmonz Exp $
 
 SHA1 (spamdyke-5.0.1.tgz) = 4de76158a98b3ee33e7002160446ae36de7c96d2
 RMD160 (spamdyke-5.0.1.tgz) = 7237108ebf0ff2a5c02b7e305985a11e93720f8d
 SHA512 (spamdyke-5.0.1.tgz) = a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
 Size (spamdyke-5.0.1.tgz) = 383720 bytes
-SHA1 (patch-aa) = c6075855c28cfd2a76ddcd279b175d55befb6eb7
+SHA1 (patch-md5.c) = f61cd888b6739c014a6de72d55589672d65c25cc
+SHA1 (patch-spamdyke.h) = fe76ef41ba4e1ce231d578368642a18fbca12050
diff -r 7e3d84614db6 -r 7c291442a0d4 mail/spamdyke/patches/patch-aa
--- a/mail/spamdyke/patches/patch-aa    Sun Jul 09 15:29:41 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2015/05/03 14:22:08 schmonz Exp $
-
-Substitute paths.
-
---- spamdyke.h.orig    2015-04-30 00:53:36.000000000 +0000
-+++ spamdyke.h
-@@ -104,7 +104,7 @@
- #define STRINGIFY(X)                    _STRINGIFY(X)
- 
- #define DEFAULT_REMOTE_IP               "0.0.0.0"
--#define DEFAULT_PATH                    "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/var/qmail/bin:/home/vpopmail/bin"
-+#define DEFAULT_PATH                    "/bin:/usr/bin:@LOCALBASE@/bin:@QMAILDIR@/bin:/home/vpopmail/bin"
- #define DEFAULT_NIHDNS_RESOLVER_FILENAME        "/etc/resolv.conf"
- #define DEFAULT_NIHDNS_PORT             53
- #define DEFAULT_TIMEOUT_NIHDNS_TOTAL_SECS       30
diff -r 7e3d84614db6 -r 7c291442a0d4 mail/spamdyke/patches/patch-md5.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamdyke/patches/patch-md5.c Sun Jul 09 16:16:32 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-md5.c,v 1.1 2017/07/09 16:16:32 schmonz Exp $
+
+Support PKGSRC_USE_SSP.
+
+--- md5.c.orig 2015-04-30 00:53:36.000000000 +0000
++++ md5.c
+@@ -165,7 +165,7 @@ unsigned char *md5(unsigned char destina
+   if (pad_len <= 0)
+     pad_len += 64;
+ 
+-  memcpy(padding, PAD_BLOCK, pad_len);
++  memcpy(padding, (PAD_BLOCK), pad_len);
+ 
+   /*
+    * Step 2, RFC 1321, page 3.
diff -r 7e3d84614db6 -r 7c291442a0d4 mail/spamdyke/patches/patch-spamdyke.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamdyke/patches/patch-spamdyke.h    Sun Jul 09 16:16:32 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-spamdyke.h,v 1.1 2017/07/09 16:16:32 schmonz Exp $
+
+Substitute paths.
+
+--- spamdyke.h.orig    2015-04-30 00:53:36.000000000 +0000
++++ spamdyke.h
+@@ -104,7 +104,7 @@
+ #define STRINGIFY(X)                    _STRINGIFY(X)
+ 
+ #define DEFAULT_REMOTE_IP               "0.0.0.0"
+-#define DEFAULT_PATH                    "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/var/qmail/bin:/home/vpopmail/bin"
++#define DEFAULT_PATH                    "/bin:/usr/bin:@PREFIX@/bin:@QMAILDIR@/bin:/home/vpopmail/bin"
+ #define DEFAULT_NIHDNS_RESOLVER_FILENAME        "/etc/resolv.conf"
+ #define DEFAULT_NIHDNS_PORT             53
+ #define DEFAULT_TIMEOUT_NIHDNS_TOTAL_SECS       30