knot: update to 3.4.1.
This commit is contained in:
parent
c7e0983b91
commit
c8a8a21376
|
@ -1,68 +0,0 @@
|
|||
From 30442aa44efda25ed6671fcdffc1f1492717ee4e Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Salzman <daniel.salzman@nic.cz>
|
||||
Date: Tue, 3 Sep 2024 17:34:54 +0200
|
||||
Subject: [PATCH] doc: fix man installation from a tarball
|
||||
|
||||
---
|
||||
configure.ac | 17 ++++++++++-------
|
||||
doc/Makefile.am | 7 +++++++
|
||||
2 files changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7ac2972826..4f485f9a94 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -121,15 +121,18 @@ AM_CONDITIONAL([HAVE_LIBUTILS], test "$enable_utilities" != "no" -o \
|
||||
# Build Knot DNS documentation
|
||||
AC_ARG_ENABLE([documentation],
|
||||
AS_HELP_STRING([--disable-documentation], [Don't build Knot DNS documentation]), [], [enable_documentation=yes])
|
||||
-AS_IF([test "$enable_documentation" = "yes"], [
|
||||
+AS_IF([test "$enable_documentation" != "no"], [
|
||||
AC_PATH_PROG([SPHINXBUILD], [sphinx-build], [false])
|
||||
- AS_IF([test "$SPHINXBUILD" = "false"],
|
||||
- [AC_MSG_WARN([missing 'sphinx-build' executable for documentation generation])
|
||||
- enable_documentation=no]
|
||||
- )
|
||||
- AC_PATH_PROG([PDFLATEX], [pdflatex], [false])
|
||||
+ AS_IF([test "$SPHINXBUILD" != "false"], [
|
||||
+ enable_documentation="man html epub"
|
||||
+ AC_PATH_PROG([PDFLATEX], [pdflatex], [false])
|
||||
+ AS_IF([test "$PDFLATEX" != "false"], [
|
||||
+ enable_documentation="$enable_documentation pdf"
|
||||
+ ])
|
||||
+ ])
|
||||
])
|
||||
-AM_CONDITIONAL([HAVE_DOCS], [test "$enable_documentation" = "yes"])
|
||||
+AM_CONDITIONAL([HAVE_DOCS], [test "$enable_documentation" != "no"])
|
||||
+AM_CONDITIONAL([HAVE_SPHINX], [test "$SPHINXBUILD" != "false"])
|
||||
AM_CONDITIONAL([HAVE_PDFLATEX], test "$PDFLATEX" != "false")
|
||||
|
||||
######################
|
||||
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||
index 6ce01dbae3..b38b211f6c 100644
|
||||
--- a/doc/Makefile.am
|
||||
+++ b/doc/Makefile.am
|
||||
@@ -99,6 +99,7 @@ man_MANS += man/kxdpgun.8
|
||||
endif # ENABLE_XDP
|
||||
endif # HAVE_UTILS
|
||||
|
||||
+if HAVE_SPHINX
|
||||
html-local:
|
||||
$(AM_V_SPHINX)$(SPHINXBUILD) -b html -d $(SPHINXBUILDDIR)/doctrees/html $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/html
|
||||
@echo "The HTML documentation has been built in $(SPHINXBUILDDIR)/html/"
|
||||
@@ -156,6 +157,12 @@ else
|
||||
html-local singlehtml pdf-local epub man install-html-local install-singlehtml install-pdf-local install-epub:
|
||||
@echo "Install 'sphinx-build' and re-run configure to be able to generate documentation!"
|
||||
|
||||
+$(man_MANS)&:
|
||||
+ @if [ ! -f "$@" ]; then \
|
||||
+ echo "Install 'sphinx-build' or disable documentation and re-run configure to generate man pages!"; \
|
||||
+ fi
|
||||
+endif # HAVE_SPHINX
|
||||
+
|
||||
endif # HAVE_DOCS
|
||||
|
||||
EXTRA_DIST += \
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'knot'
|
||||
pkgname=knot
|
||||
version=3.4.0
|
||||
version=3.4.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="
|
||||
|
@ -21,7 +21,7 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://www.knot-dns.cz/"
|
||||
changelog="https://gitlab.nic.cz/knot/knot-dns/-/raw/${version%*.*}/NEWS"
|
||||
distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
|
||||
checksum=2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736
|
||||
checksum=252a2b83a9319a605103f7491d73a881e97c63339d09170ac9d525155fa41b1a
|
||||
|
||||
system_accounts="_knot"
|
||||
_knot_homedir="/var/lib/knot"
|
||||
|
|
Loading…
Reference in New Issue