jplesnik pushed to perl-Crypt-OpenSSL-X509 (f25). "1.807 bump" - perl-devel - Fedora mailing-lists

31 Aug 2016

From 107821673e8b53d7001247effa1313ed6bc87f11 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova jplesnik@redhat.com
Date: Wed, 31 Aug 2016 14:24:18 +0200
Subject: 1.807 bump
---
 ...OpenSSL-X509-1.806-Fix-condition-negation.patch | 44 ---------------
 perl-Crypt-OpenSSL-X509-openssl.patch              | 62 ----------------------
 perl-Crypt-OpenSSL-X509.spec                       | 13 +++--
 sources                                            |  2 +-
 4 files changed, 7 insertions(+), 114 deletions(-)
 delete mode 100644 Crypt-OpenSSL-X509-1.806-Fix-condition-negation.patch
 delete mode 100644 perl-Crypt-OpenSSL-X509-openssl.patch

diff --git a/Crypt-OpenSSL-X509-1.806-Fix-condition-negation.patch b/Crypt-OpenSSL-X509-1.806-Fix-condition-negation.patch
deleted file mode 100644
index c671472..0000000
--- a/Crypt-OpenSSL-X509-1.806-Fix-condition-negation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e1117f13ef3895a738d2e6edfc288175b3677f77 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppisar@redhat.com
-Date: Wed, 11 Feb 2015 13:18:38 +0100
-Subject: [PATCH] Fix condition negation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 5.0 correctly warned on missing parathneses in (! c > 0)
-expression. This patch fixes it.
-
-https://github.com/dsully/perl-crypt-openssl-x509/issues/39
-https://bugzilla.redhat.com/show_bug.cgi?id=1190816
-
-Signed-off-by: Petr Písař ppisar@redhat.com
----
- X509.xs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/X509.xs b/X509.xs
-index 23f7666..32a1425 100644
---- a/X509.xs
-+++ b/X509.xs
-@@ -181,7 +181,7 @@ static HV* hv_exts(X509* x509, int no_name) {
-   sv_2mortal((SV*)RETVAL);
-   c = X509_get_ext_count(x509);
- 
--  if ( ! c > 0 ) {
-+  if (!(c > 0)) {
-     croak("No extensions found\n");
-   }
- 
-@@ -868,7 +868,7 @@ extension(x509, i)
- 
-   c = X509_get_ext_count(x509);
- 
--  if (!c > 0) {
-+  if (!(c > 0)) {
-     croak("No extensions found\n");
-   } else if (i >= c || i < 0) {
-     croak("Requested extension index out of range\n");
--- 
-1.9.3
-
diff --git a/perl-Crypt-OpenSSL-X509-openssl.patch b/perl-Crypt-OpenSSL-X509-openssl.patch
deleted file mode 100644
index b40d16a..0000000
--- a/perl-Crypt-OpenSSL-X509-openssl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up Crypt-OpenSSL-X509-0.7/t/x509.t.openssl Crypt-OpenSSL-X509-0.7/t/x509.t
---- Crypt-OpenSSL-X509-0.7/t/x509.t.openssl	2009-08-26 10:06:16.000000000 +0200
-+++ Crypt-OpenSSL-X509-0.7/t/x509.t	2009-08-26 10:05:21.000000000 +0200
-@@ -12,7 +12,7 @@ ok($x509->fingerprint_md5() eq '51:86:E8
- ok($x509->issuer() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'issuer()');
- ok($x509->subject() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'subject()');
- 
--ok($x509->hash() eq '2edf7016', 'hash()');
-+ok($x509->hash() eq '2edf7016' or '24ad0b63', 'hash()');
- 
- ok($x509 = Crypt::OpenSSL::X509->new_from_file('certs/thawte.pem'), 'new_from_file()');
- 
-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 23:12:45.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);
- 	}
- 
-@@ -289,7 +296,17 @@ as_string(x509, format = FORMAT_PEM)
- 		i2d_X509_bio(bio, x509);
- 
- 	} 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 = &hdr;
-+		nx.cert   = x509;
- 
-+		ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509), bio, &nx);
-+#else
- 		ASN1_HEADER ah;
- 		ASN1_OCTET_STRING os;
- 
-@@ -300,6 +317,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);
diff --git a/perl-Crypt-OpenSSL-X509.spec b/perl-Crypt-OpenSSL-X509.spec
index c744eec..a135a01 100644
--- a/perl-Crypt-OpenSSL-X509.spec
+++ b/perl-Crypt-OpenSSL-X509.spec
@@ -1,16 +1,13 @@
 Name:           perl-Crypt-OpenSSL-X509
-Version:        1.806
-Release:        5%{?dist}
+Version:        1.807
+Release:        1%{?dist}
 Summary:        Perl interface to OpenSSL for X509
 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-%%7Bversion%7D...
-# Fix condition negation, bug #1190816,
-# https://github.com/dsully/perl-crypt-openssl-x509/issues/39
-Patch0:         Crypt-OpenSSL-X509-1.806-Fix-condition-negation.patch
 # Respect distribution compiler flags
-Patch1:         Crypt-OpenSSL-X509-1.806-Do-not-hard-code-CFLAGS.patch
+Patch0:         Crypt-OpenSSL-X509-1.806-Do-not-hard-code-CFLAGS.patch
 BuildRequires:  openssl-devel
 BuildRequires:  perl
 BuildRequires:  perl-devel
@@ -45,7 +42,6 @@ Crypt::OpenSSL::X509 - Perl extension to OpenSSL's X509 API.
 %prep
 %setup -q -n Crypt-OpenSSL-X509-%{version}
 %patch0 -p1
-%patch1 -p1
 # Remove bundled modules
 rm -rf ./inc
@@ -69,6 +65,9 @@ make test
 %{_mandir}/man3/*
%changelog
+* Wed Aug 31 2016 Jitka Plesnikova jplesnik@redhat.com - 1.807-1
+- 1.807 bump
+
 * Sun May 15 2016 Jitka Plesnikova jplesnik@redhat.com - 1.806-5
 - Perl 5.24 rebuild
diff --git a/sources b/sources
index b25d8f9..73edf49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57dd7b8cc5204ef908e7837cc4a326a6  Crypt-OpenSSL-X509-1.806.tar.gz
+c9a687adeaf896c8f262b96b7f851e43  Crypt-OpenSSL-X509-1.807.tar.gz
-- 
cgit v0.12


    http://pkgs.fedoraproject.org/cgit/perl-Crypt-OpenSSL-X509.git/commit/?h=f25...

    