OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Feb-2006 18:09:12
Branch: OPENPKG_2_5_SOLID Handle: 2006022517091200
Added files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/perl-ssl perl-ssl.patch
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/perl-ssl perl-ssl.spec
Log:
MFC:
1. fix Crypt::SSLeay segfault situation. This especially fixes
WWW::Mechanize on HTTPS URLs, because it uses LWP and this in turn uses
Crypt::SSLeay
2. Backout a change between IO::Socket::SSL 0.96 and 0.97 which
breaks Net::IRC as used by the OpenPKG Foundation's irc.openpkg.net
service.
Summary:
Revision Changes Path
1.2.2.2 +37 -0 openpkg-src/perl-ssl/perl-ssl.patch
1.69.2.2 +3 -1 openpkg-src/perl-ssl/perl-ssl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-ssl/perl-ssl.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.2 perl-ssl.patch
--- /dev/null 2006-02-25 18:08:39 +0100
+++ perl-ssl.patch 2006-02-25 18:09:12 +0100
@@ -0,0 +1,37 @@
+Index: Crypt-SSLeay-0.51/SSLeay.xs
+--- Crypt-SSLeay-0.51/SSLeay.xs.orig 2006-02-25 17:19:27 +0100
++++ Crypt-SSLeay-0.51/SSLeay.xs 2006-02-25 17:31:31 +0100
+@@ -40,7 +40,7 @@
+ */
+
+
+-static void InfoCallback(SSL *s,int where,int ret)
++static void InfoCallback(const SSL *s,int where,int ret)
+ {
+ char *str;
+ int w;
+@@ -107,9 +107,10 @@
+ int rand_bytes_read;
+
+ if(!bNotFirstTime) {
+- SSLeay_add_all_algorithms();
+ SSL_load_error_strings();
+ ERR_load_crypto_strings();
++ SSL_library_init();
++ SSLeay_add_all_algorithms();
+ bNotFirstTime = 1;
+ }
+
+Index: IO-Socket-SSL-0.97/SSL.pm
+--- IO-Socket-SSL-0.97/SSL.pm.orig 2005-07-17 02:25:02 +0200
++++ IO-Socket-SSL-0.97/SSL.pm 2006-02-25 17:18:41 +0100
+@@ -220,8 +220,7 @@
+
+ sub read {
+ my $self = shift;
+- return $self->generic_read($self->blocking ?
\&Net::SSLeay::ssl_read_all :
+- \&Net::SSLeay::read, @_);
++ return $self->generic_read(\&Net::SSLeay::read, @_);
+ }
+
+ sub peek {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-ssl/perl-ssl.spec
============================================================================
$ cvs diff -u -r1.69.2.1 -r1.69.2.2 perl-ssl.spec
--- openpkg-src/perl-ssl/perl-ssl.spec 11 Oct 2005 12:51:23 -0000
1.69.2.1
+++ openpkg-src/perl-ssl/perl-ssl.spec 25 Feb 2006 17:09:12 -0000
1.69.2.2
@@ -39,12 +39,13 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.5.0
+Release: 2.5.1
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Net/Net_SSLeay.pm-%{V_net_ssleay}.tar.gz
Source1:
http://www.cpan.org/modules/by-module/Crypt/Crypt-SSLeay-%{V_crypt_ssleay}.tar.gz
Source2:
http://www.cpan.org/modules/by-module/IO/IO-Socket-SSL-%{V_io_socket_ssl}.tar.gz
+Patch0: perl-ssl.patch
# build information
Prefix: %{l_prefix}
@@ -83,6 +84,7 @@
%setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
+ %patch -p0
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
