From 7e10d7089c0e1b199dddd3884747cd32ee4c1ccd Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Apr 18 2014 21:04:55 +0000
Subject: Merge branch 'master' into f20


Conflicts:
	opendnssec.spec

---

diff --git a/.gitignore b/.gitignore
index 0604ca7..b9614d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /opendnssec-1.4.2.tar.gz
 /opendnssec-1.4.3.tar.gz
 /opendnssec-1.4.4.tar.gz
+/opendnssec-1.4.5.tar.gz
diff --git a/opendnssec-1.4.5-serial0.patch b/opendnssec-1.4.5-serial0.patch
new file mode 100644
index 0000000..b587e04
--- /dev/null
+++ b/opendnssec-1.4.5-serial0.patch
@@ -0,0 +1,13 @@
+diff -Naur opendnssec-1.4.5-orig/signer/src/adapter/addns.c opendnssec-1.4.5/signer/src/adapter/addns.c
+--- opendnssec-1.4.5-orig/signer/src/adapter/addns.c	2014-03-25 06:45:44.000000000 +0000
++++ opendnssec-1.4.5/signer/src/adapter/addns.c	2014-04-18 16:26:39.079974120 +0000
+@@ -243,7 +243,8 @@
+             tmp_serial =
+                 ldns_rdf2native_int32(ldns_rr_rdf(rr, SE_SOA_RDATA_SERIAL));
+             old_serial = adapi_get_serial(zone);
+-            if (!util_serial_gt(tmp_serial, old_serial)) {
++            if (!util_serial_gt(tmp_serial, old_serial)
++		&& zone->db->is_initialized) {
+                 ods_log_info("[%s] zone %s is already up to date, have "
+                     "serial %u, got serial %u", adapter_str, zone->name,
+                     old_serial, tmp_serial);
diff --git a/opendnssec.spec b/opendnssec.spec
index 78ce0ce..73521d2 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -3,8 +3,8 @@
 
 Summary: DNSSEC key and zone management software
 Name: opendnssec
-Version: 1.4.4
-Release: 3%{?prever}%{?dist}
+Version: 1.4.5
+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
@@ -14,6 +14,8 @@ Source3: ods.sysconfig
 Source4: conf.xml
 Source5: tmpfiles-opendnssec.conf
 Source6: opendnssec.cron
+Patch1: opendnssec-1.4.5-serial0.patch
+
 Group: Applications/System
 Requires: opencryptoki, softhsm, systemd-units
 BuildRequires: libxml2, libxslt
@@ -42,6 +44,7 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm
 %setup -q -n %{name}-%{version}%{?prever}
 # bump default policy ZSK keysize to 2048
 sed -i "s/1024/2048/" conf/kasp.xml.in
+%patch1 -p1
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now -pie -specs=/usr/lib/rpm/redhat/redhat-hardened-ld"
@@ -118,8 +121,12 @@ ods-ksmutil update all >/dev/null 2>/dev/null ||:
 %systemd_postun_with_restart ods-signerd.service
 
 %changelog
+* Fri Apr 18 2014 Paul Wouters <pwouters@redhat.com> - 1.4.5-2
+- Updated to 1.4.5
+- Added patch for serial 0 bug in XFR adapter
+
 * Tue Apr 01 2014 Paul Wouters <pwouters@redhat.com> - 1.4.4-3
-- Add buildrequires for ods-kaps2html (rhbz#1073313)
+- Add buildrequires for ods-kasp2html (rhbz#1073313)
 
 * Sat Mar 29 2014 Paul Wouters <pwouters@redhat.com> - 1.4.4-2
 - Add requires for ods-kasp2html (rhbz#1073313)
diff --git a/sources b/sources
index f80ab28..575aeda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b8f2c6921953c7a1472b54fd6dfe495  opendnssec-1.4.4.tar.gz
+76eb0e2165de2081f5018ab04ec532aa  opendnssec-1.4.5.tar.gz