From ac262df76abe39cd60bbdd765924dacec007bbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Tue, 17 Mar 2020 14:19:13 +0000 Subject: [PATCH] new upstream version: 4.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit set default cipher list to PROFILE=SYSTEM cleanup Signed-off-by: Michal Minář --- .gitignore | 2 +- gcc10.patch | 11 ------- pango-add-harfbuzz-include.patch | 31 ------------------- sources | 2 +- ssl-default-cipher-list.patch | 13 ++++++++ ...GE-LICENSING => wt-4.2.2-PACKAGE-LICENSING | 0 wt.spec | 19 +++++++----- 7 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 gcc10.patch delete mode 100644 pango-add-harfbuzz-include.patch create mode 100644 ssl-default-cipher-list.patch rename wt-4.1.0-PACKAGE-LICENSING => wt-4.2.2-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 947ac12..28b4750 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.1.0-free.tar.xz +/wt-4.2.2-free.tar.xz diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index e3a602c..0000000 --- a/gcc10.patch +++ /dev/null @@ -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 - #include "observable.hpp" - - namespace Wt { namespace Core { diff --git a/pango-add-harfbuzz-include.patch b/pango-add-harfbuzz-include.patch deleted file mode 100644 index 72bea9c..0000000 --- a/pango-add-harfbuzz-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001 -From: Roel Standaert -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}) - diff --git a/sources b/sources index 5b3454d..732f963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1 +SHA512 (wt-4.2.2-free.tar.xz) = 79fd49b54f6e9c38b3949807d7b9b6fff86258fe3aa0076673c88aa32b1ce7d5610855e8245ba03e0c5c04f8c6cf2d4f205cf76aab19b085fa0fe7246e419110 diff --git a/ssl-default-cipher-list.patch b/ssl-default-cipher-list.patch new file mode 100644 index 0000000..9578a96 --- /dev/null +++ b/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_(), diff --git a/wt-4.1.0-PACKAGE-LICENSING b/wt-4.2.2-PACKAGE-LICENSING similarity index 100% rename from wt-4.1.0-PACKAGE-LICENSING rename to wt-4.2.2-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index e4a3464..1f20f6d 100644 --- a/wt.spec +++ b/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ář - 4.2.2-1 +- New upstream version 4.2.2 + * Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild