From 866fb22a38879bd220a12dd678c62290a42c5c67 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Mar 2015 16:15:49 -0700 Subject: [PATCH 1/4] ntp: prune old ntp version --- .../coreos-overlay/net-misc/ntp/Manifest | 2 - .../ntp/files/ntp-4.2.4_p5-adjtimex.patch | 33 ------ .../net-misc/ntp/ntp-4.2.6_p5-r13.ebuild | 107 ------------------ 3 files changed, 142 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild 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 612495899b..19fa56500a 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,4 +1,2 @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch deleted file mode 100644 index 40625fa18f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://support.ntp.org/bugs/show_bug.cgi?id=769 -http://bugs.gentoo.org/254030 - ---- ntp/util/tickadj.c -+++ ntp/util/tickadj.c -@@ -21,7 +21,8 @@ - # include - #endif /* HAVE_UNISTD_H */ - --#ifdef HAVE___ADJTIMEX /* Linux */ -+/* proper handling here has been moved to upstream ntp bugzilla */ -+#ifdef linux - - #include - struct timex txc; -@@ -91,7 +92,7 @@ - } - - if (!errflg) { -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - perror("adjtimex"); - else if (!quiet) - printf("tick = %ld\ntick_adj = %d\n", -@@ -146,7 +147,7 @@ - #endif - } - -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - { - perror("adjtimex"); - } diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild deleted file mode 100644 index d8b5269c98..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild,v 1.15 2014/11/02 09:09:15 swift Exp $ - -EAPI="4" - -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 - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -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 doc examples ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf" - -DEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - 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 ) - parse-clocks? ( net-misc/pps-tools )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 - epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - append-cppflags -D_GNU_SOURCE #264109 -} - -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} - econf \ - --with-lineeditlibs=readline,edit,editline \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - use doc && dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - if use examples; then - cp -r scripts/* "${ED}"/usr/share/ntp/ || die - use prefix || fperms -R go-w /usr/share/ntp - find "${ED}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - fi - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - systemd_newtmpfilesd "${FILESDIR}"/ntp.tmpfiles ntp.conf - - if use openntpd ; then - 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}/$(systemd_get_unitdir)/ntpd.service" - systemd_enable_ntpunit 60-ntpd ntpd.service - systemd_enable_service multi-user.target ntpd.service - fi - - systemd_dounit "${FILESDIR}"/ntpdate.service - systemd_dounit "${FILESDIR}"/sntp.service -} From 0952c03bf2b15388b0a048360db5f5ef7fde10b1 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Mar 2015 16:16:53 -0700 Subject: [PATCH 2/4] ntp: pull in use flag changes from upstream Adds a threads use flag, drops the not-very-interesting docs use flag. --- .../net-misc/ntp/ntp-4.2.8-r2.ebuild | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild new file mode 100644 index 0000000000..9badbe79f4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2015 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 $ + +EAPI="4" + +inherit autotools 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 + mirror://gentoo/${MY_P}-manpages.tar.bz2" + +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" + +CDEPEND=">=sys-libs/ncurses-5.2 + >=sys-libs/readline-4.1 + >=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 ) + parse-clocks? ( net-misc/pps-tools )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax )" +PDEPEND="openntpd? ( net-misc/openntpd )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + enewgroup ntp 123 + enewuser ntp 123 -1 /dev/null ntp +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 + epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238 + use perl || epatch "${FILESDIR}"/${P}-disable-perl-scripts.patch + append-cppflags -D_GNU_SOURCE #264109 + eautoreconf +} + +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} + 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" \ + $(use_enable caps linuxcaps) \ + $(use_enable parse-clocks) \ + $(use_enable ipv6) \ + $(use_enable debug debugging) \ + $(use_enable samba ntp-signd) \ + $(use_with snmp ntpsnmpd) \ + $(use_with ssl crypto) \ + $(use_enable threads thread-support) +} + +src_install() { + default + # move ntpd/ntpdate to sbin #66671 + dodir /usr/sbin + 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 + + keepdir /var/lib/ntp + use prefix || fowners ntp:ntp /var/lib/ntp + + if use openntpd ; then + 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 + systemd_enable_ntpunit 60-ntpd ntpd.service + systemd_enable_service multi-user.target ntpd.service + fi + + systemd_dounit "${FILESDIR}"/ntpdate.service + systemd_dounit "${FILESDIR}"/sntp.service +} From 8869afe39932b640b786ddc18011f3140485b133 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Mar 2015 17:12:41 -0700 Subject: [PATCH 3/4] ntp: disable threads to work around a startup race This appears to work around a bug that causes ntpd to wedge itself on startup. Bug https://github.com/coreos/bugs/issues/304 --- .../third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild index 9badbe79f4..432a90c45e 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar 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" +IUSE="caps debug ipv6 openntpd parse-clocks perl samba selinux snmp ssl threads vim-syntax zeroconf" CDEPEND=">=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 From eebaddbd06d95a4ea8117675b96ac7b0a04bd9d1 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Mar 2015 17:20:47 -0700 Subject: [PATCH 4/4] ntp: mark new threadless ntp as stable --- .../third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild index 432a90c45e..9e4d0fdb57 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.8-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar 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" +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" CDEPEND=">=sys-libs/ncurses-5.2