Update to 3.3-rc1

This commit is contained in:
Morten Stevens 2013-05-28 14:48:11 +02:00
parent 146df30ac3
commit b1e4ba7f7a
4 changed files with 16 additions and 39 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ pdns-2.9.22.tar.gz
/pdns-3.0.1.tar.gz
/pdns-3.1.tar.gz
/pdns-3.2.tar.gz
/pdns-3.3-rc1.tar.gz

View File

@ -1,32 +0,0 @@
--- pdns-3.2/pdns/aes/aeskey.c.orig 2013-01-17 10:16:52.000000000 +0100
+++ pdns-3.2/pdns/aes/aeskey.c 2013-04-18 14:57:44.000000000 +0200
@@ -488,6 +488,7 @@ AES_RETURN aes_decrypt_key192(const unsi
ss[3] ^= ss[2]; k[v(56,(8*(i))+11)] = ss[3]; \
}
+#if 0
AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
{ uint_32t ss[9];
#if defined( d_vars )
@@ -536,11 +537,13 @@ AES_RETURN aes_decrypt_key256(const unsi
#endif
return EXIT_SUCCESS;
}
+#endif
#endif
#if defined( AES_VAR )
+#if 0
AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ctx cx[1])
{
switch(key_len)
@@ -551,6 +554,7 @@ AES_RETURN aes_decrypt_key(const unsigne
default: return EXIT_FAILURE;
}
}
+#endif
#endif

View File

@ -1,17 +1,17 @@
%global _hardened_build 1
%global backends %{nil}
%global prever rc1
Name: pdns
Version: 3.2
Release: 7%{?dist}
Version: 3.3
Release: 0.1.%{?prever}%{?dist}
Summary: A modern, advanced and high performance authoritative-only nameserver
Group: System Environment/Daemons
License: GPLv2
URL: http://powerdns.com
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.gz
Source1: pdns.service
Patch0: pdns-default-config.patch
Patch1: pdns-fixarm32.patch
Requires(pre): shadow-utils
Requires(post): systemd-sysv
@ -26,6 +26,7 @@ BuildRequires: cryptopp-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: bison
Provides: powerdns = %{version}-%{release}
%description
@ -95,9 +96,8 @@ This package contains the ldap backend for %{name}
This package contains the SQLite backend for %{name}
%prep
%setup -q
%setup -q -n %{name}-%{version}-%{?prever}
%patch0 -p1 -b .default-config-patch
%patch1 -p1 -b .pdns-fixarm32
%build
autoreconf -v -f -i
@ -167,6 +167,11 @@ exit 0
%{_mandir}/man8/pdns_control.8.gz
%{_mandir}/man8/pdns_server.8.gz
%{_mandir}/man8/zone2sql.8.gz
%{_mandir}/man8/zone2ldap.8.gz
%{_mandir}/man8/dnsreplay.8.gz
%{_mandir}/man8/dnsscope.8.gz
%{_mandir}/man8/dnswasher.8.gz
%{_mandir}/man8/pdnssec.8.gz
%{_unitdir}/pdns.service
%dir %{_libdir}/%{name}/
%dir %{_sysconfdir}/%{name}/
@ -205,6 +210,9 @@ exit 0
%doc pdns/bind-dnssec.schema.sqlite3.sql
%changelog
* Tue May 28 2013 Morten Stevens <mstevens@imt-systems.com> - 3.3-0.1.rc1
- Update do 3.3-rc1
* Mon Apr 22 2013 Morten Stevens <mstevens@imt-systems.com> - 3.2-7
- Disarm dead code that causes gcc crashes on ARM (rhbz#954191)

View File

@ -1 +1 @@
6bd35c6be34e96dd07a0e59562d38cb7 pdns-3.2.tar.gz
f8a932f598d49ad81bfc961553a81e48 pdns-3.3-rc1.tar.gz