details: https://anonhg.NetBSD.org/pkgsrc/rev/ee1c7470bb28
branches: trunk
changeset: 371992:ee1c7470bb28
user: spz <spz%pkgsrc.org@localhost>
date: Sun Nov 26 09:11:03 2017 +0000
description:
enable fortifications
diffstat:
mail/majordomo/Makefile | 4 ++--
mail/majordomo/distinfo | 4 ++--
mail/majordomo/patches/patch-aa | 12 +++++++++---
3 files changed, 13 insertions(+), 7 deletions(-)
diffs (62 lines):
diff -r 8428e8a78b40 -r ee1c7470bb28 mail/majordomo/Makefile
--- a/mail/majordomo/Makefile Sat Nov 25 23:54:52 2017 +0000
+++ b/mail/majordomo/Makefile Sun Nov 26 09:11:03 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2017/11/06 13:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2017/11/26 09:11:03 spz Exp $
DISTNAME= majordomo-1.94.5
-PKGREVISION= 21
+PKGREVISION= 22
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/
MASTER_SITES+= ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
diff -r 8428e8a78b40 -r ee1c7470bb28 mail/majordomo/distinfo
--- a/mail/majordomo/distinfo Sat Nov 25 23:54:52 2017 +0000
+++ b/mail/majordomo/distinfo Sun Nov 26 09:11:03 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2016/03/30 09:54:24 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2017/11/26 09:11:03 spz Exp $
SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00
RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4
SHA512 (majordomo-1.94.5.tgz) = d771ee99f31110676ce526687c8c2f47e0b45afd14643fb10b46bed0e238cd9edc6394fb385ac5ed0bbf19e5ca3c368f7af06a3dc17ccccddac4999678285136
Size (majordomo-1.94.5.tgz) = 312244 bytes
-SHA1 (patch-aa) = 99d6f7e1781ccb20c9895d69eb32caa0055c5a0d
+SHA1 (patch-aa) = 63bfda66e5a6435926110449b76326198565ff78
SHA1 (patch-ab) = 58aec7d2ad3625caf8bdcd9b41792a2075605fa5
SHA1 (patch-ac) = 3f8973808314927f167392d640aefc67cd504a70
SHA1 (patch-ad) = 418f7fc79217871e608ca0ab2f71d477804fc7fb
diff -r 8428e8a78b40 -r ee1c7470bb28 mail/majordomo/patches/patch-aa
--- a/mail/majordomo/patches/patch-aa Sat Nov 25 23:54:52 2017 +0000
+++ b/mail/majordomo/patches/patch-aa Sun Nov 26 09:11:03 2017 +0000
@@ -1,7 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2016/03/30 09:54:24 jperkin Exp $
+$NetBSD: patch-aa,v 1.8 2017/11/26 09:11:03 spz Exp $
warp the Makefile template to fit into pkgsrc
+add CFLAGS and LDFLAGS to the wrapper compilation so it'll pick up RELRO
+
--- Makefile.orig 2000-01-18 14:01:17.000000000 +0000
+++ Makefile
@@ -13,27 +13,29 @@
@@ -143,7 +145,7 @@
done
@rm -rf $(TMP)
-@@ -177,46 +182,40 @@ install-scripts: config-scripts
+@@ -177,49 +182,43 @@ install-scripts: config-scripts
# all cases, the sample.cf file must be installed so that config-test will
# be able to check for new variables.
install-cf:
@@ -220,4 +222,8 @@
+ Doc/man/resend.1 $(DESTDIR)$(MAN)/man1/resend.1
wrapper: wrapper.c
- $(CC) $(WRAPPER_FLAGS) -o wrapper wrapper.c
+- $(CC) $(WRAPPER_FLAGS) -o wrapper wrapper.c
++ $(CC) $(CFLAGS) $(LDFLAGS) $(WRAPPER_FLAGS) -o wrapper wrapper.c
+
+ clean:
+ rm -f wrapper *~