mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 10:27:00 +02:00
Merge pull request #687 from kinvolk/t-lo/update-to-ntp-4.2.8_p15
update to ntp-4.2.8_p15
This commit is contained in:
commit
f620c9fc23
@ -1,2 +1,2 @@
|
||||
DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
|
||||
DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
|
||||
DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
|
||||
DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
|
||||
|
75
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/man-pages/genmans.sh
vendored
Executable file
75
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/man-pages/genmans.sh
vendored
Executable file
@ -0,0 +1,75 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# ntpman.sh -- Create man pages for ntp
|
||||
#
|
||||
|
||||
VERSION=$1
|
||||
if [[ -z ${VERSION} ]] ; then
|
||||
VERSION=$(ls -1d ntp-*/ 2>/dev/null | LC_COLLATE=C sort | sed -n '${s:/::;p;Q}')
|
||||
if [[ -z ${VERSION} ]] ; then
|
||||
VERSION=$(ls "${0%/*}"/../../ntp-*.ebuild | LC_COLLATE=C sort | sed -n '${s:.*/::;s:_::;s:[.]ebuild::;p;Q}')
|
||||
if [[ -z ${VERSION} ]] ; then
|
||||
echo "Usage: $0 <version>"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
[[ ${VERSION} != ntp-* ]] && VERSION="ntp-${VERSION}"
|
||||
|
||||
SRCDIR=${0%/*}
|
||||
HTMLDIR=${SRCDIR}/${VERSION}/html
|
||||
DISTFILE=/usr/portage/distfiles/${VERSION}.tar.gz
|
||||
MANDIR=${SRCDIR}/man
|
||||
|
||||
rm -rf ${SRCDIR}/${VERSION}
|
||||
if [[ ! -d ${HTMLDIR} ]] ; then
|
||||
if [[ -f ${DISTFILE} ]] ; then
|
||||
tar zxf ${DISTFILE} -C ${SRCDIR} || exit 1
|
||||
else
|
||||
echo "ERROR: $HTMLDIR / $DISTFILE does not exist"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Process a single HTML file
|
||||
processfile() {
|
||||
HTMLFILE=$1
|
||||
MANFILE=$2
|
||||
echo -n "Processing $HTMLFILE ..."
|
||||
sed -e "s:<csobj.*<:csobj>/:" $HTMLDIR/$HTMLFILE > .$HTMLFILE
|
||||
xsltproc --html --stringparam version $VERSION ${SRCDIR}/ntp.xsl .$HTMLFILE > $MANDIR/$MANFILE || exit 1
|
||||
rm -f .$HTMLFILE
|
||||
echo "Done."
|
||||
}
|
||||
|
||||
# Print information
|
||||
echo "Generates ntp man files from HTML documentation. Using:"
|
||||
echo "VERSION: $VERSION"
|
||||
echo "HTMLDIR: $HTMLDIR"
|
||||
echo "MANDIR: $MANDIR"
|
||||
echo "Press enter to continue, or Ctrl-C to cancel."
|
||||
read
|
||||
|
||||
# Process HTML files
|
||||
rm -rf ${MANDIR}
|
||||
mkdir ${MANDIR}
|
||||
for f in ntp{date,dc,d,q,time,trace,dsim} keygen tickadj ; do
|
||||
processfile ${f}.html ${f}.8
|
||||
done
|
||||
echo
|
||||
|
||||
cp -vi /usr/local/src/freebsd/src/usr.sbin/ntp/doc/*.5 ${MANDIR}
|
||||
(
|
||||
d=${PWD}
|
||||
cd ${MANDIR}
|
||||
shopt -s nullglob
|
||||
for p in $d/*.5.patch ; do
|
||||
patch -F0 -p0 < $p || exit 1
|
||||
done
|
||||
) || exit 1
|
||||
cp -vi ${SRCDIR}/*.patch ${SRCDIR}/genmans.sh ${SRCDIR}/ntp.xsl ${MANDIR}
|
||||
|
||||
tar -jcf ${VERSION}-manpages.tar.bz2 -C ${MANDIR}/.. man
|
||||
du -b ${VERSION}-manpages.tar.bz2
|
||||
|
||||
rm -rf ${MANDIR} ${SRCDIR}/${VERSION}
|
27
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/man-pages/ntp.conf.5.patch
vendored
Normal file
27
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/man-pages/ntp.conf.5.patch
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
--- ntp.conf.5
|
||||
+++ ntp.conf.5
|
||||
@@ -24,16 +24,6 @@
|
||||
.Fl c
|
||||
command line option).
|
||||
.Pp
|
||||
-The
|
||||
-.Pa /etc/rc.d/ntpdate
|
||||
-script reads this file to get a list of NTP servers to use if the
|
||||
-variable
|
||||
-.Dq Li ntpdate_hosts
|
||||
-was not declared.
|
||||
-Refer to the
|
||||
-.Xr rc.conf 5
|
||||
-man page for further info about this.
|
||||
-.Pp
|
||||
The file format is similar to other
|
||||
.Ux
|
||||
configuration files.
|
||||
@@ -2686,7 +2676,6 @@
|
||||
Diffie-Hellman agreement parameters
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
-.Xr rc.conf 5 ,
|
||||
.Xr ntpd 8 ,
|
||||
.Xr ntpdc 8 ,
|
||||
.Xr ntpq 8
|
218
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/man-pages/ntp.xsl
vendored
Normal file
218
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/man-pages/ntp.xsl
vendored
Normal file
@ -0,0 +1,218 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
|
||||
<!--
|
||||
Description:
|
||||
Stylesheet for converting the HTML documentation
|
||||
for various ntp commands into proper manual pages
|
||||
(in troff format).
|
||||
|
||||
Author:
|
||||
Per Cederberg, <per at percederberg dot net>
|
||||
-->
|
||||
|
||||
<!DOCTYPE stylesheet [
|
||||
<!ENTITY newline "
|
||||
">
|
||||
]>
|
||||
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
version="1.0">
|
||||
|
||||
<!-- ### INPUT PARAMETERS ### -->
|
||||
<xsl:param name="version" select="''" />
|
||||
|
||||
|
||||
<!-- ### OUTPUT DECLARATION ### -->
|
||||
<xsl:output method="text"
|
||||
encoding="ISO-8859-1" />
|
||||
|
||||
<xsl:strip-space elements="html" />
|
||||
|
||||
|
||||
<!-- ### TEMPLATES ### -->
|
||||
<xsl:template match="/">
|
||||
<xsl:text>.\" Automatically generated from HTML source. </xsl:text>
|
||||
<xsl:text>DO NOT EDIT!&newline;</xsl:text>
|
||||
<xsl:apply-templates />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="head">
|
||||
<xsl:text>.TH </xsl:text>
|
||||
<xsl:value-of select="substring-before(title, ' ')" />
|
||||
<xsl:text> 1 "" "ntp </xsl:text>
|
||||
<xsl:value-of select="$version" />
|
||||
<xsl:text>"</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>.SH NAME</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:value-of select="title" />
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="body">
|
||||
<xsl:apply-templates select="*[preceding-sibling::hr]" />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="h3">
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="h4">
|
||||
<xsl:variable name="text">
|
||||
<xsl:call-template name="stringToUpper">
|
||||
<xsl:with-param name="str" select="." />
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
<xsl:if test="name(preceding-sibling::*[1]) = 'tt'">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>.SH </xsl:text>
|
||||
<xsl:value-of select="$text" />
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="address">
|
||||
<xsl:text>.SH AUTHOR</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:apply-templates />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="p">
|
||||
<xsl:variable name="text">
|
||||
<xsl:apply-templates />
|
||||
</xsl:variable>
|
||||
<xsl:if test="starts-with($text, 'Disclaimer:')">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>.P</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:value-of select="$text" />
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="dd/p">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:apply-templates />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="hr">
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="pre">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>.ft CW</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>.nf</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:call-template name="trim-newlines">
|
||||
<xsl:with-param name="str" select="." />
|
||||
</xsl:call-template>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>.ft R</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>.fi</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="ul">
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="nobr">
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:apply-templates />
|
||||
<xsl:text> </xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="dl">
|
||||
<xsl:apply-templates />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="dt">
|
||||
<xsl:text>.TP&newline;</xsl:text>
|
||||
<xsl:text>.B </xsl:text>
|
||||
<xsl:value-of select="normalize-space(.)" />
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="dd">
|
||||
<xsl:apply-templates />
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tr">
|
||||
<xsl:if test="position() > 1">
|
||||
<xsl:apply-templates />
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tt">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>\fB</xsl:text>
|
||||
<xsl:apply-templates />
|
||||
<xsl:text>\fR </xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="i">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
<xsl:text>\fI</xsl:text>
|
||||
<xsl:apply-templates />
|
||||
<xsl:text>\fR </xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="a">
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:apply-templates />
|
||||
<xsl:text> </xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="br">
|
||||
<xsl:text>&newline;</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="text()">
|
||||
<xsl:value-of select="normalize-space(.)" />
|
||||
</xsl:template>
|
||||
|
||||
|
||||
<!-- ### HELPER FUNCTIONS ### -->
|
||||
<xsl:template name="stringToUpper">
|
||||
<xsl:param name="str" />
|
||||
<xsl:value-of select="translate($str,
|
||||
'abcdefghijklmnopqrstuvwxyz',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ')" />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="trim-newlines">
|
||||
<xsl:param name="str" />
|
||||
<xsl:choose>
|
||||
<xsl:when test="starts-with($str,'&newline;')">
|
||||
<xsl:call-template name="trim-newlines">
|
||||
<xsl:with-param name="str" select="substring($str, 2)" />
|
||||
</xsl:call-template>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:call-template name="trim-newlines-tail">
|
||||
<xsl:with-param name="str" select="$str" />
|
||||
</xsl:call-template>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="trim-newlines-tail">
|
||||
<xsl:param name="str" />
|
||||
<xsl:variable name="len" select="string-length($str)" />
|
||||
<xsl:choose>
|
||||
<xsl:when test="substring($str,$len) = '&newline;'">
|
||||
<xsl:call-template name="trim-newlines-tail">
|
||||
<xsl:with-param name="str" select="substring($str, 1, $len - 1)" />
|
||||
</xsl:call-template>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="$str" />
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
@ -0,0 +1,13 @@
|
||||
https://bugs.gentoo.org/711530
|
||||
|
||||
--- ntp-4.2.8p14/ntpd/ntpd.c
|
||||
+++ ntp-4.2.8p14/ntpd/ntpd.c
|
||||
@@ -1189,7 +1189,7 @@
|
||||
* drop privileges in this case.
|
||||
*/
|
||||
cap_t caps;
|
||||
- caps = cap_from_text("cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
|
||||
+ caps = cap_from_text("cap_ipc_lock,cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
|
||||
if ( ! caps) {
|
||||
msyslog( LOG_ERR, "cap_from_text() failed: %m" );
|
||||
exit(-1);
|
@ -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
|
||||
EAPI=7
|
||||
|
||||
inherit autotools toolchain-funcs flag-o-matic user systemd
|
||||
inherit autotools toolchain-funcs flag-o-matic systemd
|
||||
|
||||
MY_P=${P/_p/p}
|
||||
DESCRIPTION="Network Time Protocol suite/programs"
|
||||
@ -13,10 +13,10 @@ 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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="caps debug ipv6 libressl openntpd parse-clocks perl readline samba selinux snmp ssl threads vim-syntax zeroconf"
|
||||
|
||||
CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
|
||||
COMMON_DEPEND="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] )
|
||||
@ -26,9 +26,13 @@ CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
parse-clocks? ( net-misc/pps-tools )"
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${CDEPEND}
|
||||
BDEPEND="virtual/pkgconfig
|
||||
acct-group/ntp
|
||||
acct-user/ntp"
|
||||
DEPEND="${COMMON_DEPEND}"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
acct-group/ntp
|
||||
acct-user/ntp
|
||||
selinux? ( sec-policy/selinux-ntp )
|
||||
vim-syntax? ( app-vim/ntp-syntax )
|
||||
!net-misc/ntpsec
|
||||
@ -43,16 +47,12 @@ PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
|
||||
"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
|
||||
"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
|
||||
"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ntp 123
|
||||
enewuser ntp 123 -1 /dev/null ntp
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
use perl || sed -i -e '/^SUBDIRS *=/,/[^\\]$/{/scripts/d;}' Makefile.am || die
|
||||
use perl || sed -i -e '/^SUBDIRS *=/,/[^\\]$/{/scripts/d;}' Makefile.am || die
|
||||
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
|
||||
@ -73,8 +73,6 @@ src_configure() {
|
||||
--with-lineeditlibs=readline,edit,editline
|
||||
--with-yielding-select
|
||||
--disable-local-libevent
|
||||
--docdir='$(datarootdir)'/doc/${PF}
|
||||
--htmldir='$(docdir)/html'
|
||||
--with-memlock=256
|
||||
$(use_enable caps linuxcaps)
|
||||
$(use_enable parse-clocks)
|
||||
@ -93,7 +91,7 @@ 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"
|
||||
mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
|
||||
|
||||
dodoc INSTALL WHERE-TO-START
|
||||
doman "${WORKDIR}"/man/*.[58]
|
||||
@ -115,7 +113,7 @@ src_install() {
|
||||
systemd_dounit "${FILESDIR}"/ntpd.service
|
||||
if use caps ; then
|
||||
sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
|
||||
"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
|
||||
"${D}$(systemd_get_systemunitdir)"/ntpd.service \
|
||||
|| die
|
||||
fi
|
||||
systemd_enable_ntpunit 60-ntpd ntpd.service
|
Loading…
Reference in New Issue
Block a user