From: "Steve Arnold" <nerdboy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/files/, net-misc/ntpsec/
Date: Mon, 5 Aug 2019 04:59:27 +0000 (UTC) [thread overview]
Message-ID: <1564981158.a9623dcbb24918843d9454ae04b6b277d25fa2ab.nerdboy@gentoo> (raw)
commit: a9623dcbb24918843d9454ae04b6b277d25fa2ab
Author: Stephen Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 04:58:15 2019 +0000
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 04:59:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9623dcb
net-misc/ntpsec: update ebuilds and use flags, fix for bug #685456
* (modified) patch supplied by James Browning <jamesb.fe80 <AT> gmail.com>
only applies to 1.1.4 and up
* remove obsolete configure option from 1.1.6 and up
Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>
net-misc/ntpsec/Manifest | 2 +-
net-misc/ntpsec/files/ntpsec-no-bsd.patch | 35 ++++++++++++++++++++++
net-misc/ntpsec/metadata.xml | 3 +-
.../{ntpsec-1.1.3.ebuild => ntpsec-1.1.4.ebuild} | 11 +++++--
net-misc/ntpsec/ntpsec-1.1.6.ebuild | 11 +++++--
net-misc/ntpsec/ntpsec-9999.ebuild | 11 +++++--
6 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 3df5149733d..4b1db6e9657 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -1,2 +1,2 @@
-DIST ntpsec-1.1.3.tar.gz 2462330 BLAKE2B 903e569ad72939def9df31d7b51b2623b140754de67362213f39e39ad770d903d70c45a10a18e98ae35927792666ae27de40b41a5c0bfe6fd8cfa6a37102d4e8 SHA512 df60c5fa63d4c94529ba1e8b21c7d6b5d0c9fb810ed7546a621b072725a6ff03edbd2dcbc3baf19ac3b3a9b82d7aff3ddee4ab8c93559b7065ed06a211b538c4
+DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
diff --git a/net-misc/ntpsec/files/ntpsec-no-bsd.patch b/net-misc/ntpsec/files/ntpsec-no-bsd.patch
new file mode 100644
index 00000000000..66dc9d34d2e
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-no-bsd.patch
@@ -0,0 +1,35 @@
+--- a/wscript 2019-05-25 07:41:24.783651700 -0700
++++ b/wscript 2019-06-22 12:47:02.288170100 -0700
+@@ -305,12 +305,6 @@
+ ctx.check_cc(lib="m", comment="Math library")
+ ctx.check_cc(lib="rt", mandatory=False, comment="realtime library")
+ ctx.check_cc(lib="pthread", mandatory=False, comment="threads library")
+- ctx.check_cc(lib="execinfo", mandatory=False,
+- comment="BSD backtrace library")
+- ret = ctx.check_cc(lib="bsd", mandatory=False,
+- comment="BSD compatibility library")
+- if ret:
+- ctx.env.LDFLAGS += ["-lbsd"]
+
+ # -lssp and -lssp_nonshared may be needed by older gcc to
+ # support "-fstack-protector-all"
+@@ -682,19 +676,6 @@
+ prerequisites=ft[1], use=ft[2],
+ mandatory=ft[3])
+
+- # check for BSD versions outside of libc
+- if not ctx.get_define("HAVE_STRLCAT"):
+- ret = probe_function(ctx, function='strlcat',
+- prerequisites=['bsd/string.h'])
+- if ret:
+- ctx.define("HAVE_STRLCAT", 1, comment="Using bsd/strlcat")
+-
+- if not ctx.get_define("HAVE_STRLCPY"):
+- ret = probe_function(ctx, function='strlcpy',
+- prerequisites=['bsd/string.h'])
+- if ret:
+- ctx.define("HAVE_STRLCPY", 1, comment="Using bsd/strlcpy")
+-
+ # Nobody uses the symbol, but this seems like a good sanity check.
+ ctx.check_cc(header_name="stdbool.h", mandatory=True,
+ comment="Sanity check.")
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 018f5f40f71..cba4511bd70 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -16,7 +16,8 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
<flag name="early">Drop root privileges early</flag>
<flag name="gdb">Enable debugging with gdb</flag>
<flag name="heat">Install contrib heat generating scripts</flag>
- <flag name="nist">Enable lockclock</flag>
+ <flag name="libbsd">Use libbsd instead of internal funcs</flag>
+ <flag name="nist">Set local clock deps</flag>
<flag name="ntpviz">Make visualizations of offsets, jiffies, etc.</flag>
<flag name="rclock_oncore">Oncore driver</flag>
<flag name="rclock_trimble">Trimble driver</flag>
diff --git a/net-misc/ntpsec/ntpsec-1.1.3.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
similarity index 93%
rename from net-misc/ntpsec/ntpsec-1.1.3.ebuild
rename to net-misc/ntpsec/ntpsec-1.1.4.ebuild
index 320a55e35a4..eb5900a5e1e 100644
--- a/net-misc/ntpsec/ntpsec-1.1.3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -12,12 +12,12 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
BDEPEND=""
- KEYWORDS="amd64"
+ KEYWORDS=""
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"
@@ -32,7 +32,7 @@ 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 libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
# net-misc/pps-tools oncore,pps
@@ -40,6 +40,7 @@ CDEPEND="${PYTHON_DEPS}
${BDEPEND}
sys-libs/libcap
dev-python/psutil[${PYTHON_USEDEP}]
+ libbsd? ( dev-libs/libbsd:0= )
libressl? ( dev-libs/libressl:0= )
!libressl? ( dev-libs/openssl:0= )
seccomp? ( sys-libs/libseccomp )
@@ -51,6 +52,7 @@ RDEPEND="${CDEPEND}
"
DEPEND="${CDEPEND}
app-text/asciidoc
+ dev-libs/libxslt
app-text/docbook-xsl-stylesheets
sys-devel/bison
rclock_oncore? ( net-misc/pps-tools )
@@ -68,6 +70,9 @@ 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
}
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index d8f848a621d..cbf16e45b9f 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -32,15 +32,17 @@ 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 nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl 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-libs/openssl:0=
dev-python/psutil[${PYTHON_USEDEP}]
+ libbsd? ( dev-libs/libbsd:0= )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
seccomp? ( sys-libs/libseccomp )
"
RDEPEND="${CDEPEND}
@@ -50,6 +52,7 @@ RDEPEND="${CDEPEND}
"
DEPEND="${CDEPEND}
app-text/asciidoc
+ dev-libs/libxslt
app-text/docbook-xsl-stylesheets
sys-devel/bison
rclock_oncore? ( net-misc/pps-tools )
@@ -67,6 +70,9 @@ 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
}
@@ -91,7 +97,6 @@ src_configure() {
$(use doc && echo "--enable-doc")
$(use early && echo "--enable-early-droproot")
$(use gdb && echo "--enable-debug-gdb")
- $(use nist && echo "--enable-lockclock")
$(use samba && echo "--enable-mssntp")
$(use seccomp && echo "--enable-seccomp")
$(use smear && echo "--enable-leap-smear")
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index d8f848a621d..cbf16e45b9f 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -32,15 +32,17 @@ 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 nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl 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-libs/openssl:0=
dev-python/psutil[${PYTHON_USEDEP}]
+ libbsd? ( dev-libs/libbsd:0= )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
seccomp? ( sys-libs/libseccomp )
"
RDEPEND="${CDEPEND}
@@ -50,6 +52,7 @@ RDEPEND="${CDEPEND}
"
DEPEND="${CDEPEND}
app-text/asciidoc
+ dev-libs/libxslt
app-text/docbook-xsl-stylesheets
sys-devel/bison
rclock_oncore? ( net-misc/pps-tools )
@@ -67,6 +70,9 @@ 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
}
@@ -91,7 +97,6 @@ src_configure() {
$(use doc && echo "--enable-doc")
$(use early && echo "--enable-early-droproot")
$(use gdb && echo "--enable-debug-gdb")
- $(use nist && echo "--enable-lockclock")
$(use samba && echo "--enable-mssntp")
$(use seccomp && echo "--enable-seccomp")
$(use smear && echo "--enable-leap-smear")
next reply other threads:[~2019-08-05 4:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 4:59 Steve Arnold [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-19 5:17 [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/files/, net-misc/ntpsec/ Sam James
2024-06-14 8:03 Sam James
2023-04-16 22:39 Sebastian Pipping
2022-11-02 0:47 Sam James
2022-06-12 11:59 Sam James
2022-06-03 5:32 Sam James
2021-12-02 21:56 Steve Arnold
2021-11-14 8:49 Sam James
2021-04-11 1:34 Steve Arnold
2020-03-14 3:24 Steve Arnold
2019-05-23 17:56 Anthony G. Basile
2018-02-25 17:19 Anthony G. Basile
2018-02-23 22:54 Steve Arnold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1564981158.a9623dcbb24918843d9454ae04b6b277d25fa2ab.nerdboy@gentoo \
--to=nerdboy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox