r1912 - in packages/libnet-irc-perl/trunk: . debian/patches

Sat Jan 14 14:23:38 UTC 2006

Author: ntyni-guest
Date: 2006-01-14 14:23:37 +0000 (Sat, 14 Jan 2006)
New Revision: 1912

Added:
   packages/libnet-irc-perl/trunk/debian/patches/00list
   packages/libnet-irc-perl/trunk/debian/patches/10manpages.dpatch
   packages/libnet-irc-perl/trunk/debian/patches/20do_one_loop.dpatch
   packages/libnet-irc-perl/trunk/debian/patches/30irctest.dpatch
Modified:
   packages/libnet-irc-perl/trunk/IRC.pm
   packages/libnet-irc-perl/trunk/Makefile.PL
   packages/libnet-irc-perl/trunk/irctest
Log:
Migrate old patches to dpatch.


Modified: packages/libnet-irc-perl/trunk/IRC.pm
===================================================================

--- packages/libnet-irc-perl/trunk/IRC.pm	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/IRC.pm	2006-01-14 14:23:37 UTC (rev 1912)
@@ -138,7 +138,7 @@
   # we don't want to bother waiting on input or running
   # scheduled events if we're just flushing the output queue
   # so we bail out here
-  return if defined($caller) and $caller eq 'Net::IRC::flush_output_queue';
+  return if $caller eq 'Net::IRC::flush_output_queue';
 
   # Check the queue for scheduled events to run.
   if(!$self->schedulequeue->is_empty) {

Modified: packages/libnet-irc-perl/trunk/Makefile.PL
===================================================================
--- packages/libnet-irc-perl/trunk/Makefile.PL	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/Makefile.PL	2006-01-14 14:23:37 UTC (rev 1912)
@@ -21,12 +21,6 @@
                   'IO::Socket'    => 0,
                   'Sys::Hostname' => 0,
               },
-	      'MAN3PODS' => {
-		  'IRC.pm' => 'blib/man3/Net::IRC.3pm',
-		  'Connection.pm' => 'blib/man3/Net::IRC::Connection.3pm',
-		  'DCC.pm' => 'blib/man3/Net::IRC::DCC.3pm',
-		  'Event.pm' => 'blib/man3/Net::IRC::Event.3pm',
-	      },
 	      'VERSION_FROM' => 'IRC.pm', # finds $VERSION
               'dist' => { 'COMPRESS' => 'gzip --best' },
 );

Added: packages/libnet-irc-perl/trunk/debian/patches/00list
===================================================================
--- packages/libnet-irc-perl/trunk/debian/patches/00list	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/debian/patches/00list	2006-01-14 14:23:37 UTC (rev 1912)
@@ -0,0 +1,4 @@
+00list
+10manpages.dpatch
+20do_one_loop.dpatch
+30irctest.dpatch

Added: packages/libnet-irc-perl/trunk/debian/patches/10manpages.dpatch
===================================================================
--- packages/libnet-irc-perl/trunk/debian/patches/10manpages.dpatch	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/debian/patches/10manpages.dpatch	2006-01-14 14:23:37 UTC (rev 1912)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10manpages.dpatch by Niko Tyni <ntyni at iki.fi>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Install manpages with the correct names. (#295967, Gunnar Wolf)
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.PL trunk/Makefile.PL
+--- trunk~/Makefile.PL	2003-04-18 06:03:58.000000000 +0300
++++ trunk/Makefile.PL	2006-01-14 16:14:34.156986139 +0200
+@@ -21,6 +21,12 @@
+                   'IO::Socket'    => 0,
+                   'Sys::Hostname' => 0,
+               },
++	      'MAN3PODS' => {
++		  'IRC.pm' => 'blib/man3/Net::IRC.3pm',
++		  'Connection.pm' => 'blib/man3/Net::IRC::Connection.3pm',
++		  'DCC.pm' => 'blib/man3/Net::IRC::DCC.3pm',
++		  'Event.pm' => 'blib/man3/Net::IRC::Event.3pm',
++	      },
+ 	      'VERSION_FROM' => 'IRC.pm', # finds $VERSION
+               'dist' => { 'COMPRESS' => 'gzip --best' },
+ );


