rpms/perl-Sendmail-PMilter/devel Sendmail-PMilter-0.97-data-command.patch, NONE, 1.1 Sendmail-PMilter-0.97-pod.patch, NONE, 1.1 Sendmail-PMilter-0.97-setdbg-settimeout.patch, NONE, 1.1 perl-Sendmail-PMilter.spec, 1.4, 1.5

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Sendmail-PMilter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28127

Modified Files:
	perl-Sendmail-PMilter.spec 
Added Files:
	Sendmail-PMilter-0.97-data-command.patch 
	Sendmail-PMilter-0.97-pod.patch 
	Sendmail-PMilter-0.97-setdbg-settimeout.patch 
Log Message:
- Add patch to make the no-op functions Sendmail::Milter::{setdb,settimeout}
  return "success" values to avoid messages like "Failed to set timeout value!"
  (CPAN RT#50144)
- Add patch to handle SMFIC_DATA (CPAN RT#51058)
- Add patch for more POD fixes (CPAN RT#51713)


Sendmail-PMilter-0.97-data-command.patch:
 Context.pm |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE Sendmail-PMilter-0.97-data-command.patch ---
https://rt.cpan.org/Public/Bug/Display.html?id=51058

SMFIC_DATA is not implemented; postfix will fail on this.

the following patch partially fixes the bug:

--- Sendmail-PMilter-0.97/lib/Sendmail/PMilter/Context.pm	2010-02-08 12:01:52.225076154 +0000
+++ Sendmail-PMilter-0.97/lib/Sendmail/PMilter/Context.pm	2010-02-08 12:05:49.308047435 +0000
@@ -264,6 +264,8 @@
 				die "SMFIC_MAIL: bad packet\n" unless (@$envfrom >= 1);
 
 				$this->call_hooks('envfrom', @$envfrom);
+			} elsif ($cmd eq SMFIC_DATA) {
+				$this->call_hooks('data');
 			} elsif ($cmd eq SMFIC_EOH) {
 				$this->call_hooks('eoh');
 			} elsif ($cmd eq SMFIC_OPTNEG) {

Sendmail-PMilter-0.97-pod.patch:
 PMilter.pm         |    2 +-
 PMilter/Context.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Sendmail-PMilter-0.97-pod.patch ---
diff --git a/lib/Sendmail/PMilter.pm b/lib/Sendmail/PMilter.pm
index 54e85d7..a6ffcfa 100644
--- a/lib/Sendmail/PMilter.pm
+++ b/lib/Sendmail/PMilter.pm
@@ -404,7 +404,7 @@ will be passed the arguments:
 MILTER is the milter object currently running.  LSOCKET is a listening
 socket (an instance of C<IO::Socket>), upon which C<accept()> should be
 called.  HANDLER is a subroutine reference which should be called, passing
-the socket object returned by C<LSOCKET->accept()>.
+the socket object returned by C<< LSOCKET->accept() >>.
 
 Note that the dispatcher may also be set from one of the off-the-shelf
 dispatchers noted in this document by setting the PMILTER_DISPATCHER
diff --git a/lib/Sendmail/PMilter/Context.pm b/lib/Sendmail/PMilter/Context.pm
index 9540c39..67b416a 100644
--- a/lib/Sendmail/PMilter/Context.pm
+++ b/lib/Sendmail/PMilter/Context.pm
@@ -533,7 +533,7 @@ sub setreply ($$$$) {
 
 =item $ctx->shutdown()
 
-A special case of C<$ctx->setreply()> which sets the short numeric reply 
+A special case of C<< $ctx->setreply() >> which sets the short numeric reply 
 code to 421 and the ESMTP code to 4.7.0.  Under Sendmail 8.13 and higher, 
 this will close the MTA's communication channel quickly, which should 
 immediately result in a "close" callback and end of milter execution. 

Sendmail-PMilter-0.97-setdbg-settimeout.patch:
 Milter.pm |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE Sendmail-PMilter-0.97-setdbg-settimeout.patch ---
--- Sendmail-PMilter-0.97/lib/Sendmail/Milter.pm	2004-08-10 22:10:32.000000000 +0100
+++ Sendmail-PMilter-0.97/lib/Sendmail/Milter.pm	2009-09-25 11:34:54.000000000 +0100
@@ -134,10 +134,12 @@
 
 sub setdbg ($) {
 	# no-op
+	1;
 }
 
 sub settimeout ($) {
 	# no-op
+	1;
 }
 
 1;


Index: perl-Sendmail-PMilter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sendmail-PMilter/devel/perl-Sendmail-PMilter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Sendmail-PMilter.spec	8 Feb 2010 14:31:49 -0000	1.4
+++ perl-Sendmail-PMilter.spec	8 Feb 2010 14:32:35 -0000	1.5
@@ -7,6 +7,9 @@ Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Sendmail-PMilter/
 Source0:	http://search.cpan.org/CPAN/authors/id/A/AV/AVAR/Sendmail-PMilter-%{version}.tar.gz
 Patch0:		Sendmail-PMilter-Context.pm_pod.patch
+Patch1:		Sendmail-PMilter-0.97-setdbg-settimeout.patch
+Patch2:		Sendmail-PMilter-0.97-data-command.patch
+Patch3:		Sendmail-PMilter-0.97-pod.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::More)
@@ -31,6 +34,17 @@ called Mail::Milter.
 # Fix up POD errors in Sendmail::PMilter::Context
 %patch0 -p1
 
+# Pretend to have succeeeded in Sendmail::Milter::{setdb,settimeout}
+# (these are no-op functions in the Sendmail::Milter implementation)
+# CPAN RT#50144
+%patch1 -p1
+
+# Handle SMFIC_DATA (CPAN RT#51058)
+%patch2 -p1
+
+# More POD fixes (CPAN RT#51713)
+%patch3 -p1
+
 # Fix interpreters in examples and turn off exec bits to avoid extra deps
 %{__sed} -i -e 's@/usr/local/bin/perl@%{__perl}@' examples/*.pl
 %{__chmod} -x examples/*.pl
@@ -67,6 +81,11 @@ echo yes | %{__perl} Makefile.PL INSTALL
 - Obsolete perl-Sendmail-Milter <= 0.18 since we provide a compatibility
   wrapper for it; we don't add a provide for this since we would be
   self-obsoleting if we did so
+- Add patch to make the no-op functions Sendmail::Milter::{setdb,settimeout}
+  return "success" values to avoid messages like "Failed to set timeout value!"
+  (CPAN RT#50144)
+- Add patch to handle SMFIC_DATA (CPAN RT#51058)
+- Add patch for more POD fixes (CPAN RT#51713)
 
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> 0.97-3
 - Rebuild against perl 5.10.1