[bind10] Make bind10 compilable against boost 1.53.0
Adam Tkac
atkac at fedoraproject.org
Wed Feb 20 12:49:49 UTC 2013
commit ad15b6f2a4c00b0177eecd19dacfcc7a09483084
Author: Adam Tkac <atkac at redhat.com>
Date: Wed Feb 20 13:49:37 2013 +0100
Make bind10 compilable against boost 1.53.0
Signed-off-by: Adam Tkac <atkac at redhat.com>
...-Decode-Normalizer-compatible-with-boost-.patch | 41 ++++++++++++++++++++
bind10.spec | 7 +++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/0001-Make-Encode-Decode-Normalizer-compatible-with-boost-.patch b/0001-Make-Encode-Decode-Normalizer-compatible-with-boost-.patch
new file mode 100644
index 0000000..a945740
--- /dev/null
+++ b/0001-Make-Encode-Decode-Normalizer-compatible-with-boost-.patch
@@ -0,0 +1,41 @@
+From 9ef432718629d6f8fbe4067002cbd046c548aade Mon Sep 17 00:00:00 2001
+From: Adam Tkac <atkac at redhat.com>
+Date: Wed, 20 Feb 2013 13:22:20 +0100
+Subject: [PATCH] Make {Encode,Decode}Normalizer compatible with boost 1.53.0
+
+Signed-off-by: Adam Tkac <atkac at redhat.com>
+---
+ src/lib/util/encode/base_n.cc | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/lib/util/encode/base_n.cc b/src/lib/util/encode/base_n.cc
+index c38f901..4dfd268 100644
+--- a/src/lib/util/encode/base_n.cc
++++ b/src/lib/util/encode/base_n.cc
+@@ -119,6 +119,11 @@ public:
+ }
+ return (*this);
+ }
++ EncodeNormalizer operator++(int) {
++ EncodeNormalizer tmp = *this;
++ ++(*this);
++ return tmp;
++ }
+ const uint8_t& operator*() const {
+ if (in_pad_) {
+ return (BINARY_ZERO_CODE);
+@@ -173,6 +178,11 @@ public:
+ }
+ return (*this);
+ }
++ DecodeNormalizer operator++(int) {
++ DecodeNormalizer tmp = *this;
++ ++(*this);
++ return tmp;
++ }
+ void skipSpaces() {
+ // If (char is signed and) *base_ < 0, on Windows platform with Visual
+ // Studio compiler it may trigger _ASSERTE((unsigned)(c + 1) <= 256);
+--
+1.8.1.2
+
diff --git a/bind10.spec b/bind10.spec
index 9badd02..32a4c47 100644
--- a/bind10.spec
+++ b/bind10.spec
@@ -6,7 +6,7 @@
Name: bind10
Version: 1.0.0
-Release: 0.3.beta%{?dist}
+Release: 0.4.beta%{?dist}
Summary: The Berkeley Internet Name Domain 10 (BIND10) DNS and DHCP suite
License: ISC
@@ -27,6 +27,7 @@ BuildRequires: systemd
# http://bind10.isc.org/ticket/2667
Patch0: bind10-rpath.patch
+Patch1: 0001-Make-Encode-Decode-Normalizer-compatible-with-boost-.patch
%description
BIND10 DNS and DHCP suite. This package contains binaries and utilities needed
@@ -68,6 +69,7 @@ BIND10 suite DHCP service daemons
%setup -q -n %{name}-%{version}-beta
%patch0 -p1 -b .rpath
+%patch1 -p1 -b .boost
%build
autoreconf -fiv
@@ -330,6 +332,9 @@ fi;
%{_libdir}/libb10-dhcpsrv.so.*
%changelog
+* Wed Feb 20 2013 Adam Tkac <atkac redhat com> - 1.0.0-0.4.beta
+- make bind10 compilable against boost 1.53.0
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.3.beta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list