b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #243342 from LeSuisse/ntp-4.2.8p17

Browse source 
ntp: 4.2.8p15 -> 4.2.8p17
This commit is contained in:
Robert Scott 2023-07-29 01:49:21 +01:00 committed by GitHub
parent afbcdc7005 5f23eb96cd
commit dabb768dc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/networking/ntp/default.nix
View file

@ -2,18 +2,13 @@
stdenv.mkDerivation rec {
pname = "ntp";
version = "4.2.8p15";
version = "4.2.8p17";
src = fetchurl {
url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
hash = "sha256-ED3ScuambFuN8H3OXpoCVV/NbxOXvft4IjcyjonTqGY=";
};
patches = [
# From https://patchwork.openembedded.org/patch/180019/
./glibc-2.34-fix.patch
];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
@ -33,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://www.ntp.org/";
homepage = "https://www.ntp.org/";
description = "An implementation of the Network Time Protocol";
license = {
# very close to isc and bsd2

28
pkgs/tools/networking/ntp/glibc-2.34-fix.patch
View file

@ -1,28 +0,0 @@
From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 31 Jul 2021 10:51:41 -0700
Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
could mean different stack sizes at runtime on different architectures
and it also causes compile failure. Default glibc thread stack size
or 64Kb set by ntp should be good in glibc these days.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libntp/work_thread.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libntp/work_thread.c b/libntp/work_thread.c
index 03a5647..3ddd751 100644
--- a/libntp/work_thread.c
+++ b/libntp/work_thread.c
@@ -41,7 +41,7 @@
#ifndef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE (64U * 1024)
#endif
-#ifndef __sun
+#if !defined(__sun) && !defined(__GLIBC__)
#if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
# undef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
--
2.32.0