add static_libs bcond

diff --git a/unbound.init b/unbound.init
index 894b5227630bb3e45d756165dd68b694613a67fa..88eed523fd4dc87167ac64cca93493bcc04f972f 100644 (file)
--- a/unbound.init
+++ b/unbound.init
@@ -70,29 +70,15 @@ case "$1" in
        ;;
   status)
        status unbound
-       RETVAL=$?
-       if [ -f /etc/rndc.conf ]; then
-               /usr/sbin/rndc status
-               RET=$?
-               if [ $RET -ne 0 ]; then
-                       RETVAL=$RET
-               fi
-       fi
        ;;
   reload|force-reload)
        if [ -f /var/lock/subsys/unbound ]; then
-               if [ -f /etc/rndc.conf ]; then
-                       run_cmd "$(nls 'Reloading %s service' 'Unbound')" /usr/sbin/rndc reload
-               else
-                       msg_reloading "Unbound"
-                       killproc unbound -HUP
-                       RETVAL=$?
-               fi
+               msg_reloading "Unbound"
+               killproc unbound -HUP
        else
                msg_not_running "Unbound"
                exit 7
        fi
-
        ;;
   restart)
        stop

diff --git a/unbound.spec b/unbound.spec
index 1532e35e4aced701536b4903426e9e7b53cd0cc1..6d17f9a51ae90a73252b6ed6bb92b938cf707121 100644 (file)
--- a/unbound.spec
+++ b/unbound.spec
@@ -6,24 +6,25 @@
 %bcond_with    dnscrypt        # dnscrypt support
 %bcond_with    dnstap          # dnstap replication support
 %bcond_with    redis           # cachedb support for redis (using hiredis)
+%bcond_without static_libs     # static library
 %bcond_with    systemd         # systemd support
 %bcond_without tests           # unit tests
 #
 Summary:       Recursive, validating DNS resolver
 Summary(pl.UTF-8):     Rekurencyjny, weryfikujący resolver DNS
 Name:          unbound
-Version:       1.16.1
+Version:       1.20.0
 Release:       1
 License:       BSD
 Group:         Applications/Network
 Source0:       https://www.unbound.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: f6673e154c1c7ff6f5ff3986c8d473d6
+# Source0-md5: 970d8a8800e6993d4453d50979b0c657
 Source1:       %{name}.init
 Source2:       %{name}.service
 Source3:       https://data.iana.org/root-anchors/icannbundle.pem
 # Source3-md5: d00ef4e253e99e93ee020da5ad5e7d9a
 Source4:       ftp://ftp.internic.net/domain/named.cache
-# Source4-md5: 174738e23c506ddb1b5c24178e5fdc13
+# Source4-md5: 256a3e44f5821c498cf777dd118944a6
 Patch0:                %{name}-default_trust_anchor.patch
 Patch1:                %{name}-sh.patch
 URL:           http://unbound.net/
@@ -37,12 +38,14 @@ BuildRequires:      flex
 BuildRequires: libevent-devel
 %{?with_dnscrypt:BuildRequires:        libsodium-devel}
 BuildRequires: libtool
+BuildRequires: linux-libc-headers >= 7:2.6.30
 BuildRequires: openssl-devel >= 1.0.0
 %{?with_dnstap:BuildRequires:  protobuf-c-devel}
 BuildRequires: rpmbuild(macros) >= 1.671
 %{?with_systemd:BuildRequires: systemd-devel}
 %if %{with python}
 BuildRequires: python3-devel
+BuildRequires: python3-modules
 BuildRequires: swig-python >= 2.0.1
 %endif
 Provides:      user(unbound)
@@ -142,6 +145,7 @@ Pythonowy interfejs do biblioteki unbound.
 %{__autoheader}
 %configure \
        PYTHON=%{__python3} \
+       %{__enable_disable static_libs static} \
        %{?with_dnscrypt:--enable-dnscrypt} \
        %{?with_dnstap:--enable-dnstap} \
        %{?with_systemd:--enable-systemd} \
@@ -220,8 +224,8 @@ fi
 %doc doc/{CREDITS,Changelog,FEATURES,LICENSE,README,TODO,control_proto_spec.txt,example.conf,ietf67-design-02.pdf,requirements.txt}
 %attr(754,root,root) /etc/rc.d/init.d/unbound
 %{systemdunitdir}/%{name}.service
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/unbound.conf
+%attr(751,unbound,root) %dir %{_sysconfdir}/%{name}
+%attr(640,unbound,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/unbound.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/named.cache
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/icannbundle.pem
 %attr(755,root,root) %{_sbindir}/unbound
@@ -251,9 +255,11 @@ fi
 %{_mandir}/man3/libunbound.3*
 %{_mandir}/man3/ub_*.3*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libunbound.a
+%endif
 
 %if %{with python}
 %files -n python3-unbound