r15103 - in /trunk/libmime-lite-perl: debian/changelog debian/control lib/MIME/Lite.pm

[dom at users.alioth.debian.org]

Author: dom
Date: Sun Feb 17 23:16:34 2008
New Revision: 15103

URL: http://svn.debian.org/wsvn/?sc=1&rev=15103
Log:
Fix #465342

Modified:
    trunk/libmime-lite-perl/debian/changelog
    trunk/libmime-lite-perl/debian/control
    trunk/libmime-lite-perl/lib/MIME/Lite.pm

Modified: trunk/libmime-lite-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/changelog?rev=15103&op=diff
==============================================================================
--- trunk/libmime-lite-perl/debian/changelog (original)
+++ trunk/libmime-lite-perl/debian/changelog Sun Feb 17 23:16:34 2008
@@ -1,3 +1,11 @@
+libmime-lite-perl (3.021-3) unstable; urgency=low
+
+  * Patch upstream to not die if sendmail is not available (closes: #465342)
+  * Remove build-dependency on nullmailer | mail-transport-agent
+    (possible as a result of the above change)
+
+ -- Dominic Hargreaves <dom at earth.li>  Sun, 17 Feb 2008 23:04:21 +0000
+
 libmime-lite-perl (3.021-2) unstable; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/libmime-lite-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/control?rev=15103&op=diff
==============================================================================
--- trunk/libmime-lite-perl/debian/control (original)
+++ trunk/libmime-lite-perl/debian/control Sun Feb 17 23:16:34 2008
@@ -5,6 +5,7 @@
 Uploaders: Gunnar Wolf <gwolf at debian.org>,
  Carlo Segre <segre at debian.org>,
  Damyan Ivanov <dmn at debian.org>
+ Dominic Hargreaves <dom at earth.li>
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/MIME-Lite/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmime-lite-perl/
@@ -12,7 +13,7 @@
 Build-Depends: debhelper (>= 6)
 Build-Depends-Indep: perl (>> 5.8.1), libmime-types-perl,
  libtest-pod-perl, libtest-pod-coverage-perl,
- nullmailer | mail-transport-agent, perl-modules, libmailtools-perl,
+ perl-modules, libmailtools-perl,
  libmime-types-perl, libemail-date-format-perl 
 
 Package: libmime-lite-perl

Modified: trunk/libmime-lite-perl/lib/MIME/Lite.pm
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/lib/MIME/Lite.pm?rev=15103&op=diff
==============================================================================
--- trunk/libmime-lite-perl/lib/MIME/Lite.pm (original)
+++ trunk/libmime-lite-perl/lib/MIME/Lite.pm Sun Feb 17 23:16:34 2008
@@ -401,13 +401,13 @@
         }
     }
     unless (-x $SENDMAIL) {
-        Carp::croak "can't find an executable sendmail"
+        undef $SENDMAIL;
     }
 }
 
 ### Our sending facilities:
 my %SenderArgs = (
-  sendmail  => ["$SENDMAIL -t -oi -oem"],
+  sendmail  => [$SENDMAIL ? "$SENDMAIL -t -oi -oem" : undef],
   smtp      => [],
   sub       => [],
 );
@@ -2666,6 +2666,7 @@
     if ( @_ == 1 and !ref $_[0] ) {
         ### Use the given command...
         my $sendmailcmd = shift @_;
+        Carp::croak "No sendmail command available" unless $sendmailcmd;
 
         ### Do it:
         local *SENDMAIL;