From 00a1bde5db4e851c52028899fee79d6ea80cb641365994603a77f3818d3537d9 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 10 Jan 2007 16:54:25 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=2

---
 openssl-0.9.8d-padlock-static.patch | 30 +++++++++++++++++++++++++++++
 openssl.changes                     |  5 +++++
 openssl.spec                        | 10 +++++++---
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 openssl-0.9.8d-padlock-static.patch

diff --git a/openssl-0.9.8d-padlock-static.patch b/openssl-0.9.8d-padlock-static.patch
new file mode 100644
index 0000000..1b421d5
--- /dev/null
+++ b/openssl-0.9.8d-padlock-static.patch
@@ -0,0 +1,30 @@
+# PadLock engine is never compiled as a shared object although
+# OpenSSL sometimes thinks so.  This patch fixes the
+# initialization sequence so that it works with static PadLock
+# again.
+# Taken from Fedora Core 5
+
+Index: openssl/crypto/engine/eng_all.c
+===================================================================
+--- openssl.orig/crypto/engine/eng_all.c
++++ openssl/crypto/engine/eng_all.c
+@@ -68,6 +68,9 @@ void ENGINE_load_builtin_engines(void)
+ #if 0
+ 	ENGINE_load_openssl();
+ #endif
++#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
++	ENGINE_load_padlock();
++#endif
+ 	ENGINE_load_dynamic();
+ #ifndef OPENSSL_NO_STATIC_ENGINE
+ #ifndef OPENSSL_NO_HW
+@@ -95,9 +98,6 @@ void ENGINE_load_builtin_engines(void)
+ #ifndef OPENSSL_NO_HW_UBSEC
+ 	ENGINE_load_ubsec();
+ #endif
+-#ifndef OPENSSL_NO_HW_PADLOCK
+-	ENGINE_load_padlock();
+-#endif
+ #endif
+ #if defined(__OpenBSD__) || defined(__FreeBSD__)
+ 	ENGINE_load_cryptodev();
diff --git a/openssl.changes b/openssl.changes
index b4f9e47..05bb37a 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  9 14:30:28 CET 2007 - mkoenig@suse.de
+
+- fix PadLock support [#230823]
+
 -------------------------------------------------------------------
 Thu Nov 30 14:33:51 CET 2006 - mkoenig@suse.de
 
diff --git a/openssl.spec b/openssl.spec
index 642151f..afad817 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssl (Version 0.9.8d)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -17,14 +17,14 @@ BuildRequires:  bc ed zlib-devel
 %endif
 %define ssletcdir %{_sysconfdir}/ssl
 %define num_version %(echo "%{version}" | sed -e "s+[a-zA-Z]++g; s+_.*++g")
-License:        BSD License and BSD-like, Other License(s), see package
+License:        BSD License and BSD-like
 Group:          Productivity/Networking/Security
 Provides:       ssl
 Conflicts:      ssleay
 Obsoletes:      ssleay
 Autoreqprov:    on
 Version:        0.9.8d
-Release:        17
+Release:        22
 Summary:        Secure Sockets and Transport Layer Security
 URL:            http://www.openssl.org/
 Source:         http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
@@ -43,6 +43,7 @@ Patch11:        openssl-s390-config.diff
 Patch20:        openssl-0.9.8a.ca-app-segfault.bug128655.dif
 Patch21:        bswap.diff
 Patch22:        openssl-CVE-2006-2940-fixup.patch
+Patch23:        openssl-0.9.8d-padlock-static.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -131,6 +132,7 @@ Authors:
 %patch20 -p1
 %patch21
 %patch22
+%patch23 -p1
 cp -p %{S:10} .
 cp -p %{S:20} certs/
 cp -p %{S:21} certs/
@@ -336,6 +338,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %{_libdir}/engines
 
 %changelog -n openssl
+* Tue Jan 09 2007 - mkoenig@suse.de
+- fix PadLock support [#230823]
 * Thu Nov 30 2006 - mkoenig@suse.de
 - enable fix for CVE-2006-2940 [#223040], SWAMP-ID 7198
 * Mon Nov 06 2006 - poeml@suse.de