- Make SHA1 cookies optional and MD5 the default

- add USE_PERL5
- /usr/bin/perl -> ${PERL}

PR:		30118
Submitted by:	maintainer
This commit is contained in:
Pete Fritchman 2001-08-29 06:51:10 +00:00
parent eaf6bd4cd1
commit 07831be82c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=47065
2 changed files with 17 additions and 6 deletions

View file

@ -12,10 +12,16 @@ CATEGORIES= mail
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 @@ INSTALL_TARGET= install install-wrapper
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}

View file

@ -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 );
}