commit 2b3ec50608f966119a022dccf81ff60a55372904
Author: Jakub Bogusz <[email protected]>
Date: Thu Mar 9 22:12:33 2017 +0100
- updated to 1.6.1
- added flex patch (fixes build with current flex)
unbound-flex.patch | 11 +++++++++++
unbound.spec | 16 +++++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/unbound.spec b/unbound.spec
index 3c94425..9fa578b 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -2,16 +2,17 @@
# Conditional build:
%bcond_without python # Python binding
%bcond_with dnstap # dnstap replication support
+%bcond_with systemd # systemd support
#
Summary: Recursive, validating DNS resolver
Summary(pl.UTF-8): Rekurencyjny, weryfikujący resolver DNS
Name: unbound
-Version: 1.5.10
+Version: 1.6.1
Release: 1
License: BSD
Group: Applications/Network
Source0: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 0a3a236811f1ab5c1dc31974fa74e047
+# Source0-md5: aa808f33d94a36c9312d1b8ad8805e14
Source1: %{name}.init
Source2: %{name}.service
Source3: https://data.iana.org/root-anchors/icannbundle.pem
@@ -21,23 +22,26 @@ Source4: ftp://ftp.internic.net/domain/named.cache
Patch0: %{name}-default_trust_anchor.patch
Patch1: %{name}-sh.patch
Patch2: %{name}-pythondir.patch
+Patch3: %{name}-flex.patch
URL: http://unbound.net/
BuildRequires: autoconf >= 2.56
BuildRequires: automake
+BuildRequires: bison
BuildRequires: expat-devel
+BuildRequires: flex
%{?with_dnstap:BuildRequires: fstrm-devel}
BuildRequires: libevent-devel
BuildRequires: libtool
BuildRequires: openssl-devel >= 1.0
%{?with_dnstap:BuildRequires: protobuf-c-devel}
-BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: rpmbuild(macros) >= 1.671
+%{?with_systemd:BuildRequires: systemd-devel}
%if %{with python}
BuildRequires: python-devel >= 1:2.4.0
BuildRequires: swig-python
%endif
-Requires(post,preun): /sbin/chkconfig
-BuildRequires: rpmbuild(macros) >= 1.671
Provides: user(unbound)
+Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
@@ -124,6 +128,7 @@ Pythonowy interfejs do biblioteki unbound.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -132,6 +137,7 @@ Pythonowy interfejs do biblioteki unbound.
%{__autoheader}
%configure \
%{?with_dnstap:--enable-dnstap} \
+ %{?with_systemd:--enable-systemd} \
%{__with_without python pyunbound} \
%{__with_without python pythonmodule} \
--with-pidfile=/run/%{name}.pid \
diff --git a/unbound-flex.patch b/unbound-flex.patch
new file mode 100644
index 0000000..a922bf8
--- /dev/null
+++ b/unbound-flex.patch
@@ -0,0 +1,11 @@
+--- unbound-1.6.1/Makefile.in.orig 2016-12-06 16:29:35.000000000 +0100
++++ unbound-1.6.1/Makefile.in 2017-03-09 18:32:30.802012387 +0100
+@@ -412,7 +412,7 @@
+ if test "$(LEX)" != ":"; then \
+ echo "#include \"config.h\"" > $@ ;\
+ echo "#include \"util/configyyrename.h\"" >> $@ ;\
+- $(LEX) -t $(srcdir)/util/configlexer.lex >> $@ ;\
++ $(LEX) -t --prefix=ub_c_ $(srcdir)/util/configlexer.lex >> $@ ;\
+ fi
+
+ util/configparser.c util/configparser.h: $(srcdir)/util/configparser.y
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/unbound.git/commitdiff/2b3ec50608f966119a022dccf81ff60a55372904
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
