htpdate: update to 1.3.3

License-Update: formatting change - tabs replaced with spaces.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Oleksandr Kravchuk
2022-04-12 17:05:54 +02:00
committed by Khem Raj
parent b420d9f221
commit 602eddeefc
3 changed files with 7 additions and 86 deletions
@@ -1,31 +0,0 @@
From 04603f52d793f964653e6a985944400fe4fa87ee Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 13 Jun 2018 17:50:20 -0700
Subject: [PATCH] Make environment variables assignments to be weak
So that OE can override them for cross builds
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 1c80c09..884126c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@ prefix = $(DESTDIR)/usr
bindir = ${prefix}/bin
mandir = ${prefix}/share/man
-CC = gcc
+CC ?= gcc
CFLAGS += -Wall -std=c99 -pedantic -O2
-INSTALL = /usr/bin/install -c
-STRIP = /usr/bin/strip -s
+INSTALL ?= /usr/bin/install -c
+STRIP ?= /usr/bin/strip -s
all: htpdate
@@ -1,40 +0,0 @@
From 75646a2d2df14fdbc4a01e222a779afac94861d1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 14 Jun 2018 20:11:08 -0700
Subject: [PATCH] Replace ntp_adjtime with adjtimex.
ntp_adjtime in glibc is an alias to adjtimex and
musl does not provide ntp_adjtime at all
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
htpdate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htpdate.c b/htpdate.c
index 4171efe..ff0bf8d 100644
--- a/htpdate.c
+++ b/htpdate.c
@@ -391,7 +391,7 @@ static int htpdate_adjtimex( double drift ) {
/* Read current kernel frequency */
tmx.modes = 0;
- ntp_adjtime(&tmx);
+ adjtimex(&tmx);
/* Calculate new frequency */
freq = (long)(65536e6 * drift);
@@ -406,7 +406,7 @@ static int htpdate_adjtimex( double drift ) {
/* Become root */
swuid(0);
- return( ntp_adjtime(&tmx) );
+ return( adjtimex(&tmx) );
}
--
2.17.1
@@ -1,8 +1,4 @@
# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com>
# Released under the MIT license (see COPYING.MIT for the terms)
SUMMARY = "HTTP based time synchronization tool" SUMMARY = "HTTP based time synchronization tool"
DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's time with\ DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's time with\
web servers as reference time source. This program can be used instead\ web servers as reference time source. This program can be used instead\
ntpdate or similar, in networks that has a firewall blocking the NTP port.\ ntpdate or similar, in networks that has a firewall blocking the NTP port.\
@@ -12,18 +8,15 @@ DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's
Htpdate works through proxy servers. Accuracy of htpdate will be usually\ Htpdate works through proxy servers. Accuracy of htpdate will be usually\
within 0.5 seconds (better with multiple servers).\ within 0.5 seconds (better with multiple servers).\
" "
HOMEPAGE = "https://github.com/twekkel/htpdate"
HOMEPAGE = "http://www.vervest.org/htp/" BUGTRACKER = "https://github.com/twekkel/htpdate/issues"
LICENSE = "GPL-2.0-or-later" LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=d7018a4d2c5a6eab392709a05e5e168a" LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=2b6cdb94bd5349646d7e33f9f501eef7"
SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.xz \ SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.gz"
file://0001-Make-environment-variables-assignments-to-be-weak.patch \ SRC_URI[sha256sum] = "74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7"
file://0001-Replace-ntp_adjtime-with-adjtimex.patch \
" TARGET_CC_ARCH += "${LDFLAGS}"
SRC_URI[md5sum] = "aad8c33933648532ac8716c809b15be1"
SRC_URI[sha256sum] = "5f1f959877852abb3153fa407e8532161a7abe916aa635796ef93f8e4119f955"
do_configure () { do_configure () {
: :
@@ -36,4 +29,3 @@ do_compile () {
do_install () { do_install () {
oe_runmake install 'INSTALL=install' 'STRIP=echo' 'DESTDIR=${D}' oe_runmake install 'INSTALL=install' 'STRIP=echo' 'DESTDIR=${D}'
} }