From 9b8ffb604022a905603c7aa384594325571444fa Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Tue, 12 Jun 2012 17:42:56 -0400
Subject: [PATCH] * Tue Jun 12 2012 Paul Wouters <pwouters@redhat.com> -
 1.4.0-0.a2.1 - Updated to 1.4.0a2 - ksm-utils patch for ods-ksmutil to die
 sooner when it can't lock   the HSM.

---
 .gitignore                     |  1 +
 opendnssec-1.4.0-ksmutil.patch | 31 +++++++++++++++++++++++++++++++
 opendnssec.spec                | 18 +++++++++++++-----
 sources                        |  1 +
 4 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 opendnssec-1.4.0-ksmutil.patch

diff --git a/.gitignore b/.gitignore
index d6549ec..e85b534 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /opendnssec-1.4.0a1.tar.gz
+/opendnssec-1.4.0a2.tar.gz
diff --git a/opendnssec-1.4.0-ksmutil.patch b/opendnssec-1.4.0-ksmutil.patch
new file mode 100644
index 0000000..592aa3e
--- /dev/null
+++ b/opendnssec-1.4.0-ksmutil.patch
@@ -0,0 +1,31 @@
+diff -Naur opendnssec-1.4.0a2-orig/enforcer/utils/ksmutil.c opendnssec-1.4.0a2/enforcer/utils/ksmutil.c
+--- opendnssec-1.4.0a2-orig/enforcer/utils/ksmutil.c	2012-05-24 12:38:04.000000000 -0400
++++ opendnssec-1.4.0a2/enforcer/utils/ksmutil.c	2012-06-12 16:01:32.090442282 -0400
+@@ -4063,6 +4063,7 @@
+ {
+     struct flock fl;
+     struct timeval tv;
++    int retry = 0;
+ 
+     if (lock_fd == NULL) {
+         printf("%s could not be opened\n", lock_filename);
+@@ -4075,6 +4076,10 @@
+     fl.l_pid = getpid();
+ 
+     while (fcntl(fileno(lock_fd), F_SETLK, &fl) == -1) {
++	if (retry >= 3) {
++	    printf("couldn't get lock on %s; %s\n", lock_filename, strerror(errno));
++	    return 1;
++	}
+         if (errno == EACCES || errno == EAGAIN) {
+             printf("%s already locked, sleep\n", lock_filename);
+ 
+@@ -4083,6 +4088,8 @@
+             tv.tv_usec = 0;
+             select(0, NULL, NULL, NULL, &tv);
+ 
++	    retry++;
++
+         } else {
+             printf("couldn't get lock on %s; %s\n", lock_filename, strerror(errno));
+             return 1;
diff --git a/opendnssec.spec b/opendnssec.spec
index 6ff71c9..c423b27 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,17 +1,17 @@
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 1.4.0
-Release: 0.a1%{?dist}.2
+Release: 0.a2%{?dist}.1
 License: BSD
 Url: http://www.opendnssec.org/
 #Source: http://www.opendnssec.org/files/source/% {name}-% {version}a1.tar.gz
-Source: http://www.opendnssec.org/files/source/testing/%{name}-%{version}a1.tar.gz
+Source: http://www.opendnssec.org/files/source/testing/%{name}-%{version}a2.tar.gz
 Source1: ods-enforcerd.service
 Source2: ods-signerd.service
 Source3: ods.sysconfig
 Source4: conf.xml
 Source5: tmpfiles-opendnssec.conf
-Source6: opendnssec-LICENSE
+Patch1: opendnssec-1.4.0-ksmutil.patch
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: opencryptoki, softhsm, systemd-units
@@ -29,12 +29,15 @@ It secures zone data just before it is published in an authoritative
 name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
-%setup -q -n %{name}-%{version}a1
+%setup -q -n %{name}-%{version}a2
+%patch1 -p1 -b .ksmutil
+
 
 %build
+# for snapshots enable below
+sh ./autogen.sh
 %configure --with-ldns=%{_libdir}
 make %{?_smp_mflags}
-cp %{SOURCE6} LICENSE
 
 %check
 # Requires sample db not shipped with upstream
@@ -118,6 +121,11 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Jun 12 2012 Paul Wouters <pwouters@redhat.com> - 1.4.0-0.a2.1
+- Updated to 1.4.0a2
+- ksm-utils patch for ods-ksmutil to die sooner when it can't lock
+  the HSM.
+
 * Mon Mar 26 2012 Paul Wouters <pwouters@redhat.com> - 1.4.0-0.a1.2
 - Added opendnssec LICENSE file from trunk (Thanks Jakob!) 
 
diff --git a/sources b/sources
index e57d259..ba4ce08 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 c7e00424dbbf87ccf4667f3b397b0aa1  opendnssec-1.4.0a1.tar.gz
+52c7fc307a0db647e2f74adb939b75cb  opendnssec-1.4.0a2.tar.gz