Rebase to 9.11.3

Signed-off-by: Petr Menšík <pemensik@redhat.com>
This commit is contained in:
Petr Menšík 2018-03-21 17:59:41 +01:00
parent 029f0510e6
commit 86ff90b834
4 changed files with 10 additions and 6 deletions

1
.gitignore vendored
View File

@ -80,3 +80,4 @@ bind-9.7.2b1.tar.gz
/config-17.tar.bz2
/bind-9.11.2-P1.tar.gz
/bind-9.11.3b1.tar.gz
/bind-9.11.3.tar.gz

View File

@ -1,5 +1,5 @@
diff --git a/Makefile.in b/Makefile.in
index b2681ed..c6e14a4 100644
index e1b2ff3..ff82f29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,7 @@
@ -20,8 +20,8 @@ index b2681ed..c6e14a4 100644
exit $$status
README: README.md
@@ -102,6 +104,6 @@ OPTIONS: OPTIONS.md
${W3M} -dump -cols 75 -O ascii -T text/html > $@
@@ -110,6 +112,6 @@ CONTRIBUTING: CONTRIBUTING.md
sed -e '$${/^$$/d;}' > $@
unit::
- sh ${top_srcdir}/unit/unittest.sh

View File

@ -3,7 +3,7 @@
#
#%%global PATCHVER P1
%global PREVER b1
#%%global PREVER b1
%global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
# bcond_without is built by default, unless --without X is passed
@ -39,7 +39,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: MPLv2.0
Version: 9.11.3
Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Release: 4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
#
@ -1355,6 +1355,9 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Wed Mar 21 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-4
- Rebase to 9.11.3
* Wed Mar 21 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-3.b1
- Fix build with disabled unittest
- Recommend softhsm from pkcs11 variant

View File

@ -1,2 +1,2 @@
SHA512 (bind-9.11.3b1.tar.gz) = 5cd841d4d4457b89770fb1e4e42416a90a24d9e5f2487bf8e195558f8478aaa97db05c93f26f573deb01b46601d1d0159f59de8da1ac1f73e675c126a1931fe1
SHA512 (bind-9.11.3.tar.gz) = 1f0da13165d1ee872800fe10bb8b0f69c6c76515f9861c1528fb6005213bb71b21a1270906d2ea9ded3eaf6df1a1bac0f2c80aa511683b8d57dcff4f278d8c35
SHA512 (config-17.tar.bz2) = 93d864be83a2aeaec3f4e150909bee21b0fc4761562928ee075f09e8fce28bc82735ed7d7a93e8dfff4fcf8e06f2aa9a04046fc3e538a6bf5cb380f2a3528729