From 83868f67da5837f7ada5d250c90cfee83aa14aaa Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Thu, 3 Apr 2014 16:37:59 +0800 Subject: [PATCH] Autoremove imported patches from packaging Removed all imported patches from perl-Crypt-SSLeay.spec and patch files from the packaging dir. --- ...01-fix-trailing-slash-in-proxy-issue.patch | 11 ------ packaging/perl-Crypt-SSLeay-cryptdef.patch | 36 ------------------- packaging/perl-Crypt-SSLeay.spec | 4 --- 3 files changed, 51 deletions(-) delete mode 100644 packaging/0001-fix-trailing-slash-in-proxy-issue.patch delete mode 100644 packaging/perl-Crypt-SSLeay-cryptdef.patch diff --git a/packaging/0001-fix-trailing-slash-in-proxy-issue.patch b/packaging/0001-fix-trailing-slash-in-proxy-issue.patch deleted file mode 100644 index 511e447..0000000 --- a/packaging/0001-fix-trailing-slash-in-proxy-issue.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr Crypt-SSLeay-0.60/lib/Net/SSL.pm Crypt-SSLeay-0.60.new/lib/Net/SSL.pm ---- Crypt-SSLeay-0.60/lib/Net/SSL.pm 2012-07-30 04:26:40.000000000 +0800 -+++ Crypt-SSLeay-0.60.new/lib/Net/SSL.pm 2012-10-19 09:58:20.655300008 +0800 -@@ -420,6 +420,7 @@ - } - - $proxy_server =~ s|\Ahttps?://||i; -+ $proxy_server =~ s|/+$||; - $proxy_server; - } - diff --git a/packaging/perl-Crypt-SSLeay-cryptdef.patch b/packaging/perl-Crypt-SSLeay-cryptdef.patch deleted file mode 100644 index b4e41a6..0000000 --- a/packaging/perl-Crypt-SSLeay-cryptdef.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -uNr Crypt-SSLeay-0.64/SSLeay.xs Crypt-SSLeay-0.64.new/SSLeay.xs ---- Crypt-SSLeay-0.64/SSLeay.xs 2012-08-05 18:41:30.000000000 -0400 -+++ Crypt-SSLeay-0.64.new/SSLeay.xs 2013-03-08 19:50:04.537023225 -0500 -@@ -9,15 +9,6 @@ - #ifdef __cplusplus - extern "C" { - #endif --#include "EXTERN.h" --#include "perl.h" -- --/* CRYPT_SSLEAY_free() will not be #defined to be free() now that we're no -- * longer supporting pre-2000 OpenSSL. --#define NO_XSLOCKS --*/ -- --#include "XSUB.h" - - /* build problem under openssl 0.9.6 and some builds of perl 5.8.x */ - #ifndef PERL5 -@@ -41,6 +32,16 @@ - #define CRYPT_SSLEAY_free OPENSSL_free - - #undef Free /* undo namespace pollution from crypto.h */ -+#include "EXTERN.h" -+#include "perl.h" -+ -+/* CRYPT_SSLEAY_free() will not be #defined to be free() now that we're no -+ * longer supporting pre-2000 OpenSSL. -+#define NO_XSLOCKS -+*/ -+ -+#include "XSUB.h" -+ - #ifdef __cplusplus - } - #endif diff --git a/packaging/perl-Crypt-SSLeay.spec b/packaging/perl-Crypt-SSLeay.spec index afee7ee..13e4bd3 100644 --- a/packaging/perl-Crypt-SSLeay.spec +++ b/packaging/perl-Crypt-SSLeay.spec @@ -5,8 +5,6 @@ Release: 10.3 License: GPL+ or Artistic Group: Development/Libraries Source0: Crypt-SSLeay_0.64.tar.gz -Patch1: perl-Crypt-SSLeay-cryptdef.patch -Patch2: 0001-fix-trailing-slash-in-proxy-issue.patch URL: http://search.cpan.org/dist/Crypt-SSLeay/ %if 0%{?suse_version} Vendor: openSUSE @@ -45,8 +43,6 @@ necessary SSL glue for that module to work. %prep %setup -q -n Crypt-SSLeay-0.64 -%patch1 -p1 -b .cryptdef -%patch2 -p1 # Fix line endings perl -pi -e 's/\r$//' README -- 2.34.1