[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: 10cb0d6efa431b8ec909a3379d523ae8fbd9852a Author: Mike Gilbert gentoo org> AuthorDate: Tue Feb 14 00:34:30 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Feb 14 00:35:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cb0d6e net-misc/ntp: use tmpfiles to create /var/lib/ntp Closes: https://github.com/gentoo/gentoo/pull/29521 Signed-off-by: Mike Gilbert gentoo.org> net-misc/ntp/files/ntp.tmpfiles | 1 + net-misc/ntp/{ntp-4.2.8_p15-r5.ebuild => ntp-4.2.8_p15-r6.ebuild} | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net-misc/ntp/files/ntp.tmpfiles b/net-misc/ntp/files/ntp.tmpfiles new file mode 100644 index ..49b0b066e30f --- /dev/null +++ b/net-misc/ntp/files/ntp.tmpfiles @@ -0,0 +1 @@ +d /var/lib/ntp 0755 ntp ntp diff --git a/net-misc/ntp/ntp-4.2.8_p15-r5.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild similarity index 97% rename from net-misc/ntp/ntp-4.2.8_p15-r5.ebuild rename to net-misc/ntp/ntp-4.2.8_p15-r6.ebuild index 0fc7ccc4e110..64ff48c345f8 100644 --- a/net-misc/ntp/ntp-4.2.8_p15-r5.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic systemd +inherit autotools flag-o-matic systemd tmpfiles MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -112,8 +112,7 @@ src_install() { 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 + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf if use openntpd ; then cd "${ED}" || die @@ -138,6 +137,7 @@ src_install() { } pkg_postinst() { + tmpfiles_process ntp.conf 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,"
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: 56ef5ce33891feec34cd0c39a0a774a81a587dc7 Author: Sam James gentoo org> AuthorDate: Thu Dec 1 05:12:50 2022 + Commit: Sam James gentoo org> CommitDate: Thu Dec 1 05:12:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ef5ce3 net-misc/ntp: another pthread configure fix Closes: https://bugs.gentoo.org/871372 Signed-off-by: Sam James gentoo.org> .../ntp/files/ntp-4.2.8_p15-configure-clang16.patch| 18 ++ ...ntp-4.2.8_p15-r3.ebuild => ntp-4.2.8_p15-r4.ebuild} | 0 2 files changed, 18 insertions(+) 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 d0dc2ad014b4..4b52248bde8f 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 @@ -1,6 +1,21 @@ Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288. https://bugs.gentoo.org/871372 +--- a/sntp/m4/openldap-thread-check.m4 b/sntp/m4/openldap-thread-check.m4 +@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++pthread_t thread; ++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then --- a/sntp/m4/openldap.m4 +++ b/sntp/m4/openldap.m4 @@ -1,16 +1,16 @@ @@ -590,3 +605,6 @@ https://bugs.gentoo.org/871372 -#endif - ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) -]) +-- +2.38.1 + diff --git a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild similarity index 100% rename from net-misc/ntp/ntp-4.2.8_p15-r3.ebuild rename to net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: d8c9b791ed0c3c23ef26ded620334d55f2587758 Author: Brian Evans gentoo org> AuthorDate: Fri Jun 3 05:15:24 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jun 3 05:29:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c9b791 net-misc/ntp: improve OpenRC init script for ntpd The attached script updates a couple things which effectively is the same as the current model however it follows the modular nature of the declarative syntax. Changes: * Removes the duplicating start_stop_daemon_args since --pidfile is automatic with pidfile= * Only have ntpd create the pidfile when forking via command_args_background * Add command_args_foreground for the option not to fork Closes: https://bugs.gentoo.org/828077 Signed-off-by: Brian Evans gentoo.org> Signed-off-by: Sam James gentoo.org> net-misc/ntp/files/ntpd.rc-r2| 23 ++ net-misc/ntp/ntp-4.2.8_p15-r1.ebuild | 143 +++ 2 files changed, 166 insertions(+) diff --git a/net-misc/ntp/files/ntpd.rc-r2 b/net-misc/ntp/files/ntpd.rc-r2 new file mode 100644 index ..f4608f784615 --- /dev/null +++ b/net-misc/ntp/files/ntpd.rc-r2 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="ntpd - the network time protocol daemon" +pidfile="/var/run/ntpd.pid" +command="/usr/sbin/ntpd" +command_args="${NTPD_OPTS}" +command_args_background="-p ${pidfile}" +command_args_foreground="-n" + +depend() { + use net dns logger + after ntp-client +} + +start_pre() { + if [ ! -f /etc/ntp.conf ] ; then + eerror "Please create /etc/ntp.conf" + return 1 + fi + return 0 +} diff --git a/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild new file mode 100644 index ..7e0c42fe3689 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p15-r1.ebuild @@ -0,0 +1,143 @@ +# 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 ~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 +) + +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) +
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: 7094bf58386e8970a0b96b92938f42e61c6bb656 Author: Sam James gentoo org> AuthorDate: Sun Oct 17 06:21:32 2021 + Commit: Sam James gentoo org> CommitDate: Sun Oct 17 06:21:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7094bf58 net-misc/ntp: fix build with glibc-2.34 Closes: https://bugs.gentoo.org/806358 Signed-off-by: Sam James gentoo.org> net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch | 28 +++ net-misc/ntp/ntp-4.2.8_p15.ebuild | 1 + 2 files changed, 29 insertions(+) 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 new file mode 100644 index 000..a32f3adabd8 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/806358 +https://patchwork.openembedded.org/patch/180019/ + +From: Khem Raj +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 +--- 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 + diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index 0809ce703a5..7e9d8bc04c2 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch "${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 ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: 2c65d47e903eb2c2b3792563530b12b2321bdc38 Author: Lars Wendler gentoo org> AuthorDate: Mon Jul 27 18:56:04 2020 + Commit: Lars Wendler gentoo org> CommitDate: Mon Jul 27 19:02:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c65d47e net-misc/ntp: Security cleanup Bug: https://bugs.gentoo.org/729458 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> net-misc/ntp/Manifest | 2 - .../ntp/files/ntp-4.2.8-gcc10-fno-common.patch | 22 net-misc/ntp/ntp-4.2.8_p14-r2.ebuild | 145 - 3 files changed, 169 deletions(-) diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 745c406ddbe..c61825354c7 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,4 +1,2 @@ -DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1 -DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8 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 diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch deleted file mode 100644 index d2ed719d8ff..000 --- a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ntp-4.2.8p14/include/ntp_config.h.psl -+++ ntp-4.2.8p14/include/ntp_config.h -@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag { - * Poll Skew List - */ - --psl_item psl[17-3+1]; /* values for polls 3-17 */ -+extern psl_item psl[17-3+1]; /* values for polls 3-17 */ - /* To simplify the runtime code we */ - /* don't want to have to special-case */ - /* dealing with a default */ ntp-4.2.8p14/ntpd/ntp_config.c.psl -+++ ntp-4.2.8p14/ntpd/ntp_config.c -@@ -202,6 +202,8 @@ intcryptosw; /* crypto command called - - extern char *stats_drift_file;/* name of the driftfile */ - -+psl_item psl[17-3+1];/* values for polls 3-17 */ -+ - #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED - /* - * backwards compatibility flags diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild deleted file mode 100644 index 2b72249e997..000 --- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs 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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 libressl 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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl: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 )" -
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: fbdf99fc6dd829214056d1333d7ec34bf8da89e7 Author: Lars Wendler gentoo org> AuthorDate: Tue Jun 23 16:16:22 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jun 23 16:16:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdf99fc net-misc/ntp: Removed old Bug: https://bugs.gentoo.org/717798 Package-Manager: Portage-2.3.102, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> net-misc/ntp/Manifest | 2 - net-misc/ntp/files/ntp-4.2.8-gc-tests.patch | 41 net-misc/ntp/ntp-4.2.8_p13-r2.ebuild| 144 net-misc/ntp/ntp-4.2.8_p13.ebuild | 144 4 files changed, 331 deletions(-) diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 298239a1bec..745c406ddbe 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,5 +1,3 @@ -DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2 -DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075 DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1 DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 diff --git a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch b/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch deleted file mode 100644 index 19f0c0f8bfe..000 --- a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -Avoid building problematic tests on platforms -whose linker does not support --gc-sections. - -https://bugs.ntp.org/show_bug.cgi?id=3601 -https://bugs.gentoo.org/564018 - a/sntp/m4/ntp_problemtests.m4 2019-09-23 07:19:18.545861137 +0200 -+++ b/sntp/m4/ntp_problemtests.m4 2019-09-23 07:19:18.545861137 +0200 -@@ -33,6 +33,10 @@ - no:0:*-*-solaris*) ;; - *) ntp_test_ntp_restrict="yes" ;; - esac -+case "$ntp_cv_gc_sections_runs" in -+ no) ntp_test_ntp_restrict="no" ;; -+ * ) ;; -+esac - AC_MSG_RESULT([$ntp_test_ntp_restrict]) - AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes]) - -@@ -43,6 +47,10 @@ - no:0:*-*-solaris*) ;; - *) ntp_test_ntp_scanner="yes" ;; - esac -+case "$ntp_cv_gc_sections_runs" in -+ no) ntp_test_ntp_scanner="no" ;; -+ * ) ;; -+esac - AC_MSG_RESULT([$ntp_test_ntp_scanner]) - AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes]) - -@@ -53,6 +61,10 @@ - no:0:*-*-solaris*) ;; - *) ntp_test_ntp_signd="yes" ;; - esac -+case "$ntp_cv_gc_sections_runs" in -+ no) ntp_test_ntp_signd="no" ;; -+ * ) ;; -+esac - AC_MSG_RESULT([$ntp_test_ntp_signd]) - AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes]) - diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild deleted file mode 100644 index a50710aa1a3..000 --- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) -
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: acf6a6498bfbb0294a07072c6acb8cfadcb56695 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat May 2 18:59:34 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat May 2 18:59:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf6a649 net-misc/ntp: fix building against GCC 10 Closes: https://bugs.gentoo.org/707688 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> .../ntp/files/ntp-4.2.8-gcc10-fno-common.patch | 22 ++ net-misc/ntp/ntp-4.2.8_p14-r2.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch new file mode 100644 index 000..d2ed719d8ff --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch @@ -0,0 +1,22 @@ +--- ntp-4.2.8p14/include/ntp_config.h.psl ntp-4.2.8p14/include/ntp_config.h +@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag { + * Poll Skew List + */ + +-psl_item psl[17-3+1]; /* values for polls 3-17 */ ++extern psl_item psl[17-3+1]; /* values for polls 3-17 */ + /* To simplify the runtime code we */ + /* don't want to have to special-case */ + /* dealing with a default */ +--- ntp-4.2.8p14/ntpd/ntp_config.c.psl ntp-4.2.8p14/ntpd/ntp_config.c +@@ -202,6 +202,8 @@ intcryptosw; /* crypto command called + + extern char *stats_drift_file;/* name of the driftfile */ + ++psl_item psl[17-3+1];/* values for polls 3-17 */ ++ + #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED + /* + * backwards compatibility flags diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild index b2cbb8b926a..79a6d513fa4 100644 --- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 + "${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: 37dea0c5a7c3b80ed51400bd89b44268c959bbe2 Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 5 18:50:28 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 5 18:51:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dea0c5 net-misc/ntp: Revbump to fix ntpd startup with USE="caps" Closes: https://bugs.gentoo.org/711530 Package-Manager: Portage-2.3.92, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch | 13 + .../{ntp-4.2.8_p14-r1.ebuild => ntp-4.2.8_p14-r2.ebuild}| 1 + 2 files changed, 14 insertions(+) diff --git a/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch new file mode 100644 index 000..183b6d8d475 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/711530 + +--- ntp-4.2.8p14/ntpd/ntpd.c ntp-4.2.8p14/ntpd/ntpd.c +@@ -1189,7 +1189,7 @@ +* drop privileges in this case. +*/ + cap_t caps; +- caps = cap_from_text("cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe"); ++ caps = cap_from_text("cap_ipc_lock,cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe"); + if ( ! caps) { + msyslog( LOG_ERR, "cap_from_text() failed: %m" ); + exit(-1); diff --git a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild similarity index 98% rename from net-misc/ntp/ntp-4.2.8_p14-r1.ebuild rename to net-misc/ntp/ntp-4.2.8_p14-r2.ebuild index a442cbc860d..61130e1b1da 100644 --- a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: a5d46eb9f6f5d33ab892827f4321626574629528 Author: Patrick McLean sony com> AuthorDate: Sat Dec 8 01:49:25 2018 + Commit: Patrick McLean gentoo org> CommitDate: Sat Dec 8 01:49:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d46eb9 net-misc/ntp: add patch to 4.2.8_p12 for libressl-2.8 compat Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Patrick McLean gentoo.org> net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 net-misc/ntp/ntp-4.2.8_p12.ebuild | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch new file mode 100644 index 000..7ec2ee678b0 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch @@ -0,0 +1,16 @@ +--- ntp-4.2.8p12.orig/include/libssl_compat.h 2018-12-08 01:14:58.434733497 + ntp-4.2.8p12/include/libssl_compat.h 2018-12-08 01:42:04.479474757 + +@@ -107,10 +107,13 @@ + + #define OpenSSL_version_num SSLeay + #define OpenSSL_version SSLeay_version ++ ++# if LIBRESSL_VERSION_NUMBER < 0x2080L + #define X509_get0_notBefore X509_get_notBefore + #define X509_getm_notBefore X509_get_notBefore + #define X509_get0_notAfterX509_get_notAfter + #define X509_getm_notAfterX509_get_notAfter ++#endif /* LIBRESSL_VERSION_NUMBER < 0x2080L */ + + /* - */ + #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */ diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild index 179de05fc60..39fa971f10b 100644 --- a/net-misc/ntp/ntp-4.2.8_p12.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,6 +42,7 @@ 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_p10-fix-build-wo-ssl-or-libressl.patch + "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch ) pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: 1e5928de346454e2feb26cceb593a0448969e77b Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 13 10:19:30 2016 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 13 10:19:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5928de net-misc/ntp: Removed old. Package-Manager: portage-2.2.26 Signed-off-by: Lars Wendler gentoo.org> net-misc/ntp/Manifest | 6 - net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch | 33 - net-misc/ntp/files/ntp-4.2.4_p7-nano.patch | 20 --- .../files/ntp-4.2.8-ntp-keygen-no-openssl.patch| 164 - net-misc/ntp/files/ntpd.rc | 36 - net-misc/ntp/files/ntpd.service-r1 | 10 -- net-misc/ntp/files/ntpdate.service | 13 -- net-misc/ntp/files/sntp.service-r1 | 13 -- net-misc/ntp/ntp-4.2.6_p5-r10.ebuild | 136 - net-misc/ntp/ntp-4.2.6_p5-r11.ebuild | 136 - net-misc/ntp/ntp-4.2.8-r1.ebuild | 129 net-misc/ntp/ntp-4.2.8-r2.ebuild | 140 -- net-misc/ntp/ntp-4.2.8-r3.ebuild | 136 - net-misc/ntp/ntp-4.2.8_p2.ebuild | 128 net-misc/ntp/ntp-4.2.8_p4.ebuild | 130 15 files changed, 1230 deletions(-) diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 5eb4405..1ee0b85 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,9 +1,3 @@ -DIST ntp-4.2.6p5-manpages.tar.bz2 47874 SHA256 f49203cba2301ce27a53113a6e22d844b258114604f2c9ee1371833babc70f9c SHA512 57d4b8fc4482a41c6595418ebff1a861d4bd7ee175b13cf5580a5915749a096b3a906ca8ddf9fc9c57ead783df22b7b9326b51bbab9cd8340576413bee3e7f84 WHIRLPOOL 83c2d95fe953ab2cd7729bc03d89e44a2de85cb68b4ec72c123a034846866aebf7b83eeb4e45add6aa1443f2de83bfbb1ecdbb437534d827d1e1a4a08f91cfd4 -DIST ntp-4.2.6p5.tar.gz 4202539 SHA256 d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c SHA512 8d76fc7e92b2ea6dd5031e6030a7aba4ff6fb3e19d3bc0153852509861be5d0960e70604814163caedb81f8315a451d78371f99634a50b55cfe1cbd2c69e3046 WHIRLPOOL 9943706ad02e377cb38d65caed6f675d37db7aa53dd86319b17405791494bf11244ac933867516cca9438947202b595b6606088a8aaa436655f9eeb8d078b77e -DIST ntp-4.2.8-manpages.tar.bz2 46542 SHA256 9c68840456c7002796baea70231e6cf7f6bc06583bbab370a09f837a66f2c409 SHA512 a87db65da978fcaf123763a6de59a399a3c799d59374acd1c397d7a7816e6ee2ff6091f24ff41223cf719effd2e595dfa7699006a724d2908d380c6098603d28 WHIRLPOOL cb0e53cc0132573d6b2910301c1d7743874598b1487968ec9e49f467a8aa62340609379c8cffb42da2694703955581629aa78897a9319f71b3589600e882b9b0 -DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee SHA512 d69ed02e57c66d5c57616bb5e4be0d58e7410dd27ea96acaed6e8b63726a37cd22ae73e8bdff089abbe8e19bcd8bee05733ab362249018fc495fcedc71aa3a44 WHIRLPOOL 4bfe1222c250425e3fc229649d1d4ae11fa6a32eb03f9d15b95575ee31171761321730c83d6e283551fc89647370a86791ec1c262c49826b31106d4317fb64e1 -DIST ntp-4.2.8p2-manpages.tar.bz2 46421 SHA256 c22f74e0361e5eb921e495ff0f1b8987c26d90db72393dfb307f68498d6501e8 SHA512 8b211e891e96006ba4fa054fe5f111ae5b52cc4b990d4bbe691fd0724f6373ec54428fc39ea0cffc8fe66f757d6f99355ac69f3dc76ad43f8f95c145f3adee9c WHIRLPOOL f1b85c4e39934d308dbaaca1b22779e33c18489abfd9e17ad26368462032445d164a2dbb96fa9865128bc138ce8f8f8790d9eeffc0c37339ed5eafa0ee687a72 -DIST ntp-4.2.8p2.tar.gz 6820869 SHA256 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 SHA512 7b39e4d8a362afd37dc57a742841fadcd4634bb1d21d59d72d484b759a867d82b90d8c77e6e104c73ec8690489b80b0f9e2e86e4dfcfa34a49621cee3dee16d0 WHIRLPOOL 70d63c895a62bcd790760e6205d6b666ab47dfc9fc8737f10d1cd7d4a2c3cafb4efe6b8141570921c5024e71b00ebca73574562694678f448ee7680a982a0084 DIST ntp-4.2.8p3-manpages.tar.bz2 46419 SHA256 83f9641e52fd79ac8bd76f7d62214591389f97fed5200e8b5d85aa31070f9112 SHA512 1d15c63f5c88e0b45f5de3a35042fde9a3a01413ab460f553124ad996832b46c72212070ccbefc0e70aef8ffe4c634b7424e06ac31f62cd921a3df13b3746d6b WHIRLPOOL 92aa9cebe97454e1d7d1533546bee131795ab6f28538b0326423afbca10b83fadc8693c8148de08d7d7bed0773d462d204632ba38e16a4c442b1bae10094a501 DIST ntp-4.2.8p3.tar.gz 7099575 SHA256 818ca4f2ed6ca845b1c5ec43f5e6ad905eaa0fc0aab2d509ed6b962a37fbf38f SHA512 5a628f72e900ac8c8a4754bc9620e6511f68035b3a1e1108d619b1beab307d3f6c9f5dad4f3ca3f4e252d0e7e3bf48900044df2934aa87df1f699316db5e9598 WHIRLPOOL 4d66c9403b0bf8b4a9b297bd13974f88bcdc3f524bede0e633f7ee17b688bdd60dcc4e8a23fa7a4efd82540fab515df0b40c140edbefd1bb51352edd06b08d2d DIST ntp-4.2.8p4-manpages.tar.bz2 24655 SHA256 fe368d6c30c8c9c3f6e7959b00fc82695e122b29d597090f3725a9a00de92da6 SHA512 80a56b5b736810e4c04e128ce5565fc3834dc0b899b2fdd4173c8dd7f53d353209b648186d0183b9aecd9debec60f2d0b179d229032971876269810bd72096a7 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
commit: ce8b45e26a3e4cea48f6e7ff7faa2125ba32a96c Author: Mike Frysinger gentoo org> AuthorDate: Sun Oct 25 01:06:40 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Oct 25 01:07:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8b45e2 net-misc/ntp: fix ntpd test link errors net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch | 21 + net-misc/ntp/ntp-4.2.8_p4.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch new file mode 100644 index 000..403b2d5 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch @@ -0,0 +1,21 @@ +http://bugs.ntp.org/show_bug.cgi?id=2951 + +--- a/tests/ntpd/Makefile.in b/tests/ntpd/Makefile.in +@@ -205,7 +205,7 @@ test_ntp_scanner_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + -o $@ + am_test_ntp_signd_OBJECTS = t-ntp_signd.$(OBJEXT) \ + run-t-ntp_signd.$(OBJEXT) test-libntp.$(OBJEXT) \ +- ntp_signd.$(OBJEXT) $(am__objects_1) ++ $(am__objects_1) + test_ntp_signd_OBJECTS = $(am_test_ntp_signd_OBJECTS) + test_ntp_signd_DEPENDENCIES = $(am__DEPENDENCIES_3) \ + $(top_builddir)/ntpd/ntp_config.o \ +@@ -871,7 +871,6 @@ test_ntp_signd_SOURCES = \ + t-ntp_signd.c \ + run-t-ntp_signd.c \ + $(srcdir)/../libntp/test-libntp.c \ +- $(srcdir)/../../ntpd/ntp_signd.c\ + $(NULL) + + diff --git a/net-misc/ntp/ntp-4.2.8_p4.ebuild b/net-misc/ntp/ntp-4.2.8_p4.ebuild index ae4fc76..4bfcda0 100644 --- a/net-misc/ntp/ntp-4.2.8_p4.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p4.ebuild @@ -42,6 +42,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 epatch "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 + epatch "${FILESDIR}"/${PN}-4.2.8-ntpd-test-signd.patch 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