packages/bind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!83 remove not enabled option

Browse Source 
Merge pull request !83 from jinag12/master
This commit is contained in:
openeuler-ci-bot 2022-01-17 08:40:46 +00:00 committed by Gitee
commit d37beceec5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bind.spec
View File

@ -30,7 +30,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.16.23 Version: 9.16.23
Release: 3 Release: 4
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -85,6 +85,7 @@ Requires: shadow-utils
Requires: glibc-common Requires: glibc-common
Requires: grep Requires: grep
Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: systemd
# This wild require should satisfy %%selinux_set_boolean macro only # This wild require should satisfy %%selinux_set_boolean macro only
# in case it needs to be used # in case it needs to be used
Requires: policycoreutils-python-utils libselinux-utils Requires: policycoreutils-python-utils libselinux-utils
@ -93,7 +94,6 @@ Recommends: bind-utils bind-dnssec-utils
BuildRequires: gcc, make BuildRequires: gcc, make
BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel
BuildRequires: libidn2-devel, libxml2-devel BuildRequires: libidn2-devel, libxml2-devel
#BuildRequires: systemd-rpm-macros
BuildRequires: selinux-policy BuildRequires: selinux-policy
# needed for %%{__python3} macro # needed for %%{__python3} macro
BuildRequires: python3-devel BuildRequires: python3-devel
@ -605,7 +605,6 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}%{_sysconfdir}/named.conf
pushd build pushd build
%make_install %make_install
popd popd
rpm -E %{_unitdir}
# Remove unwanted files # Remove unwanted files
rm -f ${RPM_BUILD_ROOT}/etc/bind.keys rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
@ -1092,6 +1091,12 @@ fi;
%endif %endif
%changelog %changelog
* Mon Jan 17 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:remove not enabled option in named.conf
* Fri Jan 14 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-3 * Fri Jan 14 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-3
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA

1
named.conf
View File

@ -33,7 +33,6 @@ options {
dnssec-validation yes; dnssec-validation yes;
managed-keys-directory "/var/named/dynamic"; managed-keys-directory "/var/named/dynamic";
geoip-directory "/usr/share/GeoIP";
pid-file "/run/named/named.pid"; pid-file "/run/named/named.pid";
session-keyfile "/run/named/session.key"; session-keyfile "/run/named/session.key";