--- libmail-imapclient-perl-2.2.9+deb.orig/BodyStructure/Parse/Makefile.PL +++ libmail-imapclient-perl-2.2.9+deb/BodyStructure/Parse/Makefile.PL @@ -42,5 +42,7 @@ 'Parse.pm' => '$(INST_LIBDIR)/BodyStructure/Parse.pm' }, + 'MAN3PODS' => {'Parse.pod' => + '$(INST_MAN3DIR)/Mail::IMAPClient::BodyStructure::Parse.3pm'}, ); --- libmail-imapclient-perl-2.2.9+deb.orig/Thread/Makefile.PL +++ libmail-imapclient-perl-2.2.9+deb/Thread/Makefile.PL @@ -41,5 +41,7 @@ 'Thread.pm' => '$(INST_LIBDIR)/Thread.pm' }, + 'MAN3PODS' => {'Thread.pod' => + '$(INST_MAN3DIR)/Mail::IMAPClient::Thread.3pm'}, ); --- libmail-imapclient-perl-2.2.9+deb.orig/IMAPClient.pod +++ libmail-imapclient-perl-2.2.9+deb/IMAPClient.pod @@ -3414,6 +3414,25 @@ parameter/value pairs to the method, or later by calling the parameter's eponymous object method. +=head2 Ssl + +Example: + + $is_ssl_active = $imap->Ssl(); + # or: + $imap->Ssl($activate_ssl); + +Specifies whether a connection should be established using a SSL (cyphered) +channel or via a regular clear TCP connection. Of course, setting this +parameter makes sense only before the connection is established. + +Please note that this parameter was specifically added for the Debian +packaging. If you are developing software to be deployed over different +machines, we suggest you not to use it - or to specify your users to install +this patch. You can get it at Debian's bug tracking system at +L, or at CPAN's +L. + =cut --- libmail-imapclient-perl-2.2.9+deb.orig/Makefile.PL +++ libmail-imapclient-perl-2.2.9+deb/Makefile.PL @@ -28,6 +28,7 @@ 'Fcntl' => 0, 'IO::Select' => 0, 'IO::File' => 0, + 'IO::Socket::SSL'=>0, 'Data::Dumper' => 0, 'Carp' => 0, }, --- libmail-imapclient-perl-2.2.9+deb.orig/IMAPClient.pm +++ libmail-imapclient-perl-2.2.9+deb/IMAPClient.pm @@ -8,6 +8,7 @@ use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK); use Socket(); use IO::Socket(); +use IO::Socket::SSL(); use IO::Select(); use IO::File(); use Carp qw(carp); @@ -114,6 +115,7 @@ Authmechanism Authcallback Ranges Readmethod Showcredentials Prewritemethod + Ssl ) ) { no strict 'refs'; @@ -245,13 +247,15 @@ and $IO::Socket::INET::VERSION eq '1.25' and !$self->Port; %$self = (%$self, @_); - my $sock = IO::Socket::INET->new( + my $sock = ($self->Ssl ? IO::Socket::SSL->new : IO::Socket::INET->new); + my $dp = ($self->Ssl ? 'imaps(993)' : 'imap(143)'); + $sock->configure({ PeerAddr => $self->Server , - PeerPort => $self->Port||'imap(143)' , + PeerPort => $self->Port||$dp , Proto => 'tcp' , Timeout => $self->Timeout||0 , Debug => $self->Debug , - ) ; + }) ; unless ( defined($sock) ) { @@ -302,9 +306,10 @@ my $id = $self->User; my $has_quotes = $id =~ /^".*"$/ ? 1 : 0; - my $string = "Login " . ( $has_quotes ? $id : qq("$id") ) . " " . - "{" . length($self->Password) . - "}\r\n".$self->Password."\r\n"; + #my $string = "Login " . ( $has_quotes ? $id : qq("$id") ) . " " . + # "{" . length($self->Password) . + # "}\r\n".$self->Password."\r\n"; + my $string = "Login " . ( $has_quotes ? $id : qq("$id") ) . " " . $self->Password . "\r\n"; $self->_imap_command($string) and $self->State(Authenticated); # $self->folders and $self->separator unless $self->NoAutoList; @@ -1628,7 +1633,7 @@ return undef; } # successfully wrote to other end, keep going... - $count += $ret; + $count += $ret if defined($ret); LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) { my $current_line = $1; @@ -1906,7 +1911,7 @@ return undef; } # successfully wrote to other end, keep going... - $count += $ret; + $count += $ret if defined($ret); LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) { my $current_line = $1; @@ -2167,8 +2172,8 @@ (?:"[^"]*"|NIL)\s+ # "delimiter" or NIL (?:"([^"]*)"|(.*))\x0d\x0a$ # Name or "Folder name" /ix; - $folders[-1] = '"' . $folders[-1] . '"' - if $1 and !$self->exists($folders[-1]) ; + #$folders[-1] = '"' . $folders[-1] . '"' + # if $1 and !$self->exists($folders[-1]) ; # $self->_debug("folders: line $list[$m]: 1=$1 and 2=$2\n"); } --- libmail-imapclient-perl-2.2.9+deb.orig/debian/changelog +++ libmail-imapclient-perl-2.2.9+deb/debian/changelog @@ -0,0 +1,116 @@ +libmail-imapclient-perl (2.2.9+deb-4) unstable; urgency=low + + [ Niko Tyni ] + * Fixed maintainer email address. (Closes: #343474) + + [ Russ Allbery ] + * Expand description slightly and mention SSL support. + * General debian/rules cleanup. + - Remove many unnecessary rules. + - Remove empty /usr/lib/perl5 directory. + - Don't ignore the exit status of make distclean. + - Add build-arch and build-indep in case Policy ever requires them. + * Move debhelper to Build-Depends since it's required for clean. + * Update to standards version 3.6.2 (no changes required). + * Update to debhelper compatibility level V5. + * Remove incorrect copyright note saying there were no package changes + outside the debian directory. + + -- Russ Allbery Sat, 21 Jan 2006 18:48:35 -0800 + +libmail-imapclient-perl (2.2.9+deb-3) unstable; urgency=low + + * Added SSL support by including Joost Cassee's patch - Thanks a lot! + (Closes: #111960) + * SSL patch requires to add build-dependency and dependency on + libio-socket-ssl-perl - did so as well. Also wrote basic documentation + for it in the module's POD and Makefile + * Clean process after build did not leave the package as in original state - + Fixed. + + -- Gunnar Wolf Sat, 14 May 2005 16:27:15 -0500 + +libmail-imapclient-perl (2.2.9+deb-2) unstable; urgency=low + + * Specified not to overwrite some manpages generated from .pod files + with the empty contents of the corresponding .pm files which caused + a whatis parse error (Closes: #283660) + + -- Gunnar Wolf Wed, 2 Mar 2005 14:17:50 -0600 + +libmail-imapclient-perl (2.2.9+deb-1) unstable; urgency=low + + * Repackaging upstream source, as it includes non-free RFCs (Closes: + #275496) + + -- Gunnar Wolf Fri, 8 Oct 2004 09:58:12 -0500 + +libmail-imapclient-perl (2.2.9-3) unstable; urgency=low + + * Adopted by Debian Perl Group (Closes: #274133) + * Prevented undefined-warning (Closes: #158617) + + -- Joachim Breitner Fri, 8 Oct 2004 13:28:43 +0200 + +libmail-imapclient-perl (2.2.9-2) unstable; urgency=low + + * Fix the build-depends-indep. + * Change section to perl + * Add watch file for uscan + + -- Michael Alan Dorman Sun, 20 Jun 2004 17:48:38 -0400 + +libmail-imapclient-perl (2.2.9-1) unstable; urgency=low + + * New upstream release. (closes: bug#208676, bug#208677) + + -- Michael Alan Dorman Thu, 18 Dec 2003 09:36:02 -0500 + +libmail-imapclient-perl (2.1.4-1) unstable; urgency=low + + * New upstream release (closes: bug#84100, bug#111959) + + -- Michael Alan Dorman Tue, 25 Sep 2001 12:41:21 -0400 + +libmail-imapclient-perl (2.0.9-1) unstable; urgency=low + + * New upstream release (closes: bug#84100) + + -- Michael Alan Dorman Sun, 4 Feb 2001 09:42:20 -0500 + +libmail-imapclient-perl (1.18-1) unstable; urgency=low + + * New upstream release + + -- Michael Alan Dorman Tue, 29 Aug 2000 13:10:42 -0400 + +libmail-imapclient-perl (1.15-1) unstable; urgency=low + + * New upstream release + + -- Michael Alan Dorman Tue, 27 Jun 2000 09:08:52 -0400 + +libmail-imapclient-perl (1.13-1) unstable; urgency=low + + * New upstream release + + -- Michael Alan Dorman Wed, 31 May 2000 22:00:33 -0400 + +libmail-imapclient-perl (1.11-1) unstable; urgency=low + + * New upstream version. + + -- Michael Alan Dorman Fri, 5 May 2000 14:04:41 -0400 + +libmail-imapclient-perl (1.09-1) unstable; urgency=low + + * The problem with disappearing blank lines in output is taken care of, + ergo this is now releasable. + + -- Michael Alan Dorman Fri, 10 Mar 2000 15:58:37 -0500 + +libmail-imapclient-perl (1.08-1) unstable; urgency=low + + * Initial packaging + + -- Michael Alan Dorman Sun, 27 Feb 2000 14:59:05 -0500 --- libmail-imapclient-perl-2.2.9+deb.orig/debian/control +++ libmail-imapclient-perl-2.2.9+deb/debian/control @@ -0,0 +1,20 @@ +Source: libmail-imapclient-perl +Priority: optional +Section: perl +Maintainer: Debian Perl Group +Uploaders: Joachim Breitner , Gunnar Wolf , Niko Tyni , Russ Allbery +Build-Depends: debhelper (>= 5) +Build-Depends-Indep: perl (>= 5.6.0-17), libparse-recdescent-perl, libio-socket-ssl-perl +Standards-Version: 3.6.2 + +Package: libmail-imapclient-perl +Architecture: all +Priority: optional +Section: perl +Depends: ${perl:Depends}, libparse-recdescent-perl, libio-socket-ssl-perl +Description: Perl library for manipulating IMAP mail stores + This module provides perl routines that simplify a sockets connection + to and an IMAP conversation with an IMAP server. It supports virtually + all IMAP client commands as of RFC 2060 and has a fallback for unknown + commands that usually works. The Debian package has been enhanced to + add SSL support. --- libmail-imapclient-perl-2.2.9+deb.orig/debian/compat +++ libmail-imapclient-perl-2.2.9+deb/debian/compat @@ -0,0 +1 @@ +5 --- libmail-imapclient-perl-2.2.9+deb.orig/debian/watch +++ libmail-imapclient-perl-2.2.9+deb/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://www.cpan.org/modules/by-module/Mail/Mail-IMAPClient-(\d.*)\.tar\.gz debian uupdate --- libmail-imapclient-perl-2.2.9+deb.orig/debian/README.Debian +++ libmail-imapclient-perl-2.2.9+deb/debian/README.Debian @@ -0,0 +1,33 @@ + SSL support added + ================= + +SSL support has been added to the Debian version of this module, via +the boolean 'Ssl' attribute (see the documentation for further +details). Now, SSL support is _not_ official, and if you write a +program depending on it, it will break on non-Debian systems. Use with +care. You have been warned. + + Missing documents from the upstream source package + ================================================== + +You might notice the RFC documents 1731, 1732, 1733, 2060, 2061, 2062, +2086, 2087, 2088, 2177, 2180, 2192, 2193, 2195, 2221, 2222, 2234, +2245, 2342, 2359, 2683, 2831, as well as the IETF drafts +imapext-sort, imapext-annotate and imapext-thread and imapv are +missing from the upstream (official) source package. This is because +those documents are not considered to meet Debian's Free Software +Guidelines (i.e., they are not modifiable), and are easy to find on +the network. + +If you are interested in any of these documents, please check: + +RFCs: http://www.ietf.org/rfc.html +IETF drafts: http://www.ietf.org/1id-abstracts.html. + +Please note that drafts might eventually become approved and blessed +into RFCs, or deleted from the IETF archive. As of October 2004: + +imapext-thread - Deleted, contact author (M. Crispin, mrc@cac.washington.edu) +imapv - RFC 3501 +imapext-sort - Still a draft, last modified May 2004 +imapext-annotate - Still a draft, last modified July 2004 --- libmail-imapclient-perl-2.2.9+deb.orig/debian/copyright +++ libmail-imapclient-perl-2.2.9+deb/debian/copyright @@ -0,0 +1,30 @@ +This is Debian GNU/Linux's prepackaged version of Mail::IMAPClient. +This is a perl library for manipulating IMAP mail stores + +Originally packaged by Michael Alan Dorman . The +original sources should always be available from the Comprehensive +Perl Archive Network (CPAN). Visit to +find a CPAN site near you. + +The Mail::IMAPClient copyright is as follows: + + Copyright 1999, The Kernen Group, Inc. + All rights reserved. + +This program is free software; you can redistribute it and/or modify +it under the terms of either: + + a) the "Artistic License" which comes with this Kit, or + + + b) the GNU General Public License as published by the Free Software + Foundation; either versio n 1, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either +the GNU General Public License or the Artistic License for more details. + +Larry Wall's "Artistic License" for perl can be found in +/usr/share/common-licenses/Artistic. The GNU General Public License +can be found in /usr/share/common-licenses/GPL. --- libmail-imapclient-perl-2.2.9+deb.orig/debian/rules +++ libmail-imapclient-perl-2.2.9+deb/debian/rules @@ -0,0 +1,52 @@ +#!/usr/bin/make -f +# -*- Makefile -*- + +PERL ?= /usr/bin/perl +TMP := $(CURDIR)/debian/libmail-imapclient-perl + +build: build-arch build-indep +build-arch: +build-indep: build-stamp +build-stamp: + dh_testdir + touch test.txt + $(PERL) Makefile.PL INSTALLDIRS=vendor + rm test.txt + $(MAKE) + $(MAKE) test + touch build-stamp + +clean: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean build-stamp install-stamp Thread/Thread.grammar \ + BodyStructure/Parse/Parse.grammar + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + $(MAKE) install PREFIX=$(TMP)/usr + rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5 + touch install-stamp + +binary: binary-arch binary-indep +binary-arch: +binary-indep: install-stamp + dh_testdir + dh_testroot + dh_installdocs README Todo + dh_installchangelogs Changes + dh_perl + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: binary binary-arch binary-indep build build-arch build-indep clean +.PHONY: install +