1.1.0
This commit is contained in:
parent
24209acb84
commit
d6b0f6b9d6
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
|||||||
/kea-1.0.0-beta2.tar.gz
|
/kea-1.0.0-beta2.tar.gz
|
||||||
/kea-1.0.0.tar.gz
|
/kea-1.0.0.tar.gz
|
||||||
/kea-1.1.0-beta.tar.gz
|
/kea-1.1.0-beta.tar.gz
|
||||||
|
/kea-1.1.0.tar.gz
|
||||||
|
11
kea-1.1.0.tar.gz.asc
Normal file
11
kea-1.1.0.tar.gz.asc
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||||
|
|
||||||
|
iQEcBAABAgAGBQJX7PWFAAoJEG+m68mRGkwC9R4IAJ38ERPBzm7TwgnjJbhONRAF
|
||||||
|
21bJHuGSy7Q3X4TrxQemIBix3HKlYAh0Xq234mv1Kx5MHPArrg9bGZQ3yFPdFW0n
|
||||||
|
qO/PdZnAybemzrwX2qhC9v1YO6rP+W4kcgOby5W3gVBIqiHj55qTbGPwsEwWZSWI
|
||||||
|
SAx2gqISn1j9rMXA0BjNIB4B9DZbyq9jSciV/7RYHVOVN++BvbB5/IM+jKTCSHu2
|
||||||
|
RT8Nwj+wf3TjGCn0qnXiaeSkUJUfIA6Sb2ZhDDe47Do/qQJ65CPtiiNDHFJBITpW
|
||||||
|
kqEuErI0AWzVg6a0dJOOY66WigC0jSs9wnbYwzqTbuIeH7CauXmUlJZ0y5os3h8=
|
||||||
|
=wVz2
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,36 +0,0 @@
|
|||||||
diff -up kea-1.1.0-beta/ext/coroutine/coroutine.h.coroutinepgsql kea-1.1.0-beta/ext/coroutine/coroutine.h
|
|
||||||
--- kea-1.1.0-beta/ext/coroutine/coroutine.h.coroutinepgsql 2016-08-28 20:36:34.000000000 +0200
|
|
||||||
+++ kea-1.1.0-beta/ext/coroutine/coroutine.h 2016-09-01 09:59:16.767902664 +0200
|
|
||||||
@@ -108,7 +108,7 @@ private:
|
|
||||||
for (_coro_value = __LINE__;;) \
|
|
||||||
if (_coro_value == 0) \
|
|
||||||
{ \
|
|
||||||
- case __LINE__: ; \
|
|
||||||
+/* case __LINE__: ;*/ \
|
|
||||||
break; \
|
|
||||||
} \
|
|
||||||
else \
|
|
||||||
diff -up kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_host_data_source.cc.coroutinepgsql kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_host_data_source.cc
|
|
||||||
--- kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_host_data_source.cc.coroutinepgsql 2016-08-28 20:36:34.000000000 +0200
|
|
||||||
+++ kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_host_data_source.cc 2016-09-02 19:48:37.210354247 +0200
|
|
||||||
@@ -1698,7 +1698,7 @@ std::pair<uint32_t, uint32_t> PgSqlHostD
|
|
||||||
uint32_t minor;
|
|
||||||
PgSqlExchange::getColumnValue(r, 0, 0, minor);
|
|
||||||
|
|
||||||
- return (std::make_pair<uint32_t, uint32_t>(version, minor));
|
|
||||||
+ return (make_pair(version, minor));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
diff -up kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_lease_mgr.cc.coroutinepgsql kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_lease_mgr.cc
|
|
||||||
--- kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_lease_mgr.cc.coroutinepgsql 2016-08-28 20:36:34.000000000 +0200
|
|
||||||
+++ kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_lease_mgr.cc 2016-09-01 09:59:16.767902664 +0200
|
|
||||||
@@ -1391,7 +1391,7 @@ PgSqlLeaseMgr::getVersion() const {
|
|
||||||
tmp.str(PQgetvalue(r, 0, 1));
|
|
||||||
tmp >> minor;
|
|
||||||
|
|
||||||
- return make_pair<uint32_t, uint32_t>(version, minor);
|
|
||||||
+ return (make_pair(version, minor));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
11
kea.spec
11
kea.spec
@ -4,20 +4,19 @@
|
|||||||
%global prever beta
|
%global prever beta
|
||||||
|
|
||||||
#%%global VERSION %%{version}-%%{patchver}
|
#%%global VERSION %%{version}-%%{patchver}
|
||||||
#%%global VERSION %%{version}
|
#%%global VERSION %%{version}-%%{prever}
|
||||||
%global VERSION %{version}-%{prever}
|
%global VERSION %%{version}
|
||||||
|
|
||||||
Summary: DHCPv4, DHCPv6 and DDNS server from ISC
|
Summary: DHCPv4, DHCPv6 and DDNS server from ISC
|
||||||
Name: kea
|
Name: kea
|
||||||
Version: 1.1.0
|
Version: 1.1.0
|
||||||
Release: 0.1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: MPLv2.0 and Boost
|
License: MPLv2.0 and Boost
|
||||||
URL: http://kea.isc.org
|
URL: http://kea.isc.org
|
||||||
Source0: http://ftp.isc.org/isc/kea/%{VERSION}/kea-%{VERSION}.tar.gz
|
Source0: http://ftp.isc.org/isc/kea/%{VERSION}/kea-%{VERSION}.tar.gz
|
||||||
|
|
||||||
# http://kea.isc.org/ticket/3529
|
# http://kea.isc.org/ticket/3529
|
||||||
Patch0: kea-systemd.patch
|
Patch0: kea-systemd.patch
|
||||||
Patch1: kea-coroutinepgsql.patch
|
|
||||||
|
|
||||||
# autoreconf
|
# autoreconf
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
@ -78,7 +77,6 @@ Header files and API documentation.
|
|||||||
%setup -q -n kea-%{VERSION}
|
%setup -q -n kea-%{VERSION}
|
||||||
|
|
||||||
%patch0 -p1 -b .systemd
|
%patch0 -p1 -b .systemd
|
||||||
%patch1 -p1 -b .coroutinepgsql
|
|
||||||
|
|
||||||
# install leases db in /var/lib/kea/ not /var/kea/
|
# install leases db in /var/lib/kea/ not /var/kea/
|
||||||
# http://kea.isc.org/ticket/3523
|
# http://kea.isc.org/ticket/3523
|
||||||
@ -242,6 +240,9 @@ EOF
|
|||||||
%{_libdir}/pkgconfig/dns++.pc
|
%{_libdir}/pkgconfig/dns++.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 04 2016 Jiri Popelka <jpopelka@redhat.com> - 1.1.0-1
|
||||||
|
- 1.1.0
|
||||||
|
|
||||||
* Thu Sep 01 2016 Jiri Popelka <jpopelka@redhat.com> - 1.1.0-0.1
|
* Thu Sep 01 2016 Jiri Popelka <jpopelka@redhat.com> - 1.1.0-0.1
|
||||||
- 1.1.0-beta
|
- 1.1.0-beta
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user