From ffb901ceb2fa34a22d363c5ea8641d0fa4f4de79 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Tue, 12 Dec 2017 13:18:26 -0500
Subject: [PATCH] * Tue Dec 12 2017 Paul Wouters <pwouters@redhat.com> -
 1.4.14-1 - Update to 1.4.14 as first steop to migrating to 2.x - Resolves:
 rhbz#1413254 Move tmpfiles.d config to %%{_tmpfilesdir}, install LICENSE as
 %%license

---
 .gitignore      |  1 +
 conf.xml        |  6 +++++-
 opendnssec.spec | 24 +++++++++++-------------
 sources         |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index c450c7b..44aaf19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /opendnssec-1.4.6.tar.gz
 /opendnssec-1.4.7.tar.gz
 /opendnssec-1.4.9.tar.gz
+/opendnssec-1.4.14.tar.gz
diff --git a/conf.xml b/conf.xml
index 8d684e6..577e6ba 100644
--- a/conf.xml
+++ b/conf.xml
@@ -66,8 +66,12 @@
 
 		<WorkingDirectory>/var/opendnssec/tmp</WorkingDirectory>
 		<WorkerThreads>4</WorkerThreads>
+		<!-- <SignerThreads>4</SignerThreads> -->
+
 <!--
-		<SignerThreads>4</SignerThreads>
+                <Listener>
+                        <Interface><Port>53</Port></Interface>
+                </Listener>
 -->
 
 		<!-- the <NotifyCommmand> will expand the following variables:
diff --git a/opendnssec.spec b/opendnssec.spec
index 5583b33..1527df8 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -3,8 +3,8 @@
 
 Summary: DNSSEC key and zone management software
 Name: opendnssec
-Version: 1.4.9
-Release: 7%{?prever}%{?dist}
+Version: 1.4.14
+Release: 1%{?prever}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
@@ -15,9 +15,6 @@ Source4: conf.xml
 Source5: tmpfiles-opendnssec.conf
 Source6: opendnssec.cron
 
-# https://github.com/opendnssec/opendnssec/commit/cc8f1a06c8e1e8e62107fb70e5291e952fe22eb1
-Patch0:  opendnssec-1.4.13-openssl1.1.patch
-
 Group: Applications/System
 Requires: opencryptoki, softhsm, systemd-units
 Requires: libxml2, libxslt sqlite
@@ -28,8 +25,6 @@ BuildRequires: procps-ng
 BuildRequires: perl-interpreter
 
 BuildRequires: systemd-units
-# needed only for Patch0, remove this in the future
-Buildrequires: autoconf, automake, libtool
 Requires(pre): shadow-utils
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -46,8 +41,6 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch0 -p1 -b .openssl110
-autoreconf -iv .
 # bump default policy ZSK keysize to 2048
 sed -i "s/1024/2048/" conf/kasp.xml.in
 
@@ -75,15 +68,15 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
 install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/
 install -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ods
 install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/opendnssec/
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/
-install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/opendnssec.conf
+mkdir -p %{buildroot}%{_tmpfilesdir}/
+install -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/opendnssec.conf
 mkdir -p %{buildroot}%{_localstatedir}/run/opendnssec
 cp enforcer/utils/migrate_1_4_8.sqlite3 %{buildroot}%{_datadir}/%{name}/
 
 %files
 %{_unitdir}/ods-enforcerd.service
 %{_unitdir}/ods-signerd.service
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/opendnssec.conf
+%config(noreplace) %{_tmpfilesdir}/opendnssec.conf
 %attr(0770,root,ods) %dir %{_sysconfdir}/opendnssec
 %attr(0770,root,ods) %dir %{_localstatedir}/opendnssec
 %attr(0770,root,ods) %dir %{_localstatedir}/opendnssec/tmp
@@ -93,7 +86,8 @@ cp enforcer/utils/migrate_1_4_8.sqlite3 %{buildroot}%{_datadir}/%{name}/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ods
 %attr(0770,root,ods) %dir %{_localstatedir}/run/opendnssec
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cron.d/opendnssec
-%doc NEWS README.md LICENSE
+%doc NEWS README.md
+%license LICENSE
 %{_mandir}/*/*
 %{_sbindir}/*
 %{_bindir}/*
@@ -136,6 +130,10 @@ ods-ksmutil update all >/dev/null 2>/dev/null ||:
 %systemd_postun_with_restart ods-signerd.service
 
 %changelog
+* Tue Dec 12 2017 Paul Wouters <pwouters@redhat.com> - 1.4.14-1
+- Update to 1.4.14 as first steop to migrating to 2.x
+- Resolves: rhbz#1413254 Move tmpfiles.d config to %%{_tmpfilesdir}, install LICENSE as %%license
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 963ca6b..418303a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d0c9e54d7ed36c6f6be9636997bea90  opendnssec-1.4.9.tar.gz
+SHA512 (opendnssec-1.4.14.tar.gz) = b814d13ef95dcf238f3e9d6bb3dc489328d7a4a5db9e32214ac29716043f9e635e62fb3795b9d5d75e8215373f9330ea5a17840830f5e467067f305a610bee6b