Add two missing files to last commit, plus other fix-ups.

Submitted by:	anders@fix.no

5 files changed, 34 insertions, 9 deletions

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index de15479e5e5..206628d650f 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -66,7 +66,9 @@ post-install:
 		done
 		@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/majordomo/doc
 .endif
-		@ ${INSTALL_DATA} ${WRKSRC}/aliases.majordomo ${PREFIX}/majordomo
+		@ if test -f ${PREFIX}/majordomo/aliases.majordomo; then :; \
+			else ${INSTALL_DATA} ${WRKSRC}/aliases.majordomo \
+			${PREFIX}/majordomo; fi
 		@ for file in test-l test-l-digest test-l.passwd test-l.info; do \
 			${INSTALL_DATA} ${FILESDIR}/$$file ${PREFIX}/majordomo/lists; \
 		done
diff --git a/mail/majordomo/files/post-install-notes b/mail/majordomo/files/post-install-notes
index ded8c8baac8..286a06a54e7 100644
--- a/mail/majordomo/files/post-install-notes
+++ b/mail/majordomo/files/post-install-notes
@@ -38,11 +38,11 @@ manually:
 	  added. The postfix port uses nobody by default, which should be
 	  changed to another user if your users can execute commands as user
 	  nobody (Apache/CGI comes to mind). Postfix does not do initgroups()
-	  properly, so you need to chgrp the wrapper script to the
-	  default_privs user (this may apply for other MTAs as well) for it
-	  to work. It is important that you do this and not just make wrapper
-	  executable for all; you are increasing the chances of it getting
-	  exploited if you do.
+	  properly, so you need to chgrp the wrapper script to the group of
+	  the default_privs user (this may apply for other MTAs as well) for
+	  it to work. It is important that you do this and not just make
+	  wrapper executable for all; you are increasing the chances of it
+	  getting exploited if you do.
 
 Enjoy Majordomo!
 
diff --git a/mail/majordomo/files/postfix-approve-patch b/mail/majordomo/files/postfix-approve-patch
new file mode 100644
index 00000000000..9a648b61753
--- /dev/null
+++ b/mail/majordomo/files/postfix-approve-patch
@@ -0,0 +1,10 @@
+--- approve.orig	Mon Jul 23 01:44:46 2001
++++ approve	Mon Jul 23 01:45:07 2001
+@@ -214,6 +214,7 @@
+ 	    $from_skipped = 1;
+ 	    next;
+ 	}
++	next if /^Delivered-To: /i;
+ 	s/^~/~~/;
+ 	print MAIL $_;
+     }
diff --git a/mail/majordomo/pkg-plist b/mail/majordomo/pkg-plist
index db185b05522..a7bc415ad57 100644
--- a/mail/majordomo/pkg-plist
+++ b/mail/majordomo/pkg-plist
@@ -42,14 +42,13 @@ majordomo/doc/majordomo-faq.html
 majordomo/doc/majordomo.lisa6.ps
 majordomo/doc/majordomo.ora
 majordomo/doc/post-install-notes
-majordomo/aliases.majordomo
 @dirrm majordomo/bin
 @dirrm majordomo/doc
 @dirrm majordomo/digests/test-l-digest
 @dirrm majordomo/digests
 @dirrm majordomo/lists/test-l-digest.archive
 @dirrm majordomo/lists/test-l.archive
-@dirrm majordomo/lists
+@unexec rmdir %D/majordomo/lists 2>/dev/null || true
 @dirrm majordomo/tmp
 @dirrm majordomo/Tools
-@dirrm majordomo
+@unexec rmdir %D/majordomo 2>/dev/null || true
diff --git a/mail/majordomo/scripts/makeseed b/mail/majordomo/scripts/makeseed
new file mode 100644
index 00000000000..ae11e9cf900
--- /dev/null
+++ b/mail/majordomo/scripts/makeseed
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+my $file = $ARGV[0];
+my $seed = '';
+my $i;
+my $patt = "./0123456789abcdefghijklmnopqrstuvwxyzQWERTYUIOPASDFGHJKLZXCVBNM";
+die unless $file;
+srand;
+for( $i = 1; $i <= 40; $i++ ) {
+   $seed = $seed . substr( $patt, int( rand() * 64 ), 1 );
+}
+open OUT, ">>$file" || die "Cannot open output file";
+print OUT "\n## Set cookie_seed to value generated during install\n";
+printf OUT '$cookie_seed="%s";'."\n", $seed;
+close( OUT );