From 7c235c00e4756821c7d309449b813a08154a2896 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 15 Jul 2013 14:27:36 +0200 Subject: [PATCH] update to 1.3.0-rc4 --- .gitignore | 1 + ...default-configuration-file-load-path.patch | 25 +++++++++++++++++++ knot.spec | 13 +++++++--- sources | 2 +- 4 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 0001-config-fix-default-configuration-file-load-path.patch diff --git a/.gitignore b/.gitignore index 208673a..2b926a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /knot-1.1.3.tar.gz /knot-1.2.0.tar.gz /knot-1.3.0-rc3.tar.gz +/knot-1.3.0-rc4.tar.gz diff --git a/0001-config-fix-default-configuration-file-load-path.patch b/0001-config-fix-default-configuration-file-load-path.patch new file mode 100644 index 0000000..0184bcc --- /dev/null +++ b/0001-config-fix-default-configuration-file-load-path.patch @@ -0,0 +1,25 @@ +From 432027f7cd31be315d267e073e1034c9737fc419 Mon Sep 17 00:00:00 2001 +From: Jan Vcelak +Date: Mon, 15 Jul 2013 14:14:49 +0200 +Subject: [PATCH] config: fix default configuration file load path + +--- + src/knot/conf/conf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c +index 9830c04..87c9a00 100644 +--- a/src/knot/conf/conf.c ++++ b/src/knot/conf/conf.c +@@ -37,7 +37,7 @@ + + /*! \brief Default config paths. */ + static const char *DEFAULT_CONFIG[] = { +- SYSCONFDIR "/" "knot.conf", ++ CONFIG_DIR "/" "knot.conf", + }; + + #define DEFAULT_CONF_COUNT 1 /*!< \brief Number of default config paths. */ +-- +1.8.3.1 + diff --git a/knot.spec b/knot.spec index 96240a4..6535086 100644 --- a/knot.spec +++ b/knot.spec @@ -1,17 +1,18 @@ %global _hardened_build 1 -%global alphatag rc3 +%global alphatag rc4 Summary: An authoritative DNS daemon Name: knot Version: 1.3.0 -Release: 0.1.%{alphatag}%{?dist} -License: GPLv3+ +Release: 0.2.%{alphatag}%{?dist} +License: GPLv3 Group: System Environment/Daemons URL: http://www.knot-dns.cz Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}.tmpfiles +Patch0: 0001-config-fix-default-configuration-file-load-path.patch BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel BuildRequires: texinfo @@ -26,11 +27,12 @@ Knot DNS is a high-performance authoritative DNS server implementation. %prep %setup -q -n %{name}-%{version}-%{alphatag} +%patch0 -p1 %build # disable debug code (causes unused warnings) CFLAGS="%{optflags} -DNDEBUG -Wno-unused" -%configure --sysconfdir=%{_sysconfdir}/%{name} --enable-fastparser +%configure --enable-fastparser make %{?_smp_mflags} %install @@ -93,6 +95,9 @@ fi %doc %{_infodir}/%{name}.info.gz %changelog +* Mon Jul 15 2013 Jan Vcelak 1.3.0-0.2.rc4 +- update to 1.3.0-rc4 + * Wed Jul 03 2013 Jan Vcelak 1.3.0-0.1.rc3 - update to 1.3.0-rc3 - update configuration diff --git a/sources b/sources index 997b7c1..81650fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ab52df20e93c4a9ccb66fafde74551f knot-1.3.0-rc3.tar.gz +e9175391abd6e0da0076179f92461457 knot-1.3.0-rc4.tar.gz