diff --git a/.gitignore b/.gitignore index b53508d..a16423a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1 @@ -/strongswan-5.0.0.tar.bz2 -/strongswan.spec -/strongswan-5.0.1.tar.bz2 -/strongswan-5.0.2.tar.bz2 -/strongswan-5.0.3.tar.bz2 -/strongswan-5.0.4.tar.bz2 -/strongswan-5.1.0.tar.bz2 -/strongswan-5.1.1.tar.bz2 -/strongswan-5.1.1.tar.bz2.sig -/strongswan-5.1.2.tar.bz2 -/strongswan-5.1.3rc1.tar.bz2 -/strongswan-5.1.3.tar.bz2 -/strongswan-5.2.0dr4.tar.bz2 -/strongswan-5.2.0dr4.tar.bz2.md5 -/strongswan-5.2.0dr4.tar.bz2.sig -/strongswan-5.2.0dr5.tar.bz2 -/strongswan-5.2.0dr6.tar.bz2 -/strongswan-5.2.0.tar.bz2 -/strongswan-5.2.0.tar.bz2.md5 -/strongswan-5.2.0.tar.bz2.sig -/strongswan-5.2.1dr1.tar.bz2 -/strongswan-5.2.1rc1.tar.bz2 -/strongswan-5.2.1rc1.tar.bz2.md5 -/strongswan-5.2.1rc1.tar.bz2.sig -/strongswan-5.2.1.tar.bz2 -/strongswan-5.2.1.tar.bz2.md5 -/strongswan-5.2.1.tar.bz2.sig -/strongswan-5.2.2dr1.tar.bz2 -/strongswan-5.2.2dr1.tar.bz2.md5 -/strongswan-5.2.2dr1.tar.bz2.sig -/strongswan-5.2.2.tar.bz2 -/strongswan-5.3.0.tar.bz2 -/strongswan-5.3.1.tar.bz2 -/strongswan-5.3.2.tar.bz2 -/strongswan-5.3.3.tar.bz2 -/strongswan-5.4.0.tar.bz2 -/strongswan-5.5.0.tar.bz2 -/strongswan-5.5.2.tar.bz2 -/strongswan-5.5.3.tar.bz2 -/strongswan-5.6.0.tar.bz2 -/strongswan-5.6.1.tar.bz2 -/strongswan-5.6.2.tar.bz2 +/strongswan-5.6.3.tar.bz2 diff --git a/sources b/sources index c1528ee..8d0f50d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (strongswan-5.6.2.tar.bz2) = cf2d5cb6c45d991fe0ad8eed4ea8628f95a1871e9728ddf0985aa26e78d1e6da1c92c961772aafd3e55cfcfa84516204a15561389d373f78140f05607b248c52 +SHA512 (strongswan-5.6.3.tar.bz2) = 080402640952b1a08e95bfe9c7f33c6a7dd01ac401b5e7e2e78257c0f2bf0a4d6078141232ac62abfacef892c493f6824948b3165d54d72b4e436ed564fd2609 diff --git a/strongswan-5.6.2-1574939-VPN-DNS.patch b/strongswan-5.6.2-1574939-VPN-DNS.patch deleted file mode 100644 index bd2e387..0000000 --- a/strongswan-5.6.2-1574939-VPN-DNS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur strongswan-5.6.2-orig/src/charon-nm/nm/nm_service.c strongswan-5.6.2/src/charon-nm/nm/nm_service.c ---- strongswan-5.6.2-orig/src/charon-nm/nm/nm_service.c 2018-02-13 11:28:06.000000000 -0500 -+++ strongswan-5.6.2/src/charon-nm/nm/nm_service.c 2018-05-23 23:33:14.143959126 -0400 -@@ -65,8 +65,7 @@ - enumerator = handler->create_enumerator(handler, type); - while (enumerator->enumerate(enumerator, &chunk)) - { -- g_variant_builder_add (&builder, "u", -- g_variant_new_uint32 (*(uint32_t*)chunk.ptr)); -+ g_variant_builder_add (&builder, "u", *(uint32_t*)chunk.ptr); - } - enumerator->destroy(enumerator); - diff --git a/strongswan.spec b/strongswan.spec index 2e60a1d..542e15e 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -2,14 +2,13 @@ #%%define prerelease dr1 Name: strongswan -Version: 5.6.2 -Release: 6%{?dist} +Version: 5.6.3 +Release: 1%{?dist} Summary: An OpenSource IPsec-based VPN and TNC solution License: GPLv2+ URL: http://www.strongswan.org/ Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2 Patch1: strongswan-5.6.0-uintptr_t.patch -Patch2: strongswan-5.6.2-1574939-VPN-DNS.patch Patch3: strongswan-5.6.2-CVE-2018-5388.patch # only needed for pre-release versions @@ -78,7 +77,6 @@ PT-TLS to support TNC over TLS. %prep %setup -q -n %{name}-%{version}%{?prerelease} %patch1 -p1 -%patch2 -p1 %patch3 -p1 %build @@ -259,6 +257,9 @@ done %{_libexecdir}/strongswan/charon-nm %changelog +* Tue May 29 2018 Mikhail Zabaluev - 5.6.3-1 +- New version 5.6.3 + * Thu May 24 2018 Paul Wouters - 5.6.2-6 - Resolves rhbz#1581868 CVE-2018-5388 strongswan: buffer underflow in stroke_socket.c