Merge branch 'upstream' into tizen_base

Change-Id: I350b8b67e225e4340c54966b5180d0374a04820a

diff --cc packaging/libgcrypt.spec
index 1daaf36,0000000..c2a97c3
mode 100644,000000..100644
--- 1/packaging/libgcrypt.spec
--- /dev/null
+++ b/packaging/libgcrypt.spec
@@@ -1,85 -1,0 +1,85 @@@
- Version:        1.10.1
 +Name:           libgcrypt
++Version:        1.10.3
 +Release:        0
 +License:        LGPL-2.1+
 +Summary:        The GNU Crypto Library
 +%define libsoname %{name}
 +Url:            http://directory.fsf.org/wiki/Libgcrypt
 +Group:          Security/Crypto Libraries
 +Source:         %{name}-%{version}.tar.bz2
 +Source2:        baselibs.conf
 +Source1001:   libgcrypt.manifest
 +BuildRequires:  libgpg-error-devel >= 1.8
 +BuildRequires:  libtool
 +
 +%description
 +Libgcrypt is a general purpose crypto library based on the code used in
 +GnuPG (alpha version).
 +
 +%package devel
 +License:        GPL-2.0+ and GPL-3.0+ and LGPL-2.1+ and X11 and BSD-2.0 and IETF
 +Summary:        The GNU Crypto Library
 +Group:          Development/Libraries
 +Requires:       %{libsoname} = %{version}
 +Requires:       glibc-devel
 +Requires:       libgpg-error-devel >= 1.8
 +
 +%description devel
 +Libgcrypt is a general purpose crypto library based on the code used in
 +GnuPG (alpha version).
 +
 +This package contains needed files to compile and link against the
 +library.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +# define ciphers to build
 +ENABLE_CIPHER="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed camellia chacha20"
 +ENABLE_PUBKEY="dsa elgamal rsa ecc"
 +ENABLE_DIGEST="crc md4 md5 rmd160 sha1 sha256 sha512 tiger whirlpool blake2"
 +#
 +autoreconf -fi
 +%configure --with-pic \
 +              --enable-noexecstack \
 +              --disable-static \
 +              --enable-ciphers="$ENABLE_CIPHER" \
 +              --enable-pubkey-ciphers="$ENABLE_PUBKEY" \
 +              --enable-digests="$ENABLE_DIGEST" \
 +              --disable-doc
 +make %{?_smp_mflags}
 +
 +%check
 +# Nice idea. however this uses /dev/random, which hangs
 +# on hardware without random feeds.
 +#make check
 +
 +%install
 +%make_install
 +
 +%post  -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%license COPYING.LIB
 +%{_libdir}/%{name}.so.20*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%license COPYING
 +%defattr(-,root,root)
 +%{_bindir}/dumpsexp
 +%{_bindir}/hmac256
 +%{_bindir}/mpicalc
 +%{_bindir}/%{name}-config
 +%{_libdir}/%{name}.so
 +%{_includedir}/gcrypt*.h
 +%{_datadir}/aclocal/%{name}.m4
 +%{_libdir}/pkgconfig/%{name}.pc
 +
 +%changelog