Attachment 30578 Details for Bug 51425 – file.shar

file.shar

file.shar (text/plain), 5.96 KB, created by Oliver Eikemeier on 2003-04-26 01:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Eikemeier

Created: 2003-04-26 01:40:08 UTC

Size: 5.96 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	p5-IMAP-Sieve
>#	p5-IMAP-Sieve/files
>#	p5-IMAP-Sieve/files/patch-Sieve.pm
>#	p5-IMAP-Sieve/files/patch-MANIFEST
>#	p5-IMAP-Sieve/Makefile
>#	p5-IMAP-Sieve/distinfo
>#	p5-IMAP-Sieve/pkg-descr
>#	p5-IMAP-Sieve/pkg-plist
>#
>echo c - p5-IMAP-Sieve
>mkdir -p p5-IMAP-Sieve > /dev/null 2>&1
>echo c - p5-IMAP-Sieve/files
>mkdir -p p5-IMAP-Sieve/files > /dev/null 2>&1
>echo x - p5-IMAP-Sieve/files/patch-Sieve.pm
>sed 's/^X//' >p5-IMAP-Sieve/files/patch-Sieve.pm << 'END-of-p5-IMAP-Sieve/files/patch-Sieve.pm'
>X--- Sieve.pm.orig	Sat Jun 23 22:42:48 2001
>X+++ Sieve.pm	Thu Apr 24 18:10:29 2003
>X@@ -93,7 +93,7 @@
>X 							 Proto => 'tcp',
>X 							 Reuse => 1); })
>X     	{
>X-		$self->_error("initialize", "could'nt establish a Sieve connection to",$self->{'Server'});				
>X+		$self->_error("initialize", "couldn't establish a Sieve connection to",$self->{'Server'});				
>X 		return;
>X     	}
>X     } # if SSL
>X@@ -110,6 +110,7 @@
>X     if (/\r$/) {
>X 	chop;
>X     }
>X+    my $starttls = 0;
>X     if (/IMPLEMENTATION/) {
>X 	$self->{'Implementation'}=$1 if /^"IMPLEMENTATION" +"(.*)"/;
>X     	#version 2 of cyrus imap/timsieved
>X@@ -119,6 +120,7 @@
>X         while (!/^OK/) {
>X 	   $self->{'Capability'}=$1 if /^"SASL" +"(.*)"/;
>X 	   $self->{'Sieve'}=$1 if /^"SIEVE" +"(.*)"/;
>X+	   $starttls=1 if /"STARTTLS"/;
>X 	   $_ = $self->_read;
>X ##	   $_=$self->_read;
>X 	}
>X@@ -126,6 +128,55 @@
>X     else {
>X 	$self->{'Capability'}=$_;
>X     }
>X+    if (!defined($self->{'SSL'}) && $starttls) {
>X+	my $cwd= cwd;
>X+	my %ssl_defaults = (
>X+			  'SSL_use_cert' => 0,
>X+			  'SSL_verify_mode' => 0x00,
>X+			  'SSL_key_file' => $cwd."/certs/client-key.pem",
>X+			  'SSL_cert_file' => $cwd."/certs/client-cert.pem",
>X+			  'SSL_ca_path' => $cwd."/certs",
>X+			  'SSL_ca_file' => $cwd."/certs/ca-cert.pem",
>X+			  'SSL_version' => 'tlsv1'
>X+			  );
>X+	my @ssl_options;
>X+	my $ssl_key;
>X+	my $key;
>X+	foreach $ssl_key (keys(%ssl_defaults)) {
>X+		if (!defined($self->{$ssl_key})) {
>X+			$self->{$ssl_key} = $ssl_defaults{$ssl_key};
>X+		}
>X+	}
>X+	foreach $ssl_key (keys(%{$self})) {
>X+		if ($ssl_key =~ /^SSL_/) {
>X+			push @ssl_options, $ssl_key,$self->{$ssl_key};
>X+		}
>X+	}
>X+        my $SSL_try="use IO::Socket::SSL";
>X+	eval $SSL_try;
>X+#	$IO::Socket::SSL::DEBUG = 4;
>X+	if ($self->{'Socket'}->isa('IO::Socket::SSL')) {
>X+	    $self->_error("starttls", "TLS already started");
>X+	    $self->close;
>X+	    return;
>X+	}
>X+	print $fh "STARTTLS\r\n";
>X+	$_ = $self->_read;
>X+	if (/OK/) {
>X+
>X+	    #IO::Socket::SSL::context_init({@ssl_options});
>X+	    if (!IO::Socket::SSL::socket_to_SSL($self->{'Socket'}, {@ssl_options}))
>X+    		{
>X+			$self->_error("starttls", "couldn't secure connection to",$self->{'Server'});
>X+	    		$self->close;
>X+			return;
>X+    		}
>X+	} else {
>X+	    $self->close;
>X+	    $self->_error("starttls", "Unknown error",$_);
>X+	    return;
>X+	}
>X+    }
>X     $userpass = "$self->{'Proxy'}\x00".$self->{'Login'}."\x00".$self->{'Password'};
>X     $encode=encode_base64($userpass);
>X     $len=length($encode);
>X@@ -196,7 +247,7 @@
>X 			}
>X 		}
>X 		else {
>X-			if (($char eq "\n") or ($char eq "\r")) {
>X+			if ($char eq "\n") {
>X 				if (length($buffer) ==0) {
>X 					# remove any cr or nl leftover
>X 				}
>X@@ -204,7 +255,7 @@
>X 					return $buffer;
>X 				}
>X 			}
>X-			else {
>X+			elsif ($char ne "\r") {
>X 				$buffer.=$char;
>X 			}
>X 		}
>END-of-p5-IMAP-Sieve/files/patch-Sieve.pm
>echo x - p5-IMAP-Sieve/files/patch-MANIFEST
>sed 's/^X//' >p5-IMAP-Sieve/files/patch-MANIFEST << 'END-of-p5-IMAP-Sieve/files/patch-MANIFEST'
>X--- MANIFEST.orig	Fri Apr 25 18:47:03 2003
>X+++ MANIFEST	Fri Apr 25 18:47:12 2003
>X@@ -2,7 +2,6 @@
>X GPL2.txt
>X LGPL2.txt
>X test.pl
>X-testssl.pl
>X Sieve.pm
>X Changes
>X MANIFEST
>END-of-p5-IMAP-Sieve/files/patch-MANIFEST
>echo x - p5-IMAP-Sieve/Makefile
>sed 's/^X//' >p5-IMAP-Sieve/Makefile << 'END-of-p5-IMAP-Sieve/Makefile'
>X# New ports collection makefile for:	p5-IMAP-Sieve
>X# Date created:		25 Apr 2003
>X# Whom:			Oliver Eikemeier <eikemeier@fillmore-labs.com>
>X#
>X# $FreeBSD$
>X#
>X
>XPORTNAME=	IMAP-Sieve
>XPORTVERSION=	0.4.9
>XCATEGORIES=	mail perl5
>XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>XMASTER_SITE_SUBDIR=	websieve
>XPKGNAMEPREFIX=	p5-
>XDISTNAME=	websieve-0.61
>X
>XMAINTAINER=	eikemeier@fillmore-labs.com
>XCOMMENT=	Perl module to edit Sieve scripts on an Cyrus IMAP server
>X
>XRUN_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
>X		${SITE_PERL}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO
>X
>XWRKSRC=		${WRKDIR}/${PERLSIEVENAME}
>X
>XPERL_CONFIGURE=	yes
>X
>XPERLSIEVENAME=	perlsieve-${PORTVERSION}
>XPERLSIEVESUFX=	b
>X
>Xpost-extract:
>X	@if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/websieve/${PERLSIEVENAME}${PERLSIEVESUFX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}); \
>X	then \
>X		exit 1; \
>X	fi
>X
>Xpre-configure:
>X	${RM} ${WRKSRC}/testssl.pl
>X
>X.include <bsd.port.mk>
>END-of-p5-IMAP-Sieve/Makefile
>echo x - p5-IMAP-Sieve/distinfo
>sed 's/^X//' >p5-IMAP-Sieve/distinfo << 'END-of-p5-IMAP-Sieve/distinfo'
>XMD5 (websieve-0.61.tar.gz) = 5f2d01a2479f8cdd8e2ea4fd1a09163e
>END-of-p5-IMAP-Sieve/distinfo
>echo x - p5-IMAP-Sieve/pkg-descr
>sed 's/^X//' >p5-IMAP-Sieve/pkg-descr << 'END-of-p5-IMAP-Sieve/pkg-descr'
>XA Perl module used by websieve for creating Sieve scripts on an Cyrus
>XIMAP mail server. Sometimes also referenced as 'perlsieve'.
>X
>XAuthor: Alain Turbide <aturbide@toshiba.ca>
>X
>X
>XWWW: http://sourceforge.net/projects/websieve
>END-of-p5-IMAP-Sieve/pkg-descr
>echo x - p5-IMAP-Sieve/pkg-plist
>sed 's/^X//' >p5-IMAP-Sieve/pkg-plist << 'END-of-p5-IMAP-Sieve/pkg-plist'
>X%%SITE_PERL%%/IMAP/Sieve.pm
>X%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve/.packlist
>X@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve
>X@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP 2>/dev/null || true
>X@unexec rmdir %D%%SITE_PERL%%/IMAP 2>/dev/null || true
>END-of-p5-IMAP-Sieve/pkg-plist
>exit

Actions: View

Attachments on bug 51425: 30577 | 30578