rpms/kea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.0-beta

Browse Source
This commit is contained in:
Jiri Popelka 2016-09-01 10:01:17 +02:00
parent 9659ad88cb
commit 24209acb84
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/kea-1.0.0-beta.tar.gz /kea-1.0.0-beta.tar.gz
/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

28
kea-coroutinepgsql.patch
View File

@ -1,6 +1,6 @@
diff -up ./ext/coroutine/coroutine.h.coroutinepgsql ./ext/coroutine/coroutine.h diff -up kea-1.1.0-beta/ext/coroutine/coroutine.h.coroutinepgsql kea-1.1.0-beta/ext/coroutine/coroutine.h
--- ./ext/coroutine/coroutine.h.coroutinepgsql 2015-12-28 13:18:05.000000000 +0100 --- kea-1.1.0-beta/ext/coroutine/coroutine.h.coroutinepgsql 2016-08-28 20:36:34.000000000 +0200
+++ ./ext/coroutine/coroutine.h 2016-03-15 14:58:26.344825900 +0100 +++ kea-1.1.0-beta/ext/coroutine/coroutine.h 2016-09-01 09:59:16.767902664 +0200
@@ -108,7 +108,7 @@ private: @@ -108,7 +108,7 @@ private:
for (_coro_value = __LINE__;;) \ for (_coro_value = __LINE__;;) \
if (_coro_value == 0) \ if (_coro_value == 0) \
@ -10,12 +10,24 @@ diff -up ./ext/coroutine/coroutine.h.coroutinepgsql ./ext/coroutine/coroutine.h
break; \ break; \
} \ } \
else \ else \
diff -up ./src/lib/dhcpsrv/pgsql_lease_mgr.cc.coroutinepgsql ./src/lib/dhcpsrv/pgsql_lease_mgr.cc 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
--- ./src/lib/dhcpsrv/pgsql_lease_mgr.cc.coroutinepgsql 2015-12-28 13:18:45.000000000 +0100 --- kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_host_data_source.cc.coroutinepgsql 2016-08-28 20:36:34.000000000 +0200
+++ ./src/lib/dhcpsrv/pgsql_lease_mgr.cc 2016-03-15 13:59:06.837391677 +0100 +++ kea-1.1.0-beta/src/lib/dhcpsrv/pgsql_host_data_source.cc 2016-09-02 19:48:37.210354247 +0200
@@ -1690,7 +1690,7 @@ PgSqlLeaseMgr::getVersion() const { @@ -1698,7 +1698,7 @@ std::pair<uint32_t, uint32_t> PgSqlHostD
uint32_t minor;
PgSqlExchange::getColumnValue(r, 0, 0, minor);
PQclear(r); - 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<uint32_t, uint32_t>(version, minor);
+ return (make_pair(version, minor)); + return (make_pair(version, minor));

2
kea-systemd.patch
View File

@ -186,7 +186,7 @@ index 43d7bff..82625ca 100644
echo "Input file: $1" echo "Input file: $1"
echo "Output file: $2" echo "Output file: $2"
-sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir@@SEP@${sysconfdir}@SEP@g" $1 > $2 -sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix\@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir\@@SEP@${sysconfdir}@SEP@g" $1 > $2
+sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix\@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir\@@SEP@${sysconfdir}@SEP@g; s@SEP@\@sbindir\@@SEP@${sbindir}@SEP@g" $1 > $2 +sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix\@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir\@@SEP@${sysconfdir}@SEP@g; s@SEP@\@sbindir\@@SEP@${sbindir}@SEP@g" $1 > $2
-- --
2.3.4 2.3.4

13
kea.spec
View File

@ -1,16 +1,16 @@
#http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html #http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html
%global _hardened_build 1 %global _hardened_build 1
%global prever beta2 %global prever beta
#%%global VERSION %%{version}-%%{patchver} #%%global VERSION %%{version}-%%{patchver}
#%%global VERSION %%{version}-%%{prever} #%%global VERSION %%{version}
%global VERSION %{version} %global VERSION %{version}-%{prever}
Summary: DHCPv4, DHCPv6 and DDNS server from ISC Summary: DHCPv4, DHCPv6 and DDNS server from ISC
Name: kea Name: kea
Version: 1.0.0 Version: 1.1.0
Release: 11%{?dist} Release: 0.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
@ -242,6 +242,9 @@ EOF
%{_libdir}/pkgconfig/dns++.pc %{_libdir}/pkgconfig/dns++.pc
%changelog %changelog
* Thu Sep 01 2016 Jiri Popelka <jpopelka@redhat.com> - 1.1.0-0.1
- 1.1.0-beta
* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 1.0.0-11 * Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 1.0.0-11
- No valgrind on MIPS - No valgrind on MIPS

2
sources
View File

@ -1 +1 @@
d53bc47ecbbfb2e25267b63c456519c4 kea-1.0.0.tar.gz 7c78472d28742ca0537e6e2a24879fde kea-1.1.0-beta.tar.gz