Property changes on: packages/libnet-irc-perl/trunk/debian/patches/10manpages.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/libnet-irc-perl/trunk/debian/patches/20do_one_loop.dpatch
===================================================================
--- packages/libnet-irc-perl/trunk/debian/patches/20do_one_loop.dpatch	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/debian/patches/20do_one_loop.dpatch	2006-01-14 14:23:37 UTC (rev 1912)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20do_one_loop.dpatch by Niko Tyni <ntyni at iki.fi>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix uninitialized value generating a warning in do_one_loop
+## DP: (#299606, patch from Michael Ablassmeier)
+
+ at DPATCH@
+diff -urNad trunk~/IRC.pm trunk/IRC.pm
+--- trunk~/IRC.pm	2006-01-14 16:17:19.000000000 +0200
++++ trunk/IRC.pm	2006-01-14 16:17:32.212158636 +0200
+@@ -138,7 +138,7 @@
+   # we don't want to bother waiting on input or running
+   # scheduled events if we're just flushing the output queue
+   # so we bail out here
+-  return if $caller eq 'Net::IRC::flush_output_queue';
++  return if defined($caller) and $caller eq 'Net::IRC::flush_output_queue';
+ 
+   # Check the queue for scheduled events to run.
+   if(!$self->schedulequeue->is_empty) {


Property changes on: packages/libnet-irc-perl/trunk/debian/patches/20do_one_loop.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/libnet-irc-perl/trunk/debian/patches/30irctest.dpatch
===================================================================
--- packages/libnet-irc-perl/trunk/debian/patches/30irctest.dpatch	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/debian/patches/30irctest.dpatch	2006-01-14 14:23:37 UTC (rev 1912)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30irctest.dpatch by Niko Tyni <ntyni at iki.fi>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In case somebody runs the example file irctest, he will get a
+## DP: warning and a delay, as this script can send any user-readable file
+## DP: on the FS. (Gunnar Wolf)
+
+
+ at DPATCH@
+diff -urNad trunk~/irctest trunk/irctest
+--- trunk~/irctest	2003-05-15 23:49:00.000000000 +0300
++++ trunk/irctest	2006-01-14 16:19:21.207291042 +0200
+@@ -14,6 +14,21 @@
+ 
+ my $irc = new Net::IRC;
+ 
++print << 'INIT_WARN';
+++------------------------------------------------------------
++| IMPORTANT NOTE
++|
++| Running this script might constitute a severe security risk
++| This script will send ANY FILE it is requested as a response
++| to the message 'Send me <filename>'
++|
++| You have been warned.
+++------------------------------------------------------------
++(sleeping for two seconds)
++INIT_WARN
++
++sleep 2;
++
+ print "Creating connection to IRC server...\n";
+ 
+ my $conn = $irc->newconn(Server   => ($ARGV[0]  ||  'irc.prison.net'),


Property changes on: packages/libnet-irc-perl/trunk/debian/patches/30irctest.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/libnet-irc-perl/trunk/irctest
===================================================================
--- packages/libnet-irc-perl/trunk/irctest	2006-01-14 14:14:09 UTC (rev 1911)
+++ packages/libnet-irc-perl/trunk/irctest	2006-01-14 14:23:37 UTC (rev 1912)
@@ -14,21 +14,6 @@
 
 my $irc = new Net::IRC;
 
-print << 'INIT_WARN';
-+------------------------------------------------------------
-| IMPORTANT NOTE
-|
-| Running this script might constitute a severe security risk
-| This script will send ANY FILE it is requested as a response
-| to the message 'Send me <filename>'
-|
-| You have been warned.
-+------------------------------------------------------------
-(sleeping for two seconds)
-INIT_WARN
-
-sleep 2;
-
 print "Creating connection to IRC server...\n";
 
 my $conn = $irc->newconn(Server   => ($ARGV[0]  ||  'irc.prison.net'),


