From 5ca30a8061703953a65d5238cb702afe625cbc15 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 25 Jan 2021 16:04:08 +0100 Subject: [PATCH] Update to 1.9.3. --- .gitignore | 1 + kea-remove_werror.patch | 30 ++++++++++++++++++++++++++++++ kea.spec | 7 ++++++- sources | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 kea-remove_werror.patch diff --git a/.gitignore b/.gitignore index 1b91691..aa00b27 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /kea-1.8.0.tar.gz /kea-1.9.1.tar.gz /kea-1.9.2.tar.gz +/kea-1.9.3.tar.gz diff --git a/kea-remove_werror.patch b/kea-remove_werror.patch new file mode 100644 index 0000000..acd9d84 --- /dev/null +++ b/kea-remove_werror.patch @@ -0,0 +1,30 @@ +commit ee320d0af861b3b5ba17762a8b69563cc92a800e +Author: Andrei Pavel +Date: Thu Jan 7 01:29:14 2021 +0200 + + [#1637] remove unnecessary -Werror in Makefiles + +diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am +index d781ee6ee8..276f86b9b4 100644 +--- a/src/bin/perfdhcp/Makefile.am ++++ b/src/bin/perfdhcp/Makefile.am +@@ -3,7 +3,6 @@ SUBDIRS = . tests + AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib + AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin + AM_CPPFLAGS += $(BOOST_INCLUDES) +-AM_CPPFLAGS += -Werror + + AM_CXXFLAGS = $(KEA_CXXFLAGS) + +diff --git a/src/bin/perfdhcp/tests/Makefile.am b/src/bin/perfdhcp/tests/Makefile.am +index 7e3c262077..31ec9e8508 100644 +--- a/src/bin/perfdhcp/tests/Makefile.am ++++ b/src/bin/perfdhcp/tests/Makefile.am +@@ -4,7 +4,6 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -I$(top_builddir + AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/.. + AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\" + AM_CPPFLAGS += $(BOOST_INCLUDES) +-AM_CPPFLAGS += -Werror + AM_CXXFLAGS = $(KEA_CXXFLAGS) + + if USE_STATIC_LINK diff --git a/kea.spec b/kea.spec index 78d16ce..4a3418e 100644 --- a/kea.spec +++ b/kea.spec @@ -5,7 +5,7 @@ #%%global prever P1 Name: kea -Version: 1.9.2 +Version: 1.9.3 Release: 3%{?dist} Summary: DHCPv4, DHCPv6 and DDNS server from ISC @@ -19,6 +19,7 @@ Source4: kea-ctrl-agent.service Patch3: 0004-Openssl-version.patch Patch4: kea-gcc11.patch +Patch5: kea-remove_werror.patch # autoreconf BuildRequires: autoconf automake libtool @@ -221,6 +222,10 @@ EOF %changelog +* Mon Jan 25 2021 Pavel Zhukov pzhukov@redhat.com> - 1.9.3-3 +- Update to 1.9.3 +- Fix Werror bug + * Fri Jan 22 2021 Jonathan Wakely - 1.9.2-3 - Rebuilt for Boost 1.75 diff --git a/sources b/sources index 2c8e1fb..6abe10d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kea-1.9.2.tar.gz) = 9d5a5f97034f5a0f604f3ea4add4671c729b77974b1fac5d508c576636ca25c92d95f77c31cdca6f2fc815dd215997b4a6d857c88ae64a875956f2d827130cb8 +SHA512 (kea-1.9.3.tar.gz) = a433f371828d622fa5c17d7fea4cfdbfc4964bbb1d5ab1dfda7dd031421ee2a19193812e4b718c91e8a7bfa557576c573fa65107e0e3e761da0a0d537e0e6718