From 2de464f0c3d740f0f2a5d239ae8b70edbbf96bc3 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Tue, 29 Aug 2017 01:56:55 +0200
Subject: [PATCH] openrdate: use correct leap datafile

---
 openrdate/.md5sum        |  1 +
 openrdate/Pkgfile        | 18 ++++++++++--------
 openrdate/ntpleaps.patch | 12 ++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 openrdate/ntpleaps.patch

diff --git a/openrdate/.md5sum b/openrdate/.md5sum
index bbf2a7e..fa5d018 100644
--- a/openrdate/.md5sum
+++ b/openrdate/.md5sum
@@ -1,3 +1,4 @@
 5a84634e148e20b426d4d0ef0cddaf7d  ntp.patch
+30591f4d63ae9ff02ef97775e6d85a82  ntpleaps.patch
 ad9bd58e1fb7babc74d0a0a16a1248a2  openrdate-1.2.tar.gz
 c212d60bdabec86c27d82b1a19223aa0  rdate
diff --git a/openrdate/Pkgfile b/openrdate/Pkgfile
index 9b422a5..3debbf9 100644
--- a/openrdate/Pkgfile
+++ b/openrdate/Pkgfile
@@ -1,18 +1,20 @@
 # Description: Time setting software implementing RFC 868 (inetd time) and RFC 2030 (SNTP/NTP) protocols
-# URL:         http://sourceforge.net/projects/openrdate/
-# Maintainer:  CRUX System Team, core-ports at crux dot nu
+# URL: http://sourceforge.net/projects/openrdate/
+# Maintainer: CRUX System Team, core-ports at crux dot nu
 
 name=openrdate
 version=1.2
 release=2
 source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz/$name-$version.tar.gz 
-        rdate ntp.patch)
+        rdate ntp.patch ntpleaps.patch)
 
 build() {
-    cd $name-$version
+  cd $name-$version
   patch -p1 -i $SRC/ntp.patch
-    ./configure --prefix=/usr
-    make
-    make DESTDIR=$PKG install
-    install -D -m 755 $SRC/rdate $PKG/etc/cron/daily/rdate
+  # FS1462
+  patch -p1 -i $SRC/ntpleaps.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$PKG install
+  install -D -m 755 $SRC/rdate $PKG/etc/cron/daily/rdate
 }
diff --git a/openrdate/ntpleaps.patch b/openrdate/ntpleaps.patch
new file mode 100644
index 0000000..f94e563
--- /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);
+ 
-- 
2.26.2