mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-misc/chrony: add 4.3_pre1 (unkeyworded)
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,2 +1,4 @@
|
||||
DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
|
||||
DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
|
||||
DIST chrony-4.3-pre1.tar.gz 592966 BLAKE2B 26811ff6ebd55720cc39ce8cb9d4ddd2e70a9919dbc9a8416728bb81ad02b53dcb895a68aa696c4a063930661f533c5a219c98d67e3b93920351e7160022dca4 SHA512 6a97b11cd7604808aa57db8cd67ae854391ef2bca84bb0256c043464e33683e15682a8ebadec3d2fcca83203d2c731953dfd4972976fe193246ca4af7fb7e0e7
|
||||
DIST chrony-4.3-pre1.tar.gz.asc 833 BLAKE2B 40b80f6fdcc749077d1548e7861ff4f55dcfa8c8a84bd197d89f3f25626d5dd3a2b36dbb8b907f3f0f61444e1e3b908631529a7a1665f95b499c70c899249ade SHA512 3a9cd53fcd0f2842241817d5bdeb3c6151eec9e1d0864ae4a89a2d7b93924ac28be7d4f090a32b99ab4b229437d027c2663bb552433182a97eca347175138164
|
||||
|
||||
251
net-misc/chrony/chrony-4.3_pre1.ebuild
Normal file
251
net-misc/chrony/chrony-4.3_pre1.ebuild
Normal file
@@ -0,0 +1,251 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo systemd tmpfiles toolchain-funcs
|
||||
|
||||
DESCRIPTION="NTP client and server programs"
|
||||
HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
|
||||
inherit git-r3
|
||||
else
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
|
||||
SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
|
||||
|
||||
if [[ ${PV} != *_pre* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${P/_/-}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
|
||||
# nettle > nss > libtomcrypt in configure
|
||||
REQUIRED_USE="
|
||||
sechash? ( || ( nettle nss libtomcrypt ) )
|
||||
nettle? ( !nss )
|
||||
nss? ( !nettle )
|
||||
libtomcrypt? ( !nettle !nss )
|
||||
!sechash? ( !nss )
|
||||
!sechash? ( !nts? ( !nettle ) )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
caps? (
|
||||
acct-group/ntp
|
||||
acct-user/ntp
|
||||
sys-libs/libcap
|
||||
)
|
||||
libedit? ( dev-libs/libedit )
|
||||
!libedit? ( sys-libs/readline:= )
|
||||
nettle? ( dev-libs/nettle:= )
|
||||
nss? ( dev-libs/nss:= )
|
||||
nts? ( net-libs/gnutls:= )
|
||||
pps? ( net-misc/pps-tools )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
selinux? ( sec-policy/selinux-chronyd )
|
||||
"
|
||||
BDEPEND="
|
||||
html? ( dev-ruby/asciidoctor )
|
||||
nts? ( virtual/pkgconfig )
|
||||
sechash? (
|
||||
nettle? ( virtual/pkgconfig )
|
||||
nss? ( virtual/pkgconfig )
|
||||
)
|
||||
"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Needed for doc generation in 9999
|
||||
REQUIRED_USE+=" html"
|
||||
BDEPEND+=" virtual/w3m"
|
||||
else
|
||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
|
||||
"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
|
||||
doc/* examples/* || die
|
||||
|
||||
cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if ! use caps ; then
|
||||
sed -i \
|
||||
-e 's/ -u ntp//' \
|
||||
"${T}"/chronyd.conf examples/chronyd.service || die
|
||||
fi
|
||||
|
||||
if ! use seccomp ; then
|
||||
sed -i \
|
||||
-e 's/ -F 2//' \
|
||||
"${T}"/chronyd.conf examples/chronyd.service || die
|
||||
fi
|
||||
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# Update from time to time with output from "date +%s"
|
||||
# on a system that is time-synced.
|
||||
export SOURCE_DATE_EPOCH=1607976314
|
||||
|
||||
# Not an autotools generated script
|
||||
local myconf=(
|
||||
$(use_enable seccomp scfilter)
|
||||
|
||||
$(usex caps '' '--disable-linuxcaps')
|
||||
$(usex cmdmon '' '--disable-cmdmon')
|
||||
$(usex debug '--enable-debug' '')
|
||||
$(usex ipv6 '' '--disable-ipv6')
|
||||
$(usex libedit '' '--without-editline')
|
||||
$(usex libtomcrypt '' '--without-tomcrypt')
|
||||
$(usex nettle '' '--without-nettle')
|
||||
$(usex nss '' '--without-nss')
|
||||
$(usex ntp '' '--disable-ntp')
|
||||
$(usex nts '' '--disable-nts')
|
||||
$(usex nts '' '--without-gnutls')
|
||||
$(usex phc '' '--disable-phc')
|
||||
$(usex pps '' '--disable-pps')
|
||||
$(usex refclock '' '--disable-refclock')
|
||||
$(usex rtc '' '--disable-rtc')
|
||||
$(usex samba '--enable-ntp-signd' '')
|
||||
$(usex sechash '' '--disable-sechash')
|
||||
|
||||
--chronysockdir="${EPREFIX}/run/chrony"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
--mandir="${EPREFIX}/usr/share/man"
|
||||
--prefix="${EPREFIX}/usr"
|
||||
--sysconfdir="${EPREFIX}/etc/chrony"
|
||||
--with-hwclockfile="${EPREFIX}/etc/adjtime"
|
||||
--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
|
||||
|
||||
${EXTRA_ECONF}
|
||||
)
|
||||
|
||||
# Print the ./configure call
|
||||
edo ./configure "${myconf[@]}" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Uses w3m
|
||||
emake -C doc man txt
|
||||
fi
|
||||
|
||||
emake all docs $(usex html '' 'ADOC=true')
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
|
||||
newconfd "${T}"/chronyd.conf chronyd
|
||||
|
||||
insinto /etc/${PN}
|
||||
newins examples/chrony.conf.example1 chrony.conf
|
||||
|
||||
docinto examples
|
||||
dodoc examples/*.example*
|
||||
|
||||
newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
|
||||
|
||||
if use html ; then
|
||||
docinto html
|
||||
dodoc doc/*.html
|
||||
fi
|
||||
|
||||
keepdir /var/{lib,log}/chrony
|
||||
|
||||
if use caps ; then
|
||||
# Prepare a directory for the chrony.drift file (a la ntpsec)
|
||||
# Ensures the environment is sane on new installs
|
||||
# bug #711058
|
||||
fowners ntp:ntp /var/{lib,log}/chrony
|
||||
fperms 770 /var/lib/chrony
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
|
||||
|
||||
systemd_dounit examples/chronyd.service
|
||||
systemd_dounit examples/chrony-wait.service
|
||||
systemd_enable_ntpunit 50-chrony chronyd.service
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
HAD_CAPS=0
|
||||
HAD_SECCOMP=0
|
||||
HAD_PRE_NEW_SECCOMP_LEVEL=0
|
||||
|
||||
# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
|
||||
# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
|
||||
if has_version 'net-misc/chrony[caps]' ; then
|
||||
HAD_CAPS=1
|
||||
fi
|
||||
|
||||
if has_version 'net-misc/chrony[seccomp]' ; then
|
||||
HAD_SECCOMP=1
|
||||
fi
|
||||
|
||||
if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
|
||||
# This version introduced a new filter level: -F 2
|
||||
# It's a limited set of seccomp filters designed to be 'bare minimum'
|
||||
HAD_PRE_NEW_SECCOMP_LEVEL=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process chronyd.conf
|
||||
|
||||
if [[ -n "${REPLACING_VERSIONS}" ]] ; then
|
||||
if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
|
||||
# bug #719876
|
||||
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
|
||||
ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
|
||||
ewarn "This is necessary for chrony to drop privileges"
|
||||
elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
|
||||
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
|
||||
fi
|
||||
fi
|
||||
|
||||
# See bug #783915 for general discussion on enabling seccomp filtering
|
||||
# by default.
|
||||
local show_seccomp_enable_msg=0
|
||||
|
||||
# Was seccomp disabled before and now enabled?
|
||||
if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
|
||||
show_seccomp_enable_msg=1
|
||||
fi
|
||||
|
||||
# Are we coming from an old version without the new 'minimal' filter?
|
||||
# (-F 2)
|
||||
if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
|
||||
show_seccomp_enable_msg=1
|
||||
fi
|
||||
|
||||
if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
|
||||
elog "To enable seccomp in a stricter mode, please modify:"
|
||||
elog "- /etc/conf.d/chronyd for OpenRC"
|
||||
elog "- systemctl edit chronyd for systemd"
|
||||
elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
|
||||
elog "By default, we now use -F 2 which is a baseline/minimal filter."
|
||||
fi
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit systemd tmpfiles toolchain-funcs
|
||||
inherit edo systemd tmpfiles toolchain-funcs
|
||||
|
||||
DESCRIPTION="NTP client and server programs"
|
||||
HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
|
||||
inherit git-r3
|
||||
else
|
||||
@@ -19,7 +19,7 @@ else
|
||||
SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
|
||||
|
||||
if [[ ${PV} != *_pre* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -65,7 +65,7 @@ BDEPEND="
|
||||
)
|
||||
"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Needed for doc generation in 9999
|
||||
REQUIRED_USE+=" html"
|
||||
BDEPEND+=" virtual/w3m"
|
||||
@@ -141,12 +141,11 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Print the ./configure call
|
||||
echo sh ./configure "${myconf[@]}" >&2
|
||||
sh ./configure "${myconf[@]}" || die
|
||||
edo ./configure "${myconf[@]}" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Uses w3m
|
||||
emake -C doc man txt
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user