From 88587120eb5bfa5cdce5364ee45bfd047631c9e4 Mon Sep 17 00:00:00 2001
From: Thomas Lotterer <thl@openpkg.org>
Date: Wed, 19 Feb 2003 10:04:07 +0000
Subject: [PATCH] fix from http://www.securityfocus.com/bid/6761

---
 majordomo/majordomo.patch | 14 ++++++++++++++
 majordomo/majordomo.spec  |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/majordomo/majordomo.patch b/majordomo/majordomo.patch
index 8fd7a11ec4..de28922a9f 100644
--- a/majordomo/majordomo.patch
+++ b/majordomo/majordomo.patch
@@ -12,3 +12,17 @@
  	s/^~/~~/;
  	print MAIL $_;
      }
+--- majordomo.orig      Mon Feb  3 13:23:45 2003
++++ majordomo   Mon Feb  3 13:23:23 2003
+@@ -624,6 +624,11 @@
+ 
+ sub do_which {
+     local($subscriber) = join(" ", @_) || &valid_addr($reply_to);
++    if ($subscriber !~ /^[0-9a-zA-Z\.\-\_]+\@[0-9a-zA-Z\.\-]+\.[a-zA-Z]{2,3}$/) {
++       
++       &log("which abuse -> $subscriber passed as an argument.");
++       exit(0);
++       };
+     local($count, $per_list_hits) = 0;
+     # Tell the requestor which lists they are on by reading through all
+     # the lists, comparing their address to each address from each list
diff --git a/majordomo/majordomo.spec b/majordomo/majordomo.spec
index 74f0158b0d..c158df5b81 100644
--- a/majordomo/majordomo.spec
+++ b/majordomo/majordomo.spec
@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      Majordomo License Agreement
 Version:      1.94.5
-Release:      20030114
+Release:      20030219
 
 #   list of sources
 Source0:      http://www.greatcircle.com/majordomo/%{version}/majordomo-%{version}.tar.gz