From owner-freebsd-ports  Mon Aug 27  0:40: 9 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3642B37B407
	for <freebsd-ports@hub.freebsd.org>; Mon, 27 Aug 2001 00:40:04 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f7R7e4003983;
	Mon, 27 Aug 2001 00:40:04 -0700 (PDT)
	(envelope-from gnats)
Received: from totem.fix.no (totem.fix.no [213.142.66.130])
	by hub.freebsd.org (Postfix) with ESMTP id 34CAC37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Aug 2001 00:31:48 -0700 (PDT)
	(envelope-from anders@totem.fix.no)
Received: by totem.fix.no (Postfix, from userid 1000)
	id 87C703C84; Mon, 27 Aug 2001 09:31:46 +0200 (CEST)
Message-Id: <20010827073146.87C703C84@totem.fix.no>
Date: Mon, 27 Aug 2001 09:31:46 +0200 (CEST)
From: Anders Nordby <anders@fix.no>
Reply-To: Anders Nordby <anders@fix.no>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/30118: Update port: mail/majordomo
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         30118
>Category:       ports
>Synopsis:       Update port: mail/majordomo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 27 00:40:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Anders Nordby
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
Fluxpod Information eXchange
>Environment:

	<Relevant environment information (multiple lines)>

>Description:

Make SHA1 cookies optional and MD5 the default.

>How-To-Repeat:

	<Code/input/activities to reproduce the problem (multiple lines)>

>Fix:

diff -Nur majordomo.old/Makefile majordomo/Makefile
--- majordomo.old/Makefile	Tue Jul 24 06:21:42 2001
+++ majordomo/Makefile	Mon Aug 27 09:13:25 2001
@@ -12,10 +12,16 @@
 MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/1.94.5/ \
 		ftp://ftp.sgi.com/other/majordomo/1.94.5/
 EXTRACT_SUFX=   .tgz
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
 
 MAINTAINER=	anders@fix.no
 
+.if defined(WITH_SHA1_COOKIES)
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+.else
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+.endif
+USE_PERL5=	yes
+
 # Needs to create a user and group
 IS_INTERACTIVE= yes
 NO_PACKAGE=	"User and group need to be created"
@@ -24,19 +30,24 @@
 MAN1=		approve.1 bounce-remind.1 digest.1
 MAN8=		majordomo.8
 
-.if defined(WITH_POSTFIX_APPROVE_PATCH)
 post-patch:
+.if defined(WITH_POSTFIX_APPROVE_PATCH)
 	@cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/postfix-approve-patch 2>/dev/null
 .endif
+.if defined(WITH_SHA1_COOKIES)
+	${SED} <${WRKSRC}/majordomo >${WRKSRC}/majordomo.temp \
+		"{s/md5_hex/sha1_hex/g;s/Digest::MD5/Digest::SHA1/g;}"
+	${MV} ${WRKSRC}/majordomo.temp ${WRKSRC}/majordomo
+.endif
 
 pre-configure:
-		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@ ${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/createuser
 		@ ${CP} ${FILESDIR}/aliases.majordomo ${WRKSRC}
 
 pre-install:
 		@ if test -f ${WRKSRC}/majordomo.cf; then :; else \
 			${CP} ${WRKSRC}/sample.cf ${WRKSRC}/majordomo.cf; \
-			/usr/bin/perl ${SCRIPTDIR}/makeseed ${WRKSRC}/majordomo.cf; \
+			${PERL} ${SCRIPTDIR}/makeseed ${WRKSRC}/majordomo.cf; \
 		fi
 post-install:
 .for file in ${MAN1}
diff -Nur majordomo.old/files/patch-bf majordomo/files/patch-bf
--- majordomo.old/files/patch-bf	Mon Jul 23 18:14:01 2001
+++ majordomo/files/patch-bf	Mon Aug 27 09:22:33 2001
@@ -4,7 +4,7 @@
  require "majordomo.pl";		# all sorts of general-purpose Majordomo subs
  require "shlock.pl";		# NNTP-style file locking
  require "config_parse.pl";	# functions to parse the config files
-+use Digest::SHA1 qw( sha1_hex );
++use Digest::MD5 qw( md5_hex );
  
  print STDERR "$0:  requires succeeded.  Setting defaults.\n" if $DEBUG; 
  
@@ -38,7 +38,7 @@
 -	$cookie |= $carry;
 -    }
 -    return (sprintf("%08x", $cookie));
-+    return sha1_hex( $combined );
++    return md5_hex( $combined );
  }
  
  
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message