From 959575d1af06bc64016d62d064143faba68a4c43 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Nov 2022 13:12:41 +0000 Subject: gentoo auto-resync : 25:11:2022 - 13:12:41 --- net-misc/ntp/Manifest | 4 +- .../files/ntp-4.2.8_p15-configure-clang16.patch | 80 +++++++----- net-misc/ntp/ntp-4.2.8_p15-r2.ebuild | 144 --------------------- net-misc/ntp/ntp-4.2.8_p15-r3.ebuild | 144 +++++++++++++++++++++ 4 files changed, 191 insertions(+), 181 deletions(-) delete mode 100644 net-misc/ntp/ntp-4.2.8_p15-r2.ebuild create mode 100644 net-misc/ntp/ntp-4.2.8_p15-r3.ebuild (limited to 'net-misc/ntp') diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 6e666f36ba41..660072c96367 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -4,7 +4,7 @@ AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f1 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f -AUX ntp-4.2.8_p15-configure-clang16.patch 17561 BLAKE2B 987b6cd58dadb56500a65f56f906cf86342a52182d7cb38c4281323020f9d8a68ae61d85246a992693fd4d8b291a14dc5b7ca3385027fc08ca8736ae7c8915c3 SHA512 d4e8c6a980e51550216b11bc3e53517ba55be9ae1df888816dac522a003061bc98f5affa48ae3dd013bbdb46079b087540ccd2a67b275914b6e2992ff5ac805f +AUX ntp-4.2.8_p15-configure-clang16.patch 17951 BLAKE2B 18ae5fd4de77a9019942d5e46ed9cc9a6830ad640f63825dafdab43ca1d09db2f8798b353fb75f004a4c88b896f21b82750b603c259834edffada49b5f2b929e SHA512 2bc83e239ff8413b8571f9b9cb1ac169ee65887072632e82984b17f0967bf7144e27d6324018bb3efc862bdbdeb81a5280323627b35fc41c21a315e87911ddf7 AUX ntp-4.2.8_p15-gcc10.patch 2019 BLAKE2B df64e28c70d7aa1cf2513b594dc5f79f0be862c6dd0ba3e3e75e6bce394eeaff2bd994e65ad4435d212bd1b2c406e49e587c72a6c8f9fc1f63fa166dac717844 SHA512 15f2756c1ac370f4896ffc1d8bd340bb7c09869c47a78edc66da855855c9dca0adeef0e03d262ace9c7ae408c2bcb080d6e01e4fc32783518fb8db28b08200b7 AUX ntp-4.2.8_p15-glibc-2.34.patch 928 BLAKE2B 993f2c6ab2b4e6242811d553e0021911bbae37ba5febbbf9914bef5481c3b1472c273fc04a6d6f1e420bed2b4eb3193bc4a9532faa6b23e9f2a2802b1664e187 SHA512 474f50f92b105cbd3e9b3700418114ea65c3998e28ddb7a11d45602a7865bdcad07ee251176bf2e4012e3a15792a4334ee85aca198cbb98c757fc12cdd09747d AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 @@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 EBUILD ntp-4.2.8_p15-r1.ebuild 4451 BLAKE2B fcedb2061bf179e64a63673b171bb96c927c53898888f77474771dc146b88a1e32afe5c7a04ddae951d923cb4f15bbd1221b0371489d511f4bbc8a430e096aee SHA512 abf7491c5ed83b9c85ad56d1fb289b074dda2f3707bf6b5b6fb4b8b33b7b889a0c82b985d7ad297c58ce36b69cd7fa30f4aeb2ca70a272b931d681da4f1628c0 -EBUILD ntp-4.2.8_p15-r2.ebuild 4512 BLAKE2B c4a34f6772a262e9d8b339d28e5724a7ed1e6ed99d18d10b52369eae3d473a731dee01ebe63fd6a21e9bc60bbd59cc0a7e3948f9315f8741b197b8fa5ecc268d SHA512 1f2f22571ff97214b6197626821f372a120548db7590bdb6f87ff9006a0c3cfdbc616a7c29951b169e9c2e8fceba8ac9996303449c5d3fc5382c5982700e96a9 +EBUILD ntp-4.2.8_p15-r3.ebuild 4512 BLAKE2B c4a34f6772a262e9d8b339d28e5724a7ed1e6ed99d18d10b52369eae3d473a731dee01ebe63fd6a21e9bc60bbd59cc0a7e3948f9315f8741b197b8fa5ecc268d SHA512 1f2f22571ff97214b6197626821f372a120548db7590bdb6f87ff9006a0c3cfdbc616a7c29951b169e9c2e8fceba8ac9996303449c5d3fc5382c5982700e96a9 EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791 diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch index 959050784bf6..d0dc2ad014b4 100644 --- a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch +++ b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch @@ -24,7 +24,15 @@ https://bugs.gentoo.org/871372 dnl . dnl dnl -------------------------------------------------------------------- -@@ -170,7 +170,7 @@ exit (0); } +@@ -154,6 +154,7 @@ fi + if test $ol_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + AC_RUN_IFELSE([AC_LANG_SOURCE([[#include ++#include + #ifndef HAVE_EBCDIC + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -170,7 +171,7 @@ exit (0); } ]])],[],[ol_cv_header_stdc=no],[:]) fi]) if test $ol_cv_header_stdc = yes; then @@ -33,10 +41,11 @@ https://bugs.gentoo.org/871372 fi ac_cv_header_stdc=disable ]) -@@ -243,312 +243,39 @@ OL_RESOLVER_TRY(ol_cv_resolver_none) +@@ -242,313 +243,40 @@ AC_DEFUN([OL_RESOLVER_LINK], + OL_RESOLVER_TRY(ol_cv_resolver_none) OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv]) OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind]) - ]) +-]) -dnl -dnl ==================================================================== -dnl International Components for Unicode (ICU) @@ -203,13 +212,13 @@ https://bugs.gentoo.org/871372 - return 1; - } -#endif - +- - return 0; -}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross]) - - LIBS="$ol_LIBS" --]) -- + ]) + - if test $ol_cv_berkeley_db_version = no ; then - AC_MSG_ERROR([Berkeley DB version mismatch]) - fi @@ -247,11 +256,19 @@ https://bugs.gentoo.org/871372 - DB_ENV *env = NULL; - - rc = db_env_create( &env, 0 ); -- ++dnl Check for version compatility with back-mdb ++AC_DEFUN([OL_MDB_COMPAT], ++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[ ++ AC_EGREP_CPP(__mdb_version_compat,[ ++#include + - flags |= DB_INIT_MPOOL; -#ifdef DB_MPOOL_PRIVATE - flags |= DB_MPOOL_PRIVATE; --#endif ++/* require 0.9.18 or later */ ++#if MDB_VERSION_FULL >= 0x000000090012 ++ __mdb_version_compat + #endif - - if( rc ) { - printf("BerkeleyDB: %s\n", db_strerror(rc) ); @@ -276,12 +293,7 @@ https://bugs.gentoo.org/871372 -#else - DB_ENV env; - memset( &env, '\0', sizeof(env) ); -+dnl Check for version compatility with back-mdb -+AC_DEFUN([OL_MDB_COMPAT], -+[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[ -+ AC_EGREP_CPP(__mdb_version_compat,[ -+#include - +- - rc = db_appinit( NULL, NULL, &env, flags ); - - if( rc == 0 ) { @@ -290,10 +302,7 @@ https://bugs.gentoo.org/871372 - - unlink("__db_mpool.share"); - unlink("__db_lock.share"); -+/* require 0.9.18 or later */ -+#if MDB_VERSION_FULL >= 0x000000090012 -+ __mdb_version_compat - #endif +-#endif - - return rc; -}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross]) @@ -354,9 +363,9 @@ https://bugs.gentoo.org/871372 -#ifndef DB_VERSION_MINOR -# define DB_VERSION_MINOR 0 -#endif - --#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR) - +-#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR) + -/* require 4.4 or later */ -#if DB_VERSION_MM >= 0x0404 - __db_version_compat @@ -366,7 +375,7 @@ https://bugs.gentoo.org/871372 dnl dnl ==================================================================== -@@ -664,12 +391,10 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ +@@ -664,12 +392,10 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ return 0; ]]) @@ -382,7 +391,7 @@ https://bugs.gentoo.org/871372 { OL_PTHREAD_TEST_FUNCTION } -@@ -706,7 +431,7 @@ dnl Check GNU Pth pthread Header +@@ -706,7 +432,7 @@ dnl Check GNU Pth pthread Header dnl dnl defines ol_cv_header linux_threads to 'yes' or 'no' dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h @@ -391,7 +400,7 @@ https://bugs.gentoo.org/871372 dnl checked. dnl AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [ -@@ -728,7 +453,7 @@ AC_DEFUN([OL_NT_THREADS], [ +@@ -728,7 +454,7 @@ AC_DEFUN([OL_NT_THREADS], [ AC_CHECK_FUNC(_beginthread) if test $ac_cv_func__beginthread = yes ; then @@ -400,7 +409,7 @@ https://bugs.gentoo.org/871372 ol_cv_nt_threads=yes fi ]) -@@ -737,7 +462,7 @@ dnl Check LinuxThreads Header +@@ -737,7 +463,7 @@ dnl Check LinuxThreads Header dnl dnl defines ol_cv_header linux_threads to 'yes' or 'no' dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h @@ -409,7 +418,7 @@ https://bugs.gentoo.org/871372 dnl checked. dnl AC_DEFUN([OL_HEADER_LINUX_THREADS], [ -@@ -749,7 +474,7 @@ AC_DEFUN([OL_HEADER_LINUX_THREADS], [ +@@ -749,7 +475,7 @@ AC_DEFUN([OL_HEADER_LINUX_THREADS], [ [ol_cv_header_linux_threads=no]) ]) if test $ol_cv_header_linux_threads = yes; then @@ -418,7 +427,7 @@ https://bugs.gentoo.org/871372 fi ])dnl dnl -------------------------------------------------------------------- -@@ -791,7 +516,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ +@@ -791,7 +517,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ #include #include static char *pattern, *string; @@ -427,16 +436,17 @@ https://bugs.gentoo.org/871372 { int rc; regex_t re; -@@ -818,7 +543,7 @@ AC_DEFUN([OL_C_UPPER_LOWER], +@@ -818,7 +544,8 @@ AC_DEFUN([OL_C_UPPER_LOWER], [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include -main() ++#include +int main(void) { if ('C' == toupper('C')) exit(0); -@@ -826,7 +551,7 @@ main() +@@ -826,7 +553,7 @@ main() exit(1); }]])],[ol_cv_c_upper_lower=no],[ol_cv_c_upper_lower=yes],[ol_cv_c_upper_lower=safe])]) if test $ol_cv_c_upper_lower != no ; then @@ -445,7 +455,7 @@ https://bugs.gentoo.org/871372 fi ]) dnl -@@ -837,29 +562,32 @@ dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. +@@ -837,29 +564,32 @@ dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. dnl Reported by Keith Bostic. AC_DEFUN([OL_SYS_ERRLIST], @@ -493,7 +503,7 @@ https://bugs.gentoo.org/871372 AC_DEFUN([OL_NONPOSIX_STRERROR_R], [AC_CACHE_CHECK([non-posix strerror_r],ol_cv_nonposix_strerror_r,[ AC_EGREP_CPP(strerror_r,[#include ], -@@ -873,24 +601,23 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R], +@@ -873,24 +603,23 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R], ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no]) else AC_RUN_IFELSE([AC_LANG_SOURCE([[ @@ -522,7 +532,7 @@ https://bugs.gentoo.org/871372 ol_cv_func_strerror_r=no if test "${ac_cv_func_strerror_r}" = yes ; then OL_NONPOSIX_STRERROR_R -@@ -910,7 +637,7 @@ AC_DEFUN([OL_C_VOLATILE], +@@ -910,7 +639,7 @@ AC_DEFUN([OL_C_VOLATILE], if test $ol_cv_c_volatile = yes; then : else @@ -531,7 +541,7 @@ https://bugs.gentoo.org/871372 fi ])dnl dnl -@@ -918,7 +645,7 @@ dnl ==================================================================== +@@ -918,7 +647,7 @@ dnl ==================================================================== dnl Look for fetch(3) AC_DEFUN([OL_LIB_FETCH], [ol_LIBS=$LIBS @@ -540,7 +550,7 @@ https://bugs.gentoo.org/871372 AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_SYS_PARAM_H -@@ -928,8 +655,8 @@ AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ +@@ -928,8 +657,8 @@ AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ #include ]], [[struct url *u = fetchParseURL("file:///"); ]])],[ol_cv_lib_fetch=yes],[ol_cv_lib_fetch=no])]) LIBS=$ol_LIBS if test $ol_cv_lib_fetch != no ; then @@ -551,7 +561,7 @@ https://bugs.gentoo.org/871372 [define if you actually have FreeBSD fetch(3)]) fi ])dnl -@@ -1094,7 +821,7 @@ AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS], +@@ -1094,7 +823,7 @@ AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS], ])dnl dnl dnl -------------------------------------------------------------------- @@ -560,7 +570,7 @@ https://bugs.gentoo.org/871372 AC_DEFUN([OL_SASL_COMPAT], [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[ AC_EGREP_CPP(__sasl_compat,[ -@@ -1113,19 +840,3 @@ AC_DEFUN([OL_SASL_COMPAT], +@@ -1113,19 +842,3 @@ AC_DEFUN([OL_SASL_COMPAT], #endif ], [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])]) ]) diff --git a/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild deleted file mode 100644 index 5bfcc0767728..000000000000 --- a/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) - >=dev-libs/libevent-2.0.9:=[threads?] - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( - dev-libs/openssl:0= - ) - parse-clocks? ( net-misc/pps-tools )" -BDEPEND="virtual/pkgconfig - acct-group/ntp - acct-user/ntp" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - acct-group/ntp - acct-user/ntp - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax ) - !net-misc/ntpsec - !openntpd? ( !net-misc/openntpd ) -" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 - "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 - "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 - "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 - "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch - "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch -) - -src_prepare() { - default - append-cppflags -D_GNU_SOURCE #264109 - # Make sure every build uses the same install layout. #539092 - find sntp/loc/ -type f '!' -name legacy -delete || die - eautoreconf #622754 - # Disable pointless checks. - touch .checkChangeLog .gcc-warning FRC.html html/.datecheck -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - local myeconfargs=( - --with-lineeditlibs=readline,edit,editline - --with-yielding-select - --disable-local-libevent - # Increase the default memlimit from 32MiB to 128MiB. #533232 - --with-memlock=256 - $(use_enable caps linuxcaps) - $(use_enable parse-clocks) - $(use_enable ipv6) - $(use_enable debug debugging) - $(use_with readline lineeditlibs readline) - $(use_enable samba ntp-signd) - $(use_with snmp ntpsnmpd) - $(use_with ssl crypto) - $(use_enable threads thread-support) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - - insinto /etc - doins "${FILESDIR}"/ntp.conf - use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 - newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" || die - rm usr/sbin/ntpd || die - rm -r var/lib || die - rm etc/{conf,init}.d/ntpd || die - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - if use caps ; then - sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ - "${D}$(systemd_get_systemunitdir)"/ntpd.service \ - || die - fi - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild new file mode 100644 index 000000000000..5bfcc0767728 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic systemd + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="http://www.ntp.org/" +SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz + https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) + >=dev-libs/libevent-2.0.9:=[threads?] + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( + dev-libs/openssl:0= + ) + parse-clocks? ( net-misc/pps-tools )" +BDEPEND="virtual/pkgconfig + acct-group/ntp + acct-user/ntp" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 + "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + append-cppflags -D_GNU_SOURCE #264109 + # Make sure every build uses the same install layout. #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + eautoreconf #622754 + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck +} + +src_configure() { + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + local myeconfargs=( + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + # Increase the default memlimit from 32MiB to 128MiB. #533232 + --with-memlock=256 + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable ipv6) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + # move ntpd/ntpdate to sbin #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + doman "${WORKDIR}"/man/*.[58] + + insinto /etc + doins "${FILESDIR}"/ntp.conf + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + keepdir /var/lib/ntp + use prefix || fowners ntp:ntp /var/lib/ntp + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm -r var/lib || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/*/ntpd.8 || die + else + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} -- cgit v1.2.3