[Tizen-submit] 19256: Changes to Tizen:IVI/openssl

noreply at tizen.org noreply at tizen.org
Tue Jan 7 00:51:20 GMT 2014


Hi,
Michael Demeter have made the following changes to openssl in project Tizen:IVI. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #19256

  submit:       Tizen:IVI:build/openssl(cleanup) -> Tizen:IVI


Message:
Submitter: Michael Demeter <michael.demeter at intel.com>
Comments: Update to 1.0.1f
Git project: platform/upstream/openssl
Tag: submit/tizen/20140107.005545
Commit: eca4ad076b25d485f55795e6200316870a0b0906 Move openssl from 1.0.1e to 1.0.1f

State:   new        2014-01-07T00:48:47 tizenrobot
Comment: <no comment>
changes files:
--------------

old:
----
  openssl-1.0.1e.tar.gz

new:
----
  0806f37-to-0b88c1d.diff
  openssl-1.0.1f.tar.gz

spec files:
-----------
--- openssl.spec
+++ openssl.spec
@@ -1,4 +1,5 @@
 Name:           openssl
+VCS:            platform/upstream/openssl#eca4ad076b25d485f55795e6200316870a0b0906
 BuildRequires:  bc
 BuildRequires:  ed
 BuildRequires:  pkg-config
@@ -6,9 +7,8 @@
 %define ssletcdir %{_sysconfdir}/ssl
 %define num_version 1.0.0
 Provides:       ssl
-Version:        1.0.1e
+Version:        1.0.1f
 Release:        0
-VCS:            platform/upstream/openssl#submit/tizen/20130912.090512-0-gecbc968bbf2ed3b1d1fb9cb3576a53c7ae52a0b4
 Summary:        Secure Sockets and Transport Layer Security
 License:        OpenSSL
 Group:          Security/Crypto Libraries
@@ -18,6 +18,8 @@
 Source1:        openssl.changes
 Source2:        baselibs.conf
 Source1001: 	openssl.manifest
+# Patches auto-generated by git-buildpackage:
+Patch0:     0806f37-to-0b88c1d.diff
 
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -87,6 +89,8 @@
 
 %prep
 %setup -q 
+# 0806f37-to-0b88c1d.diff
+%patch0 -p1
 cp %{SOURCE1001} .
 
 echo "adding/overwriting some entries in the 'table' hash in Configure"

other changes:
--------------

++++++ 0806f37-to-0b88c1d.diff (new)
--- 0806f37-to-0b88c1d.diff
+++ 0806f37-to-0b88c1d.diff
@@ -0,0 +1,90 @@
+From: jenkins <None>
+Date: Mon, 6 Jan 2014 16:51:21 -0800
+Subject: Raw diff 0806f37..0b88c1d
+
+Raw diff between tag '0806f37' and
+commit '0b88c1d'
+---
+ crypto/bn/asm/x86_64-gf2m.pl           |    4 ++++
+ doc/crypto/EVP_PKEY_verify_recover.pod |    6 +++---
+ openssl.spec                           |    5 ++++-
+ ssl/ssl_lib.c                          |    4 +++-
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/crypto/bn/asm/x86_64-gf2m.pl b/crypto/bn/asm/x86_64-gf2m.pl
+index 226c66c..c08dcd0 100644
+--- a/crypto/bn/asm/x86_64-gf2m.pl
++++ b/crypto/bn/asm/x86_64-gf2m.pl
+@@ -31,8 +31,12 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+ ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
+ die "can't locate x86_64-xlate.pl";
+ 
++<<<<<<< HEAD
+ open OUT,"| \"$^X\" $xlate $flavour $output";
+ *STDOUT=*OUT;
++=======
++open STDOUT,"| \"$^X\" $xlate $flavour $output";
++>>>>>>> ecbc968bbf2ed3b1d1fb9cb3576a53c7ae52a0b4

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list