From owner-freebsd-ports Sun Mar 31 18:20:16 2002 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 B7FB137B423 for ; Sun, 31 Mar 2002 18:20:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g312K1R81684; Sun, 31 Mar 2002 18:20:01 -0800 (PST) (envelope-from gnats) Received: from wwweasel.geeksrus.net (wwweasel.geeksrus.net [64.8.210.226]) by hub.freebsd.org (Postfix) with ESMTP id 75E1A37B405 for ; Sun, 31 Mar 2002 18:11:43 -0800 (PST) Received: (from alane@localhost) by wwweasel.geeksrus.net (8.11.6/8.11.6) id g312An302267; Sun, 31 Mar 2002 21:10:49 -0500 (EST) (envelope-from alane) Message-Id: <200204010210.g312An302267@wwweasel.geeksrus.net> Date: Sun, 31 Mar 2002 21:10:49 -0500 (EST) From: Alan Eldridge Reply-To: Alan Eldridge To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/36600: mail/gotmail: take maintainership, fix 2 showstoppers Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 36600 >Category: ports >Synopsis: mail/gotmail: take maintainership, fix 2 showstoppers >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 31 18:20:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Alan Eldridge >Release: FreeBSD 4.5-STABLE i386 >Organization: Geeksrus.NET >Environment: System: FreeBSD wwweasel.geeksrus.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Mon Mar 11 00:59:22 EST 2002 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386 >Description: 1. Take maintainership. 2. Fix showstopper that made downloaded mailboxes invalid: Micro$**t has invalid "From" headers. 3. Fix showstopper that prevented it from running at all: Micro$**t changed the Hotmail web pages so gotmail couldn't parse them. 4. De-DOSify the damn script. >How-To-Repeat: >Fix: ==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<== Index: mail/gotmail/Makefile =================================================================== RCS file: /home/ports/cvsroot/ports/mail/gotmail/Makefile,v retrieving revision 1.1 diff -u -3 -r1.1 Makefile --- mail/gotmail/Makefile 19 Dec 2001 02:58:45 -0000 1.1 +++ mail/gotmail/Makefile 1 Apr 2002 02:08:06 -0000 @@ -7,11 +7,12 @@ PORTNAME= gotmail PORTVERSION= 0.6.6 +PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= http://www.hawkins.emu.id.au/gotmail/ DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@geeksrus.net RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI @@ -21,8 +22,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME} +pre-patch: + ${PERL} -pi -e 's|\r$$||' ${WRKSRC}/${PORTNAME}.pl + do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} post-install: .if !defined(NOPORTDOCS) Index: mail/gotmail/pkg-plist =================================================================== RCS file: /home/ports/cvsroot/ports/mail/gotmail/pkg-plist,v retrieving revision 1.1 diff -u -3 -r1.1 pkg-plist --- mail/gotmail/pkg-plist 19 Dec 2001 02:58:45 -0000 1.1 +++ mail/gotmail/pkg-plist 31 Mar 2002 21:03:02 -0000 @@ -1,4 +1,4 @@ -bin/gotmail.pl +bin/gotmail %%PORTDOCS%%share/doc/gotmail/COPYING %%PORTDOCS%%share/doc/gotmail/ChangeLog %%PORTDOCS%%share/doc/gotmail/README Index: mail/gotmail/files/patch-gotmail.pl =================================================================== RCS file: mail/gotmail/files/patch-gotmail.pl diff -N mail/gotmail/files/patch-gotmail.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/gotmail/files/patch-gotmail.pl 1 Apr 2002 02:06:05 -0000 @@ -0,0 +1,22 @@ +--- gotmail.pl.orig Mon Jul 23 20:04:47 2001 ++++ gotmail.pl Sun Mar 31 19:47:52 2002 +@@ -462,6 +462,8 @@ + + if ($page =~ m//i) { + $redirect_location = $3; ++ } elsif ($page =~ m/\w+\.location\.replace\s*\(\"([^\"]+)\"/i) { ++ $redirect_location = $1; + } + + if ($redirect_location eq "") +@@ -577,6 +579,10 @@ + if ($stripmboxheader) + { + s/^From (.*)\n//; ++ } ++ else ++ { ++ s/^From\s+(\S+)\s+(\w+),\s+(\d+)\s+(\w+)\s+(\d+)\s+(\d+:\d+:\d+)/From $1 $2 $4 $3 $6 $5/; + } + + # Strip any HTML artifacts from the message body. ==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<== >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message