r21654 - in /trunk/libnet-ssleay-perl/debian: changelog control patches/00list patches/10fix_pod.dpatch patches/10fix_pod.patch patches/20egd_path.dpatch patches/20egd_path.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun 15 17:14:41 2008
New Revision: 21654

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21654
Log:
Switch patch system from dpatch to quilt.

Added:
    trunk/libnet-ssleay-perl/debian/patches/10fix_pod.patch
    trunk/libnet-ssleay-perl/debian/patches/20egd_path.patch
    trunk/libnet-ssleay-perl/debian/patches/series
Removed:
    trunk/libnet-ssleay-perl/debian/patches/00list
    trunk/libnet-ssleay-perl/debian/patches/10fix_pod.dpatch
    trunk/libnet-ssleay-perl/debian/patches/20egd_path.dpatch
Modified:
    trunk/libnet-ssleay-perl/debian/changelog
    trunk/libnet-ssleay-perl/debian/control
    trunk/libnet-ssleay-perl/debian/rules

Modified: trunk/libnet-ssleay-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/changelog?rev=21654&op=diff
==============================================================================
--- trunk/libnet-ssleay-perl/debian/changelog (original)
+++ trunk/libnet-ssleay-perl/debian/changelog Sun Jun 15 17:14:41 2008
@@ -8,6 +8,7 @@
     Florian Ragwitz <rafl at debian.org>); Florian Ragwitz <rafl at debian.org>
     moved to Uploaders.
   * Add debian/watch.
+  * Switch patch system from dpatch to quilt.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 15 Jun 2008 18:55:16 +0200
 

Modified: trunk/libnet-ssleay-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/control?rev=21654&op=diff
==============================================================================
--- trunk/libnet-ssleay-perl/debian/control (original)
+++ trunk/libnet-ssleay-perl/debian/control Sun Jun 15 17:14:41 2008
@@ -7,7 +7,7 @@
 Homepage: http://search.cpan.org/dist/Net-SSLeay/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnet-ssleay-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/
-Build-Depends: debhelper (>> 4.1), perl (>> 5.8.1), libssl-dev (>> 0.9.7), openssl, dpatch
+Build-Depends: debhelper (>> 4.1), perl (>> 5.8.1), libssl-dev (>> 0.9.7), openssl, quilt (>= 0.40)
 
 Package: libnet-ssleay-perl
 Architecture: any

Added: trunk/libnet-ssleay-perl/debian/patches/10fix_pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/patches/10fix_pod.patch?rev=21654&op=file
==============================================================================
--- trunk/libnet-ssleay-perl/debian/patches/10fix_pod.patch (added)
+++ trunk/libnet-ssleay-perl/debian/patches/10fix_pod.patch Sun Jun 15 17:14:41 2008
@@ -1,0 +1,14 @@
+Author: Florian Ragwitz <rafl at debianforum.de>
+Description: Fix overlong lines and typos in POD
+--- libnet-ssleay-perl.orig/SSLeay.pm
++++ libnet-ssleay-perl/SSLeay.pm
+@@ -787,7 +787,8 @@
+ my $crl = &Net::SSLeay::PEM_read_bio_X509_CRL($bio);
+ if ($crl)
+ {
+-    &Net::SSLeay::X509_STORE_add_crl(&Net::SSLeay::CTX_get_cert_store($ssl, $crl);
++    &Net::SSLeay::X509_STORE_add_crl(
++            &Net::SSLeay::CTX_get_cert_store($ssl, $crl));
+ }
+ else
+ {

Added: trunk/libnet-ssleay-perl/debian/patches/20egd_path.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/patches/20egd_path.patch?rev=21654&op=file
==============================================================================
--- trunk/libnet-ssleay-perl/debian/patches/20egd_path.patch (added)
+++ trunk/libnet-ssleay-perl/debian/patches/20egd_path.patch Sun Jun 15 17:14:41 2008
@@ -1,0 +1,23 @@
+Author: Florian Ragwitz <florian.ragwitz at s2004.tu-chemnitz.de>
+Description: Fix insecure entropy source
+--- libnet-ssleay-perl.orig/SSLeay.pm
++++ libnet-ssleay-perl/SSLeay.pm
+@@ -1870,8 +1870,8 @@
+     my ($rn_seed_file, $seed, $egd_path) = @_;
+     my $rnsf = defined($rn_seed_file) && -r $rn_seed_file;
+ 
++    $egd_path = '';
+     $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'};
+-    $egd_path = '/tmp/entropy'   unless $egd_path;
+     
+     RAND_seed(rand() + $$);  # Stir it with time and pid
+     
+@@ -1882,7 +1882,7 @@
+     RAND_load_file($rn_seed_file, -s _) if $rnsf;
+     RAND_seed($seed) if $seed;
+     RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED};
+-    RAND_egd($egd_path) if -S $egd_path;
++    RAND_egd($egd_path) if -e $egd_path && -S _;
+     RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8)
+ 	if -r $Net::SSLeay::random_device;
+ }

Added: trunk/libnet-ssleay-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/patches/series?rev=21654&op=file
==============================================================================
--- trunk/libnet-ssleay-perl/debian/patches/series (added)
+++ trunk/libnet-ssleay-perl/debian/patches/series Sun Jun 15 17:14:41 2008
@@ -1,0 +1,2 @@
+10fix_pod.patch
+20egd_path.patch

Modified: trunk/libnet-ssleay-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/rules?rev=21654&op=diff
==============================================================================
--- trunk/libnet-ssleay-perl/debian/rules (original)
+++ trunk/libnet-ssleay-perl/debian/rules Sun Jun 15 17:14:41 2008
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 export PERL_MM_USE_DEFAULT=1
 
@@ -20,7 +20,7 @@
 endif
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL /usr INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""