Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/
Date: Wed, 04 Mar 2020 10:54:23
Message-Id: 1583319249.b1f63abf1a7650f43036f31492b0d5f5390e6261.polynomial-c@gentoo
1 commit: b1f63abf1a7650f43036f31492b0d5f5390e6261
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 10:20:00 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 10:54:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f63abf
7
8 net-misc/ntp: Bump to version 4.2.8_p14
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-misc/ntp/Manifest | 2 +
14 net-misc/ntp/ntp-4.2.8_p14.ebuild | 144 ++++++++++++++++++++++++++++++++++++++
15 2 files changed, 146 insertions(+)
16
17 diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
18 index 171e56db1a1..6fe616383e6 100644
19 --- a/net-misc/ntp/Manifest
20 +++ b/net-misc/ntp/Manifest
21 @@ -1,2 +1,4 @@
22 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
23 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
24 +DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1
25 +DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
26
27 diff --git a/net-misc/ntp/ntp-4.2.8_p14.ebuild b/net-misc/ntp/ntp-4.2.8_p14.ebuild
28 new file mode 100644
29 index 00000000000..2150ef08bd9
30 --- /dev/null
31 +++ b/net-misc/ntp/ntp-4.2.8_p14.ebuild
32 @@ -0,0 +1,144 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit autotools toolchain-funcs flag-o-matic systemd
39 +
40 +MY_P=${P/_p/p}
41 +DESCRIPTION="Network Time Protocol suite/programs"
42 +HOMEPAGE="http://www.ntp.org/"
43 +SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
44 + https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
45 +
46 +LICENSE="HPND BSD ISC"
47 +SLOT="0"
48 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
49 +IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
50 +
51 +COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
52 + >=dev-libs/libevent-2.0.9:=[threads?]
53 + kernel_linux? ( caps? ( sys-libs/libcap ) )
54 + zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
55 + snmp? ( net-analyzer/net-snmp )
56 + ssl? (
57 + !libressl? ( dev-libs/openssl:0= )
58 + libressl? ( dev-libs/libressl:0= )
59 + )
60 + parse-clocks? ( net-misc/pps-tools )"
61 +BDEPEND="virtual/pkgconfig
62 + acct-group/ntp
63 + acct-user/ntp"
64 +DEPEND="${COMMON_DEPEND}"
65 +RDEPEND="${COMMON_DEPEND}
66 + acct-group/ntp
67 + acct-user/ntp
68 + selinux? ( sec-policy/selinux-ntp )
69 + vim-syntax? ( app-vim/ntp-syntax )
70 + !net-misc/ntpsec
71 + !openntpd? ( !net-misc/openntpd )
72 +"
73 +PDEPEND="openntpd? ( net-misc/openntpd )"
74 +
75 +S="${WORKDIR}/${MY_P}"
76 +
77 +PATCHES=(
78 + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
79 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
80 + "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
81 + "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
82 + "${FILESDIR}"/${PN}-4.2.8-gc-tests.patch #564018
83 +)
84 +
85 +src_prepare() {
86 + default
87 + append-cppflags -D_GNU_SOURCE #264109
88 + # Make sure every build uses the same install layout. #539092
89 + find sntp/loc/ -type f '!' -name legacy -delete || die
90 + eautoreconf #622754
91 + # Disable pointless checks.
92 + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
93 +}
94 +
95 +src_configure() {
96 + # avoid libmd5/libelf
97 + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
98 + export ac_cv_lib_elf_nlist=no
99 + # blah, no real configure options #176333
100 + export ac_cv_header_dns_sd_h=$(usex zeroconf)
101 + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
102 + # Increase the default memlimit from 32MiB to 128MiB. #533232
103 + local myeconfargs=(
104 + --with-lineeditlibs=readline,edit,editline
105 + --with-yielding-select
106 + --disable-local-libevent
107 + --with-memlock=256
108 + $(use_enable caps linuxcaps)
109 + $(use_enable parse-clocks)
110 + $(use_enable ipv6)
111 + $(use_enable debug debugging)
112 + $(use_with readline lineeditlibs readline)
113 + $(use_enable samba ntp-signd)
114 + $(use_with snmp ntpsnmpd)
115 + $(use_with ssl crypto)
116 + $(use_enable threads thread-support)
117 + )
118 + econf "${myeconfargs[@]}"
119 +}
120 +
121 +src_install() {
122 + default
123 + # move ntpd/ntpdate to sbin #66671
124 + dodir /usr/sbin
125 + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
126 +
127 + dodoc INSTALL WHERE-TO-START
128 + doman "${WORKDIR}"/man/*.[58]
129 +
130 + insinto /etc
131 + doins "${FILESDIR}"/ntp.conf
132 + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
133 + newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
134 + newconfd "${FILESDIR}"/ntpd.confd ntpd
135 + newinitd "${FILESDIR}"/ntp-client.rc ntp-client
136 + newconfd "${FILESDIR}"/ntp-client.confd ntp-client
137 + newinitd "${FILESDIR}"/sntp.rc sntp
138 + newconfd "${FILESDIR}"/sntp.confd sntp
139 + if ! use caps ; then
140 + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
141 + fi
142 + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
143 +
144 + keepdir /var/lib/ntp
145 + use prefix || fowners ntp:ntp /var/lib/ntp
146 +
147 + if use openntpd ; then
148 + cd "${ED}" || die
149 + rm usr/sbin/ntpd || die
150 + rm -r var/lib || die
151 + rm etc/{conf,init}.d/ntpd || die
152 + rm usr/share/man/*/ntpd.8 || die
153 + else
154 + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
155 + if use caps ; then
156 + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
157 + "${D}$(systemd_get_systemunitdir)"/ntpd.service \
158 + || die
159 + fi
160 + systemd_enable_ntpunit 60-ntpd ntpd.service
161 + fi
162 +
163 + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
164 + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
165 + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
166 + systemd_install_serviced "${FILESDIR}"/sntp.service.conf
167 +}
168 +
169 +pkg_postinst() {
170 + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
171 + eerror "The notrust option was found in your /etc/ntp.conf!"
172 + ewarn "If your ntpd starts sending out weird responses,"
173 + ewarn "then make sure you have keys properly setup and see"
174 + ewarn "https://bugs.gentoo.org/41827"
175 + fi
176 +}