From 8f091f88d24ed90b425c095ea10c2b6981b570b7 Mon Sep 17 00:00:00 2001 From: jiangheng Date: Mon, 17 Jan 2022 11:06:36 +0800 Subject: [PATCH] remove not enabled option --- bind.spec | 11 ++++++++--- named.conf | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bind.spec b/bind.spec index 861ec3e..1e4a628 100644 --- a/bind.spec +++ b/bind.spec @@ -30,7 +30,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.16.23 -Release: 3 +Release: 4 Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -85,6 +85,7 @@ Requires: shadow-utils Requires: glibc-common Requires: grep Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: systemd # This wild require should satisfy %%selinux_set_boolean macro only # in case it needs to be used Requires: policycoreutils-python-utils libselinux-utils @@ -93,7 +94,6 @@ Recommends: bind-utils bind-dnssec-utils BuildRequires: gcc, make BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel BuildRequires: libidn2-devel, libxml2-devel -#BuildRequires: systemd-rpm-macros BuildRequires: selinux-policy # needed for %%{__python3} macro BuildRequires: python3-devel @@ -605,7 +605,6 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}%{_sysconfdir}/named.conf pushd build %make_install popd -rpm -E %{_unitdir} # Remove unwanted files rm -f ${RPM_BUILD_ROOT}/etc/bind.keys @@ -1092,6 +1091,12 @@ fi; %endif %changelog +* Mon Jan 17 2022 jiangheng - 9.16.23-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:remove not enabled option in named.conf + * Fri Jan 14 2022 jiangheng - 9.16.23-3 - Type:bugfix - CVE:NA diff --git a/named.conf b/named.conf index c673ed4..d62d389 100644 --- a/named.conf +++ b/named.conf @@ -33,7 +33,6 @@ options { dnssec-validation yes; managed-keys-directory "/var/named/dynamic"; - geoip-directory "/usr/share/GeoIP"; pid-file "/run/named/named.pid"; session-keyfile "/run/named/session.key"; -- Gitee