From a7536d19103d1e141ea037732860dc38b0a44975 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Dec 12 2015 03:56:27 +0000 Subject: Fix build, use system ca-certificates --- diff --git a/gwen-gnutls.patch b/gwen-gnutls.patch new file mode 100644 index 0000000..b830152 --- /dev/null +++ b/gwen-gnutls.patch @@ -0,0 +1,19 @@ +diff -up gwenhywfar-4.13.1/src/sio/syncio_tls.c.foo gwenhywfar-4.13.1/src/sio/syncio_tls.c +--- gwenhywfar-4.13.1/src/sio/syncio_tls.c.foo 2015-12-11 22:35:48.474181431 -0500 ++++ gwenhywfar-4.13.1/src/sio/syncio_tls.c 2015-12-11 22:41:27.414733356 -0500 +@@ -361,12 +361,12 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO + + /* possibly force protocol priority */ + if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) { +- const int proto_prio[2] = { GNUTLS_SSL3, 0 }; ++ char *force_sslv3_str = "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0"; + + DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3"); +- rv=gnutls_protocol_set_priority(xio->session, proto_prio); ++ rv=gnutls_priority_set_direct(xio->session, force_sslv3_str, NULL); + if (rv) { +- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv)); ++ DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv)); + gnutls_deinit(xio->session); + return GWEN_ERROR_GENERIC; + } diff --git a/gwenhywfar.spec b/gwenhywfar.spec index b386b79..0f6116f 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -11,10 +11,12 @@ Group: System Environment/Libraries License: LGPLv2+ Patch: gwenhywfar-3.4.1-pkgconfig.patch Patch2: gwen-gcc47.patch +Patch3: gwen-gnutls.patch URL: http://www.aquamaniac.de/sites/download/packages.php?package=01&showall=1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnutls-devel gettext libgcrypt-devel openssl-devel BuildRequires: gtk2-devel >= 2.17.5, qt4-devel >= 4.3.0 +Requires: ca-certificates Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -55,6 +57,8 @@ This package contains the qt4 gwenhywfar GUI backend. # Port gwenhywfar-config to pkgconfig %patch -p1 -b .pkgconfig %patch2 -p1 -b .gcc47 +# don't use deprecated/removed gnutls functions +%patch3 -p1 -b .gnutls %build %configure --disable-static --with-openssl-libs=%{_libdir} \ @@ -67,6 +71,11 @@ make [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# use system ca-certificates +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/ca-bundle.crt +ln -sf %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ca-bundle.crt + find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \; %find_lang %{name} @@ -118,6 +127,10 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \; %{_libdir}/libgwengui-cpp.so.* %changelog +* Fri Dec 11 2015 Bill Nottingham - 4.13.1-5 +- Use system ca-certificates (#1272503, ) +- Fix build (#1239551) + * Wed Jun 17 2015 Fedora Release Engineering - 4.13.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild