1.8.0 release

4 files changed, 139 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e1ca4fab2ae..ad1a3bcc7942 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Feb  4 13:14:37 UTC 2016
+# Thu Feb  4 13:43:26 UTC 2016
 pkgbase = avro-cpp
 	pkgdesc = C++ implementation of the Apache Avro data serialization system
-	pkgver = 1.7.7
-	pkgrel = 2
+	pkgver = 1.8.0
+	pkgrel = 1
 	url = https://avro.apache.org/
 	arch = i686
 	arch = x86_64
@@ -13,12 +13,12 @@ pkgbase = avro-cpp
 	makedepends = cmake
 	makedepends = python2
 	depends = boost-libs
-	source = http://www.us.apache.org/dist/avro/avro-1.7.7/cpp/avro-cpp-1.7.7.tar.gz
+	source = http://www.us.apache.org/dist/avro/avro-1.8.0/cpp/avro-cpp-1.8.0.tar.gz
 	source = avro-cpp-python2.patch
 	source = avro-cpp-boost160.patch
-	sha256sums = f9bdfad58f513014940fcda372840e36f4f3787a20a00bc0666d254973a1ec1d
-	sha256sums = fa454091ea8b8886b71d16f2c0a51a7851cb2da8bb01f1bb028a0a9595d80da8
-	sha256sums = 0a144caf1ff99e51a0c3ab1c704ca50fea93fb831a68e2583b83356e83ff8837
+	sha256sums = ec6e2ec957e95ca07f70cc25f02f5c416f47cb27bd987a6ec770dcbe72527368
+	sha256sums = 5d54151dd25e717a19109c97e68ce2a07d3b28b9fd3fb3ae1dc5df06b8600fd4
+	sha256sums = 3c35ec2d6982b98accad0663d9ce732718c4c775631a7a07b473613deb9e30c9
 
 pkgname = avro-cpp
 
diff --git a/PKGBUILD b/PKGBUILD
index dbaf80f163ad..263f216ca362 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,27 @@
 # Maintainer: Andrew Nelless <andrew at nelless dot net>
 pkgname='avro-cpp'
-pkgver=1.7.7
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 arch=('i686' 'x86_64')
 
 pkgdesc="C++ implementation of the Apache Avro data serialization system"
 url="https://avro.apache.org/"
 license=('Apache')
-
 groups=('avro')
 depends=('boost-libs')
 makedepends=('boost' 'cmake' 'python2')
+
 source=("http://www.us.apache.org/dist/avro/avro-$pkgver/cpp/$pkgname-$pkgver.tar.gz"
 	$pkgname-python2.patch
         $pkgname-boost160.patch)
-sha256sums=('f9bdfad58f513014940fcda372840e36f4f3787a20a00bc0666d254973a1ec1d'
-            'fa454091ea8b8886b71d16f2c0a51a7851cb2da8bb01f1bb028a0a9595d80da8'
-            '0a144caf1ff99e51a0c3ab1c704ca50fea93fb831a68e2583b83356e83ff8837')
+sha256sums=('ec6e2ec957e95ca07f70cc25f02f5c416f47cb27bd987a6ec770dcbe72527368'
+            '5d54151dd25e717a19109c97e68ce2a07d3b28b9fd3fb3ae1dc5df06b8600fd4'
+            '3c35ec2d6982b98accad0663d9ce732718c4c775631a7a07b473613deb9e30c9')
 
 prepare() {
     cd "$srcdir/$pkgname-$pkgver"
     patch -p1 -i "$srcdir/$pkgname-python2.patch"
-    patch -p2 -i "$srcdir/$pkgname-boost160.patch"
+    patch -p1 -i "$srcdir/$pkgname-boost160.patch"
 }
 
 build() {
diff --git a/avro-cpp-boost160.patch b/avro-cpp-boost160.patch
index bae047b5538c..86d4229187a9 100644
--- a/avro-cpp-boost160.patch
+++ b/avro-cpp-boost160.patch
@@ -1,126 +1,218 @@
-diff -uNr -p1 src/avro-cpp-1.7.7/test/buffertest.cc src-bak/avro-cpp-1.7.7/test/buffertest.cc
---- src/avro-cpp-1.7.7/test/buffertest.cc	2014-07-18 20:20:04.000000000 +0100
-+++ src-bak/avro-cpp-1.7.7/test/buffertest.cc	2015-12-28 17:53:53.487075354 +0000
-@@ -66,3 +66,3 @@ void TestReserve()
+diff -uNr avro-cpp-1.8.0.orig/test/buffertest.cc avro-cpp-1.8.0/test/buffertest.cc
+--- avro-cpp-1.8.0.orig/test/buffertest.cc	2016-02-04 13:28:36.564240294 +0000
++++ avro-cpp-1.8.0/test/buffertest.cc	2016-02-04 13:29:06.177573701 +0000
+@@ -64,7 +64,7 @@
+ 
+ void TestReserve()
  {
 -    BOOST_MESSAGE( "TestReserve");
 +    BOOST_TEST_MESSAGE( "TestReserve");
      {
-@@ -113,3 +113,3 @@ void TestGrow()
+         OutputBuffer ob;
+         BOOST_CHECK_EQUAL(ob.size(), 0U);
+@@ -111,7 +111,7 @@
+ 
+ void TestGrow()
  {
 -    BOOST_MESSAGE( "TestGrow");
 +    BOOST_TEST_MESSAGE( "TestGrow");
      { 
-@@ -153,3 +153,3 @@ void TestDiscard()
+         OutputBuffer ob;
+ 
+@@ -151,7 +151,7 @@
+ 
+ void TestDiscard()
  {
 -    BOOST_MESSAGE( "TestDiscard");
 +    BOOST_TEST_MESSAGE( "TestDiscard");
      {
-@@ -259,3 +259,3 @@ void TestConvertToInput()
+         OutputBuffer ob;
+         size_t dataSize = kDefaultBlockSize*2 + kDefaultBlockSize/2;
+@@ -257,7 +257,7 @@
+ 
+ void TestConvertToInput()
  {
 -    BOOST_MESSAGE( "TestConvertToInput");
 +    BOOST_TEST_MESSAGE( "TestConvertToInput");
      {
-@@ -279,3 +279,3 @@ void TestExtractToInput()
+         OutputBuffer ob;
+         size_t dataSize = kDefaultBlockSize*2 + kDefaultBlockSize/2;
+@@ -277,7 +277,7 @@
+ 
+ void TestExtractToInput()
  {
 -    BOOST_MESSAGE( "TestExtractToInput");
 +    BOOST_TEST_MESSAGE( "TestExtractToInput");
      {
-@@ -378,3 +378,3 @@ void TestAppend()
+         OutputBuffer ob;
+         size_t dataSize = kDefaultBlockSize*2 + kDefaultBlockSize/2;
+@@ -376,7 +376,7 @@
+ 
+ void TestAppend()
  {
 -    BOOST_MESSAGE( "TestAppend");
 +    BOOST_TEST_MESSAGE( "TestAppend");
      {
-@@ -407,3 +407,3 @@ void TestBufferStream()
+         OutputBuffer ob;
+         size_t dataSize = kDefaultBlockSize + kDefaultBlockSize/2;
+@@ -405,7 +405,7 @@
+ 
+ void TestBufferStream()
  {
 -    BOOST_MESSAGE( "TestBufferStream");
 +    BOOST_TEST_MESSAGE( "TestBufferStream");
  
-@@ -458,3 +458,3 @@ void TestBufferStreamEof()
+     {
+         // write enough bytes to a buffer, to create at least 3 blocks
+@@ -456,7 +456,7 @@
+ 
+ void TestBufferStreamEof()
  {
 -    BOOST_MESSAGE( "TestBufferStreamEof");
 +    BOOST_TEST_MESSAGE( "TestBufferStreamEof");
  
-@@ -471,3 +471,3 @@ void TestSeekAndTell()
+     TestEof<int32_t>();
+ 
+@@ -469,7 +469,7 @@
+ 
+ void TestSeekAndTell()
  {
 -    BOOST_MESSAGE( "TestSeekAndTell");
 +    BOOST_TEST_MESSAGE( "TestSeekAndTell");
  
-@@ -503,3 +503,3 @@ void TestReadSome()
+     {
+         std::string junk = makeString(kDefaultBlockSize/2);
+@@ -501,7 +501,7 @@
+ 
+ void TestReadSome()
  {
 -    BOOST_MESSAGE( "TestReadSome");
 +    BOOST_TEST_MESSAGE( "TestReadSome");
      {
-@@ -533,3 +533,3 @@ void TestSeek()
+         std::string junk = makeString(kDefaultBlockSize/2);
+ 
+@@ -531,7 +531,7 @@
+ 
+ void TestSeek()
  {
 -    BOOST_MESSAGE( "TestSeek");
 +    BOOST_TEST_MESSAGE( "TestSeek");
      {
-@@ -594,3 +594,3 @@ void TestIterator()
+         const std::string str = "SampleMessage";
+ 
+@@ -592,7 +592,7 @@
+ 
+ void TestIterator() 
  {
 -    BOOST_MESSAGE( "TestIterator");
 +    BOOST_TEST_MESSAGE( "TestIterator");
      {
-@@ -676,3 +676,3 @@ void TestAsioBuffer()
+         OutputBuffer ob(2 * kMaxBlockSize + 10);
+         BOOST_CHECK_EQUAL(ob.numChunks(), 3);
+@@ -674,7 +674,7 @@
+ void TestAsioBuffer()
+ {
      using boost::asio::ip::tcp;
 -    BOOST_MESSAGE( "TestAsioBuffer");
 +    BOOST_TEST_MESSAGE( "TestAsioBuffer");
      {
-@@ -748,3 +748,3 @@ void TestSplit()
+         boost::barrier b(2);
+ 
+@@ -746,7 +746,7 @@
+ 
+ void TestSplit()
  {
 -    BOOST_MESSAGE( "TestSplit");
 +    BOOST_TEST_MESSAGE( "TestSplit");
      {
-@@ -775,3 +775,3 @@ void TestSplitOnBorder()
+         const std::string str = "This message is to be split";
+ 
+@@ -773,7 +773,7 @@
+ 
+ void TestSplitOnBorder()
  {
 -    BOOST_MESSAGE( "TestSplitOnBorder");
 +    BOOST_TEST_MESSAGE( "TestSplitOnBorder");
      {
-@@ -814,3 +814,3 @@ void TestSplitTwice()
+ 
+         const std::string part1 = "This message";
+@@ -812,7 +812,7 @@
+ 
+ void TestSplitTwice() 
  {
 -    BOOST_MESSAGE( "TestSplitTwice");
 +    BOOST_TEST_MESSAGE( "TestSplitTwice");
      {
-@@ -844,3 +844,3 @@ void TestCopy()
+         const std::string msg1 = makeString(30);
+ 
+@@ -842,7 +842,7 @@
+ 
+ void TestCopy() 
  {
 -    BOOST_MESSAGE( "TestCopy");
 +    BOOST_TEST_MESSAGE( "TestCopy");
  
-@@ -1000,3 +1000,3 @@ void TestBug()
+     const std::string msg = makeString(30);
+     // Test1, small data, small buffer
+@@ -998,7 +998,7 @@
+ // this is reproducing a sequence of steps that caused a crash
+ void TestBug()  
  {
 -    BOOST_MESSAGE( "TestBug");
 +    BOOST_TEST_MESSAGE( "TestBug");
      {
-@@ -1040,3 +1040,3 @@ void TestForeign ()
+         OutputBuffer rxBuf;
+         OutputBuffer  buf;
+@@ -1038,7 +1038,7 @@
+ 
+ void TestForeign ()  
  {
 -    BOOST_MESSAGE( "TestForeign");
 +    BOOST_TEST_MESSAGE( "TestForeign");
      {
-@@ -1067,3 +1067,3 @@ void TestForeignDiscard ()
+         std::string hello = "hello ";
+         std::string there = "there ";
+@@ -1065,7 +1065,7 @@
+ 
+ void TestForeignDiscard ()  
  {
 -    BOOST_MESSAGE( "TestForeign");
 +    BOOST_TEST_MESSAGE( "TestForeign");
      {
-@@ -1106,3 +1106,3 @@ void TestPrinter()
+         std::string hello = "hello ";
+         std::string again = "again ";
+@@ -1104,7 +1104,7 @@
+ 
+ void TestPrinter()
  {
 -    BOOST_MESSAGE( "TestPrinter");
 +    BOOST_TEST_MESSAGE( "TestPrinter");
      {
-diff -uNr -p1 src/avro-cpp-1.7.7/test/SchemaTests.cc src-bak/avro-cpp-1.7.7/test/SchemaTests.cc
---- src/avro-cpp-1.7.7/test/SchemaTests.cc	2014-07-18 20:20:04.000000000 +0100
-+++ src-bak/avro-cpp-1.7.7/test/SchemaTests.cc	2015-12-28 16:10:38.783416399 +0000
-@@ -140,3 +140,3 @@ static void testBasic(const char* schema
+         OutputBuffer ob;
+         addDataToBuffer(ob, 128);
+diff -uNr avro-cpp-1.8.0.orig/test/SchemaTests.cc avro-cpp-1.8.0/test/SchemaTests.cc
+--- avro-cpp-1.8.0.orig/test/SchemaTests.cc	2016-02-04 13:28:36.564240294 +0000
++++ avro-cpp-1.8.0/test/SchemaTests.cc	2016-02-04 13:29:06.177573701 +0000
+@@ -138,19 +138,19 @@
+ 
+ static void testBasic(const char* schema)
  {
 -    BOOST_CHECKPOINT(schema);
 +    BOOST_TEST_CHECKPOINT(schema);
      compileJsonSchemaFromString(schema);
-@@ -146,3 +146,3 @@ static void testBasic_fail(const char* s
+ }
+ 
+ static void testBasic_fail(const char* schema)
  {
 -    BOOST_CHECKPOINT(schema);
 +    BOOST_TEST_CHECKPOINT(schema);
      BOOST_CHECK_THROW(compileJsonSchemaFromString(schema), Exception);
-@@ -152,3 +152,3 @@ static void testCompile(const char* sche
+ }
+ 
+ static void testCompile(const char* schema)
  {
 -    BOOST_CHECKPOINT(schema);
 +    BOOST_TEST_CHECKPOINT(schema);
      compileJsonSchemaFromString(std::string(schema));
+ }
+ 
diff --git a/avro-cpp-python2.patch b/avro-cpp-python2.patch
index 29f618a68ad9..79a7ad042a42 100644
--- a/avro-cpp-python2.patch
+++ b/avro-cpp-python2.patch
@@ -1,7 +1,6 @@
-Only in avro-cpp-1.7.7-patched/: CMakeLists.txt.orig
-diff -ur avro-cpp-1.7.7/scripts/gen-cppcode.py avro-cpp-1.7.7-patched/scripts/gen-cppcode.py
---- avro-cpp-1.7.7/scripts/gen-cppcode.py	2014-07-18 20:20:04.000000000 +0100
-+++ avro-cpp-1.7.7-patched/scripts/gen-cppcode.py	2014-07-30 01:19:33.603500815 +0100
+diff -uNr avro-cpp-1.8.0.orig/scripts/gen-cppcode.py avro-cpp-1.8.0/scripts/gen-cppcode.py
+--- avro-cpp-1.8.0.orig/scripts/gen-cppcode.py	2016-02-04 13:28:36.564240294 +0000
++++ avro-cpp-1.8.0/scripts/gen-cppcode.py	2016-02-04 13:35:33.354241323 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python2