r1722 - in packages/libmime-lite-perl/trunk: debian lib/MIME

[Gunnar Wolf]

Author: gwolf
Date: 2005-12-21 03:57:13 +0000 (Wed, 21 Dec 2005)
New Revision: 1722

Modified:
   packages/libmime-lite-perl/trunk/debian/changelog
   packages/libmime-lite-perl/trunk/debian/rules
   packages/libmime-lite-perl/trunk/lib/MIME/Lite.pm
Log:
Fixed: The generated dates was not RFC-clean
Does not ignore the result of make distclean


Modified: packages/libmime-lite-perl/trunk/debian/changelog
===================================================================
--- packages/libmime-lite-perl/trunk/debian/changelog	2005-12-20 21:06:39 UTC (rev 1721)
+++ packages/libmime-lite-perl/trunk/debian/changelog	2005-12-21 03:57:13 UTC (rev 1722)
@@ -1,3 +1,14 @@
+libmime-lite-perl (3.01-6) unstable; urgency=low
+
+  * MIME::Lite outputs non-RFC-compliant dates - Added a patch to
+    address this. This problem is addressed in the CPAN request tracker
+    (bug 274), but this module upstream development seems halted. Thanks
+    to Nicolas Pomarede for pointing this out and providing a simple
+    patch.
+  * Does not ignore the output of make distclean anymore
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 20 Dec 2005 21:53:07 -0600
+
 libmime-lite-perl (3.01-5) unstable; urgency=low
 
   * Added debian/watch

Modified: packages/libmime-lite-perl/trunk/debian/rules
===================================================================
--- packages/libmime-lite-perl/trunk/debian/rules	2005-12-20 21:06:39 UTC (rev 1721)
+++ packages/libmime-lite-perl/trunk/debian/rules	2005-12-21 03:57:13 UTC (rev 1722)
@@ -21,7 +21,7 @@
 clean:	checkroot
 	rm -f build-stamp
 	dh_clean debian/changes
-	-$(MAKE) distclean
+	[ ! -e Makefile ] || $(MAKE) distclean
 
 binary-indep:	checkroot build
 	dh_clean

Modified: packages/libmime-lite-perl/trunk/lib/MIME/Lite.pm
===================================================================
--- packages/libmime-lite-perl/trunk/lib/MIME/Lite.pm	2005-12-20 21:06:39 UTC (rev 1721)
+++ packages/libmime-lite-perl/trunk/lib/MIME/Lite.pm	2005-12-21 03:57:13 UTC (rev 1722)
@@ -321,6 +321,7 @@
 
 use Carp ();
 use FileHandle;
+use POSIX qw(strftime);
 
 use strict;
 use vars qw(
@@ -1052,9 +1053,17 @@
     my $ds_wanted    = $params{Datestamp};
     my $ds_defaulted = ($is_top and !exists($params{Datestamp}));
     if (($ds_wanted or $ds_defaulted) and !exists($params{Date})) {
-	my ($u_wdy, $u_mon, $u_mdy, $u_time, $u_y4) =
-	    split /\s+/, gmtime()."";   ### should be non-locale-dependent
-	my $date = "$u_wdy, $u_mdy $u_mon $u_y4 $u_time UT";
+###### Debian-specific patch: MIME::Lite outputs a non-RFC-compliant date.
+###### Refer to the CPAN RT bug 274 for more information.
+###### Thanks to Nicolas Pomarede for this patch.
+###	my ($u_wdy, $u_mon, $u_mdy, $u_time, $u_y4) =
+###	    split /\s+/, gmtime()."";   ### should be non-locale-dependent
+###	my $date = "$u_wdy, $u_mdy $u_mon $u_y4 $u_time UT";
+        my ($u_wdy, $u_mon, $u_mdy, $u_time, $u_y4) =
+	          split /\s+/, localtime() . "";
+	my $date = "$u_wdy, $u_mdy $u_mon $u_y4 $u_time " . strftime "%z" ,
+	    localtime;
+	
 	$self->add("date", $date);
     }