openssl: backport c09bf5d177a7ecd2045ef7e13fff4528137a9775 from OE-Core

commit c09bf5d177a7ecd2045ef7e13fff4528137a9775
Author: Martin Jansa <martin.jansa@gmail.com>
Date:   Sat Jun 16 08:43:35 2012 +0200

    openssl: add deprecated and unmaintained find.pl from perl-5.14 to fix perlpath.pl

    * openembedded-core/meta/recipes-connectivity/openssl/openssl.inc
    *
    * is using perlpath.pl:
    *
    *   do_configure () {
    *           cd util
    *           perl perlpath.pl ${STAGING_BINDIR_NATIVE}
    *   ...
    *
    * and perlpath.pl is using find.pl:
    * openssl-1.0.0i/util/perlpath.pl:
    *   #!/usr/local/bin/perl
    *   #
    *   # modify the '#!/usr/local/bin/perl'
    *   # line in all scripts that rely on perl.
    *   #
    *
    *   require "find.pl";
    *   ...
    *
    * which was removed in perl-5.16.0 and marked as deprecated and
    * unmaintained in 5.14 and older:
    * /tmp/usr/lib/perl5/5.14.2/find.pl:
    *   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.

    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/find.pl b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/find.pl
new file mode 100644 (file)
index 0000000..8e1b42c
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/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-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb b/meta-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb
index c1e9cca..b341267 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb
+++ b/meta-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb
@@ -1,6 +1,6 @@
 require recipes-connectivity/openssl/openssl.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
@@ -26,13 +26,18 @@ SRC_URI += "file://debian/ca.patch \
 
 SRC_URI += "file://configure-targets.patch \
             file://shared-libs.patch \
-            file://parallel-make-fix.patch"
+            file://parallel-make-fix.patch \
+            file://find.pl"
 
 SRC_URI[md5sum] = "ee17e9bc805c8cc7d0afac3b0ef78eda"
 SRC_URI[sha256sum] = "7ce0c7f2c451070b4497ea7ca6f23eba6cef1a56db2e86e433f65926a7bc7497"
 
 EXTRA_OECONF += "no-idea no-mdc2 no-rc5"
 
+do_configure_prepend() {
+        cp ${WORKDIR}/find.pl ${S}/util/find.pl
+}
+
 BBCLASSEXTEND = "native nativesdk"
 
 PARALLEL_MAKEINST = ""