Merge branch 'upstream' into tizen

Change-Id: Ibec5317981dc6c41a1708da7db83255010d57438
Signed-off-by: sangsu <sangsu.choi@samsung.com>

diff --cc Makefile.am
index f1374e2,4ab3c5c..433bc79
mode 100755,100644..100755
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am

diff --cc aclocal.m4
Simple merge

diff --cc gl/Makefile.am
index d1f351f,d9ecc80..0ea98d7
mode 100755,100644..100755
--- 1/gl/Makefile.am
--- 2/gl/Makefile.am
+++ b/gl/Makefile.am

diff --cc gl/m4/gnulib-common.m4
Simple merge

diff --cc packaging/gnutls.spec
index 4914246,0000000..d2535b1
mode 100755,000000..100755
--- 1/packaging/gnutls.spec
--- /dev/null
+++ b/packaging/gnutls.spec
@@@ -1,166 -1,0 +1,169 @@@
- Version:        3.3.5
 +%define gnutls_sover 28
 +%define gnutlsxx_sover 28
 +%define gnutls_ossl_sover 27
 +
 +Name:           gnutls
- %{_bindir}/danetool
++Version:        3.4.11
 +Release:        0
 +Summary:        The GNU Transport Layer Security Library
 +License:        LGPL-2.1+
 +Group:          Security/Crypto Libraries
 +Url:            http://www.gnutls.org/
 +Source0:        http://ftp.gnu.org/gnu/gnutls/%{name}-%{version}.tar.xz
 +Source1:        baselibs.conf
 +Source1001:     gnutls.manifest
 +BuildRequires:  automake
 +BuildRequires:  gcc-c++
 +BuildRequires:  libidn-devel
 +BuildRequires:  pkgconfig(nettle)
 +BuildRequires:  libtasn1-devel
 +BuildRequires:  gettext-tools
 +BuildRequires:  libtool
 +BuildRequires:  pkg-config
 +BuildRequires:  xz
 +BuildRequires:  zlib-devel
 +BuildRequires:  makeinfo
 +
 +Provides: gnutls-utils = %{version}-%{release}
 +
 +%description
 +The GnuTLS project aims to develop a library that provides a secure
 +layer over a reliable transport layer. Currently the GnuTLS library
 +implements the proposed standards of the IETF's TLS working group.
 +
 +%package -n libgnutls
 +Summary:        The GNU Transport Layer Security Library
 +License:        LGPL-2.1+
 +Group:          Security/Crypto Libraries
 +
 +%description -n libgnutls
 +The GnuTLS project aims to develop a library that provides a secure
 +layer over a reliable transport layer. Currently the GnuTLS library
 +implements the proposed standards of the IETF's TLS working group.
 +
 +%package -n libgnutlsxx
 +Summary:        The GNU Transport Layer Security Library
 +License:        LGPL-2.1+
 +Group:          Security/Crypto Libraries
 +
 +%description -n libgnutlsxx
 +The GnuTLS project aims to develop a library that provides a secure
 +layer over a reliable transport layer. Currently the GnuTLS library
 +implements the proposed standards of the IETF's TLS working group.
 +
 +
 +%package -n libgnutls-devel
 +Summary:        Development package for gnutls
 +License:        LGPL-2.1+
 +Group:          Development/Libraries
 +Requires:       glibc-devel
 +Requires:       libgnutls = %{version}
 +Provides:       gnutls-devel = %{version}-%{release}
 +
 +%description -n libgnutls-devel
 +Files needed for software development using gnutls.
 +
 +%package -n libgnutlsxx-devel
 +Summary:        Development package for gnutls
 +License:        LGPL-2.1+
 +Group:          Development/Libraries
 +Requires:       libgnutls-devel = %{version}
 +Requires:       libgnutlsxx = %{version}
 +Requires:       libstdc++-devel
 +
 +%description -n libgnutlsxx-devel
 +Files needed for software development using gnutls.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +echo %{_includedir}/%{name}/abstract.h
 +
 +%build
 +%reconfigure \
++        --without-p11-kit \
 +        --disable-static \
 +        --with-pic \
 +        --disable-rpath \
 +        --disable-silent-rules \
 +        --with-default-trust-store-dir=/etc/ssl/certs \
 +        --with-sysroot=/%{?_sysroot}
 +%__make %{?_smp_mflags}
 +
 +# 17-ago-2011, Test suite passes in factory, just not
 +#in the build system due to some broken code requiring both networking
 +#and fixes.
 +#make check
 +
 +%install
 +%make_install
 +rm -rf doc/examples/.deps doc/examples/.libs doc/examples/*.{o,lo,la} doc/examples/Makefile{,.in}
 +find doc/examples -perm -111 -exec rm {} \;
 +rm -rf %{buildroot}%{_datadir}/locale/en@{,bold}quot
 +# Do not package static libs and libtool files
 +rm -f %{buildroot}%{_libdir}/*.la
 +%find_lang libgnutls --all-name
 +
 +%post -n libgnutls -p /sbin/ldconfig
 +
 +%postun -n libgnutls -p /sbin/ldconfig
 +
 +%post -n libgnutlsxx -p /sbin/ldconfig
 +
 +%postun -n libgnutlsxx -p /sbin/ldconfig
 +
 +%files -f libgnutls.lang
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_bindir}/certtool
 +%{_bindir}/crywrap
 +%{_bindir}/gnutls-cli
 +%{_bindir}/gnutls-cli-debug
 +%{_bindir}/gnutls-serv
 +%{_bindir}/ocsptool
 +%{_bindir}/psktool
 +%{_bindir}/srptool
 +%{_mandir}/man1/*
 +
 +%files -n libgnutls
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_libdir}/libgnutls.so.*
 +
 +%files -n libgnutlsxx
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_libdir}/libgnutlsxx.so.*
 +
 +%files -n libgnutls-devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%dir %{_includedir}/%{name}
 +%{_includedir}/%{name}/abstract.h
 +%{_includedir}/%{name}/crypto.h
 +%{_includedir}/%{name}/compat.h
 +%{_includedir}/%{name}/dtls.h
 +%{_includedir}/%{name}/gnutls.h
 +%{_includedir}/%{name}/openpgp.h
 +%{_includedir}/%{name}/ocsp.h
 +%{_includedir}/%{name}/pkcs11.h
 +%{_includedir}/%{name}/pkcs12.h
 +%{_includedir}/%{name}/x509.h
 +%{_includedir}/%{name}/x509-ext.h
 +%{_includedir}/%{name}/self-test.h
 +%{_includedir}/%{name}/tpm.h
++%{_includedir}/%{name}/pkcs7.h
++%{_includedir}/%{name}/system-keys.h
++%{_includedir}/%{name}/urls.h
 +%{_libdir}/libgnutls.so
 +%{_libdir}/pkgconfig/gnutls.pc
 +%{_mandir}/man3/*
 +%{_infodir}/*.*
 +%doc doc/examples doc/gnutls.html doc/*.png doc/gnutls.pdf doc/reference/html/*
 +
 +%files -n libgnutlsxx-devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_libdir}/libgnutlsxx.so
 +%dir %{_includedir}/%{name}
 +%{_includedir}/%{name}/gnutlsxx.h