FreeBSD Bugzilla – Attachment 154128 Details for
Bug 198355
databases/riak: update to 2.0.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
poudriere pass
riak.diff (text/plain), 24.39 KB, created by
nbari
on 2015-03-10 09:57:27 UTC
(
hide
)
Description:
poudriere pass
Filename:
MIME Type:
Creator:
nbari
Created:
2015-03-10 09:57:27 UTC
Size:
24.39 KB
patch
obsolete
>diff -ruN riak.orig/Makefile riak/Makefile >--- riak.orig/Makefile 2015-03-09 13:57:29.212812184 +0000 >+++ riak/Makefile 2015-03-10 09:32:17.420957844 +0000 >@@ -1,47 +1,57 @@ >-# $FreeBSD: head/databases/riak/Makefile 379548 2015-02-21 20:39:33Z robak $ >+# $FreeBSD: head/databases/riak/Makefile 371981 2014-11-01 00:09:15Z bapt $ > > PORTNAME= riak >-PORTVERSION= 1.4.12 >+PORTVERSION= 2.0.5 > 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}/ >+ http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \ >+ http://s3.amazonaws.com/files.basho.com/solr/:solr \ >+ http://s3.amazonaws.com/files.basho.com/yokozuna/:yokozuna >+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ >+ solr-4.7.0-yz-1.tgz:solr \ >+ yokozuna-1.jar:yokozuna \ >+ yz_monitor-1.jar:yokozuna >+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} solr-4.7.0-yz-1.tgz > > MAINTAINER= robak@FreeBSD.org > COMMENT= Riak is an open source, distributed, noSQL database > > LICENSE= APACHE20 > >-BUILD_DEPENDS= ${LOCALBASE}/lib/erlang15/bin/erlc:${PORTSDIR}/lang/erlang-runtime15 >+BUILD_DEPENDS= ${LOCALBASE}/lib/erlang16/bin/erlc:${PORTSDIR}/lang/erlang-runtime16 > > USES= gmake readline > USE_RC_SUBR= riak >- >-PLIST= ${WRKDIR}/pkg-plist >-PLIST_SUB+= GROUPS=${GROUPS} \ >- RIAK_CONFDIR=${RIAK_CONFDIR} \ >- RIAK_DBDIR=${RIAK_DBDIR} \ >- RIAK_HOMEDIR=${RIAK_HOMEDIR} \ >- RIAK_LIBDIR=${RIAK_LIBDIR} \ >- RIAK_LOGDIR=${RIAK_LOGDIR} \ >- USERS=${USERS} >+USE_GCC= yes > > USERS= riak > GROUPS= riak > >-RIAK_CONFDIR?= ${PREFIX}/etc/${PORTNAME} > RIAK_LOGDIR?= /var/log/${PORTNAME} > RIAK_DBDIR?= /var/db/${PORTNAME} >-RIAK_LIBDIR?= ${PREFIX}/lib/${PORTNAME}/lib > RIAK_HOMEDIR?= ${PREFIX}/lib/${PORTNAME} >+RIAK_LIBDIR?= ${PREFIX}/lib/${PORTNAME}/lib >+ >+PLIST= ${WRKDIR}/pkg-plist >+PLIST_SUB+= RIAK_DBDIR=${RIAK_DBDIR} \ >+ RIAK_HOMEDIR=${RIAK_HOMEDIR} \ >+ RIAK_LIBDIR=${RIAK_LIBDIR} \ >+ RIAK_LOGDIR=${RIAK_LOGDIR} \ >+ USERS=${USERS} \ >+ GROUPS=${GROUPS} > > ALL_TARGET= rel > MAKE_JOBS_UNSAFE=yes >-MAKE_ENV= PATH=${LOCALBASE}/lib/erlang15/bin:${PATH} >+MAKE_ENV= PATH=${LOCALBASE}/lib/erlang16/bin:${PATH} > > .include <bsd.port.pre.mk> > > post-patch: > @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config >+ @${REINPLACE_CMD} -e 's|%%BUILD_DIR%%|${WRKDIR}|g' \ >+ -e 's|%%DISTDIR%%|${DISTDIR}|g' \ >+ -e 's|%%YOKOZUNA%%|${WRKSRC}/deps/yokozuna|g' \ >+ ${WRKSRC}/deps/yokozuna/tools/grab-solr.sh > > pre-install: > ${RM} -f ${PLIST} >@@ -55,17 +65,20 @@ > (cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type f \ > | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ > | ${AWK} '{print "lib/"$$2 }' >> ${PLIST}) >+ (cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type d -empty \ >+ | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ >+ | ${AWK} '{print "@dir lib/"$$2 }' >> ${PLIST}) > ${ECHO} "@owner" >> ${PLIST} > ${ECHO} "@group" >> ${PLIST} > > do-install: >-.for d in ${RIAK_CONFDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR} >+.for d in ${ETCDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR} > ${MKDIR} ${STAGEDIR}${d} > .endfor >- ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/vm.args ${STAGEDIR}${RIAK_CONFDIR}/vm.args.sample >- ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/app.config ${STAGEDIR}${RIAK_CONFDIR}/app.config.sample >- ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/cert.pem ${STAGEDIR}${RIAK_CONFDIR}/cert.pem.sample >- ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/key.pem ${STAGEDIR}${RIAK_CONFDIR}/key.pem.sample >+ ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${ETCDIR}/riak.conf.sample >+ ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${ETCDIR}/riak.conf >+ ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${ETCDIR}/solr-log4j.properties.sample >+ ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${ETCDIR}/solr-log4j.properties > (cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR}) > (cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/) > (cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches) >@@ -76,4 +89,13 @@ > ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ > ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ > >+post-install: >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/bitcask-1.7.0/priv/bitcask.so >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/erlang_js-1.3.0-0-g07467d8/priv/erlang_js_drv.so >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/syslog-1.0.2/priv/syslog_drv.so >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/canola-2.0.0-0-g9bdfee8/priv/canola-port >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/riak_ensemble-2.0.0-1-gd66a102/priv/riak_ensemble.so >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/sext-1.1p3-0-g846b9cc/priv/sext.so >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/eleveldb-2.0.0-3-g10fcb78/priv/eleveldb.so >+ > .include <bsd.port.post.mk> >diff -ruN riak.orig/distinfo riak/distinfo >--- riak.orig/distinfo 2015-03-09 13:57:29.212812184 +0000 >+++ riak/distinfo 2015-03-09 19:56:10.102395073 +0000 >@@ -1,2 +1,8 @@ >-SHA256 (riak-1.4.12.tar.gz) = 2ae63ba183ce457399a21542c75aa6149481c972ebac739a1599e93e81982c91 >-SIZE (riak-1.4.12.tar.gz) = 13821609 >+SHA256 (riak-2.0.5.tar.gz) = 390cd596762a7465712b472eb7058314a400068fa1ad567b93530eecdaed8047 >+SIZE (riak-2.0.5.tar.gz) = 17805547 >+SHA256 (solr-4.7.0-yz-1.tgz) = 172380c6c334797b4639f7c497a2a34a249efbfd3917106b3662f6b1e8a0352f >+SIZE (solr-4.7.0-yz-1.tgz) = 166999678 >+SHA256 (yokozuna-1.jar) = 91a208e1fde1ef2a931f8d14ba150f730c92bc3a7a8e8bce30c6a6b027e18f82 >+SIZE (yokozuna-1.jar) = 10645 >+SHA256 (yz_monitor-1.jar) = 35c41c103c83452c6377fac42b6c8bb714d2e1e2b8c02053397c0fa2423b694d >+SIZE (yz_monitor-1.jar) = 2661 >diff -ruN riak.orig/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform >--- riak.orig/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform 2015-03-09 13:57:29.211812539 +0000 >+++ riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform 1970-01-01 00:00:00.000000000 +0000 >@@ -1,29 +0,0 @@ >---- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2014-04-02 12:41:11.174611987 +0000 >-+++ deps/eleveldb/c_src/leveldb/build_detect_platform 2014-04-02 12:42:31.766605994 +0000 >-@@ -134,7 +134,7 @@ >- true >- else >- # If -std=c++0x works, use <cstdatomic>. Otherwise use port_posix.h. >-- $CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null <<EOF >-+ $CXX $CFLAGS -std=c++0x -x c++ - 2>/dev/null <<EOF >- #include <cstdatomic> >- int main() {} >- EOF >-@@ -147,7 +147,7 @@ >- >- # Test whether Snappy library is installed >- # http://code.google.com/p/snappy/ >-- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF >-+ $CXX $CFLAGS -x c++ - 2>/dev/null <<EOF >- #include <snappy.h> >- int main() {} >- EOF >-@@ -157,7 +157,7 @@ >- fi >- >- # Test whether tcmalloc is available >-- $CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null <<EOF >-+ $CXX $CFLAGS -x c++ - -ltcmalloc 2>/dev/null <<EOF >- int main() {} >- EOF >- if [ "$?" = 0 ]; then >diff -ruN riak.orig/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc >--- riak.orig/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc 2015-03-09 13:57:29.211812539 +0000 >+++ riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc 1970-01-01 00:00:00.000000000 +0000 >@@ -1,36 +0,0 @@ >---- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2014-04-02 12:26:08.746672588 +0000 >-+++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2014-04-02 12:37:06.719627543 +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(314572800), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false}, >-+ {UINT64_C(10485760), UINT64_C(419430400), INT64_C(57671680), UINT64_C( 4094304000), UINT64_C( 3355443200), UINT64_C(419430400), false}, >-+ {UINT64_C(10485760), UINT64_C(524288000), INT64_C(57671680), UINT64_C( 41943040000), UINT64_C( 33554432000), UINT64_C(524288000), false}, >-+ {UINT64_C(10485760), UINT64_C(629145600), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false}, >-+ {UINT64_C(10485760), UINT64_C(734003200), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false} >- }; >- >- /// ULL above needed to compile on OSX 10.7.3 >diff -ruN riak.orig/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch >--- riak.orig/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch 2015-03-09 13:57:29.211812539 +0000 >+++ riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch 1970-01-01 00:00:00.000000000 +0000 >@@ -1,18 +0,0 @@ >---- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig 2013-01-29 21:13:01.000000000 +0100 >-+++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch 2013-09-12 14:59:29.000000000 +0200 >-@@ -1,6 +1,6 @@ >- --- c_src.orig/js/src/config/FreeBSD.mk 1969-12-31 19:00:00.000000000 -0500 >- +++ c_src/js/src/config/FreeBSD.mk 2011-03-30 20:12:51.000000000 -0400 >--@@ -0,0 +1,99 @@ >-+@@ -0,0 +1,100 @@ >- +# -*- Mode: makefile -*- >- +# >- +# ***** BEGIN LICENSE BLOCK ***** >-@@ -46,6 +46,7 @@ >- + >- +CC ?= gcc >- +CCC ?= g++ >-++LD = $(CC) >- +CFLAGS += -Wall -Wno-format >- +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R >- + >diff -ruN riak.orig/files/patch-deps-node_package-priv-base-env.sh riak/files/patch-deps-node_package-priv-base-env.sh >--- riak.orig/files/patch-deps-node_package-priv-base-env.sh 2015-03-09 13:57:29.211812539 +0000 >+++ riak/files/patch-deps-node_package-priv-base-env.sh 1970-01-01 00:00:00.000000000 +0000 >@@ -1,27 +0,0 @@ >---- deps/node_package/priv/base/env.sh.orig 2013-09-13 10:22:32.000000000 +0200 >-+++ deps/node_package/priv/base/env.sh 2013-09-13 10:27:16.000000000 +0200 >-@@ -100,7 +100,7 @@ >- # read/write/delete .pid files during startup/shutdown >- create_pid_dir() { >- # Validate RUNNER_USER is set and they have permissions to write to /var/run >-- # Don't continue if we've already sudo'd to RUNNER_USER >-+ # Don't continue if we've already su'd to RUNNER_USER >- if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then >- if [ -w $RUN_DIR ]; then >- mkdir -p $PID_DIR >-@@ -161,12 +161,12 @@ >- # Validate that the user running the script is the owner of the >- # RUN_DIR. >- if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then >-- type sudo > /dev/null 2>&1 >-+ type su > /dev/null 2>&1 >- if [ "$?" -ne 0 ]; then >-- echoerr "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 >-+ echoerr "su doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 >- exit 1 >- fi >-- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ >-+ exec su - $RUNNER_USER -c "$RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@" >- fi >- } >- >diff -ruN riak.orig/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch riak/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch >--- riak.orig/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch 1970-01-01 00:00:00.000000000 +0000 >+++ riak/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch 2015-03-09 20:45:44.623130149 +0000 >@@ -0,0 +1,27 @@ >+--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig 2015-02-26 16:11:58 UTC >++++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch >+@@ -1,6 +1,6 @@ >+ --- c_src.orig/js/src/config/FreeBSD.mk 1969-12-31 19:00:00.000000000 -0500 >+ +++ c_src/js/src/config/FreeBSD.mk 2011-03-30 20:12:51.000000000 -0400 >+-@@ -0,0 +1,99 @@ >++@@ -0,0 +1,100 @@ >+ +# -*- Mode: makefile -*- >+ +# >+ +# ***** BEGIN LICENSE BLOCK ***** >+@@ -46,6 +46,7 @@ >+ + >+ +CC ?= gcc >+ +CCC ?= g++ >+++LD = $(CC) >+ +CFLAGS += -Wall -Wno-format >+ +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R >+ + >+@@ -63,7 +64,7 @@ >+ +OS_CFLAGS+= -DX86_LINUX >+ + >+ +ifeq (gcc, $(CC)) >+-+# if using gcc on x86, check version for opt bug >+++# if using gcc on x86, check version for opt bug >+ +# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892) >+ +GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }') >+ +GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) ) >\ No newline at end of file >diff -ruN riak.orig/files/patch-deps_yokozuna_tools_grab-solr.sh riak/files/patch-deps_yokozuna_tools_grab-solr.sh >--- riak.orig/files/patch-deps_yokozuna_tools_grab-solr.sh 1970-01-01 00:00:00.000000000 +0000 >+++ riak/files/patch-deps_yokozuna_tools_grab-solr.sh 2015-03-10 09:40:11.407928356 +0000 >@@ -0,0 +1,111 @@ >+--- deps/yokozuna/tools/grab-solr.sh.orig 2015-01-27 15:59:10 UTC >++++ deps/yokozuna/tools/grab-solr.sh >+@@ -1,4 +1,4 @@ >+-#!/usr/bin/env bash >++#!/usr/bin/env sh >+ # >+ # Script to grab Solr and embed in priv dir. This script assumes it is >+ # being called from root dir or tools dir. >+@@ -14,10 +14,10 @@ then >+ cd tools >+ fi >+ >+-PRIV_DIR=../priv >++PRIV_DIR=%%YOKOZUNA%%/priv >+ CONF_DIR=$PRIV_DIR/conf >+ SOLR_DIR=$PRIV_DIR/solr >+-BUILD_DIR=../build >++BUILD_DIR=%%BUILD_DIR%% >+ VSN=solr-4.7.0-yz-1 >+ FILENAME=$VSN.tgz >+ TMP_DIR=/var/tmp/yokozuna >+@@ -32,56 +32,11 @@ check_for_solr() >+ test -e $SOLR_DIR/start.jar >+ } >+ >+-download() >+-{ >+- if which wget > /dev/null; then >+- wget --no-check-certificate --progress=dot:mega $1 >+- elif which curl > /dev/null; then >+- curl --insecure --progress-bar -O $1 >+- fi >+-} >+- >+-get_solr() >+-{ >+- if [[ -z ${SOLR_PKG_DIR+x} ]] >+- then >+- if [ -e $TMP_FILE ]; then >+- echo "Using cached copy of Solr $TMP_FILE" >+- ln -s $TMP_FILE $FILENAME >+- else >+- echo "Pulling Solr from S3" >+- download "http://s3.amazonaws.com/files.basho.com/solr/$FILENAME" >+- if [ -d $TMP_DIR ]; then >+- cp $FILENAME $TMP_DIR >+- else >+- mkdir $TMP_DIR >+- cp $FILENAME $TMP_DIR >+- fi >+- fi >+- else >+- # This is now obsolete thanks to implicit caching above >+- # but will leave in for now as to not break anyone. >+- echo "Using local copy of Solr $SOLR_PKG_DIR/$FILENAME" >+- cp $SOLR_PKG_DIR/$FILENAME ./ >+- fi >+- tar zxf $FILENAME >+-} >+- >+ if ! check_for_solr >+ then >+ >+- echo "Create dir $BUILD_DIR" >+- if [ ! -e $BUILD_DIR ]; then >+- mkdir $BUILD_DIR >+- fi >+- >+ cd $BUILD_DIR >+ >+- if [ ! -e $SRC_DIR ] >+- then >+- get_solr >+- fi >+- >+ echo "Creating Solr dir $SOLR_DIR" >+ >+ # Explicitly copy files needed rather than copying everything and >+@@ -106,7 +61,7 @@ then >+ echo "Solr dir created successfully" >+ fi >+ >+-JAVA_LIB=../priv/java_lib >++JAVA_LIB=%%YOKOZUNA%%/priv/java_lib >+ YZ_JAR_VSN=1 >+ YZ_JAR_NAME=yokozuna-$YZ_JAR_VSN.jar >+ >+@@ -117,18 +72,16 @@ then >+ mkdir $JAVA_LIB >+ fi >+ >+- echo "Downloading $YZ_JAR_NAME" >+- download "http://s3.amazonaws.com/files.basho.com/yokozuna/$YZ_JAR_NAME" >+- mv $YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME >++ echo "Copying $YZ_JAR_NAME" >++ cp %%DISTDIR%%/$YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME >+ fi >+ >+-EXT_LIB=../priv/solr/lib/ext >++EXT_LIB=%%YOKOZUNA%%/priv/solr/lib/ext >+ MON_JAR_VSN=1 >+ MON_JAR_NAME=yz_monitor-$MON_JAR_VSN.jar >+ >+ if [ ! -e $EXT_LIB/$MON_JAR_NAME ] >+ then >+- echo "Downloading $MON_JAR_NAME" >+- download "http://s3.amazonaws.com/files.basho.com/yokozuna/$MON_JAR_NAME" >+- mv $MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME >++ echo "Copying $MON_JAR_NAME" >++ cp %%DISTDIR%%/$MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME >+ fi >diff -ruN riak.orig/files/patch-rel-reltool.config riak/files/patch-rel-reltool.config >--- riak.orig/files/patch-rel-reltool.config 2015-03-09 13:57:29.212812184 +0000 >+++ riak/files/patch-rel-reltool.config 1970-01-01 00:00:00.000000000 +0000 >@@ -1,16 +0,0 @@ >---- rel/reltool.config.orig 2013-09-17 20:53:23.000000000 +0200 >-+++ rel/reltool.config 2013-09-17 20:55:40.000000000 +0200 >-@@ -37,8 +37,12 @@ >- {boot_rel, "riak"}, >- {profile, embedded}, >- {excl_sys_filters, ["^bin/.*", >-- "^erts.*/bin/(dialyzer|typer)"]}, >-+ "^erts.*/bin/(dialyzer|typer)", >-+ "^erts.*/bin/(dialyzer|typer)", >-+ "^erts.*/doc", >-+ "^erts.*/man"]}, >- {excl_archive_filters, [".*"]}, >-+ {app, mnesia, [{incl_app_filters, ["ebin/*"]}]}, >- {app, cluster_info, [{incl_cond, include}]}, >- {app, erlang_js, [{incl_cond, include}]}, >- {app, ebloom, []}, >diff -ruN riak.orig/files/patch-rel-vars.config riak/files/patch-rel-vars.config >--- riak.orig/files/patch-rel-vars.config 2015-03-09 13:57:29.211812539 +0000 >+++ riak/files/patch-rel-vars.config 1970-01-01 00:00:00.000000000 +0000 >@@ -1,41 +0,0 @@ >---- rel/vars.config.orig 2013-08-29 20:13:02.000000000 +0200 >-+++ rel/vars.config 2013-09-11 23:04:34.000000000 +0200 >-@@ -2,11 +2,12 @@ >- %% ex: ft=erlang ts=4 sw=4 et >- >- %% Platform-specific installation paths >--{platform_bin_dir, "./bin"}. >--{platform_data_dir, "./data"}. >--{platform_etc_dir, "./etc"}. >--{platform_lib_dir, "./lib"}. >--{platform_log_dir, "./log"}. >-+{platform_bin_dir, "%%PREFIX%%/sbin"}. >-+{platform_data_dir, "/var/db/riak"}. >-+{platform_etc_dir, "%%PREFIX%%/etc/riak"}. >-+{platform_base_dir, "%%PREFIX%%/lib/riak"}. >-+{platform_lib_dir, "%%PREFIX%%/lib/riak/lib"}. >-+{platform_log_dir, "/var/log/riak"}. >- >- %% >- %% etc/app.config >-@@ -47,12 +48,12 @@ >- %% >- %% bin/riak >- %% >--{runner_script_dir, "$(cd ${0%/*} && pwd)"}. >--{runner_base_dir, "{{runner_script_dir}}/.."}. >--{runner_etc_dir, "$RUNNER_BASE_DIR/etc"}. >--{runner_log_dir, "$RUNNER_BASE_DIR/log"}. >--{runner_lib_dir, "$RUNNER_BASE_DIR/lib"}. >--{runner_patch_dir, "$RUNNER_BASE_DIR/lib/basho-patches"}. >--{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}. >--{runner_user, ""}. >-+{runner_script_dir, "{{platform_bin_dir}}"}. >-+{runner_base_dir, "{{platform_base_dir}}"}. >-+{runner_etc_dir, "{{platform_etc_dir}}"}. >-+{runner_log_dir, "{{platform_log_dir}}"}. >-+{runner_lib_dir, "{{platform_lib_dir}}"}. >-+{runner_patch_dir, "{{platform_lib_dir}}/basho-patches"}. >-+{pipe_dir, "/tmp/riak"}. >-+{runner_user, "riak"}. >- {runner_wait_process, "riak_core_node_watcher"}. >diff -ruN riak.orig/files/patch-rel_vars.config riak/files/patch-rel_vars.config >--- riak.orig/files/patch-rel_vars.config 1970-01-01 00:00:00.000000000 +0000 >+++ riak/files/patch-rel_vars.config 2015-03-09 20:45:44.623130149 +0000 >@@ -0,0 +1,42 @@ >+--- rel/vars.config.orig 2015-02-27 13:37:42 UTC >++++ rel/vars.config >+@@ -2,11 +2,12 @@ >+ %% ex: ft=erlang ts=4 sw=4 et >+ >+ %% Platform-specific installation paths >+-{platform_bin_dir, "./bin"}. >+-{platform_data_dir, "./data"}. >+-{platform_etc_dir, "./etc"}. >+-{platform_lib_dir, "./lib"}. >+-{platform_log_dir, "./log"}. >++{platform_base_dir, "%%PREFIX%%/lib/riak"}. >++{platform_bin_dir, "%%PREFIX%%/sbin"}. >++{platform_etc_dir, "%%PREFIX%%/etc/riak"}. >++{platform_lib_dir, "%%PREFIX%%/lib/riak/lib"}. >++{platform_data_dir, "/var/db/riak"}. >++{platform_log_dir, "/var/log/riak"}. >+ >+ %% >+ %% etc/app.config >+@@ -40,14 +41,14 @@ >+ %% >+ %% bin/riak >+ %% >+-{runner_script_dir, "\`cd \\`dirname $0\\` && /bin/pwd\`"}. >+-{runner_base_dir, "{{runner_script_dir}}/.."}. >+-{runner_etc_dir, "$RUNNER_BASE_DIR/etc"}. >+-{runner_log_dir, "$RUNNER_BASE_DIR/log"}. >+-{runner_lib_dir, "$RUNNER_BASE_DIR/lib"}. >+-{runner_patch_dir, "$RUNNER_BASE_DIR/lib/basho-patches"}. >+-{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}. >+-{runner_user, ""}. >++{runner_script_dir, "{{platform_bin_dir}}"}. >++{runner_base_dir, "{{platform_base_dir}}"}. >++{runner_etc_dir, "{{platform_etc_dir}}"}. >++{runner_log_dir, "{{platform_log_dir}}"}. >++{runner_lib_dir, "{{platform_lib_dir}}"}. >++{runner_patch_dir, "{{platform_lib_dir}}/basho-patches"}. >++{pipe_dir, "/tmp/riak"}. >++{runner_user, "riak"}. >+ {runner_wait_process, "riak_core_node_watcher"}. >+ {runner_ulimit_warn, 65536}. >diff -ruN riak.orig/files/riak.in riak/files/riak.in >--- riak.orig/files/riak.in 2015-03-09 13:57:29.210815791 +0000 >+++ riak/files/riak.in 2015-03-09 20:45:44.623130149 +0000 >@@ -1,84 +1,27 @@ >-#!/bin/sh >-# $FreeBSD: head/databases/riak/files/riak.in 357522 2014-06-11 18:44:31Z trociny $ >+#!/bin/sh > >+# $FreeBSD$ >+# > # PROVIDE: riak >-# REQUIRE: LOGIN cleanvar >+# REQUIRE: LOGIN > # KEYWORD: shutdown >- > # >-# Add the following lines to /etc/rc.conf to enable riak: >-# riak_enable (bool): Set to "NO" by default. >-# Set it to "YES" to enable riak on boot. >+# Add these lines to /etc/rc.conf.local or /etc/rc.conf >+# to enable this service: > # >+# riak_enable (bool): Set to NO by default. >+# Set it to YES to enable riak > > . /etc/rc.subr > >-name="riak" >+name=riak > rcvar=riak_enable > >-pidfile=/var/run/riak/riak.pid >- >-start_cmd="riak_start" >-stop_cmd="riak_stop" >-restart_cdm="riak_restart" >-status_cmd="riak_status" >-command="%%PREFIX%%/sbin/riak" >- > load_rc_config $name > >-# Read rc.d config and set defaults >-load_rc_config "$name" >-: ${riak_enable="NO"} >- >-riak_start() >-{ >- echo "Starting Riak." >- %%PREFIX%%/sbin/riak start >- return 0 >-} >- >-riak_stop() >-{ >- echo "Stopping Riak processes" >- %%PREFIX%%/sbin/riak stop >- killall -9 epmd >- return 0 >-} >- >-riak_restart() >-{ >- riak_stop >- riak_start >- return 0 >-} >- >-riak_status() >-{ >- if riak_running; then >- echo "Riak is running." >- return 0 >- else >- echo "Riak is not running" >- return 1 >- fi >-} >- >-riak_running() >-{ >- local pid result ps >- pid=`%%PREFIX%%/sbin/riak getpid` >- result=`echo $?` >- if [ "$result" == 0 ]; then >- ps=`ps -waux | grep ${pid} | grep riak` >- result=`echo $?` >- if [ "$result" ]; then >- return 0 >- else >- return 1 >- fi >- else >- return 1 >- fi >-} >+command=%%PREFIX%%/lib/riak/erts-5.10.4/bin/beam.smp >+pidfile="/var/run/${name}/${name}.pid" >+start_cmd="%%PREFIX%%/sbin/${name} start" >+stop_cmd="%%PREFIX%%/sbin/${name} stop" > > run_rc_command "$1" >diff -ruN riak.orig/pkg-plist riak/pkg-plist >--- riak.orig/pkg-plist 2015-03-09 13:57:29.212812184 +0000 >+++ riak/pkg-plist 2015-03-09 17:29:19.708937943 +0000 >@@ -6,11 +6,10 @@ > man/man1/riak-debug.1.gz > man/man1/riak.1.gz > man/man1/search-cmd.1.gz >-@sample %%ETCDIR%%/vm.args.sample >-@sample %%ETCDIR%%/app.config.sample >-@sample %%ETCDIR%%/cert.pem.sample >-@sample %%ETCDIR%%/key.pem.sample >-@dir %%RIAK_CONFDIR%% >+%%ETCDIR%%/riak.conf >+%%ETCDIR%%/riak.conf.sample >+%%ETCDIR%%/solr-log4j.properties >+%%ETCDIR%%/solr-log4j.properties.sample > @owner %%USERS%% > @group %%GROUPS%% > @dir %%RIAK_DBDIR%%
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=154128">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 198355
:
153901
|
153902
|
153907
|
153931
|
153981
|
154128
|
154161