commit 34663ae9e0bdd8f85d9c84070154605c6260d03d Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun May 10 12:43:03 2015 +0200
- updated to 1.3.14 (fixes CVE-2011-4091 CVE-2011-4093) - added gnutls patch (fixes build with gnutls 3.4) net6-gnutls.patch | 11 +++++++++++ net6.spec | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) --- diff --git a/net6.spec b/net6.spec index bebe294..09e111f 100644 --- a/net6.spec +++ b/net6.spec @@ -1,17 +1,18 @@ Summary: Net6 network library Summary(pl.UTF-8): Biblioteka sieciowa net6 Name: net6 -Version: 1.3.9 -Release: 3 +Version: 1.3.14 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://releases.0x539.de/net6/%{name}-%{version}.tar.gz -# Source0-md5: afab12d33fc201a7dbc2cfa116218079 +# Source0-md5: be6db739f71c5c08421bf6181e77f3b2 +Patch0: %{name}-gnutls.patch URL: http://gobby.0x539.de/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9 BuildRequires: gettext-tools >= 0.15 -BuildRequires: gnutls-devel >= 1.0.0 +BuildRequires: gnutls-devel >= 2.2 BuildRequires: libsigc++-devel >= 2.0 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.5 @@ -34,7 +35,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki net6 Summary(pt_BR.UTF-8): Arquivos do pacote net6 para desenvolvimento Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gnutls-devel >= 1.0.0 +Requires: gnutls-devel >= 2.2 Requires: libsigc++-devel >= 2.0 %description devel @@ -66,6 +67,7 @@ aplicativos estáticos que usam net6. %prep %setup -q +%patch0 -p1 %build %{__gettextize} @@ -100,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libnet6.so %{_libdir}/libnet6.la -%{_includedir}/%{name} +%{_includedir}/net6 %{_pkgconfigdir}/net6-1.3.pc %files static diff --git a/net6-gnutls.patch b/net6-gnutls.patch new file mode 100644 index 0000000..45b193a --- /dev/null +++ b/net6-gnutls.patch @@ -0,0 +1,11 @@ +--- net6-1.3.14/src/encrypt.cpp.orig 2011-09-28 13:15:10.000000000 +0200 ++++ net6-1.3.14/src/encrypt.cpp 2015-05-10 12:30:45.280437813 +0200 +@@ -178,7 +178,7 @@ + const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 }; + + gnutls_set_default_priority(session); +- gnutls_kx_set_priority(session, kx_prio); ++ gnutls_priority_set_direct(session, "NORMAL:+ANON_DH", NULL); + + gnutls_transport_set_ptr( + session, ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/net6.git/commitdiff/34663ae9e0bdd8f85d9c84070154605c6260d03d _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit