Merge tag 'upstream/1.0.2j' into tizen_base

Change-Id: I05036caf74c3d9b0b33053458c4a9ec8640dae79
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

diff --cc openssl.spec
Simple merge

diff --cc packaging/openssl.spec
index d66d87e,0000000..b3ba614
mode 100644,000000..100644
--- 1/packaging/openssl.spec
--- /dev/null
+++ b/packaging/openssl.spec
@@@ -1,176 -1,0 +1,176 @@@
- Version: 1.0.2i
 +%define _unpackaged_files_terminate_build 0
 +%define debug_package %{nil}
 +Release: 1
 +
 +%define openssldir %{_sysconfdir}/ssl
 +
 +Summary: Secure Sockets Layer and cryptography libraries and tools
 +Name: openssl
++Version: 1.0.2j
 +Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 +License: OpenSSL
 +Group: Security/Crypto Libraries
 +Provides: SSL
 +URL: http://www.openssl.org/
 +
 +%description
 +The OpenSSL Project is a collaborative effort to develop a robust,
 +commercial-grade, fully featured, and Open Source toolkit implementing the
 +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
 +protocols as well as a full-strength general purpose cryptography library.
 +The project is managed by a worldwide community of volunteers that use the
 +Internet to communicate, plan, and develop the OpenSSL tookit and its related
 +documentation.
 +
 +OpenSSL is based on the excellent SSLeay library developed from Eric A.
 +Young and Tim J. Hudson.  The OpenSSL toolkit is licensed under an
 +Apache-style licence, which basically means that you are free to get and
 +use it for commercial and non-commercial purposes.
 +
 +This package contains the base OpenSSL cryptography and SSL/TLS
 +libraries and tools.
 +
 +%package -n libopenssl
 +Summary: Secure Sockets Layer and crypto libraries
 +Group: Security/Crypto Libraries
 +%description -n libopenssl
 +Secure Sockets Layer and crypto libraries.
 +
 +%package -n libopenssl-devel
 +Summary: Secure Sockets Layer and cryptography static libraries and headers
 +Group: Development/Libraries
 +Obsoletes: openssl-devel < %{version}
 +Requires: %{name} = %{version}-%{release}
 +Requires: libopenssl = %{version}-%{release}
 +Requires: zlib-devel
 +Provides: openssl-devel = %{version}-%{release}
 +%description -n libopenssl-devel
 +The OpenSSL Project is a collaborative effort to develop a robust,
 +commercial-grade, fully featured, and Open Source toolkit implementing the
 +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
 +protocols as well as a full-strength general purpose cryptography library.
 +The project is managed by a worldwide community of volunteers that use the
 +Internet to communicate, plan, and develop the OpenSSL tookit and its related
 +documentation.
 +
 +OpenSSL is based on the excellent SSLeay library developed from Eric A.
 +Young and Tim J. Hudson.  The OpenSSL toolkit is licensed under an
 +Apache-style licence, which basically means that you are free to get and
 +use it for commercial and non-commercial purposes.
 +
 +This package contains the the OpenSSL cryptography and SSL/TLS
 +static libraries and header files required when developing applications.
 +
 +%package doc
 +Summary: OpenSSL miscellaneous files
 +Group: Documentation
 +BuildArch: noarch
 +%description doc
 +The OpenSSL Project is a collaborative effort to develop a robust,
 +commercial-grade, fully featured, and Open Source toolkit implementing the
 +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
 +protocols as well as a full-strength general purpose cryptography library.
 +The project is managed by a worldwide community of volunteers that use the
 +Internet to communicate, plan, and develop the OpenSSL tookit and its related
 +documentation.
 +
 +OpenSSL is based on the excellent SSLeay library developed from Eric A.
 +Young and Tim J. Hudson.  The OpenSSL toolkit is licensed under an
 +Apache-style licence, which basically means that you are free to get and
 +use it for commercial and non-commercial purposes.
 +
 +This package contains the the OpenSSL cryptography and SSL/TLS extra
 +documentation and POD files from which the man pages were produced.
 +
 +%package misc
 +Summary: Include Files and Libraries mandatory for Development
 +Group:   Development/Libraries
 +Requires: %{name} = %{version}-%{release}
 +%description misc
 +Additional data files and scripts for %{name}.
 +
 +%prep
 +
 +%setup -q
 +
 +%build
 +
 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -s "s/--param=ssp-buffer-size=32//g")
 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -s "s/-mcpu=cortex-a15.cortex-a7//g")
 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -s "s/-march=armv7ve/-march=armv7-a/g")
 +
 +CONFIG_FLAGS="--prefix=%_prefix --openssldir=%openssldir --libdir=%_lib \
 +    threads shared no-idea no-rc5 no-camellia no-asm no-ssl2-method enable-md2 \
 +    $RPM_OPT_FLAGS -std=gnu99"
 +
 +BINARY_FORMAT=
 +%ifarch %{arm}
 +BINARY_FORMAT=armv4
 +%endif
 +%ifarch aarch64
 +BINARY_FORMAT=aarch64
 +%endif
 +%ifarch %{ix86}
 +BINARY_FORMAT=elf
 +%endif
 +%ifarch ppc
 +BINARY_FORMAT=ppc
 +%endif
 +%ifarch alpha
 +BINARY_FORMAT=alpha
 +%endif
 +%ifarch x86_64
 +BINARY_FORMAT=x86_64
 +%endif
 +
 +./Configure $CONFIG_FLAGS linux-$BINARY_FORMAT
 +
 +LD_LIBRARH_PATH=`pwd` make depend
 +LD_LIBRARY_PATH=`pwd` make %{?_smp_mflags}
 +
 +%check
 +LD_LIBRARY_PATH=`pwd` make test
 +
 +%install
 +rm -rf $RPM_BUILD_ROOT
 +make INSTALL_PREFIX="$RPM_BUILD_ROOT" install_sw
 +
 +%files -n lib%name
 +%manifest %name.manifest
 +%license LICENSE
 +%_libdir/libcrypto.so.*
 +%_libdir/libssl.so.*
 +%_libdir/engines/*.so
 +
 +%files -n lib%name-devel
 +%license LICENSE
 +%_includedir/%name
 +%exclude %_libdir/libcrypto.a
 +%exclude %_libdir/libssl.a
 +%_libdir/libcrypto.so
 +%_libdir/libssl.so
 +%_libdir/pkgconfig/libcrypto.pc
 +%_libdir/pkgconfig/libssl.pc
 +%_libdir/pkgconfig/openssl.pc
 +
 +%files doc
 +%license LICENSE
 +%doc CHANGES CHANGES.SSLeay NEWS README
 +
 +%files
 +%manifest %name.manifest
 +%license LICENSE
 +%_bindir/%name
 +%openssldir/openssl.cnf
 +
 +%files misc
 +%manifest %name.manifest
 +%license LICENSE
 +%_bindir/c_rehash
 +%openssldir/misc
 +
 +%post -n lib%name
 +ldconfig
 +
 +%postun -n lib%name
 +ldconfig