CVS commit: pkgsrc/mail/majordomo

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun Nov 26 09:11:03 UTC 2017

Modified Files:
        pkgsrc/mail/majordomo: Makefile distinfo
        pkgsrc/mail/majordomo/patches: patch-aa

Log Message:
enable fortifications


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/mail/majordomo/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/majordomo/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/majordomo/patches/patch-aa

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

Modified files:

Index: pkgsrc/mail/majordomo/Makefile
diff -u pkgsrc/mail/majordomo/Makefile:1.53 pkgsrc/mail/majordomo/Makefile:1.54
--- pkgsrc/mail/majordomo/Makefile:1.53 Mon Nov  6 13:27:55 2017
+++ pkgsrc/mail/majordomo/Makefile      Sun Nov 26 09:11:03 2017
@@ -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/

Index: pkgsrc/mail/majordomo/distinfo
diff -u pkgsrc/mail/majordomo/distinfo:1.19 pkgsrc/mail/majordomo/distinfo:1.20
--- pkgsrc/mail/majordomo/distinfo:1.19 Wed Mar 30 09:54:24 2016
+++ pkgsrc/mail/majordomo/distinfo      Sun Nov 26 09:11:03 2017
@@ -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

Index: pkgsrc/mail/majordomo/patches/patch-aa
diff -u pkgsrc/mail/majordomo/patches/patch-aa:1.7 pkgsrc/mail/majordomo/patches/patch-aa:1.8
--- pkgsrc/mail/majordomo/patches/patch-aa:1.7  Wed Mar 30 09:54:24 2016
+++ pkgsrc/mail/majordomo/patches/patch-aa      Sun Nov 26 09:11:03 2017
@@ -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 @@ warp the Makefile template to fit into p
        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 @@ warp the Makefile template to fit into p
 +              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 *~