commit 92107289459977f8eeaff3c40b418b6b2667fc2e
Author: Elan Ruusamäe <[email protected]>
Date: Tue Sep 10 09:27:00 2013 +0300
add patch for use of deprecated find.pl in 5.14 and removed in 5.16
find.pl-deprecated.patch | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
openssl.spec | 2 ++
2 files changed, 93 insertions(+)
---
diff --git a/openssl.spec b/openssl.spec
index a99c757..0f6170b 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -32,6 +32,7 @@ Patch5: %{name}-asflag.patch
Patch6: %{name}-ca-certificates.patch
Patch7: %{name}-fips_install.patch
Patch8: %{name}-ldflags.patch
+Patch9: find.pl-deprecated.patch
URL: http://www.openssl.org/
BuildRequires: bc
BuildRequires: perl-devel >= 1:5.6.1
@@ -202,6 +203,7 @@ RC4, RSA и SSL. Включает статические библиотеки д
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
`grep -l -r "%{_prefix}/local/bin/perl" *`
diff --git a/find.pl-deprecated.patch b/find.pl-deprecated.patch
new file mode 100644
index 0000000..71aac90
--- /dev/null
+++ b/find.pl-deprecated.patch
@@ -0,0 +1,91 @@
+http://patches.openembedded.org/patch/29989/
+
+diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
b/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
+new file mode 100644
+index 0000000..8e1b42c
+--- /dev/null
++++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
+@@ -0,0 +1,54 @@
++warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core
distribution in the next major release. Please install it from the CPAN
distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line
@{[(caller)[2]]}.\n";
++
++# This library is deprecated and unmaintained. It is included for
++# compatibility with Perl 4 scripts which may use it, but it will be
++# removed in a future version of Perl. Please use the File::Find module
++# instead.
++
++# Usage:
++# require "find.pl";
++#
++# &find('/foo','/bar');
++#
++# sub wanted { ... }
++# where wanted does whatever you want. $dir contains the
++# current directory name, and $_ the current filename within
++# that directory. $name contains "$dir/$_". You are cd'ed
++# to $dir when the function is called. The function may
++# set $prune to prune the tree.
++#
++# For example,
++#
++# find / -name .nfs\* -mtime +7 -exec rm -f {} \; -o -fstype nfs -prune
++#
++# corresponds to this
++#
++# sub wanted {
++# /^\.nfs.*$/ &&
++# (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
++# int(-M _) > 7 &&
++# unlink($_)
++# ||
++# ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) &&
++# $dev < 0 &&
++# ($prune = 1);
++# }
++#
++# Set the variable $dont_use_nlink if you're using AFS, since AFS cheats.
++
++use File::Find ();
++
++*name = *File::Find::name;
++*prune = *File::Find::prune;
++*dir = *File::Find::dir;
++*topdir = *File::Find::topdir;
++*topdev = *File::Find::topdev;
++*topino = *File::Find::topino;
++*topmode = *File::Find::topmode;
++*topnlink = *File::Find::topnlink;
++
++sub find {
++ &File::Find::find(\&wanted, @_);
++}
++
++1;
+diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
+index ca15a38..c233ba1 100644
+--- a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
++++ b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
+@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
+
+ CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
+
+-PR = "${INC_PR}.2"
++PR = "${INC_PR}.3"
+
+ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
+
+@@ -29,6 +29,7 @@ SRC_URI += "file://configure-targets.patch \
+ file://debian/no-symbolic.patch \
+ file://debian/debian-targets.patch \
+ file://openssl_fix_for_x32.patch \
++ file://find.pl \
+ "
+
+ SRC_URI[md5sum] = "b4df9c11af454fd68178c85a1d5f328f"
+@@ -43,3 +44,7 @@ FILES_${PN}-engines = "${libdir}/ssl/engines/*.so
${libdir}/engines"
+ FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
+
+ PARALLEL_MAKEINST = ""
++
++do_configure_prepend() {
++ cp ${WORKDIR}/find.pl ${S}/util/find.pl
++}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/6e3101fe33dd6c5a156c853bdabf4be3962935a0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
