Upstream released new version

- Run as dnsdist user / group (#1326623)
- Enable support for libre2 and protobufs
- Fix systemd detection
- Only build with lua if luajit is not available

.gitignore

@@ -1 +1,3 @@
 /dnsdist-1.0.0-alpha2.tar.bz2
+/dnsdist-1.0.0-beta1.tar.bz2
+/dnsdist-1.0.0.tar.bz2

dnsdist.spec

@@ -1,5 +1,4 @@
 %global _hardened_build 1
-%global prever alpha2
 %ifarch %{nodejs_arches}
 %global uglify 1
 %endif
@@ -7,12 +6,12 @@
 
 Name: dnsdist
 Version: 1.0.0
-Release: 0.8.%{?prever}%{?dist}
+Release: 1%{?dist}
 Summary: Highly DNS-, DoS- and abuse-aware loadbalancer
 Group: System Environment/Daemons
 License: GPLv2
 URL: http://dnsdist.org
-Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 
 BuildRequires: boost-devel
 BuildRequires: libedit-devel
@@ -20,13 +19,19 @@ BuildRequires: libsodium-devel
 BuildRequires: lua-devel
 %ifnarch %{power64} aarch64 s390 s390x
 BuildRequires: luajit-devel
+%else
+BuildRequires: lua-devel
 %endif
+BuildRequires: protobuf-devel
+BuildRequires: re2-devel
 BuildRequires: readline-devel
+BuildRequires: systemd-devel
 BuildRequires: systemd-units
 %if 0%{?uglify}
 BuildRequires: uglify-js
 %endif
 Requires(post): systemd
+Requires(preun): shadow-utils
 Requires(preun): systemd
 Requires(postun): systemd
 
@@ -37,7 +42,10 @@ legitimate users while shunting or blocking abusive traffic.
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{?prever}
+%setup -q -n %{name}-%{version}
+
+# run as dnsdist user
+sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.in
 
 %build
 %configure \
@@ -47,9 +55,10 @@ legitimate users while shunting or blocking abusive traffic.
 	--disable-silent-rules \
 	--enable-dnscrypt \
 	--enable-libsodium \
-	--with-lua \
 %ifnarch %{power64} aarch64 s390 s390x
 	--with-luajit \
+%else
+	--with-lua \
 %endif
 	--enable-unit-tests
 rm html/js/*
@@ -66,12 +75,15 @@ mv dnsdistconf.lua dnsdist.conf.sample
 make install DESTDIR=%{buildroot}
 
 # install systemd unit file
-install -D -p -m 644 contrib/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
+install -D -p -m 644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service
 install -d %{buildroot}%{_sysconfdir}/%{name}/
 
-%check
-make %{?_smp_mflags} check
-rm %{buildroot}%{_bindir}/testrunner
+%pre
+getent group dnsdist >/dev/null || groupadd -r dnsdist
+getent passwd dnsdist >/dev/null || \
+    useradd -r -g dnsdist -d / -s /sbin/nologin \
+    -c "dnsdist user" dnsdist
+exit 0
 
 %post
 %systemd_post %{name}.service
@@ -93,6 +105,22 @@ rm %{buildroot}%{_bindir}/testrunner
 
 
 %changelog
+* Thu Apr 21 2016 Sander Hoentjen <sander@hoentjen.eu> - 1.0.0-1
+- Upstream released new version
+
+* Fri Apr 15 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 1.0.0-0.10.beta1
+- Use the correct systemd service file
+
+* Fri Apr 15 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 1.0.0-0.10.beta1
+- Upstream released new version
+- Run as dnsdist user / group (#1326623)
+- Enable support for libre2 and protobufs
+- Fix systemd detection
+- Only build with lua if luajit is not available
+
+* Tue Mar 08 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> 1.0.0-0.9.alpha2
+- Rebuild for libsodium soname bump
+
 * Tue Feb 23 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.0-0.8.alpha2
 - Add aarch64/s390(x) to luajit excludes
 - uglify-js available on nodejs arches so use that define

sources

@@ -1 +1 @@
-d6696df9c34d5bc24108179fbf00a7aa  dnsdist-1.0.0-alpha2.tar.bz2
+b3bd87d28965eced28feac651b174935  dnsdist-1.0.0.tar.bz2