Commit c4e904e1 authored by Tomas Krizek's avatar Tomas Krizek

Merge branch 'packaging-update' into 'master'

distro: packaging updates

See merge request !567
parents 7fae33f4 b9c6b876
Pipeline #36729 passed with stages
in 9 minutes
......@@ -11,9 +11,18 @@ license=('GPL3')
backup=('etc/knot-resolver/kresd.conf')
options=(debug strip)
install=install
depends=('libuv' 'knot>=2.6.4' 'luajit' 'cmocka' 'lua51-sec' 'lua51-socket' 'hiredis' 'libmemcached' 'libsystemd')
depends=('cmocka'
'gnutls'
'knot>=2.6.4'
'libedit'
'libsystemd'
'libuv'
'lmdb'
'lua51-sec'
'lua51-socket'
'luajit')
source=("knot-resolver_${pkgver}.orig.tar.xz"
"kresd.conf"
"kresd.conf"
"root.keys")
_makevars="PREFIX=/usr SBINDIR=/usr/bin LIBDIR=/usr/lib INCLUDEDIR=/usr/include ETCDIR=/etc/knot-resolver V=1"
......
Format: 3.0 (quilt)
Source: knot-resolver
Binary: knot-resolver, knot-resolver-module-http, knot-resolver-doc, libkres7, libkres-dev
Binary:
knot-resolver,
knot-resolver-module-http,
knot-resolver-doc,
libkres7,
libkres-dev
Architecture: any all
Version: __VERSION__-1
Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
Uploaders: Tomas Krizek <tomas.krizek@nic.cz>
Homepage: https://www.knot-resolver.cz/
Testsuite: autopkgtest
Build-Depends: debhelper (>= 9~), dns-root-data, libcmocka-dev (>= 1.0.0), libedit-dev, libgeoip-dev, libgnutls28-dev, libhiredis-dev, libjansson-dev, libknot-dev (>= 2.6.4), liblmdb-dev, libluajit-5.1-dev, libmemcached-dev, libsystemd-dev (>= 227), libuv1-dev, luajit, pkg-config, python3
Build-Depends-Indep: doxygen, python3-breathe, python3-sphinx, python3-sphinx-rtd-theme
Build-Depends:
debhelper (>= 9~),
dns-root-data,
libcmocka-dev (>= 1.0.0),
libedit-dev,
libgeoip-dev,
libgnutls28-dev,
libknot-dev (>= 2.6.4),
liblmdb-dev,
libluajit-5.1-dev,
libsystemd-dev (>= 227),
libuv1-dev,
luajit,
pkg-config,
Build-Depends-Indep:
doxygen,
python3-breathe,
python3-sphinx,
python3-sphinx-rtd-theme
Package-List:
knot-resolver deb net optional arch=any
knot-resolver-doc deb doc optional arch=all
......
......@@ -16,9 +16,9 @@ Source0: knot-resolver_%{version}.orig.tar.xz
# LuaJIT only on these arches
%if 0%{?rhel}
# RHEL 7 does not have aarch64 LuaJIT
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
%else
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
%endif
Source2: kresd.conf
......@@ -29,49 +29,47 @@ Source1: knot-resolver-%{version}.tar.xz.asc
# PGP keys used to sign upstream releases
# Export with --armor using command from https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures
# Don't forget to update %%prep section when adding/removing keys
Source100: gpgkey-B6006460B60A80E782062449E747DF1F9575A3AA.gpg.asc
Source101: gpgkey-BE26EBB9CBE059B3910CA35BCE8DD6A1A50A21E4.gpg.asc
Source102: gpgkey-4A8BA48C2AED933BD495C509A1FBA5F7EF8C4869.gpg.asc
Source100: gpgkey-B6006460B60A80E782062449E747DF1F9575A3AA.gpg.asc
Source101: gpgkey-BE26EBB9CBE059B3910CA35BCE8DD6A1A50A21E4.gpg.asc
Source102: gpgkey-4A8BA48C2AED933BD495C509A1FBA5F7EF8C4869.gpg.asc
BuildRequires: gnupg2
%endif
BuildRequires: pkgconfig(cmocka)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libedit)
BuildRequires: pkgconfig(libknot) >= 2.6.4
BuildRequires: pkgconfig(libzscanner) >= 2.4.2
BuildRequires: pkgconfig(libdnssec) >= 2.3.1
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libuv)
BuildRequires: pkgconfig(luajit) >= 2.0
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(libedit)
BuildRequires: pkgconfig(libmemcached) >= 1.0
BuildRequires: pkgconfig(hiredis)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(cmocka)
BuildRequires: systemd
%if 0%{?fedora}
# dependencies for doc package; disable in EPEL (missing fonts)
# https://bugzilla.redhat.com/show_bug.cgi?id=1492884
BuildRequires: doxygen
BuildRequires: python2-breathe
BuildRequires: python2-sphinx
BuildRequires: python2-sphinx_rtd_theme
%endif
# Lua 5.1 version of the libraries have different package names
%if 0%{?rhel}
BuildRequires: lmdb-devel
# Lua 5.1 version of the libraries have different package names
Requires: lua-socket
Requires: lua-sec
%else
BuildRequires: pkgconfig(lmdb)
Requires: lua-socket-compat
Requires: lua-sec-compat
%endif
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%if 0%{?fedora}
# dependencies for doc package; disable in EPEL (missing fonts)
# https://bugzilla.redhat.com/show_bug.cgi?id=1492884
BuildRequires: doxygen
BuildRequires: python3-breathe
BuildRequires: python3-sphinx
BuildRequires: python3-sphinx_rtd_theme
%endif
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description
The Knot DNS Resolver is a caching full resolver implementation written in C
......@@ -174,7 +172,7 @@ getent group knot-resolver >/dev/null || groupadd -r knot-resolver
getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysconfdir}/knot-resolver -s /sbin/nologin -c "Knot DNS Resolver" knot-resolver
%post
%systemd_post system-kresd.slice
%systemd_post kresd@*.service
/sbin/ldconfig
# TODO: can be removed when Fedora 27 is no longer supported and migration is no longer necessary
......@@ -200,10 +198,10 @@ if [ -d "/run/kresd" ]; then
fi
%preun
%systemd_preun system-kresd.slice
%systemd_preun kresd@*.service
%postun
%systemd_postun_with_restart system-kresd.slice
%systemd_postun_with_restart kresd@*.service
/sbin/ldconfig
%files
......
......@@ -101,6 +101,9 @@ number. To enable 3 concurrent daemons:
.B Using system-kresd.slice
The following commands may not work with older systemd (e.g. on CentOS 7).
See notes for more info.
The easiest way to view the status of systemd-supervised \fBkresd\fR
instances is to use the \fIsystem-kresd.slice\fR:
......@@ -151,6 +154,12 @@ network interfaces for \fBkresd\fR in \fI/etc/knot-resolver/kresd.conf\fR. The
service can be started or enabled in the same way as in the examples below, but
it doesn't have any sockets associated with it.
.IP * 2
Controlling the service with \fIsystem-kresd.slice\fR requires newer systemd.
It may not work in some distributions, notably CentOS 7. To control multiple
kresd instances, use \fIkresd@*.service\fR or \fIBrace Expansion\fR mentioned
below.
.SH "EXAMPLES"
.B Single instance
......@@ -203,7 +212,7 @@ To enable multiple concurrent daemons, for example 16:
To start all enabled daemons:
.nf
.RS
.B systemctl start 'kresd@*.service'
.B systemctl start --all 'kresd@*.service'
.RE
.fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment