openssl: Allow building this package on aarch64

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 7ddb8e1359d51cce4c2fcfce1eb065f3ab6454e2..9773c91d15727e925a9cc09aa85d865bd6c3d4da 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.1h
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -56,6 +56,10 @@ build
                ssl_arch = linux-elf no-asm 386
        end
 
+       if "%{DISTRO_ARCH}" == "aarch64"
+               ssl_arch = linux-generic64
+       end
+
        if "%{DISTRO_ARCH}" == "armv5tel"
                ssl_arch = linux-generic32
        end
@@ -106,8 +110,10 @@ build
                mkdir -pv %{BUILDROOT}/usr/share
                mv -v %{BUILDROOT}/etc/pki/tls/man %{BUILDROOT}/usr/share/
 
-               mkdir -pv %{BUILDROOT}%{libdir}/openssl
-               mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               if [ -d "%{BUILDROOT}%{libdir}/engines" ]; then
+                       mkdir -pv %{BUILDROOT}%{libdir}/openssl
+                       mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               fi
 
                mkdir -pv %{BUILDROOT}/etc/pki/CA/private
                chmod -v 700 -R %{BUILDROOT}/etc/pki/CA

diff --git a/openssl/patches/openssl-1.0.1c-perlfind.patch b/openssl/patches/openssl-1.0.1c-perlfind.patch
new file mode 100644 (file)
index 0000000..956afd6
--- /dev/null
+++ b/openssl/patches/openssl-1.0.1c-perlfind.patch
@@ -0,0 +1,16 @@
+diff -up openssl-1.0.1c/util/perlpath.pl.perlfind openssl-1.0.1c/util/perlpath.pl
+--- openssl-1.0.1c/util/perlpath.pl.perlfind   2012-07-11 22:57:33.000000000 +0200
++++ openssl-1.0.1c/util/perlpath.pl    2012-07-12 00:31:12.102156275 +0200
+@@ -4,10 +4,10 @@
+ # line in all scripts that rely on perl.
+ #
+ 
+-require "find.pl";
++use File::Find;
+ 
+ $#ARGV == 0 || print STDERR "usage: perlpath newpath  (eg /usr/bin)\n";
+-&find(".");
++find(\&wanted, ".");
+ 
+ sub wanted
+       {