From e49c5f101277154a5d86a7d6f9d820f9eb2bae94 Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Sun, 27 Aug 2017 14:45:15 +0200
Subject: [PATCH] openrdate: use correct leap datafile

closes FS#1452
---
 openrdate/.md5sum        |  1 +
 openrdate/.signature     |  5 +++--
 openrdate/Pkgfile        |  8 ++++++--
 openrdate/ntpleaps.patch | 12 ++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 openrdate/ntpleaps.patch

diff --git a/openrdate/.md5sum b/openrdate/.md5sum
index 90e4fb6a..34aa263c 100644
--- a/openrdate/.md5sum
+++ b/openrdate/.md5sum
@@ -1,2 +1,3 @@
+30591f4d63ae9ff02ef97775e6d85a82  ntpleaps.patch
 ad9bd58e1fb7babc74d0a0a16a1248a2  openrdate-1.2.tar.gz
 c212d60bdabec86c27d82b1a19223aa0  rdate
diff --git a/openrdate/.signature b/openrdate/.signature
index fa144935..34a6988e 100644
--- a/openrdate/.signature
+++ b/openrdate/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVequ+o8siipqEJLc0fsqisqHVgWibaAykRKSewyBXPJwDsFYo2O7lE2VnlA2R+9X+sddqRAOLT2IVYWvb9oQMq3wI=
-SHA256 (Pkgfile) = 74bbe8d26160940d21514fd7a1adf59786ef054a0153b559f7c44b872bb88fc7
+RWRJc1FUaeVeqjGmuOWkG2RNsl5L4uriHI3cSAzyZrGLh6SP7HuSQVXqFj6oy2G7s6TfnaRCEVP2ZUHsEpXrwjYVjtbJ7CnfyAo=
+SHA256 (Pkgfile) = ed5969cac6210500d80f18f6395a1cc617e3945b46ce26e761b5b5bec715bcae
 SHA256 (.footprint) = 79491872e3f3d7fcf8b9bb31cccdf16a41987da60df1d6d451d9b62f0335d7d5
 SHA256 (openrdate-1.2.tar.gz) = 2921fc96d4ca676190d6ffd45fa80e107c1fe12291c0c4f64827c29639863332
 SHA256 (rdate) = b050a5e063a5b0b8ce6dde657729335ce7dc3eb02e002fb35f37aa0ef71d3aa1
+SHA256 (ntpleaps.patch) = 4ff6eb862397e05c70713897b3e80dba19160fea3cf8ec608b3d680e3e690a02
diff --git a/openrdate/Pkgfile b/openrdate/Pkgfile
index 17fd26be..b297cc3a 100644
--- a/openrdate/Pkgfile
+++ b/openrdate/Pkgfile
@@ -4,12 +4,16 @@
 
 name=openrdate
 version=1.2
-release=2
+release=3
 source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz/$name-$version.tar.gz 
-        rdate)
+        rdate ntpleaps.patch)
 
 build() {
     cd $name-$version
+
+    # FS1462
+    patch -p1 -i $SRC/ntpleaps.patch
+
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
diff --git a/openrdate/ntpleaps.patch b/openrdate/ntpleaps.patch
new file mode 100644
index 00000000..f94e563b
--- /dev/null
+++ b/openrdate/ntpleaps.patch
@@ -0,0 +1,12 @@
+diff -rupN openrdate-1.2-orig/src/ntpleaps.c openrdate-1.2/src/ntpleaps.c
+--- openrdate-1.2-orig/src/ntpleaps.c	2008-03-19 19:21:29.000000000 +0100
++++ openrdate-1.2/src/ntpleaps.c	2017-08-27 14:41:55.618929195 +0200
+@@ -125,7 +125,7 @@ ntpleaps_read(void)
+ 	u_int64_t s;
+ 	u_int64_t *l;
+ 
+-	fd = open("/usr/share/zoneinfo/right/UTC", O_RDONLY | O_NDELAY);
++	fd = open("/usr/share/zoneinfo-leaps/UTC", O_RDONLY | O_NDELAY);
+ 	if (fd == -1)
+ 		return (-1);
+