rpms/perl-Crypt-OpenSSL-X509/devel perl-Crypt-OpenSSL-X509-openssl.patch, NONE, 1.1 perl-Crypt-OpenSSL-X509.spec, 1.11, 1.12

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14677

Modified Files:
	perl-Crypt-OpenSSL-X509.spec 
Added Files:
	perl-Crypt-OpenSSL-X509-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
- rebuilt with new openssl


perl-Crypt-OpenSSL-X509-openssl.patch:
 X509.xs |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

--- NEW FILE perl-Crypt-OpenSSL-X509-openssl.patch ---
diff -up Crypt-OpenSSL-X509-0.7/X509.xs.openssl Crypt-OpenSSL-X509-0.7/X509.xs
--- Crypt-OpenSSL-X509-0.7/X509.xs.openssl	2008-02-23 23:18:11.000000000 +0100
+++ Crypt-OpenSSL-X509-0.7/X509.xs	2009-08-25 21:40:15.000000000 +0200
@@ -252,12 +252,19 @@ accessor(x509)
 	} else if (ix == 7) {
 
 		int j;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+		STACK_OF(OPENSSL_STRING) *emlst = X509_get1_email(x509);
+
+		for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++) {
+			BIO_printf(bio, "%s", sk_OPENSSL_STRING_value(emlst, j));
+		}
+#else
 		STACK *emlst = X509_get1_email(x509);
 
 		for (j = 0; j < sk_num(emlst); j++) {
 			BIO_printf(bio, "%s", sk_value(emlst, j));
 		}
-
+#endif
 		X509_email_free(emlst);
 	}
 
@@ -290,6 +297,17 @@ as_string(x509, format = FORMAT_PEM)
 
 	} else if (format == FORMAT_NETSCAPE) {
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+		NETSCAPE_X509 nx;
+		ASN1_OCTET_STRING hdr;
+
+		hdr.data   = (unsigned char *)NETSCAPE_CERT_HDR;
+		hdr.length = strlen(NETSCAPE_CERT_HDR);
+		nx.header = &os;
+		nx.cert   = x509;
+
+		ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509), bio, &nx);
+#else
 		ASN1_HEADER ah;
 		ASN1_OCTET_STRING os;
 
@@ -300,6 +318,7 @@ as_string(x509, format = FORMAT_PEM)
 		ah.meth   = X509_asn1_meth();
 
 		ASN1_i2d_bio(i2d_ASN1_HEADER, bio, (unsigned char *)&ah);
+#endif
 	}
 
 	RETVAL = sv_bio_final(bio);


Index: perl-Crypt-OpenSSL-X509.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-OpenSSL-X509.spec	21 Aug 2009 15:19:50 -0000	1.11
+++ perl-Crypt-OpenSSL-X509.spec	25 Aug 2009 19:42:22 -0000	1.12
@@ -6,6 +6,7 @@ License:        GPL+ or Artistic 
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Crypt-OpenSSL-X509/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANIEL/Crypt-OpenSSL-X509-%{version}.tar.gz
+Patch1:         perl-Crypt-OpenSSL-X509-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl openssl-devel
 BuildRequires:  perl(Test::More) perl(Test::Pod) perl(Module::Install)
@@ -17,6 +18,7 @@ Crypt::OpenSSL::X509 - Perl extension to
 
 %prep
 %setup -q -n Crypt-OpenSSL-X509-%{version}
+%patch1 -p1 -b .openssl
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -47,7 +49,7 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
 - rebuilt with new openssl
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-4