diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest index bffafdacab..1b50bf8011 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/Manifest @@ -1 +1,2 @@ -DIST ntp-4.2.8p7.tar.gz 7175313 SHA256 81d20c06a0b01abe3b84fac092185bf014252d38fe5e7b2758f604680a0220dc SHA512 7b80192f0e3c4a05cc05f167ab85593acca685d514dcd46fb8f42b4cd2a5525e76ba5e15fd7ff13220e4155de6aab5661554e0ded60bfb1d27a969c589958f55 WHIRLPOOL 858f9f0f22ece06c304f2e19cfd3743facc5f2794d758f88528f2cebbb68f8d7d93dd93d976c1bdb912ad8f7ec4c5c2d6b669d3b2f7723337a70c50da033a323 +DIST ntp-4.2.8p8-manpages.tar.xz 24992 SHA256 d1c349c970280b2bdb8ba197b1229c0c909a59782b76f3d650a9d2663e8a4d36 SHA512 1a2b71d66ee9e6f03bfbb8f2c4ab1ed30cb2a5a0673e9769749569aa55e8994bacbef399c4b67da265a9673195618df63d84eafbeb37bef30aea302ab99653ef WHIRLPOOL ec62bc2d01c2494727e385fab4dd40581e69806e5ee7b97dd8cb30c44331386c96650358ff09414536d4b74b8178b0e85a3c436673282f228200b9df863c1890 +DIST ntp-4.2.8p8.tar.gz 7205710 SHA256 2ab3d0b5f0456e6311dda1cc27ab75da108762773a19e46abd938bd9407b97ee SHA512 253675667f78ad8855e961d02f6a120b68b75233c18ddb92cb6c9510fb3847f1672d0d6f93ad1eb11b14e3bdf78fdbc1458e516d906b763e8599490da6a4f225 WHIRLPOOL cc054a550e59b44428989a183978ea59c7f1bc2ed9514e7d1cf82127f3188f73edb3521ee5b215438368a3c22b8cae09a78174e943195ddd752f0571335adb9e diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/metadata.xml index 50f686d2f4..88e81f1ab2 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/metadata.xml @@ -1,7 +1,10 @@ - base-system + + base-system@gentoo.org + Gentoo Base System + NTP is a protocol designed to synchronize the clocks of computers over a network. NTP version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p7.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p8.ebuild similarity index 67% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p7.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p8.ebuild index 226fabe5c5..bafaec1e0e 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8_p8.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r2.ebuild,v 1.2 2015/02/26 18:30:06 floppym Exp $ +# $Id$ -EAPI="4" +EAPI="5" -inherit autotools eutils toolchain-funcs flag-o-matic user systemd +inherit eutils toolchain-funcs flag-o-matic user 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" +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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks perl samba selinux snmp ssl threads vim-syntax zeroconf" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" +IUSE="caps debug ipv6 libressl openntpd parse-clocks perl readline samba selinux snmp ssl threads vim-syntax zeroconf" -CDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 +CDEPEND="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] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) parse-clocks? ( net-misc/pps-tools )" DEPEND="${CDEPEND} virtual/pkgconfig" @@ -34,22 +37,25 @@ 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-ntpd-test-signd.patch +) + pkg_setup() { enewgroup ntp 123 enewuser ntp 123 -1 /dev/null ntp } 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 + epatch "${PATCHES[@]}" use perl || epatch "${FILESDIR}"/${PN}-4.2.8-disable-perl-scripts.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 # Disable pointless checks. touch .checkChangeLog .gcc-warning FRC.html html/.datecheck - eautoreconf } src_configure() { @@ -59,16 +65,19 @@ src_configure() { # 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} + # Increase the default memlimit from 32MiB to 128MiB. #533232 econf \ --with-lineeditlibs=readline,edit,editline \ --with-yielding-select \ --disable-local-libevent \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --docdir='$(datarootdir)'/doc/${PF} \ + --htmldir='$(docdir)/html' \ + --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) \ @@ -82,10 +91,12 @@ src_install() { mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" dodoc INSTALL WHERE-TO-START + doman "${WORKDIR}"/man/*.[58] insinto /usr/share/ntp doins "${FILESDIR}"/ntp.conf systemd_newtmpfilesd "${FILESDIR}"/ntp.tmpfiles ntp.conf + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/usr/share/ntp/ntp.conf #524726 keepdir /var/lib/ntp use prefix || fowners ntp:ntp /var/lib/ntp @@ -94,6 +105,7 @@ src_install() { cd "${ED}" rm usr/sbin/ntpd || die rm -r var/lib + rm usr/share/man/*/ntpd.8 || die else systemd_dounit "${FILESDIR}"/ntpd.service use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service