- Update download urls

- Do not enable geoip on old distros, the geoip db was shut down
  so we need to use geoip2 everywhere

OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=265
This commit is contained in:
Tomáš Chvátal 2020-02-22 07:43:31 +00:00 committed by Git OBS Bridge
parent 0264c27ba3
commit 50814f9437
5 changed files with 28 additions and 31 deletions

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl5Gv1gACgkQdLtrmky7
PTiZTRAAttLbWGHGhV04HYIKcH9VmzjltviyhGnKD0014vaGlLbBkuSyDzSk6irF
h76DKJr3m5HmKfLJGaeGi+uBzbQZZkt5ZZM6TXeOlcU4AfTBBOkaGXh8U+vTix0M
z1u80TPWDzly7ZtQXstmIqPkB0bJCkzTqq8woFMEeMAruQyIDra+0VakwLricYsx
FsqKBq6X8jVwGoTrN2aWqraR+zRtbJbzV9TFjoF5TnEg9dptpOHRgs436acqlyIG
tcqplxa88HaEI1QKU3Vd7XYVmFTSuBPSCTZfN5KM61pWdOa5Uglx79bKbJpT6alh
rJtPEeHdcSAv8tkEVZT9PytnarDOJNlEdAJ0L9Us1V51mvgQcWjI4r4pX6r7n/mJ
sYXrhsFIx5c1DNcY3mv5HoM6TN7TIw+HkiHF13PqcN+7+j8V3HzlJU0tMmA2HHWz
w0T1I//gAWfKOCZ2/6EGkuGhYasmK4fzzEeSLkvpLCjMT5VVa0D3eIiL8OYqmQR1
EQNa81Jla2ZnjnNo5zhkVDFxiKL22V2Tx3FOlOoxY8BmPOKdE4bk49ZyWmhr8sDM
c2yUrGq7kPKmG19Bbv6WqnNAXz5l3wTGIhIrmwNkvjPquebm/8CRH+4xNfv9EtMG
ycu7wyTY8FQVaO38HKDq+lSCFIErooBGXmQmboyUrNpqfp/FIkQ=
=gnC8
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl5Gv1cACgkQdLtrmky7
PThhYw/+IX80x6rs8e2bKjM1cpIgddoAIHDfGLEIwH3JFfdiSWnvRvR4oa64ehPP
DeSXT905Y+rBQW7Kky9JqiJpPq6QoiV8X/BlxlQjiHKeF0ysuLCKa3v7drWKyo+q
CPRKoO2Q+i99np7Y8K+Ze0GVSVRfixYWQD+3tg9NvpiOoCsE3Qx0NAbzHjSxH8Ad
P8upxu29pLu5yIB7gfzMxNoYyTAPbQcCmVxmA78G9VPZcMnPgHcILrYT/Y9ZYcHK
p+QEi5h2jdgcmkI5rAm3Z2BiOgvONUreUQenD8ZT8E9vV5IxLBGcv5Q/YWocFTft
2eAgizxXZ9K3yrc5++v2tWhd1xNuaHNZlzQ/CLBmMqnOpsUxfSgKrz3zuKU9J1Da
XrhtLrm/60DqocuyRfbHtzEWJtgHmnyClRIanFQcmQJ8yIz2C5uTPmexvScRKB7X
RC2xj4xNfnpUlMWWeb+SF5vGDTweVb01JLrA6ejuXijOYBWZl9rIkxxRdJ/Sv6Rp
hgzh8OO6UvaHY5P5IhwliIEyp8LaEAafOaLrvuDKJEhQw/7j6q3lQiLWnW0u/9rm
IIJzT+hqk6NaKWz4dH/ikqrFQHZn4t5wzGsw6I81hhPw3s+5cheR+VKmZMytbIGt
AETI6CudHsJr5ztyYsjbqbbzg01JG7pbwp0VlPCxM0UiWPZUxaY=
=IyuH
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Feb 22 07:42:08 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update download urls
- Do not enable geoip on old distros, the geoip db was shut down
so we need to use geoip2 everywhere
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 20 09:33:45 UTC 2020 - Josef Möllers <josef.moellers@suse.com> Thu Feb 20 09:33:45 UTC 2020 - Josef Möllers <josef.moellers@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package bind # spec file for package bind
# #
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -46,10 +46,8 @@
%define USERMOD_NAMED getent passwd %{NAMED_UID_NAME} >/dev/null || %{_sbindir}/usermod -s %{NAMED_SHELL} -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} %define USERMOD_NAMED getent passwd %{NAMED_UID_NAME} >/dev/null || %{_sbindir}/usermod -s %{NAMED_SHELL} -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME}
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%define with_systemd 1 %define with_systemd 1
%define with_geoip 0
%else %else
%define with_systemd 0 %define with_systemd 0
%define with_geoip 1
%endif %endif
%if 0%{?suse_version} < 1315 %if 0%{?suse_version} < 1315
%define with_sfw2 1 %define with_sfw2 1
@ -67,11 +65,11 @@ Release: 0
Summary: Domain Name System (DNS) Server (named) Summary: Domain Name System (DNS) Server (named)
License: MPL-2.0 License: MPL-2.0
Group: Productivity/Networking/DNS/Servers Group: Productivity/Networking/DNS/Servers
Url: http://isc.org/sw/bind/ URL: http://isc.org/sw/bind/
Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz
Source1: vendor-files.tar.bz2 Source1: vendor-files.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
Source3: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz.sha512.asc Source3: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz.sha512.asc
# from http://www.isc.org/about/openpgp/ ... changes yearly apparently. # from http://www.isc.org/about/openpgp/ ... changes yearly apparently.
Source4: %{name}.keyring Source4: %{name}.keyring
Source9: ftp://ftp.internic.net/domain/named.root Source9: ftp://ftp.internic.net/domain/named.root
@ -97,11 +95,7 @@ BuildRequires: update-desktop-files
BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(json)
BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libidn)
%if %{with_geoip}
BuildRequires: pkgconfig(geoip)
%else
BuildRequires: pkgconfig(libmaxminddb) BuildRequires: pkgconfig(libmaxminddb)
%endif
BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(libuv)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
Requires: %{name}-chrootenv Requires: %{name}-chrootenv
@ -320,12 +314,8 @@ export CFLAGS="%{optflags} -DNO_VERSION_DATE"
--with-pic \ --with-pic \
--disable-openssl-version-check \ --disable-openssl-version-check \
--with-tuning=large \ --with-tuning=large \
%if %{with_geoip}
--with-geoip \
%else
--without-geoip \ --without-geoip \
--with-geoip2 \ --with-geoip2 \
%endif
--with-dlopen \ --with-dlopen \
--with-gssapi=yes \ --with-gssapi=yes \
--disable-isc-spnego \ --disable-isc-spnego \

View File

@ -9,8 +9,8 @@
; on server FTP.INTERNIC.NET ; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET ; -OR- RS.INTERNIC.NET
; ;
; last update: September 11, 2018 ; last update: February 20, 2020
; related version of root zone: 2018091102 ; related version of root zone: 2020022000
; ;
; FORMERLY NS.INTERNIC.NET ; FORMERLY NS.INTERNIC.NET
; ;