commit: fc97b39381f4a59af2f83fbc3c4fb56cf8e39f61 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Mon Nov 17 16:58:41 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Mon Nov 17 16:58:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc97b393
net-misc/ntp: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch | 75 ----------------------- net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch | 28 --------- 2 files changed, 103 deletions(-) diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch b/net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch deleted file mode 100644 index 619ea07558c2..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch +++ /dev/null @@ -1,75 +0,0 @@ - -Source: -https://bugs.ntp.org/show_bug.cgi?id=3688 - -Juergen Perlinger 2020-12-24 07:10:49 UTC -Created attachment 1760 [details] -ultimate patch, v00 - ---- a/sntp/log.c 2020-12-24 08:02:05.206004072 +0100 -+++ a/sntp/log.c 2020-12-24 08:02:05.206004072 +0100 -@@ -2,7 +2,7 @@ - - #include "log.h" - --const char *progname; /* for msyslog use too */ -+extern const char *progname; /* for msyslog use too */ - - static int counter = 0; - ---- a/sntp/main.c 2020-12-24 08:02:05.210003956 +0100 -+++ a/sntp/main.c 2020-12-24 08:02:05.210003956 +0100 -@@ -20,7 +20,6 @@ - #include "log.h" - #include "libntp.h" - -- - int shutting_down; - int time_derived; - int time_adjusted; ---- a/sntp/main.h 2020-12-24 08:02:05.210003956 +0100 -+++ a/sntp/main.h 2020-12-24 08:02:05.210003956 +0100 -@@ -16,6 +16,14 @@ - - #include "crypto.h" - -+/* !Attention! 'progname' must de instantiated in any program that wants -+ * to use this library. Putting it into the library breaks a lot of -+ * things, since many programs define it itself and then the symbol -+ * might end up twice in the linker. -+ */ -+extern const char * progname; -+ -+ - void set_li_vn_mode(struct pkt *spkt, char leap, char version, char mode); - extern int sntp_main(int argc, char **argv, const char *); - int generate_pkt(struct pkt *x_pkt, const struct timeval *tv_xmt, ---- a/sntp/sntp.c 2020-12-24 08:02:05.210003956 +0100 -+++ a/sntp/sntp.c 2020-12-24 08:02:05.210003956 +0100 -@@ -2,6 +2,8 @@ - - #include "main.h" - -+const char * progname; -+ - int - main ( - int argc, ---- a/sntp/tests/t-log.c 2020-12-24 08:02:05.210003956 +0100 -+++ a/sntp/tests/t-log.c 2020-12-24 08:02:05.210003956 +0100 -@@ -3,7 +3,6 @@ - #include "ntp_types.h" - - --//#include "log.h" - #include "log.c" - - void setUp(void); ---- a/tests/libntp/test-libntp.h 2020-12-24 08:02:05.210003956 +0100 -+++ a/tests/libntp/test-libntp.h 2020-12-24 08:02:05.210003956 +0100 -@@ -5,4 +5,4 @@ - - time_t timefunc(time_t *ptr); - void settime(int y, int m, int d, int H, int M, int S); --time_t nowtime; -+extern time_t nowtime; diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch b/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch deleted file mode 100644 index a32f3adabd8b..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/806358 -https://patchwork.openembedded.org/patch/180019/ - -From: Khem Raj <[email protected]> -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 <[email protected]> ---- 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 -
