r9640 - in /trunk/libauthen-captcha-perl: Captcha.pm debian/changelog debian/control debian/patches/ debian/patches/fix409731 debian/patches/series debian/rules

emhn-guest at users.alioth.debian.org emhn-guest at users.alioth.debian.org
Tue Nov 20 19:19:12 UTC 2007 

Author: emhn-guest
Date: Tue Nov 20 19:19:12 2007
New Revision: 9640

URL: http://svn.debian.org/wsvn/?sc=1&rev=9640
Log:
	W: libauthen-captcha-perl: windows-thumbnail-database-in-package
* Applied patch by Chris Dunlop <chris at onthe.net.au> (Closes: #409731)
* Changed debian/rules to use quilt for patch management until
  upstream catches up.

Added:
    trunk/libauthen-captcha-perl/debian/patches/
    trunk/libauthen-captcha-perl/debian/patches/fix409731
    trunk/libauthen-captcha-perl/debian/patches/series
Modified:
    trunk/libauthen-captcha-perl/Captcha.pm
    trunk/libauthen-captcha-perl/debian/changelog
    trunk/libauthen-captcha-perl/debian/control
    trunk/libauthen-captcha-perl/debian/rules

Modified: trunk/libauthen-captcha-perl/Captcha.pm
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/Captcha.pm?rev=9640&op=diff
==============================================================================
--- trunk/libauthen-captcha-perl/Captcha.pm (original)
+++ trunk/libauthen-captcha-perl/Captcha.pm Tue Nov 20 19:19:12 2007
@@ -232,11 +232,7 @@
 	foreach my $line (@data) 
 	{
 		$line =~ s/\n//;
-        # Fixes Debian Bug #409731
-        # Extract untainted time and code
-        # Chris Dunlop <chris at onthe.net.au>
-        # Applied by Ernesto Hernández-Novich <emhn at usb.ve>
-		my ($data_time,$data_code) = $line =~ m/(^\d+)::([[:xdigit:]]{32})$/;
+		my ($data_time,$data_code) = split(/::/,$line);
 		
 		my $png_file = File::Spec->catfile($self->output_folder(),$data_code . ".png");
 		if ($data_code eq $crypt)
@@ -355,12 +351,7 @@
 	foreach my $line (@data) 
 	{
 		$line =~ s/\n//;
-        # Fixes Debian Bug #409731
-        # Extract untainted time and code
-        # Chris Dunlop <chris at onthe.net.au>
-        # Applied by Ernesto Hernández-Novich <emhn at usb.ve>
-		my ($data_time,$data_code) = $line =~ m/(^\d+)::([[:xdigit:]]{32})$/;
-
+		my ($data_time,$data_code) = split(/::/,$line);
 		if ( (($current_time - $data_time) > ($self->expire())) ||
 		     ($data_code  eq $md5) )
 		{	# remove expired captcha, or a dup

Modified: trunk/libauthen-captcha-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/debian/changelog?rev=9640&op=diff
==============================================================================
--- trunk/libauthen-captcha-perl/debian/changelog (original)
+++ trunk/libauthen-captcha-perl/debian/changelog Tue Nov 20 19:19:12 2007
@@ -5,8 +5,6 @@
   * Fixed copyright file with a better URL.
   * Cleanup debian/rules.
   * Fixed watch file.
-  * Applied patch by Chris Dunlop <chris at onthe.net.au> (Closes: #409731)
-    until upstream catches up.
 
   [ Rene Mayorga ]
   * Remove debian/docs, is not needed, Changes and README are installed
@@ -14,11 +12,15 @@
   * Install examples with dh_installexamples
   * Fix Upstream URLs at debian/control and debian/copyright
   * Remove Thumbs.db to keeps lintian happy
-  	W: libauthen-captcha-perl: windows-thumbnail-database-in-package 
+  	W: libauthen-captcha-perl: windows-thumbnail-database-in-package
            usr/share/perl5/Authen/Captcha/images/Thumbs.db
 
+  [ Ernesto Hernández-Novich (USB) ]
+  * Applied patch by Chris Dunlop <chris at onthe.net.au> (Closes: #409731)
+  * Changed debian/rules to use quilt for patch management until
+    upstream catches up.
 
- -- Rene Mayorga <rmayorga at debian.org.sv>  Sun, 18 Nov 2007 22:35:12 -0600
+ -- Ernesto Hernández-Novich (USB) <emhn at usb.ve>  Tue, 20 Nov 2007 15:05:03 -0400
 
 libauthen-captcha-perl (1.023-3) unstable; urgency=low
 

Modified: trunk/libauthen-captcha-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/debian/control?rev=9640&op=diff
==============================================================================
--- trunk/libauthen-captcha-perl/debian/control (original)
+++ trunk/libauthen-captcha-perl/debian/control Tue Nov 20 19:19:12 2007
@@ -1,7 +1,7 @@
 Source: libauthen-captcha-perl
 Section: perl
 Priority: extra
-Build-Depends: debhelper (>= 4.0.2)
+Build-Depends: debhelper (>= 4.0.2), quilt
 Build-Depends-Indep: perl (>= 5.6.0), libgd-gd2-noxpm-perl | libgd-gd2-perl
 Maintainer: Debian Pkg Perl <pkg-perl at lists.alioth.debian.org>
 Uploaders: Ernesto Hernández-Novich (USB) <emhn at usb.ve>

Added: trunk/libauthen-captcha-perl/debian/patches/fix409731
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/debian/patches/fix409731?rev=9640&op=file
==============================================================================
--- trunk/libauthen-captcha-perl/debian/patches/fix409731 (added)
+++ trunk/libauthen-captcha-perl/debian/patches/fix409731 Tue Nov 20 19:19:12 2007
@@ -1,0 +1,31 @@
+Index: libauthen-captcha-perl/Captcha.pm
+===================================================================
+--- libauthen-captcha-perl.orig/Captcha.pm	2007-11-20 14:57:48.219068831 -0400
++++ libauthen-captcha-perl/Captcha.pm	2007-11-20 15:00:29.961048461 -0400
+@@ -232,7 +232,11 @@
+ 	foreach my $line (@data) 
+ 	{
+ 		$line =~ s/\n//;
+-		my ($data_time,$data_code) = split(/::/,$line);
++        # Fixes Debian Bug #409731
++        # Extract untainted time and code
++        # Patch provided by Chris Dunlop <chris at onthe.net.au>
++        # applied by Ernesto Hernández-Novich <emhn at usb.ve>
++        my ($data_time,$data_code) = $line =~ m/(^\d+)::([[:xdigit:]]{32})$/;
+ 		
+ 		my $png_file = File::Spec->catfile($self->output_folder(),$data_code . ".png");
+ 		if ($data_code eq $crypt)
+@@ -351,7 +355,12 @@
+ 	foreach my $line (@data) 
+ 	{
+ 		$line =~ s/\n//;
+-		my ($data_time,$data_code) = split(/::/,$line);
++        # Fixes Debian Bug #409731
++        # Extract untainted time and code
++        # Patch provided by Chris Dunlop <chris at onthe.net.au>
++        # applied by Ernesto Hernández-Novich <emhn at usb.ve>
++        my ($data_time,$data_code) = $line =~ m/(^\d+)::([[:xdigit:]]{32})$/;
++
+ 		if ( (($current_time - $data_time) > ($self->expire())) ||
+ 		     ($data_code  eq $md5) )
+ 		{	# remove expired captcha, or a dup

Added: trunk/libauthen-captcha-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/debian/patches/series?rev=9640&op=file
==============================================================================
--- trunk/libauthen-captcha-perl/debian/patches/series (added)
+++ trunk/libauthen-captcha-perl/debian/patches/series Tue Nov 20 19:19:12 2007
@@ -1,0 +1,1 @@
+fix409731

Modified: trunk/libauthen-captcha-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/debian/rules?rev=9640&op=diff
==============================================================================
--- trunk/libauthen-captcha-perl/debian/rules (original)
+++ trunk/libauthen-captcha-perl/debian/rules Tue Nov 20 19:19:12 2007
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Using quilt for patches
+include /usr/share/quilt/quilt.make
 
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
@@ -19,7 +15,7 @@
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -27,7 +23,7 @@
 	$(MAKE) test
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp

More information about the Pkg-perl-cvs-commits mailing list