Merge branch 'upstream' into tizen_5.5_base

Change-Id: I6d1f3c90fa10380849e672526efe35ba2ded787c

diff --cc packaging/openssl.spec
index 41eadc4,0000000..8c81bb2
mode 100644,000000..100644
--- 1/packaging/openssl.spec
--- /dev/null
+++ b/packaging/openssl.spec
@@@ -1,133 -1,0 +1,133 @@@
- Version:   1.0.2t
 +%define _unpackaged_files_terminate_build 0
 +%define openssldir %{_sysconfdir}/ssl
 +
 +Summary:   Secure Sockets Layer and cryptography libraries and tools
 +Name:      openssl
++Version:   1.0.2u
 +Release:   0
 +License:   OpenSSL and Apache-2.0 and BSD-3-Clause
 +Group:     Security/Crypto Libraries
 +Url:       https://www.openssl.org/
 +Source0:   ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 +Requires:  openssl1.1
 +
 +%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:   libopenssl = %{version}-%{release}
 +Requires:   zlib-devel
 +Provides:   openssl-devel = %{version}-%{release}
 +Conflicts:  libopenssl1.1-devel
 +
 +%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.
 +
 +%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 -fPIC -pie"
 +
 +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
 +%manifest %{name}.manifest
 +%exclude %{_bindir}
 +%exclude %{openssldir}
 +
 +%files -n lib%{name}
 +%manifest %{name}.manifest
 +%license LICENSE
 +%license LICENSE.Apache-2.0
 +%license LICENSE.BSD-3-Clause
 +%{_libdir}/*.so.*
 +%{_libdir}/engines/*.so
 +%{openssldir}/openssl.cnf
 +%post -n lib%{name} -p /sbin/ldconfig
 +%postun -n lib%{name} -p /sbin/ldconfig
 +
 +%files -n lib%{name}-devel
 +%manifest %{name}.manifest
 +%license LICENSE
 +%{_includedir}/%{name}
 +%exclude %{_libdir}/*.a
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc
 +