new upstream version: 4.2.2

set default cipher list to PROFILE=SYSTEM

cleanup

Signed-off-by: Michal Minář <miminar@redhat.com>

.gitignore

@@ -1 +1 @@
-/wt-4.1.0-free.tar.xz
+/wt-4.2.2-free.tar.xz

gcc10.patch

@@ -1,11 +0,0 @@
-diff -rup a/src/Wt/Core/observing_ptr_impl.hpp b/src/Wt/Core/observing_ptr_impl.hpp
---- a/src/Wt/Core/observing_ptr_impl.hpp	2019-07-31 07:07:38.000000000 -0600
-+++ b/src/Wt/Core/observing_ptr_impl.hpp	2019-10-13 09:05:52.032057543 -0600
-@@ -7,6 +7,7 @@
- #ifndef WT_CORE_OBSERVING_PTR_IMPL_H_
- #define WT_CORE_OBSERVING_PTR_IMPL_H_
- 
-+#include <stdexcept>
- #include "observable.hpp"
- 
- namespace Wt { namespace Core {

pango-add-harfbuzz-include.patch

@@ -1,31 +0,0 @@
-From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001
-From: Roel Standaert <roel@emweb.be>
-Date: Wed, 14 Aug 2019 12:19:11 +0200
-Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir
-
----
- cmake/WtFindPangoFt2.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
-index 5dae4cbf7..d64eeeecc 100644
---- a/cmake/WtFindPangoFt2.txt
-+++ b/cmake/WtFindPangoFt2.txt
-@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h
- FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
-           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
- 
-+FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h
-+          HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
-+
- FIND_PATH(GLIB2_INCLUDE_DIR glib.h
-           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
- 
-@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS
-     ${FT2_INCLUDE_DIR}
-     ${FT2BUILD_INCLUDE_DIR}
-     ${FONTCONFIG_INCLUDE_DIR}
-+    ${HARFBUZZ_INCLUDE_DIR}
-     ${GLIB2_INCLUDE_DIR}
-     ${GLIB2_CONFIG_INCLUDE_DIR})
- 

sources

@@ -1 +1 @@
-SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1
+SHA512 (wt-4.2.2-free.tar.xz) = 79fd49b54f6e9c38b3949807d7b9b6fff86258fe3aa0076673c88aa32b1ce7d5610855e8245ba03e0c5c04f8c6cf2d4f205cf76aab19b085fa0fe7246e419110

ssl-default-cipher-list.patch

@@ -0,0 +1,13 @@
+Index: wt-4.2.2/src/http/Configuration.C
+===================================================================
+--- wt-4.2.2.orig/src/http/Configuration.C
++++ wt-4.2.2/src/http/Configuration.C
+@@ -58,7 +58,7 @@ Configuration::Configuration(Wt::WLogger
+     sslClientVerification_("none"),
+     sslVerifyDepth_(1),
+     sslCaCertificates_(),
+-    sslCipherList_(),
++    sslCipherList_("PROFILE=SYSTEM"),
+     sslPreferServerCiphers_(false),
+     sessionIdPrefix_(),
+     accessLog_(),

wt.spec

@@ -5,8 +5,8 @@
 %global WTRUNGROUP      apache
 
 Name:           wt
-Version:        4.1.0
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        C++ library for developing web applications
 
 # For a breakdown of the licensing, see PACKAGE-LICENSING
@@ -29,13 +29,11 @@ Source3:        README.fedora
 Source4:        wt-generate-tarball.sh
 
 Patch0:         use-system-sqlite.patch
-# fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66
-Patch1:         pango-add-harfbuzz-include.patch
-Patch2:		gcc10.patch
+Patch1:         ssl-default-cipher-list.patch
 
 BuildRequires:  cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen
 BuildRequires:  GraphicsMagick-devel pango-devel sqlite-devel libpq-devel
-BuildRequires:  mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt-devel
+BuildRequires:  mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt5-devel
 
 # Don't use bundled glew on fedora >= 21
 %if 0%{?fedora} >= 21
@@ -89,8 +87,9 @@ applications using the Wt toolkit and the Wt::Dbo ORM library.
 %package        examples
 Summary:        Examples for Wt
 License:        GPLv2 and MIT
-Requires:       %{name}%{?_isa}     = %{version}-%{release}
-Requires:       %{name}-dbo%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa}      = %{version}-%{release}
+Requires:       %{name}-dbo%{?_isa}  = %{version}-%{release}
+Requires:       %{name}-files{?_isa} = %{version}-%{release}
 
 %description    examples
 This package contains programming examples distributed with official Wt
@@ -281,8 +280,12 @@ popd
 %{_defaultdocdir}/%{name}-doc/reference/*
 %{_defaultdocdir}/%{name}-doc/tutorial/*
 %{_defaultdocdir}/%{name}-doc/examples/*
+%{_defaultdocdir}/%{name}-doc/*.dox
 
 %changelog
+* Tue Mar 17 2020 Michal Minář <miminar@redhat.com> - 4.2.2-1
+- New upstream version 4.2.2
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild