From 1f4fadc0455a6ade2faec204855a7a6fd5b423a5 Mon Sep 17 00:00:00 2001 From: Adam Osuchowski Date: Sun, 10 Jan 2016 19:51:21 +0100 Subject: [PATCH] - up to 0.15 --- perl-Crypt-OpenSSL-PKCS10-utf8_support.patch | 41 -------------------- perl-Crypt-OpenSSL-PKCS10.spec | 8 ++-- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 perl-Crypt-OpenSSL-PKCS10-utf8_support.patch diff --git a/perl-Crypt-OpenSSL-PKCS10-utf8_support.patch b/perl-Crypt-OpenSSL-PKCS10-utf8_support.patch deleted file mode 100644 index 508fc4a..0000000 --- a/perl-Crypt-OpenSSL-PKCS10-utf8_support.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN Crypt-OpenSSL-PKCS10-0.14.orig/PKCS10.pm Crypt-OpenSSL-PKCS10-0.14/PKCS10.pm ---- Crypt-OpenSSL-PKCS10-0.14.orig/PKCS10.pm 2014-09-16 20:49:27.000000000 +0200 -+++ Crypt-OpenSSL-PKCS10-0.14/PKCS10.pm 2015-07-20 23:02:46.190862357 +0200 -@@ -96,10 +96,11 @@ - - =over 2 - --=item set_subject($subject) -+=item set_subject($subject, [ $utf8 ]) - - Sets the subject DN of the request. --Note: $subject is expected to be in the format /type0=value0/type1=value1/type2=... where characters may be escaped by \ -+Note: $subject is expected to be in the format /type0=value0/type1=value1/type2=... where characters may be escaped by \. -+If $utf8 is non-zero integer, $subject is interpreted as UTF-8 string. - - =item add_ext($nid, $extension) - -diff -ruN Crypt-OpenSSL-PKCS10-0.14.orig/PKCS10.xs Crypt-OpenSSL-PKCS10-0.14/PKCS10.xs ---- Crypt-OpenSSL-PKCS10-0.14.orig/PKCS10.xs 2014-09-16 20:48:21.000000000 +0200 -+++ Crypt-OpenSSL-PKCS10-0.14/PKCS10.xs 2015-07-20 23:00:17.113517886 +0200 -@@ -477,9 +477,10 @@ - RETVAL - - int --set_subject(pkcs10, subj_SV) -+set_subject(pkcs10, subj_SV, utf8 = 0) - pkcs10Data *pkcs10; - SV* subj_SV; -+ int utf8; - - PREINIT: - unsigned char* subj; -@@ -488,7 +489,7 @@ - CODE: - subj = SvPV(subj_SV, subj_length); - -- RETVAL = build_subject(pkcs10->req, subj, MBSTRING_ASC, 0); -+ RETVAL = build_subject(pkcs10->req, subj, utf8 ? MBSTRING_UTF8 : MBSTRING_ASC, 0); - if (!RETVAL) - croak ("build_subject"); - diff --git a/perl-Crypt-OpenSSL-PKCS10.spec b/perl-Crypt-OpenSSL-PKCS10.spec index 4d03b81..fd08904 100644 --- a/perl-Crypt-OpenSSL-PKCS10.spec +++ b/perl-Crypt-OpenSSL-PKCS10.spec @@ -7,13 +7,12 @@ %include /usr/lib/rpm/macros.perl Summary: Crypt::OpenSSL::PKCS10 - Perl extension to OpenSSL's PKCS10 API Name: perl-%{pdir}-%{pnam} -Version: 0.14 -Release: 2 +Version: 0.15 +Release: 1 License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -# Source0-md5: 3e0df0a318a037d9a7c4cb77391a6c5c -Patch0: %{name}-utf8_support.patch +# Source0-md5: 3cb59192c437c106dc2073717ebccc9b URL: http://search.cpan.org/dist/Crypt-OpenSSL-PKCS10/ BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 @@ -29,7 +28,6 @@ certificate requests using RSA key pairs. %prep %setup -q -n %{pdir}-%{pnam}-%{version} -%patch0 -p1 rm -rf inc/Module/Install inc/Module/Install.pm -- 2.44.0