- updated to 1.5.6

- added sh patch (fix quotes inside backticks issue)

diff --git a/unbound-sh.patch b/unbound-sh.patch
new file mode 100644 (file)
index 0000000..b9bf9e6
--- /dev/null
+++ b/unbound-sh.patch
@@ -0,0 +1,11 @@
+--- unbound-1.5.6/configure.ac.orig    2015-10-06 12:29:20.000000000 +0200
++++ unbound-1.5.6/configure.ac 2015-11-02 16:42:08.808434766 +0100
+@@ -479,7 +479,7 @@
+               AC_ERROR([Python version >= 2.4.0 is required])
+       fi
+ 
+-      [PY_MAJOR_VERSION="`$PYTHON -c \"import sys; print(sys.version_info[0])\"`"]
++      [PY_MAJOR_VERSION="$($PYTHON -c "import sys; print(sys.version_info[0])")"]
+       AC_SUBST(PY_MAJOR_VERSION)
+       # Have Python
+       AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])

diff --git a/unbound.spec b/unbound.spec
index d0a66d2e1e9e8452ab027a00433a7b96b96171e1..a632084acc33a488f8c40b9ac4645faec1e836ba 100644 (file)
--- a/unbound.spec
+++ b/unbound.spec
@@ -1,3 +1,4 @@
+# TODO: dnstap? (BR: protobuf-c-devel, libfstrm -devel)
 #
 # Conditional build:
 %bcond_without python  # Python binding
@@ -5,12 +6,12 @@
 Summary:       Recursive, validating DNS resolver
 Summary(pl.UTF-8):     Rekurencyjny, weryfikujący resolver DNS
 Name:          unbound
-Version:       1.5.4
+Version:       1.5.6
 Release:       1
 License:       BSD
 Group:         Applications/Network
 Source0:       http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: f85854baad15adc7ce8acefe6cda4cf8
+# Source0-md5: 691a34abd8e9257dd65b70f28326c1f0
 Source1:       %{name}.init
 Source2:       %{name}.service
 Source3:       https://data.iana.org/root-anchors/icannbundle.pem
@@ -18,10 +19,14 @@ Source3:    https://data.iana.org/root-anchors/icannbundle.pem
 Source4:       ftp://ftp.internic.net/domain/named.cache
 # Source4-md5: b2afc34d106e104730b63876c9a07caf
 Patch0:                %{name}-default_trust_anchor.patch
+Patch1:                %{name}-sh.patch
 URL:           http://unbound.net/
+BuildRequires: autoconf >= 2.56
+BuildRequires: automake
 BuildRequires: expat-devel
 BuildRequires: libevent-devel
-BuildRequires: openssl-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel >= 1.0
 BuildRequires: rpmbuild(macros) >= 1.228
 %if %{with python}
 BuildRequires: python-devel >= 1:2.4.0
@@ -114,8 +119,13 @@ Pythonowy interfejs do biblioteki unbound.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
 %configure \
        %{__with_without python pyunbound} \
        %{__with_without python pythonmodule} \