[Pkg-ruby-extras-maintainers] r872 - in packages/liblog4r-ruby/trunk/debian: . patches

[Paul van Tilburg]

Author: paulvt
Date: 2006-10-04 19:30:17 +0000 (Wed, 04 Oct 2006)
New Revision: 872

Added:
   packages/liblog4r-ruby/trunk/debian/patches/
   packages/liblog4r-ruby/trunk/debian/patches/01_emailoutputter-postpone-smtp.patch
   packages/liblog4r-ruby/trunk/debian/patches/02_emailoutputter-exception-reraise.patch
Modified:
   packages/liblog4r-ruby/trunk/debian/changelog
   packages/liblog4r-ruby/trunk/debian/rules
Log:
* debian/rules:
    - added support for CDBS' simple-patchsys.
* debian/patches:
    + added 01_emailoutputter-postpone-smtp.patch to let the email
      outputter open the SMTP connection only when needed (patch courtesy
      of Marc Dequ?\195?\168nes, closes #361349).
    + added 02_emailoutputter-exception-reraise.patch that reraises
      the exceptions caught by the emailoutputter so the environment
      receives them too (closes: #361780).

Modified: packages/liblog4r-ruby/trunk/debian/changelog
===================================================================
--- packages/liblog4r-ruby/trunk/debian/changelog	2006-10-04 19:09:21 UTC (rev 871)
+++ packages/liblog4r-ruby/trunk/debian/changelog	2006-10-04 19:30:17 UTC (rev 872)
@@ -2,14 +2,22 @@
 
   * Bumped standards version to 3.7.2; no changes required.
   * debian/rules:
-      modified the build/install system to use CDBS.  Upstream comes
-      without any build/install system, so using dh_install to copy stuff.
-  * debian/control.in: 
+      - modified the build/install system to use CDBS.  Upstream comes
+        without any build/install system, so using dh_install to copy stuff.
+      - added support for CDBS' simple-patchsys.
+  * debian/control.in:
       moved the build-depends-indep on cdbs and debhelper to build-depends.
-  * debian/liblog4r-ruby1.8.docs: 
+  * debian/liblog4r-ruby1.8.docs:
       removed because README is already installed by default.
+  * debian/patches:
+      + added 01_emailoutputter-postpone-smtp.patch to let the email
+        outputter open the SMTP connection only when needed (patch courtesy
+        of Marc Dequènes, closes #361349).
+      + added 02_emailoutputter-exception-reraise.patch that reraises
+        the exceptions caught by the emailoutputter so the environment
+        receives them too (closes: #361780).
 
- -- Paul van Tilburg <paulvt at debian.org>  Wed,  4 Oct 2006 21:07:20 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Wed,  4 Oct 2006 21:26:00 +0200
 
 liblog4r-ruby (1.0.5-4) unstable; urgency=low
 

Added: packages/liblog4r-ruby/trunk/debian/patches/01_emailoutputter-postpone-smtp.patch
===================================================================
--- packages/liblog4r-ruby/trunk/debian/patches/01_emailoutputter-postpone-smtp.patch	                        (rev 0)
+++ packages/liblog4r-ruby/trunk/debian/patches/01_emailoutputter-postpone-smtp.patch	2006-10-04 19:30:17 UTC (rev 872)
@@ -0,0 +1,27 @@
+--- src/log4r/outputter/emailoutputter.rb.orig	2006-04-08 14:18:47.000000000 +0200
++++ src/log4r/outputter/emailoutputter.rb	2006-04-08 14:21:06.000000000 +0200
+@@ -14,10 +14,11 @@
+       validate(hash)
+       @buff = []
+       begin 
+-        @smtp = Net::SMTP.start(*@params)
++        smtp = Net::SMTP.start(*@params)
+         Logger.log_internal {
+           "EmailOutputter '#{@name}' running SMTP client on #{@server}:#{@port}"
+         }
++	smtp.finish
+       rescue Exception => e
+         Logger.log_internal(-2) {
+           "EmailOutputter '#{@name}' failed to start SMTP client!"
+@@ -101,7 +102,10 @@
+         "#{msg}"
+ 
+       ### send email
+-      begin @smtp.sendmail(rfc822msg, @from, @to)
++      begin
++      	smtp = Net::SMTP.start(*@params)
++      	smtp.sendmail(rfc822msg, @from, @to)
++	smtp.finish
+       rescue Exception => e
+         Logger.log_internal(-2) {
+           "EmailOutputter '#{@name}' couldn't send email!"

Added: packages/liblog4r-ruby/trunk/debian/patches/02_emailoutputter-exception-reraise.patch
===================================================================
--- packages/liblog4r-ruby/trunk/debian/patches/02_emailoutputter-exception-reraise.patch	                        (rev 0)
+++ packages/liblog4r-ruby/trunk/debian/patches/02_emailoutputter-exception-reraise.patch	2006-10-04 19:30:17 UTC (rev 872)
@@ -0,0 +1,18 @@
+--- src/log4r/outputter/emailoutputter.rb.orig	2006-10-04 21:20:43.000000000 +0200
++++ src/log4r/outputter/emailoutputter.rb	2006-10-04 21:21:38.000000000 +0200
+@@ -24,6 +24,7 @@
+         }
+         Logger.log_internal {e}
+         self.level = OFF
++        raise e
+       end
+     end
+ 
+@@ -108,6 +109,7 @@
+         }
+         Logger.log_internal {e}
+         self.level = OFF
++        raise e
+       ensure @buff.clear
+       end
+     end

Modified: packages/liblog4r-ruby/trunk/debian/rules
===================================================================
--- packages/liblog4r-ruby/trunk/debian/rules	2006-10-04 19:09:21 UTC (rev 871)
+++ packages/liblog4r-ruby/trunk/debian/rules	2006-10-04 19:30:17 UTC (rev 872)
@@ -3,4 +3,5 @@
 # CDBS file to build the Log4r Ruby package.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk