From fb38cbd4b7f03e04e3275ce0ab540fff373499ea Mon Sep 17 00:00:00 2001 From: "Sam James (sam_c)" Date: Tue, 10 Mar 2020 23:38:53 +0000 Subject: [PATCH] net-misc/getdate: Fix build with glibc-2.31, bump EAPI * Patches getdate to not use stime (removed in glibc-2.31). (Tested and adjusts time fine.) * Bump EAPI from 4 -> 7 Closes: https://bugs.gentoo.org/709642 Signed-off-by: Sam James (sam_c) Closes: https://github.com/gentoo/gentoo/pull/14923 Signed-off-by: Sergei Trofimovich --- .../getdate/files/getdate-glibc-2.31.patch | 13 ++++++ net-misc/getdate/getdate-1.2-r2.ebuild | 42 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 net-misc/getdate/files/getdate-glibc-2.31.patch create mode 100644 net-misc/getdate/getdate-1.2-r2.ebuild diff --git a/net-misc/getdate/files/getdate-glibc-2.31.patch b/net-misc/getdate/files/getdate-glibc-2.31.patch new file mode 100644 index 000000000000..2926f7c7a2bc --- /dev/null +++ b/net-misc/getdate/files/getdate-glibc-2.31.patch @@ -0,0 +1,13 @@ +--- a/getdate.c ++++ b/getdate.c +@@ -214,7 +214,9 @@ + /* Dangerous! Could upset cron and other + * timer related events. + */ +- stime(&new_time); ++ struct timespec s = {0}; ++ s.tv_sec = new_time; ++ clock_settime(CLOCK_REALTIME, &s); + print_samples(host, first_sample, second_sample); + printf("getdate: set time to %s to match host %s\n", + time_to_str(new_time), diff --git a/net-misc/getdate/getdate-1.2-r2.ebuild b/net-misc/getdate/getdate-1.2-r2.ebuild new file mode 100644 index 000000000000..93e4e9d1d8e6 --- /dev/null +++ b/net-misc/getdate/getdate-1.2-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN}_rfc868" +MY_P="${MY_PN}-${PV}" + +inherit toolchain-funcs + +DESCRIPTION="Network Date/Time Query and Set Local Date/Time Utility" +HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/network/misc/" +SRC_URI="http://www.ibiblio.org/pub/Linux/system/network/misc/${MY_P}.tar.gz" + +LICENSE="GPL-1+" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~x86" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-glibc-2.31.patch" +) + +src_prepare() { + sed -i -e "/errno.h/ a\#include " getdate.c || die + # Respect CFLAGS + sed -i -e "/CFLAGS/d" Makefile || die + + default +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin getdate + doman getdate.8 + dodoc README getdate-cron +} -- 2.26.2