From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-misc/ntpsec/Manifest | 10 ++- net-misc/ntpsec/ntpsec-1.1.4.ebuild | 6 +- net-misc/ntpsec/ntpsec-1.1.6.ebuild | 6 +- net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild | 6 +- net-misc/ntpsec/ntpsec-1.1.8.ebuild | 159 +++++++++++++++++++++++++++++++++ net-misc/ntpsec/ntpsec-9999.ebuild | 4 +- 6 files changed, 176 insertions(+), 15 deletions(-) create mode 100644 net-misc/ntpsec/ntpsec-1.1.8.ebuild (limited to 'net-misc/ntpsec') diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index eaaa2b105647..47b58ad0b39b 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -8,8 +8,10 @@ AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9 -EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984 -EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885 -EBUILD ntpsec-1.1.7-r1.ebuild 4186 BLAKE2B b22105dd6337ff4fcb36d441bec8db8f750c4fc8faf3b1ea9a043535ef5a6b200d55a99101dd310d4223e82fd2ef0902036e85c64a648ab5af5c752e2b3a98a6 SHA512 8e2094a6a796e50d516f9fda942977d00262fb14d7f2134e6b1909faf86bdb2dfe67d8540a52cb5faa027dfab5d940da9457929856ca3e59cf0ff1e35bfead01 -EBUILD ntpsec-9999.ebuild 4113 BLAKE2B a8f7d26adaa2518397851b8d35119a767d24cebfdb5dd6f52a0b6af01c285a9771b15a2ae3770738f2d98ce529dc7713baf0af06732bef1bc9192ccb96b98ae2 SHA512 f0a31da90aa4b3fdd76250bcf17953691e50fbf4c05d0f5fa42c5c95c51e20fc48315e4d61298fee3a9a8615f3193ca4edf88384b92fa54416c017738b01c120 +DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c +EBUILD ntpsec-1.1.4.ebuild 4129 BLAKE2B df2ff391b6f084c8c19d6ef64e7a1f2b161b935fed7959e3b9f5581c11b2f9c95fb9ab5eb6030171a05156f219ffdbb5b0d25f867067f8c19acafb2dd32a0e4a SHA512 1053d16b3ef63b90526837ba4147190c83672ae9928b70665a3f3ebbaeeb4bc642ed87df42ba53ba20c1f8da84b75fd47cfe8bffcdc559af7a10a382efd1a024 +EBUILD ntpsec-1.1.6.ebuild 4087 BLAKE2B ef856f1e3bed036f0ca07f2c70d72f4cceec53510689c578f9b4a4e27799ea41c834daca0c5f10cb2eddc0e74beacad33690e2b21853a4383c08601398753215 SHA512 09b86ab6a59aa19d5eb90a2ef864edb96ea5b47d143625b697bbf0a20135f8445675fea28b652b5e0b4670c64c014c2c171537656250a681113f3c4140081fa6 +EBUILD ntpsec-1.1.7-r1.ebuild 4180 BLAKE2B b5b4d46fbd3e5880b5278bf4385320c60b65e79dcfd4624169618cafe37e421dd5ff0f0dc246460cab0f4dc3c9c62d2a254df23d7cab9b4ca463b6448d6c78f7 SHA512 e59e9764694811e9e7b63021ebdafdc38e4a1d372653d926c352f2e56e15589475a2340ddd96db5248501db8d09a51d605719f9361ef5bbfbe762c4267c335c3 +EBUILD ntpsec-1.1.8.ebuild 4109 BLAKE2B 0c2f48f7d481378a47931659312ab6005855325e1c3c909c7538c2442d0f0e160136a07f4260ca27868e797243eb39d1fbd6a4e1364c261e1c00b9501143376a SHA512 c02087784096401c19771004d4b3dfe560d0b848aef7b44c6b228bf23c85d740bd909babc849f0e75fbb914f040d9550f6da1fb5ff26c3882cc902790038cf71 +EBUILD ntpsec-9999.ebuild 4109 BLAKE2B 0c2f48f7d481378a47931659312ab6005855325e1c3c909c7538c2442d0f0e160136a07f4260ca27868e797243eb39d1fbd6a4e1364c261e1c00b9501143376a SHA512 c02087784096401c19771004d4b3dfe560d0b848aef7b44c6b228bf23c85d740bd909babc849f0e75fbb914f040d9550f6da1fb5ff26c3882cc902790038cf71 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild index fdf4cc4b9cc2..89b9f6d4b4cf 100644 --- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild +++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_6 ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic python-r1 waf-utils systemd user @@ -132,7 +132,7 @@ src_install() { newconfd "${FILESDIR}"/ntpd.confd ntp # Install the systemd unit file - systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service + systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service # Prepare a directory for the ntp.drift file mkdir -pv "${ED}"/var/lib/ntp diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild index 7cc6f74f6d34..8862e1be4568 100644 --- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild +++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_6 ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic python-r1 waf-utils systemd user @@ -131,7 +131,7 @@ src_install() { newconfd "${FILESDIR}"/ntpd.confd ntp # Install the systemd unit file - systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service + systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service # Prepare a directory for the ntp.drift file mkdir -pv "${ED}"/var/lib/ntp diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild index 984a26200b85..ec96cc7d8316 100644 --- a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_6 ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic python-r1 waf-utils systemd @@ -17,7 +17,7 @@ else SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" RESTRICT="mirror" BDEPEND="" - KEYWORDS="amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 ~x86" fi DESCRIPTION="The NTP reference implementation, refactored" diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild new file mode 100644 index 000000000000..32a1121feb40 --- /dev/null +++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_REQ_USE='threads(+)' + +inherit flag-o-matic python-r1 waf-utils systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" + BDEPEND="" + KEYWORDS="" +else + SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" + RESTRICT="mirror" + BDEPEND="" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="The NTP reference implementation, refactored" +HOMEPAGE="https://www.ntpsec.org/" + +NTPSEC_REFCLOCK=( + oncore trimble truetime gpsd jjy generic spectracom + shm pps hpgps zyfer arbiter nmea neoclock modem + local) + +IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} + +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" + +# net-misc/pps-tools oncore,pps +CDEPEND="${PYTHON_DEPS} + ${BDEPEND} + sys-libs/libcap + dev-python/psutil[${PYTHON_USEDEP}] + libbsd? ( dev-libs/libbsd:0= ) + dev-libs/openssl:0= + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND="${CDEPEND} + ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) + !net-misc/ntp + !net-misc/openntpd + acct-group/ntp + acct-user/ntp +" +DEPEND="${CDEPEND} + app-text/asciidoc + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + sys-devel/bison + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) +" + +WAF_BINARY="${S}/waf" + +src_prepare() { + default + # Remove autostripping of binaries + sed -i -e '/Strip binaries/d' wscript + if ! use libbsd ; then + epatch "${FILESDIR}/${PN}-no-bsd.patch" + fi + python_copy_sources +} + +src_configure() { + is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + + local string_127="" + local rclocks=""; + local CLOCKSTRING="" + + for refclock in ${NTPSEC_REFCLOCK[@]} ; do + if use rclock_${refclock} ; then + string_127+="$refclock," + fi + done + CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" + + local myconf=( + --nopyc + --nopyo + --refclock="${CLOCKSTRING}" + --build-epoch="$(date +%s)" + $(use doc && echo "--enable-doc") + $(use early && echo "--enable-early-droproot") + $(use gdb && echo "--enable-debug-gdb") + $(use samba && echo "--enable-mssntp") + $(use seccomp && echo "--enable-seccomp") + $(use smear && echo "--enable-leap-smear") + $(use tests && echo "--alltests") + $(use debug && echo "--enable-debug") + ) + + python_configure() { + waf-utils_src_configure "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure +} + +src_compile() { + unset MAKEOPTS + python_compile() { + waf-utils_src_compile + } + python_foreach_impl run_in_build_dir python_compile +} + +src_install() { + python_install() { + waf-utils_src_install + } + python_foreach_impl run_in_build_dir python_install + python_foreach_impl python_optimize + + # Install heat generating scripts + use heat && dosbin "${S}"/contrib/ntpheat{,usb} + + # Install the openrc files + newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newconfd "${FILESDIR}"/ntpd.confd ntp + + # Install the systemd unit file + systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service + + # Prepare a directory for the ntp.drift file + mkdir -pv "${ED}"/var/lib/ntp + chown ntp:ntp "${ED}"/var/lib/ntp + chmod 770 "${ED}"/var/lib/ntp + keepdir /var/lib/ntp + + # Install a log rotate script + mkdir -pv "${ED}"/etc/logrotate.d + cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd + + # Install the configuration file and sample configuration + cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf + cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ + + # move doc files to /usr/share/doc/"${P}" + use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html +} + +pkg_postinst() { + einfo "If you want to serve time on your local network, then" + einfo "you should disable all the ref_clocks unless you have" + einfo "one and can get stable time from it. Feel free to try" + einfo "it but PPS probably won't work unless you have a UART" + einfo "GPS that actually provides PPS messages." +} diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 0d9f22dc3aa8..32a1121feb40 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_6 ) PYTHON_REQ_USE='threads(+)' inherit flag-o-matic python-r1 waf-utils systemd -- cgit v1.2.3