From 50c291a3ace58006f8fa9cf44a36f6e42bff2b54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Jun 2023 21:37:49 +0100 Subject: gentoo auto-resync : 05:06:2023 - 21:37:49 --- net-misc/ntp/Manifest | 2 +- net-misc/ntp/ntp-4.2.8_p16-r1.ebuild | 161 +++++++++++++++++++++++++++++++++++ net-misc/ntp/ntp-4.2.8_p16.ebuild | 158 ---------------------------------- 3 files changed, 162 insertions(+), 159 deletions(-) create mode 100644 net-misc/ntp/ntp-4.2.8_p16-r1.ebuild delete mode 100644 net-misc/ntp/ntp-4.2.8_p16.ebuild (limited to 'net-misc/ntp') diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 52856d7b7cdc..57b677a078aa 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -24,5 +24,5 @@ DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 DIST ntp-4.2.8p16.tar.gz 7084978 BLAKE2B a6cd6f56da7fda85be70f1293674fdab76140608407b5bda422049a49133694803cf3d38174a329d75f599fcce0ff899c00b47a18b22a1b801e495b476445a3e SHA512 0b4a3336def620d3ab2f06dacf8621e848167e35657c0a1206eca178a7541dd8730071bd7a0a8dea2c4682c4f38d31c3772d01093c26fd5a4395e37a86e770e2 EBUILD ntp-4.2.8_p15-r6.ebuild 4629 BLAKE2B 1aa9260d9af3c3ebcd90dd6e2a31aa451d2da246169c18adee9b224aef366c0f9b8e545a6265aebc8f93632d19f2048f491bf40923a362815ed28d912d226070 SHA512 8885b65c869f6fbb325a07f2b4a2e752f3875042329c9e7420b8e24468873ebd58b66fe3c4f20079e4291154ef20bbe3df18e0f1c6ad43de7955c78de9b43be4 -EBUILD ntp-4.2.8_p16.ebuild 4480 BLAKE2B de18563fd5b9f63acdcf283166017a1574753efffaba90656205ca9733d18f463f54ba8ce53bfee070e0a01d6c60013fa3f01db95754df93cde347adcf175fd0 SHA512 5ba7954717093266aa5424b8cc907c0b01684d9a340894c88df519a01d2fcd89313553a0811fd64fdc48aa1385688898e7a08878421e2986002959589d1d2acc +EBUILD ntp-4.2.8_p16-r1.ebuild 4575 BLAKE2B 6e21999bc6507102ff780459968881e6aba8692ad38c38efdd962f318d137416586217782325c1ce3cef9f67460fc1c5a93f2c1431684c1f6e4b077c403369b7 SHA512 9b6dcc2f88e3c3b211507c809bc66a06cbd79e7c570c670af56cac60ac8f84ae8c9aacde404215add87ce90aee1a3e77895d4b5c8082a8dfb4471124954c8d1c MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791 diff --git a/net-misc/ntp/ntp-4.2.8_p16-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p16-r1.ebuild new file mode 100644 index 000000000000..bcd2887e326e --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p16-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd tmpfiles + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="https://www.ntp.org/" +SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +DEPEND=" + >=dev-libs/libevent-2.0.9:=[threads(+)?] + readline? ( >=sys-libs/readline-4.1:= ) + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( dev-libs/openssl:= ) + parse-clocks? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +BDEPEND=" + acct-group/ntp + acct-user/ntp + virtual/pkgconfig +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + + # Make sure every build uses the same install layout, bug #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + + # bug #622754 + eautoreconf + + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die +} + +src_configure() { + # bug #264109 + append-cppflags -D_GNU_SOURCE + + # 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} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + + local myeconfargs=( + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + + # Increase the default memlimit from 32MiB to 128MiB, bug #533232 + --with-memlock=256 + + # Avoid overriding the user's toolchain settings, bug #895802 + --with-hardenfile=/dev/null + + $(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) + $(use_enable threads thread-support) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Move ntpd/ntpdate to sbin, bug #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + + insinto /etc + doins "${FILESDIR}"/ntp.conf + + #bug #524726 + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf + + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/man1/ntpd.1 || die + else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi + + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} diff --git a/net-misc/ntp/ntp-4.2.8_p16.ebuild b/net-misc/ntp/ntp-4.2.8_p16.ebuild deleted file mode 100644 index 8ab34a0081da..000000000000 --- a/net-misc/ntp/ntp-4.2.8_p16.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic systemd tmpfiles - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="https://www.ntp.org/" -SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -DEPEND=" - >=dev-libs/libevent-2.0.9:=[threads(+)?] - readline? ( >=sys-libs/readline-4.1:= ) - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl:= ) - parse-clocks? ( net-misc/pps-tools ) -" -RDEPEND=" - ${DEPEND} - acct-group/ntp - acct-user/ntp - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax ) - !net-misc/ntpsec - !openntpd? ( !net-misc/openntpd ) -" -BDEPEND=" - acct-group/ntp - acct-user/ntp - virtual/pkgconfig -" -PDEPEND="openntpd? ( net-misc/openntpd )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966 - "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 - "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 - "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch -) - -src_prepare() { - default - - # Make sure every build uses the same install layout, bug #539092 - find sntp/loc/ -type f '!' -name legacy -delete || die - - # bug #622754 - eautoreconf - - # Disable pointless checks. - touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die -} - -src_configure() { - # bug #264109 - append-cppflags -D_GNU_SOURCE - - # 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} - # Unity builds, we don't really need support for it, bug #804109 - export PATH_RUBY=/bin/false - - local myeconfargs=( - --with-lineeditlibs=readline,edit,editline - --with-yielding-select - --disable-local-libevent - - # Increase the default memlimit from 32MiB to 128MiB, bug #533232 - --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) - $(use_enable threads thread-support) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Move ntpd/ntpdate to sbin, bug #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - - insinto /etc - doins "${FILESDIR}"/ntp.conf - - #bug #524726 - use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf - - newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - if use openntpd ; then - cd "${ED}" || die - rm usr/sbin/ntpd || die - rm etc/{conf,init}.d/ntpd || die - rm usr/share/man/man1/ntpd.1 || die - else - newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - if use caps ; then - sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ - "${D}$(systemd_get_systemunitdir)"/ntpd.service \ - || die - fi - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - if ! use openntpd; then - tmpfiles_process ntp.conf - fi - - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} -- cgit v1.2.3