Date: Sat, 19 Apr 2014 14:00:01 GMT From: Allen Landsidel <landsidel.allen@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/188775: Update databases/riak to 1.4.8 Message-ID: <201404191400.s3JE01RV045559@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/188775; it has been noted by GNATS. From: Allen Landsidel <landsidel.allen@gmail.com> To: bug-followup@FreeBSD.org, r@robakdesign.com Cc: Subject: Re: ports/188775: Update databases/riak to 1.4.8 Date: Sat, 19 Apr 2014 09:59:20 -0400 This is a multi-part message in MIME format. --------------070804010503050803060505 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit The full diff is attached at bartek's request. Generated with svn diff --patch-compatible The changes to the leveldb file are not functional, the old patch simply would not apply because of changes to the original file. I simply recreated the patch from the new source file. --------------070804010503050803060505 Content-Type: text/plain; charset=windows-1252; name="riak.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="riak.patch" Index: Makefile =================================================================== --- Makefile (revision 351596) +++ Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= riak -PORTVERSION= 1.4.2 +PORTVERSION= 1.4.8 CATEGORIES= databases MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \ http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ Index: distinfo =================================================================== --- distinfo (revision 351596) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (riak-1.4.2.tar.gz) = 6a1fdcfc1f3f0357eeb377ead6638db4187379e3b40121cef16b517e03c6fd11 -SIZE (riak-1.4.2.tar.gz) = 13738074 +SHA256 (riak-1.4.8.tar.gz) = 69159cefeef48f5ad3ebec02ea4856f7c739e158758405e69c2d001d2d7958d1 +SIZE (riak-1.4.8.tar.gz) = 13799400 Index: files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc =================================================================== --- files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc (revision 351596) +++ files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc (working copy) @@ -1,5 +1,5 @@ ---- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2013-08-29 23:03:04.000000000 +0200 -+++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2013-09-22 14:38:08.000000000 +0200 +--- ./deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2014-04-18 16:05:03.000000000 +0000 ++++ ./deps/eleveldb/c_src/leveldb/db/version_set.cc 2014-04-18 16:06:33.000000000 +0000 @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. @@ -17,13 +17,13 @@ // WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified { -- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true}, -- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true}, -- {10485760, 104371840, 57671680, 1006632960, 200000000, 314572800, false}, -- {10485760, 125829120, 57671680, 4094304000, 3355443200, 419430400, false}, -- {10485760, 147286400, 57671680, 41943040000, 33554432000, 524288000, false}, -- {10485760, 188743680, 57671680, 419430400000, 335544320000, 629145600, false}, -- {10485760, 220200960, 57671680, 4194304000000, 3355443200000, 734003200, false} +- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true}, +- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true}, +- {10485760, 314572800, 57671680, 1006632960, 200000000, 314572800, false}, +- {10485760, 419430400, 57671680, 4094304000ULL, 3355443200ULL, 419430400, false}, +- {10485760, 524288000, 57671680, 41943040000ULL, 33554432000ULL, 524288000, false}, +- {10485760, 629145600, 57671680, 419430400000ULL, 335544320000ULL, 629145600, false}, +- {10485760, 734003200, 57671680, 4194304000000ULL, 3355443200000ULL, 734003200, false} + {UINT64_C(10485760), UINT64_C(262144000), INT64_C(57671680), UINT64_C( 209715200), UINT64_C( 0), UINT64_C(300000000), true}, + {UINT64_C(10485760), UINT64_C( 82914560), INT64_C(57671680), UINT64_C( 419430400), UINT64_C( 0), UINT64_C(209715200), true}, + {UINT64_C(10485760), UINT64_C(104371840), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false}, @@ -32,3 +32,5 @@ + {UINT64_C(10485760), UINT64_C(188743680), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false}, + {UINT64_C(10485760), UINT64_C(220200960), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false} }; + + /// ULL above needed to compile on OSX 10.7.3 --------------070804010503050803060505--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404191400.s3JE01RV045559>