Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Apr 2014 20:54:07 GMT
From:      Allen <landsidel.allen@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/188775: Update databases/riak to 1.4.8
Message-ID:  <201404182054.s3IKs7DK075787@cgiserv.freebsd.org>
Resent-Message-ID: <201404182100.s3IL00KK091656@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188775
>Category:       ports
>Synopsis:       Update databases/riak to 1.4.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 18 21:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Allen
>Release:        9-STABLE
>Organization:
>Environment:
FreeBSD riakmaster.concord.local 9.1-STABLE FreeBSD 9.1-STABLE #2 r252191: Tue Jun 25 04:51:17 UTC 2013     root@prodx-master.concord.local:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Brings databases/riak up to latest release.
>How-To-Repeat:
Install databases/riak
>Fix:
Update PORTVERSION in Makefile to 1.4.8

Update distfiles with new signature and size:
  SHA256 (riak-1.4.8.tar.gz) = 69159cefeef48f5ad3ebec02ea4856f7c739e158758405e69c2d001d2d7958d1
  SIZE (riak-1.4.8.tar.gz) = 13799400

Fix the version_set.cc (new file attached).



Patch attached with submission follows:

--- ./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.
 
+#define __STDC_CONSTANT_MACROS
 #include "db/version_set.h"
 
 #include <algorithm>
 #include <stdio.h>
+#include <stdint.h>
 #include "db/filename.h"
 #include "db/log_reader.h"
 #include "db/log_writer.h"
@@ -53,13 +55,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,  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},
+    {UINT64_C(10485760), UINT64_C(125829120), INT64_C(57671680), UINT64_C(   4094304000), UINT64_C(   3355443200), UINT64_C(419430400), false},
+    {UINT64_C(10485760), UINT64_C(147286400), INT64_C(57671680), UINT64_C(  41943040000), UINT64_C(  33554432000), UINT64_C(524288000), false},
+    {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


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404182054.s3IKs7DK075787>