CVS commit: pkgsrc/mail/spamdyke

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jul  9 16:16:32 UTC 2017

Modified Files:
        pkgsrc/mail/spamdyke: Makefile distinfo
Added Files:
        pkgsrc/mail/spamdyke/patches: patch-md5.c patch-spamdyke.h
Removed Files:
        pkgsrc/mail/spamdyke/patches: patch-aa

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


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mail/spamdyke/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/spamdyke/distinfo
cvs rdiff -u -r1.12 -r0 pkgsrc/mail/spamdyke/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/spamdyke/patches/patch-md5.c \
    pkgsrc/mail/spamdyke/patches/patch-spamdyke.h

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

Modified files:

Index: pkgsrc/mail/spamdyke/Makefile
diff -u pkgsrc/mail/spamdyke/Makefile:1.35 pkgsrc/mail/spamdyke/Makefile:1.36
--- pkgsrc/mail/spamdyke/Makefile:1.35  Sat Mar  5 11:28:51 2016
+++ pkgsrc/mail/spamdyke/Makefile       Sun Jul  9 16:16:32 2017
@@ -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 @@ WRKSRC=                     ${WRKDIR}/${PKGNAME_NOREV}/${P
 
 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
 

Index: pkgsrc/mail/spamdyke/distinfo
diff -u pkgsrc/mail/spamdyke/distinfo:1.31 pkgsrc/mail/spamdyke/distinfo:1.32
--- pkgsrc/mail/spamdyke/distinfo:1.31  Tue Nov  3 23:27:21 2015
+++ pkgsrc/mail/spamdyke/distinfo       Sun Jul  9 16:16:32 2017
@@ -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

Added files:

Index: pkgsrc/mail/spamdyke/patches/patch-md5.c
diff -u /dev/null pkgsrc/mail/spamdyke/patches/patch-md5.c:1.1
--- /dev/null   Sun Jul  9 16:16:32 2017
+++ pkgsrc/mail/spamdyke/patches/patch-md5.c    Sun Jul  9 16:16:32 2017
@@ -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.
Index: pkgsrc/mail/spamdyke/patches/patch-spamdyke.h
diff -u /dev/null pkgsrc/mail/spamdyke/patches/patch-spamdyke.h:1.1
--- /dev/null   Sun Jul  9 16:16:32 2017
+++ pkgsrc/mail/spamdyke/patches/patch-spamdyke.h       Sun Jul  9 16:16:32 2017
@@ -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