diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-07-28 22:47:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-28 22:47:41 -0600 |
| commit | e8afbe5a0a1d4db17c4f3c1172083bb1c0d19608 (patch) | |
| tree | d3604ebb4bf935bc14a5c7bdf1bdd88c22d349af | |
| parent | Merge pull request #245959 from NixOS/backport-245713-to-release-23.05 (diff) | |
| parent | ntp: 4.2.8p15 -> 4.2.8p17 (diff) | |
| download | nixpkgs-e8afbe5a0a1d4db17c4f3c1172083bb1c0d19608.tar.gz | |
Merge pull request #245977 from NixOS/backport-243342-to-release-23.05
[Backport release-23.05] ntp: 4.2.8p15 -> 4.2.8p17
| -rw-r--r-- | pkgs/tools/networking/ntp/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/networking/ntp/glibc-2.34-fix.patch | 28 |
2 files changed, 4 insertions, 37 deletions
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index f272470a98f4..1a081993bbd6 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -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 diff --git a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch deleted file mode 100644 index 256f125a77b2..000000000000 --- a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch +++ /dev/null @@ -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 |